Skip to content

Commit 7d3eeba

Browse files
roranmorearoranmorea
authored
Merge pull request #114 from pythonpoet/maxi-fix-ios
Upgraded to Non-nullable
2 parents ab2fcda + 8d2fde6 commit 7d3eeba

214 files changed

Lines changed: 2700 additions & 3361 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.metadata‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,27 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 68587a0916366e9512a78df22c44163d041dd5f3
8-
channel: stable
7+
revision: "7482962148e8d758338d8a28f589f317e1e42ba4"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
17+
base_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
18+
- platform: android
19+
create_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
20+
base_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎analysis_options.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This file configures the analyzer, which statically analyzes Dart code to
2+
# check for errors, warnings, and lints.
3+
#
4+
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
5+
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
6+
# invoked from the command line by running `flutter analyze`.
7+
8+
# The following line activates a set of recommended lints for Flutter apps,
9+
# packages, and plugins designed to encourage good coding practices.
10+
include: package:flutter_lints/flutter.yaml
11+
12+
linter:
13+
# The lint rules applied to this project can be customized in the
14+
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
15+
# included above or to enable additional rules. A list of all available lints
16+
# and their documentation is published at https://dart.dev/lints.
17+
#
18+
# Instead of disabling a lint rule for the entire project in the
19+
# section below, it can also be suppressed for a single line of code
20+
# or a specific dart file by using the `// ignore: name_of_lint` and
21+
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
22+
# producing the lint.
23+
rules:
24+
# avoid_print: false # Uncomment to disable the `avoid_print` rule
25+
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
26+
27+
# Additional information about this file can be found at
28+
# https://dart.dev/guides/language/analysis-options

‎android/.gitignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java
8+
9+
# Remember to never publicly share your keystore.
10+
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
key.properties
12+
**/*.keystore
13+
**/*.jks

