mrmilu · Anullos · Aug 16, 2024 · Aug 14, 2024
diff --git a/.env.beta b/.env.beta
@@ -4,4 +4,4 @@ ENVIRONMENT="beta"
 APP_NAME="Flutter base (beta)"
 FIREBASE_REVERSED_CLIENT_ID="com.googleusercontent.apps.xxxx-xxxxxxxxx"
 DYNAMIC_LINK_HOST="flutterbase.page.link"
-DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbasemrmilu.beta"
+DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbase.beta"
diff --git a/.env.dev b/.env.dev
@@ -1,6 +1,6 @@
 API_URL="https://f84a-2-139-107-2.ngrok.io"
 ENVIRONMENT="dev"
-APP_ID="com.flutterbasemrmilu.dev"
+APP_ID="com.flutterbase.dev"
 APP_NAME="Flutter base (dev)"
 DYNAMIC_LINK_HOST="flutterbase2022.page.link"
-DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbasemrmilu.dev"
+DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbase.dev"
diff --git a/.env.live b/.env.live
@@ -2,4 +2,4 @@ API_URL="https://f84a-2-139-107-2.ngrok.io"
 ENVIRONMENT="live"
 APP_NAME="Flutter base"
 DYNAMIC_LINK_HOST="flutterbase2022.page.link"
-DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbasemrmilu.live"
+DYNAMIC_LINKS_URL_TYPE_SCHEMA="com.flutterbase.live"
diff --git a/android/.gitignore b/android/.gitignore
@@ -17,5 +17,4 @@ app/release
 **/*.keystore
 **/*.jks
 
