Merge pull request #108 from Rumpelstilzli/maxi

Maxi

Author: roranmorea

.ash_history

@@ -0,0 +1 @@
+exit

.gitignore

@@ -60,10 +60,10 @@
 **/ios/Flutter/App.framework
 **/ios/Flutter/Flutter.framework
 **/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/flutter_export_environment.sh
 **/ios/Flutter/app.flx
 **/ios/Flutter/app.zip
 **/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 **/ios/Flutter/Flutter.podspec
@@ -79,3 +79,4 @@
 # VSCode
 /.vscode/
 **/.vscode/launch.json
+.vscode/launch.json

.gradle/5.6.2/fileChanges/last-build.bin

@@ -22,6 +22,7 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
@@ -31,23 +32,17 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 28
-
-     /*sourceSets {
+    compileSdkVersion 30
+    
+    sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
-    }*/
-
-    lintOptions {
-        disable 'InvalidPackage'
     }
     defaultConfig {
-        applicationId "ch.morea.morea"
-        minSdkVersion 16
-        targetSdkVersion 29
+        applicationId "productions.morea.app"
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
     }
     signingConfigs {
         release {
@@ -75,14 +70,11 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    /*testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 
-    //implementation 'com.google.firebase:firebase-core:16.0.9'
-    implementation 'androidx.multidex:multidex'
-    //implementation 'com.google.firebase:firebase-auth:17.0.0'
-    //implementation 'com.google.firebase:firebase-analytics:16.0.0'
+    implementation 'androidx.multidex:multidex'*/
 }
 apply plugin: 'com.google.gms.google-services'
-//apply plugin: 'kotlin-android'

.gradle/5.6.2/gc.properties

@@ -1,41 +1,41 @@
 {
   "project_info": {
-    "project_number": "782312393773",
-    "firebase_url": "https://pfadi-morea.firebaseio.com",
-    "project_id": "pfadi-morea",
-    "storage_bucket": "pfadi-morea.appspot.com"
+    "project_number": "891584307361",
+    "firebase_url": "https://morea-8f840.firebaseio.com",
+    "project_id": "morea-8f840",
+    "storage_bucket": "morea-8f840.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:782312393773:android:c10f471f8f449c59373ca4",
+        "mobilesdk_app_id": "1:891584307361:android:7d2290de7384810ed010e0",
         "android_client_info": {
-          "package_name": "ch.morea.morea"
+          "package_name": "productions.morea.app"
         }
       },
       "oauth_client": [
         {
-          "client_id": "782312393773-s4133bc25e5j1afsqon6d8rdpjs1pg5s.apps.googleusercontent.com",
+          "client_id": "891584307361-pskmvh6daubc7jtl1boe1i2gcr4qc6r1.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDHVCZ-RGqcuvKXQqtXZivnEcYLbFcNZPk"
+          "current_key": "AIzaSyBXKlAMZwb8l2A863s0Odh_nAW4IHF2kso"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "782312393773-s4133bc25e5j1afsqon6d8rdpjs1pg5s.apps.googleusercontent.com",
+              "client_id": "891584307361-pskmvh6daubc7jtl1boe1i2gcr4qc6r1.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "782312393773-j08q5fos63cl88m2iuaogr89else5uhi.apps.googleusercontent.com",
+              "client_id": "891584307361-eg7gmf0975qnufrkgmsita1uh4jnf8ij.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "ch.morea.app"
+                "bundle_id": "productions.morea.app"
               }
             }
           ]

.vscode/launch.json

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.morea.morea">
+    package="productions.morea.app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/build.gradle

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.morea.morea">
+    package="productions.morea.app">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
@@ -14,10 +14,11 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
-        android:icon="@mipmap/ic_launcher"
-        android:label="Pfadi Morea"
-        android:roundIcon="@mipmap/ic_morea_launcher_round">
+        android:icon="@mipmap/launcher_icon"
+        android:label="Morea">
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_stat_ic_notification" />
@@ -27,10 +28,15 @@
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/colorCustomNotification" />
 
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyBFvIWmgunjzx7l8TytZg4vPQ7Tgg2k6V0" />
+
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
             android:hardwareAccelerated="true"
+            android:screenOrientation="portrait"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
@@ -50,4 +56,4 @@
         </activity>
         <activity android:name="com.apptreesoftware.barcodescan.BarcodeScannerActivity" />
     </application>
-</manifest>
+</manifest>