refactor: update project (#24)

* chore: update gradle

* chore: set android:exported on `AndroidManifest`

* chore: update deps

* style: fix formatting

* refactor: replace `WillPopScope` with `PopScope`

Author: x1z7

android/app/build.gradle

@@ -34,6 +34,16 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -42,19 +52,13 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.fireship.quizapp"
-        minSdkVersion 19
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
     }
 
-    // TODO: Remove when below fix is available in stable channel.
-    // https://github.com/flutter/flutter/pull/82309
-    lintOptions {
-        checkReleaseBuilds false
-    }
-
     signingConfigs {
         if (System.getenv("ANDROID_KEYSTORE_PATH")) {
             release {
@@ -78,24 +82,26 @@ android {
         production {
             dimension "default"
             applicationIdSuffix ""
+            manifestPlaceholders = [appName: "Quiz App"]
         }
         development {
             dimension "default"
             applicationIdSuffix ".dev"
+            manifestPlaceholders = [appName: "[DEV] Quiz App"]
         }
     }
 
     buildTypes {
         release {
             signingConfig signingConfigs.release
             minifyEnabled true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
         debug {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'io.fireship.quizapp'
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

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

android/app/src/main/AndroidManifest.xml

@@ -1,10 +1,10 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.fireship.quizapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="Quizapp"
         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/app/src/profile/AndroidManifest.xml

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

android/build.gradle

@@ -1,21 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.8'
+        classpath 'com.google.gms:google-services:4.4.1'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Tue Apr 02 02:12:39 EEST 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+zipStoreBase=GRADLE_USER_HOME

lib/topics/view/topic_page.dart

@@ -21,10 +21,12 @@ class TopicPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        context.flow<TopicsFlowState>().deselectTopic();
-        return false;
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (didPop) {
+        if (!didPop) {
+          context.flow<TopicsFlowState>().deselectTopic();
+        }
       },
       child: Scaffold(
         appBar: AppBar(
@@ -87,7 +89,7 @@ class QuizList extends StatelessWidget {
     final quizzes = context.select((Topic topic) => topic.quizzes);
     return Column(
       children: [
-        for (final quiz in quizzes) QuizItem(quiz: quiz, topicId: topicId)
+        for (final quiz in quizzes) QuizItem(quiz: quiz, topicId: topicId),
       ],
     );
   }

packages/api_client/pubspec.yaml

@@ -9,14 +9,14 @@ environment:
 dependencies:
   app_core:
     path: ../app_core
-  cloud_firestore: ^4.8.0
-  firebase_auth: ^4.6.2
-  firebase_core: ^2.13.1
+  cloud_firestore: ^4.15.10
+  firebase_auth: ^4.18.0
+  firebase_core: ^2.27.2
   flutter:
     sdk: flutter
-  google_sign_in: ^6.1.3
-  sign_in_with_apple: ^4.3.0
+  google_sign_in: ^6.2.1
+  sign_in_with_apple: ^6.0.0
 
 dev_dependencies:
-  very_good_analysis: ^5.0.0+1
+  very_good_analysis: ^5.1.0
 

packages/app_core/pubspec.yaml

@@ -7,14 +7,14 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  bloc: ^8.1.2
+  bloc: ^8.1.4
   crypto: ^3.0.3
   equatable: ^2.0.5
   flutter:
     sdk: flutter
   json_annotation: ^4.8.1
-  provider: ^6.0.5
+  provider: ^6.1.2
   rxdart: ^0.27.7
 
 dev_dependencies:
-  very_good_analysis: ^5.0.0+1
+  very_good_analysis: ^5.1.0

packages/app_ui/lib/src/widgets.dart

@@ -169,7 +169,7 @@ class ActionButton extends StatelessWidget {
             onPressed: onPressed,
             style: style,
             child: label,
-          )
+          ),
       ],
     );
   }