-# TODO: IMPORTANT REMOVE THIS IGNORE ON FINAL PROJECT
-google-services.json
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -30,7 +30,7 @@ if (flutterCompileSdkVersion == null) {
 
 def flutterMinSdkVersion = localProperties.getProperty('flutter.minSdkVersion')
 if (flutterMinSdkVersion == null) {
-    flutterMinSdkVersion = '21'
+    flutterMinSdkVersion = '23'
 }
 
 def flutterTargetSdkVersion = localProperties.getProperty('flutter.targetSdkVersion')
@@ -63,6 +63,7 @@ project.ext.envConfigFiles = [
 apply from: project(':flutter_config').projectDir.getPath() + "/dotenv.gradle"
 
 android {
+
     signingConfigs {
         release_beta {
             keyAlias betaKeystoreProperties['keyAlias']
@@ -78,22 +79,32 @@ android {
         }
     }
 
-    flavorDimensions "flavor-type"
+    // ----- BEGIN flavorDimensions (autogenerated by flutter_flavorizr) -----
+    flavorDimensions += "flavor-type"
 
     productFlavors {
         dev {
             dimension "flavor-type"
+            applicationId "com.flutterbase.dev"
+            resValue "string", "app_name", "FlutterBase (Dev)"
         }
         beta {
             dimension "flavor-type"
+            applicationId "com.flutterbase.beta"
             signingConfig signingConfigs.release_beta
+            resValue "string", "app_name", "FlutterBase (Beta)"
         }
         live {
             dimension "flavor-type"
-            signingConfig signingConfigs.release_live
+            applicationId "com.flutterbase.live"
+            // signingConfig signingConfigs.release_live
+            resValue "string", "app_name", "FlutterBase"
         }
     }
 
+    // ----- END flavorDimensions (autogenerated by flutter_flavorizr) -----
+
+
     compileSdkVersion flutterCompileSdkVersion.toInteger()
 
     compileOptions {
@@ -120,7 +131,7 @@ android {
         versionName flutterVersionName
         resValue "string", "app_name", project.env.hasProperty("APP_NAME") ? project.env.get("APP_NAME") : "Flutter base"
         resValue "string", "dynamic_link_host", project.env.get("DYNAMIC_LINK_HOST")
-        resValue "string", "build_config_package", "com.flutterbasemrmilu.live"
+        resValue "string", "build_config_package", "com.flutterbase.live"
     }
 }
 
@@ -129,6 +140,7 @@ flutter {
 }
 
 dependencies {
+    implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
     implementation 'androidx.window:window:1.0.0'
     implementation 'androidx.window:window-java:1.0.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

diff --git a/android/app/src/beta/google-services.json b/android/app/src/beta/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "426720039629",
+    "project_id": "flutter-base-1e320",
+    "storage_bucket": "flutter-base-1e320.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:426720039629:android:d2ce4db65b1a9ac6fa0f84",
+        "android_client_info": {
+          "package_name": "com.flutterbase.beta"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCg-GIT4IvzyHrMH0-H6BCwiknBp4jtmaU"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png b/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png b/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flutterbasemrmilu.live">
+    package="com.flutterbase.live">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/dev/google-services.json b/android/app/src/dev/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "426720039629",
+    "project_id": "flutter-base-1e320",
+    "storage_bucket": "flutter-base-1e320.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:426720039629:android:d2ce4db65b1a9ac6fa0f84",
+        "android_client_info": {
+          "package_name": "com.flutterbase.beta"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCg-GIT4IvzyHrMH0-H6BCwiknBp4jtmaU"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png b/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png b/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/live/google-services.json b/android/app/src/live/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "795134483527",
+    "project_id": "flutter-base-live",
+    "storage_bucket": "flutter-base-live.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:795134483527:android:c23b66fa3ea2f9aefa6562",
+        "android_client_info": {
+          "package_name": "com.flutterbase.live"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCaYz5WmSYLlTylBurRPLD4wstnbZ9Hu_s"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/android/app/src/live/res/mipmap-hdpi/ic_launcher.png b/android/app/src/live/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/live/res/mipmap-mdpi/ic_launcher.png b/android/app/src/live/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/live/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/live/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/live/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/live/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/live/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/live/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,34 +1,27 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.flutterbasemrmilu.live">
-  <application android:label="@string/app_name" android:name="${applicationName}"
-    android:icon="@mipmap/ic_launcher">
-    <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop"
-      android:theme="@style/LaunchTheme"
-      android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-      android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.flutterbase.live">
+  <application android:label="@string/app_name" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
+    <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
-      <meta-data android:name="io.flutter.embedding.android.NormalTheme"
-        android:resource="@style/NormalTheme" />
+      <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
       <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:host="@string/DYNAMIC_LINK_HOST" android:scheme="https" />
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:host="@string/DYNAMIC_LINK_HOST" android:scheme="https"/>
       </intent-filter>
     </activity>
     <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-    <meta-data android:name="flutterEmbedding" android:value="2" />
+    <meta-data android:name="flutterEmbedding" android:value="2"/>
   </application>
-  <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
-  <uses-permission android:name="android.permission.VIBRATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+  <uses-permission android:name="android.permission.VIBRATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/android/app/src/main/kotlin/com/example/flutter_base_app/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutter_base_app/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.flutterbasemrmilu.live
+package com.flutterbase.live
 
 import io.flutter.embedding.android.FlutterActivity
 

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flutterbasemrmilu.live">
+    package="com.flutterbase.live">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/fastlane/Appfile b/android/fastlane/Appfile
@@ -1,2 +1,2 @@
 json_key_file("fastlane/api-access.json")
-package_name("com.flutterbasemrmilu.live")
+package_name("com.flutterbase.live")
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
@@ -20,7 +20,7 @@ platform :android do
   lane :build_deploy_internal_beta do
     sh("flutter", "build", "appbundle", "--flavor", "beta", "./lib/main_beta.dart")
     upload_to_play_store(
-      package_name: 'com.flutterbasemrmilu.beta',
+      package_name: 'com.flutterbase.beta',
       track: 'internal',
       aab: '../build/app/outputs/bundle/betaRelease/app-beta-release.aab'
     )
@@ -29,7 +29,7 @@ platform :android do
   lane :build_deploy_internal_prod do
     sh("flutter", "build", "appbundle", "--flavor", "live", "./lib/main_live.dart")
     upload_to_play_store(
-      package_name: 'com.flutterbasemrmilu.live',
+      package_name: 'com.flutterbase.live',
       track: 'alpha',
       aab: '../build/app/outputs/bundle/liveRelease/app-live-release.aab'
     )

diff --git a/ios/Flutter/Default.xcconfig b/ios/Flutter/Default.xcconfig
@@ -1,3 +1 @@
-FLUTTER_WEB_AUTO_DETECT=true
-FLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/04817c99c9fd4956f27505204f7e344335810aed/
-FLUTTER_APP_FLAVOR=dev
+
diff --git a/ios/Flutter/betaDebug.xcconfig b/ios/Flutter/betaDebug.xcconfig
@@ -1,5 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-beta.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_beta.dart
+ASSET_PREFIX=beta
+BUNDLE_NAME=FlutterBase (Beta)
+BUNDLE_DISPLAY_NAME=FlutterBase (Beta)
diff --git a/ios/Flutter/betaProfile.xcconfig b/ios/Flutter/betaProfile.xcconfig
@@ -1,6 +1,7 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_beta.dart
-
-
+ASSET_PREFIX=beta
+BUNDLE_NAME=FlutterBase (Beta)
+BUNDLE_DISPLAY_NAME=FlutterBase (Beta)
diff --git a/ios/Flutter/betaRelease.xcconfig b/ios/Flutter/betaRelease.xcconfig
@@ -1,7 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-beta.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_beta.dart
-
-
+ASSET_PREFIX=beta
+BUNDLE_NAME=FlutterBase (Beta)
+BUNDLE_DISPLAY_NAME=FlutterBase (Beta)
diff --git a/ios/Flutter/devDebug.xcconfig b/ios/Flutter/devDebug.xcconfig
@@ -1,5 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-dev.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_dev.dart
+ASSET_PREFIX=dev
+BUNDLE_NAME=FlutterBase (Dev)
+BUNDLE_DISPLAY_NAME=FlutterBase (Dev)
diff --git a/ios/Flutter/devProfile.xcconfig b/ios/Flutter/devProfile.xcconfig
@@ -1,4 +1,7 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_dev.dart
+ASSET_PREFIX=dev
+BUNDLE_NAME=FlutterBase (Dev)
+BUNDLE_DISPLAY_NAME=FlutterBase (Dev)
diff --git a/ios/Flutter/devRelease.xcconfig b/ios/Flutter/devRelease.xcconfig
@@ -1,5 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-dev.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-#include? "tmp.xcconfig"
 
 FLUTTER_TARGET=lib/main_dev.dart
+ASSET_PREFIX=dev
+BUNDLE_NAME=FlutterBase (Dev)
+BUNDLE_DISPLAY_NAME=FlutterBase (Dev)
diff --git a/ios/Flutter/liveDebug.xcconfig b/ios/Flutter/liveDebug.xcconfig
@@ -1,5 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-live.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
 
-
 FLUTTER_TARGET=lib/main_live.dart
+ASSET_PREFIX=live
+BUNDLE_NAME=FlutterBase
+BUNDLE_DISPLAY_NAME=FlutterBase
diff --git a/ios/Flutter/liveProfile.xcconfig b/ios/Flutter/liveProfile.xcconfig
@@ -1,4 +1,7 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
-
 FLUTTER_TARGET=lib/main_live.dart
+ASSET_PREFIX=live
+BUNDLE_NAME=FlutterBase
+BUNDLE_DISPLAY_NAME=FlutterBase
diff --git a/ios/Flutter/liveRelease.xcconfig b/ios/Flutter/liveRelease.xcconfig
@@ -1,5 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-live.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
-
 FLUTTER_TARGET=lib/main_live.dart
+ASSET_PREFIX=live
+BUNDLE_NAME=FlutterBase
+BUNDLE_DISPLAY_NAME=FlutterBase