Feature/redesign release 6

blackbox/android/app/build.gradle

@@ -23,6 +23,9 @@ if (flutterVersionName == null) {
 
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+// START: FlutterFire Configuration
+apply plugin: 'com.google.gms.google-services'
+// END: FlutterFire Configuration
 
    def keystoreProperties = new Properties()
    def keystorePropertiesFile = rootProject.file('key.properties')
@@ -31,7 +34,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
    }
 
    android {
-    compileSdkVersion 29
+    compileSdkVersion 34
 
     lintOptions {
         disable 'InvalidPackage'
@@ -40,9 +43,9 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
     defaultConfig {
         applicationId "be.dezijwegel.blackbox"
         // Defines the minimum API level required to run the app.
-        minSdkVersion 20
+        minSdkVersion 21
         // Specifies the API level used to test the app.
-        targetSdkVersion 29
+        targetSdkVersion 34
         // Defines the version number of your app.
         versionCode flutterVersionCode.toInteger()
         // Defines a user-friendly version name for your app.
@@ -76,15 +79,8 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.google.firebase:firebase-firestore:20.1.0'
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.firebase:firebase-auth:18.1.0'
-    implementation 'com.google.android.gms:play-services-auth:17.0.0'
-
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-apply plugin: 'com.google.gms.google-services'
 

blackbox/android/app/google-services.json

@@ -23,11 +23,11 @@
           }
         },
         {
-          "client_id": "1092212056414-krjco3aqjcu1rliotvll1du0ju5a94fk.apps.googleusercontent.com",
+          "client_id": "1092212056414-2lauh5brmhjsq6ra76q032q7jhaks9bo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "be.dezijwegel.blackbox",
-            "certificate_hash": "a2689ae6bb9aed08c07c59954b97de155580e159"
+            "certificate_hash": "db0cd3f4ce229c3434d4dac7223c05b701214b02"
           }
         },
         {
@@ -39,19 +39,19 @@
           }
         },
         {
-          "client_id": "1092212056414-2lauh5brmhjsq6ra76q032q7jhaks9bo.apps.googleusercontent.com",
+          "client_id": "1092212056414-a0hn4k6ojintg17dr4gjgu5geha0i5f2.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "be.dezijwegel.blackbox",
-            "certificate_hash": "db0cd3f4ce229c3434d4dac7223c05b701214b02"
+            "certificate_hash": "2c3a4b25246cefcc54a5a3131af60a16508be4fd"
           }
         },
         {
-          "client_id": "1092212056414-a0hn4k6ojintg17dr4gjgu5geha0i5f2.apps.googleusercontent.com",
+          "client_id": "1092212056414-a5vifpei16n19u8jus1lurmiseqksl34.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "be.dezijwegel.blackbox",
-            "certificate_hash": "2c3a4b25246cefcc54a5a3131af60a16508be4fd"
+            "certificate_hash": "3b972d1748e2f41c4eb16f1003f97edec6c4cabd"
           }
         },
         {
@@ -62,6 +62,22 @@
             "certificate_hash": "896066500f3b93c383d691664d9c2d1a65969e19"
           }
         },
+        {
+          "client_id": "1092212056414-krjco3aqjcu1rliotvll1du0ju5a94fk.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "be.dezijwegel.blackbox",
+            "certificate_hash": "a2689ae6bb9aed08c07c59954b97de155580e159"
+          }
+        },
+        {
+          "client_id": "1092212056414-nkonv6skd5i5tk7iv51h9q5nna5o8mg1.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "be.dezijwegel.blackbox",
+            "certificate_hash": "902f93f02f97b765b7a2f8dc3f16e5f581a432b0"
+          }
+        },
         {
           "client_id": "1092212056414-osqhpe8peu21knm71f58b7fa3q6i535o.apps.googleusercontent.com",
           "client_type": 1,
@@ -89,7 +105,8 @@
             }
           ]
         }
-      }
+      },
+      "admob_app_id": "ca-app-pub-7249563995197214~6874711564"
     }
   ],
   "configuration_version": "1"

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

@@ -22,6 +22,7 @@
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
+            android:exported="true"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

blackbox/android/build.gradle

@@ -1,12 +1,16 @@
 buildscript {
+    ext.kotlin_version = '1.8.21'
+
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        // START: FlutterFire Configuration
+        classpath 'com.google.gms:google-services:4.4.1'
+        // END: FlutterFire Configuration
 
     }
 }
@@ -24,12 +28,11 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
 
 
-apply plugin: 'com.google.gms.google-services'
 
 
 

blackbox/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

blackbox/ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

blackbox/ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

blackbox/ios/Podfile

@@ -0,0 +1,38 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '11.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

blackbox/ios/Runner.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		37C02C74ADCDCA26C6DB2816 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 57063DD5C00B86C72807EC2D /* GoogleService-Info.plist */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -41,6 +42,7 @@
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
+		57063DD5C00B86C72807EC2D /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -87,7 +89,7 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
+				57063DD5C00B86C72807EC2D /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -188,6 +190,7 @@
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				37C02C74ADCDCA26C6DB2816 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

blackbox/ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>1092212056414-v5hmnosdpjmvvjo0iqkktp49bcd92ftt.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.1092212056414-v5hmnosdpjmvvjo0iqkktp49bcd92ftt</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>1092212056414-0l4572mstea5ujp5fhvlu96595tqkdm6.apps.googleusercontent.com</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDmf4JqmBkrMvbIzLXSnGtWL2uQpmjkmsk</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1092212056414</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.example.blackbox</string>
+	<key>PROJECT_ID</key>
+	<string>blackbox-app</string>
+	<key>STORAGE_BUCKET</key>
+	<string>blackbox-app.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1092212056414:ios:36310f94f8f18e580cefcf</string>
+	<key>DATABASE_URL</key>
+	<string>https://blackbox-app.firebaseio.com</string>
+</dict>
+</plist>

blackbox/ios/firebase_app_id_file.json

@@ -0,0 +1,7 @@
+{
+  "file_generated_by": "FlutterFire CLI",
+  "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
+  "GOOGLE_APP_ID": "1:1092212056414:ios:36310f94f8f18e580cefcf",
+  "FIREBASE_PROJECT_ID": "blackbox-app",
+  "GCM_SENDER_ID": "1092212056414"
+}