WIP

Author: pedrox-hs

.env.default

@@ -1,5 +1,2 @@
 ZAPIFY_HOME_BANNER_UNIT_ID=
 ZAPIFY_AMPLITUDE_KEY=
-FIREBASE_PROJECT_ID=zapfy-f575a
-ANDROID_PACKAGE_NAME=com.zapfy.app.dev
-IOS_BUNDLE_ID=com.zapfy.app.dev

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.3.10",
+  "flutterSdkVersion": "3.7.12",
   "flavors": {}
 }

.gitignore

@@ -29,7 +29,7 @@
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
 
 # Web related
 lib/generated_plugin_registrant.dart

.groovylintrc.json

@@ -0,0 +1,14 @@
+{
+    "extends": "recommended",
+    "rules": {
+        "CompileStatic": {
+            "enabled": false
+        },
+        "NoDef": {
+            "enabled": false
+        },
+        "VariableTypeRequired": {
+            "enabled": false
+        }
+    }
+}

.metadata

@@ -1,10 +1,27 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 7e9793dee1b85a243edd0e06cb1658e98b077561
-  channel: unknown
+  revision: 135454af32477f815a7525073027a3ff9eff1bfd
+  channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

.pre-commit-config.yaml

@@ -12,4 +12,5 @@ repos:
   rev: v1.1.0
   hooks:
   - id: fvm-dart-format
+    args: ["--set-exit-if-changed"]
   - id: fvm-dart-analyze

README.md

@@ -18,30 +18,20 @@ There are many of others applications for the same purpose, but this app is just
 
 ### Requirements
 