‎android/app/build.gradle‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
7+
def keystoreProperties = new Properties()
8+
def keystorePropertiesFile = rootProject.file('key.properties')
9+
if (keystorePropertiesFile.exists()) {
10+
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
11+
}
12+
113
def localProperties = new Properties()
214
def localPropertiesFile = rootProject.file('local.properties')
315
if (localPropertiesFile.exists()) {
@@ -6,11 +18,6 @@ if (localPropertiesFile.exists()) {
618
}
719
}
820

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1421
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1522
if (flutterVersionCode == null) {
1623
flutterVersionCode = '1'
@@ -21,29 +28,38 @@ if (flutterVersionName == null) {
2128
flutterVersionName = '1.0'
2229
}
2330

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
31+
android {
32+
namespace "productions.morea.app"
33+
// compileSdk flutter.compileSdkVersion
34+
compileSdk 34
35+
ndkVersion flutter.ndkVersion
36+
37+
compileOptions {
38+
sourceCompatibility JavaVersion.VERSION_1_8
39+
targetCompatibility JavaVersion.VERSION_1_8
40+
}
41+
42+
kotlinOptions {
43+
jvmTarget = '1.8'
44+
}
45+
2746

28-
def keystoreProperties = new Properties()
29-
def keystorePropertiesFile = rootProject.file('key.properties')
30-
if (keystorePropertiesFile.exists()) {
31-
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
32-
}
3347

34-
android {
35-
compileSdkVersion 30
36-
3748
sourceSets {
3849
main.java.srcDirs += 'src/main/kotlin'
3950
}
51+
4052
defaultConfig {
53+
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4154
applicationId "productions.morea.app"
42-
minSdkVersion 21
43-
targetSdkVersion 30
55+
// You can update the following values to match your application needs.
56+
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
57+
minSdkVersion 33
58+
targetSdkVersion flutter.targetSdkVersion
4459
versionCode flutterVersionCode.toInteger()
4560
versionName flutterVersionName
4661
}
62+
4763
signingConfigs {
4864
release {
4965
keyAlias keystoreProperties['keyAlias']
@@ -52,29 +68,16 @@ android {
5268
storePassword keystoreProperties['storePassword']
5369
}
5470
}
55-
5671
buildTypes {
5772
release {
5873
signingConfig signingConfigs.release
59-
60-
minifyEnabled true
61-
useProguard true
62-
63-
proguardFiles getDefaultProguardFile ('proguard-android.txt'), 'proguard-rules.pro'
6474
}
6575
}
76+
6677
}
6778

6879
flutter {
6980
source '../..'
7081
}
7182

72-
dependencies {
73-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
74-
/*testImplementation 'junit:junit:4.12'
75-
androidTestImplementation 'androidx.test:runner:1.1.1'
76-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
77-
78-
implementation 'androidx.multidex:multidex'*/
79-
}
80-
apply plugin: 'com.google.gms.google-services'
83+
dependencies {}

‎android/app/google-services.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,42 @@
66
"storage_bucket": "morea-8f840.appspot.com"
77
},
88
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:891584307361:android:700493ee0c858a38d010e0",
12+
"android_client_info": {
13+
"package_name": "com.example.morea"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "891584307361-pskmvh6daubc7jtl1boe1i2gcr4qc6r1.apps.googleusercontent.com",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key": "AIzaSyBXKlAMZwb8l2A863s0Odh_nAW4IHF2kso"
25+
}
26+
],
27+
"services": {
28+
"appinvite_service": {
29+
"other_platform_oauth_client": [
30+
{
31+
"client_id": "891584307361-pskmvh6daubc7jtl1boe1i2gcr4qc6r1.apps.googleusercontent.com",
32+
"client_type": 3
33+
},
34+
{
35+
"client_id": "891584307361-eg7gmf0975qnufrkgmsita1uh4jnf8ij.apps.googleusercontent.com",
36+
"client_type": 2,
37+
"ios_info": {
38+
"bundle_id": "productions.morea.app"
39+
}
40+
}
41+
]
42+
}
43+
}
44+
},
945
{
1046
"client_info": {
1147
"mobilesdk_app_id": "1:891584307361:android:7d2290de7384810ed010e0",

‎android/app/proguard-rules.pro‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎android/app/src/debug/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="productions.morea.app">
3-
<!-- Flutter needs it to communicate with the running application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="productions.morea.app">
3-
4-
<!-- The INTERNET permission is required for development. Specifically,
5-
flutter needs it to communicate with the running application
6-
to allow setting breakpoints, to provide hot reload, etc.
7-
-->
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
82
<uses-permission android:name="android.permission.INTERNET" />
93
<uses-permission android:name="android.permission.CAMERA" />
10-
11-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
12-
calls FlutterMain.startInitialization(this); in its onCreate method.
13-
In most cases you can leave this as-is, but you if you want to provide
14-
additional functionality it is fine to subclass or reimplement
15-
FlutterApplication and put your custom class here. -->
164
<application
17-
android:icon="@mipmap/launcher_icon"
18-
android:label="Morea">
19-
<meta-data
20-
android:name="flutterEmbedding"
21-
android:value="2" />
5+
android:label="Morea"
6+
android:name="${applicationName}"
7+
android:icon="@mipmap/launcher_icon">
8+
229
<meta-data
2310
android:name="com.google.firebase.messaging.default_notification_icon"
2411
android:resource="@drawable/ic_stat_ic_notification" />
25-
<!-- Set color used with incoming notification messages. This is used when no color is set for the incoming
26-
notification message. See README(https://goo.gl/6BKBk7) for more. -->
2712
<meta-data
2813
android:name="com.google.firebase.messaging.default_notification_color"
2914
android:resource="@color/colorCustomNotification" />
30-
3115
<meta-data
3216
android:name="com.google.android.geo.API_KEY"
3317
android:value="AIzaSyBFvIWmgunjzx7l8TytZg4vPQ7Tgg2k6V0" />
34-
3518
<activity
3619
android:name=".MainActivity"
37-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
20+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
3821
android:hardwareAccelerated="true"
39-
android:screenOrientation="portrait"
22+
android:exported="true"
4023
android:launchMode="singleTop"
4124
android:theme="@style/LaunchTheme"
4225
android:windowSoftInputMode="adjustResize">
43-
<!-- This keeps the window background of the activity showing
44-
until Flutter renders its first frame. It can be removed if
45-
there is no splash screen (such as the default splash screen
46-
defined in @style/LaunchTheme). -->
47-
26+
<!-- Specifies an Android theme to apply to this Activity as soon as
27+
the Android process has started. This theme is visible to the user
28+
while the Flutter UI initializes. After that, this theme continues
29+
to determine the Window background behind the Flutter UI. -->
30+
<meta-data
31+
android:name="io.flutter.embedding.android.NormalTheme"
32+
android:resource="@style/NormalTheme"
33+
/>
4834
<intent-filter>
49-
<action android:name="android.intent.action.MAIN" />
50-
<category android:name="android.intent.category.LAUNCHER" />
35+
<action android:name="android.intent.action.MAIN"/>
36+
<category android:name="android.intent.category.LAUNCHER"/>
5137
</intent-filter>
38+
5239
<intent-filter>
5340
<action android:name="FLUTTER_NOTIFICATION_CLICK" />
5441
<category android:name="android.intent.category.DEFAULT" />
5542
</intent-filter>
5643
</activity>
57-
<activity android:name="com.apptreesoftware.barcodescan.BarcodeScannerActivity" />
44+
<!-- Don't delete the meta-data below.
45+
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
46+
<meta-data
47+
android:name="flutterEmbedding"
48+
android:value="2" />
5849
</application>
59-
</manifest>
50+
<!-- Required to query activities that can process text, see:
51+
https://developer.android.com/training/package-visibility?hl=en and
52+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
53+
54+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
55+
<queries>
56+
<intent>
57+
<action android:name="android.intent.action.PROCESS_TEXT"/>
58+
<data android:mimeType="text/plain"/>
59+
</intent>
60+
</queries>
61+
</manifest>

‎android/app/src/main/ic_launcher-web.png‎

-18.6 KB
Binary file not shown.

‎android/app/src/main/ic_morea_launcher-web.png‎

-19.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)