-- [FVM](https://fvm.app/)
+- Flutter ^3.7 or [FVM](https://fvm.app/) (recommended)
 - Platform SDKs: Android and XCode
-- Registered Android and iOS projects in Firebase
-
-### Setup
-
-```bash
-# Get dependencies
-fvm flutter pub get
-
-# Download Firebase configuration
-fvm dart run flutter_toolkit:cli project-setup
-```
+- Registered Android and iOS projects in Firebase (optional)
 
 ### Run
 
 ```bash
-fvm dart run flutter_toolkit:cli run-app
+flutter run
 ```
 
 ### Unit tests
 
 ```bash
-fvm flutter test
+flutter test
 ```
 
 ## Built with

android/app/build.gradle

@@ -1,3 +1,4 @@
+/* groovylint-disable DuplicateListLiteral, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, UnnecessaryGString */
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -18,34 +19,23 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-def flutterMinSdkVersion = localProperties.getProperty('flutter.minSdkVersion')
-if (flutterMinSdkVersion == null) {
-    flutterMinSdkVersion = '19'
-}
+def flutterVersionCode = localProperties['flutter.versionCode'] ?: '1'
+def flutterVersionName = localProperties['flutter.versionName'] ?: '1.0'
+def flutterMinSdkVersion = localProperties['flutter.minSdkVersion'] ?: '19'
 
 def isFirebaseDistribution = System.getenv('IS_FIREBASE_DISTRIBUTION') == 'true'
 
 apply plugin: 'com.android.application'
-// START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'com.google.firebase.crashlytics'
-// END: FlutterFire Configuration
 apply plugin: 'kotlin-android'
+
+apply from: 'load-environment-variables.gradle'
+apply from: 'google-services.gradle'
+apply from: 'google-ads.gradle'
+
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -64,12 +54,10 @@ android {
         applicationId "com.zapfy.app"
 
         minSdkVersion flutterMinSdkVersion.toInteger()
-        targetSdkVersion 33
+        targetSdkVersion flutter.targetSdkVersion
 
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-
-        manifestPlaceholders["ADS_APP_ID"] = System.getenv('ANDROID_ADS_APP_ID') ?: secretsProperties.getProperty('ads.appId')
     }
 
     signingConfigs {
@@ -83,9 +71,6 @@ android {
 
     buildTypes {
         debug {
-            FirebasePerformance {
-                instrumentationEnabled false
-            }
             applicationIdSuffix ".dev"
             signingConfig signingConfigs.debug
         }
@@ -110,20 +95,6 @@ flutter {
     source '../..'
 }
 
-project.gradle.taskGraph.whenReady { graph ->
-    project.tasks.findAll().forEach { task ->
-        if (task.name.contains("processDebugGoogleServices")) {
-            def googleServicesJsonFiles = fileTree(dir: ".", include: "**/google-services.json")
-            if (googleServicesJsonFiles.isEmpty()) {
-                task.enabled = false
-            }
-        }
-    }
-}
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation platform('com.google.firebase:firebase-bom:30.3.0')
-    implementation 'com.google.firebase:firebase-analytics'
 }

android/app/google-ads.gradle

@@ -0,0 +1,35 @@
+import groovy.json.JsonSlurper
+
+def hasGoogleAdsPlugin = false
+
+def flutterProjectRoot = rootProject.projectDir.parentFile
+def pluginsFile = new File(flutterProjectRoot, '.flutter-plugins-dependencies')
+
+if (pluginsFile.exists()) {
+    def flutterPlugins = new JsonSlurper().parseText(pluginsFile.text).plugins.android
+    hasGoogleAdsPlugin = flutterPlugins.any { plugin -> plugin.name == 'google_mobile_ads' }
+}
+
+if (!hasGoogleAdsPlugin) {
+    println 'No Google Ads ID found, skipping'
+    return
+}
+
+println 'Found Google Mobile ADS plugin, adding Google Ads ID to manifest'
+
+def secretsPropertiesFile = rootProject.file("secrets.properties")
+if (!secretsPropertiesFile.exists()) {
+    secretsPropertiesFile = rootProject.file("secrets.defaults.properties")
+}
+def secretsProperties = new Properties()
+secretsProperties.load(new FileInputStream(secretsPropertiesFile))
+
+def adsAppId = System.getenv('ANDROID_ADS_APP_ID') ?: secretsProperties.getProperty('ads.appId')
+
+apply plugin: 'com.google.gms.google-services'
+
+android {
+    defaultConfig {
+        manifestPlaceholders["ADS_APP_ID"] = adsAppId
+    }
+}

android/app/google-services.gradle

@@ -0,0 +1,102 @@
+import groovy.json.JsonSlurper
+
+def flutterProjectRoot = rootProject.projectDir.parentFile
+def googleServicesJsonFiles = fileTree(dir: '.', include: '**/google-services.json')
+def pluginsFile = new File(flutterProjectRoot, '.flutter-plugins-dependencies')
+def hasFirebasePlugin = false
+
+if (pluginsFile.exists() && !googleServicesJsonFiles.empty) {
+    def flutterPlugins = new JsonSlurper().parseText(pluginsFile.text).plugins.android
+    hasFirebasePlugin = flutterPlugins.any { plugin -> plugin.name.startsWith('firebase_') }
+}
+
+if (hasFirebasePlugin) {
+    println 'Found Firebase plugin, adding Google Services config'
+} else {
+    println 'No Firebase plugins detected, skipping Google Services'
+    return
+}
+
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.firebase-perf'
+apply plugin: 'com.google.firebase.crashlytics'
+
+android {
+    buildTypes {
+        debug {
+            FirebasePerformance {
+                instrumentationEnabled false
+            }
+        }
+        release {
+            firebaseCrashlytics {
+                mappingFileUploadEnabled true
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation platform('com.google.firebase:firebase-bom:30.3.0')
+    implementation 'com.google.firebase:firebase-analytics'
+}
+
+task generateFirebaseOptions {
+    enabled = !googleServicesJsonFiles.files.empty
+
+    outputs.upToDateWhen {
+        processDebugGoogleServices.state.upToDate
+    }
+
+    doLast {
+        logger.info('Updating firebase_options.jsonc...')
+
+        def scriptFile = rootProject.file(firebaseOptionsGeneratorScriptPath)
+        def srcConfigFile = googleServicesJsonFiles.files.first()
+        def destConfigFile = rootProject.file(firebaseOptionsJsonPath)
+
+        def applicationId = android.applicationVariants
+            .find { variant -> variant.name == 'debug' }
+            .mergedFlavor
+            .applicationId
+
+        def proc = [
+            scriptFile,
+            '--android-app-id',
+            applicationId,
+            srcConfigFile,
+            destConfigFile,
+        ].execute()
+
+        def sdout = new StringBuffer()
+        def sderr = new StringBuffer()
+
+        proc.waitForProcessOutput(sdout, sderr)
+        proc.waitFor()
+
+        if (!sdout.empty) {
+            logger.quiet("${sdout}")
+        }
+
+        if (proc.exitValue() != 0) {
+            throw new GradleException("Failed to update ${destConfigFile}: ${sderr}")
+        }
+
+        logger.info("Firebase options updated: ${destConfigFile.absolutePath}")
+    }
+}
+
+
+
+// tasks.whenTaskAdded { task ->
+//     if (task.name.contains('processDebugGoogleServices')) {
+//         task.finalizedBy(generateFirebaseOptions)
+//         if (googleServicesJsonFiles.empty) {
+//             task.enabled = false
+//         }
+//     } else if (task.name.contains('copyFlutterAssetsDebug')) {
+//         task.dependsOn(generateFirebaseOptions)
+//     } else if (task.name.contains('compileFlutterBuild')) {
+//         task.dependsOn(peitica)
+//     }
+// }