From 3b9ab5f7cfaebb42ce231f0a28fbe8ef9f5cbbce Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 14:37:44 +0000
Subject: [PATCH 01/16] bump Gradle to 8.6

---
 uni/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uni/android/gradle/wrapper/gradle-wrapper.properties b/uni/android/gradle/wrapper/gradle-wrapper.properties
index 89e56bdb6..628d33c21 100644
--- a/uni/android/gradle/wrapper/gradle-wrapper.properties
+++ b/uni/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-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

From 626e371f67c44bb93afc39c06c6bac79f1fc5e6b Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 14:51:43 +0000
Subject: [PATCH 02/16] update Kotlin, AGP, and migrate Gradle buildscripts to
 a modern style

---
 uni/android/app/build.gradle | 60 ++++++++++++++++++------------------
 uni/android/build.gradle     | 19 ++----------
 uni/android/settings.gradle  | 30 +++++++++++++-----
 3 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/uni/android/app/build.gradle b/uni/android/app/build.gradle
index abcdccc32..ad7afbcdf 100644
--- a/uni/android/app/build.gradle
+++ b/uni/android/app/build.gradle
@@ -1,71 +1,67 @@
+plugins {
+    id "com.android.application"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "org.jetbrains.kotlin.android"
+}
+
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-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')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
+def keystorePropertiesFile = rootProject.file("key.properties")
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
 android {
-    if (project.android.hasProperty("namespace")) {
-        namespace "pt.up.fe.ni.uni"
-    }
+    namespace "pt.up.fe.ni.uni"
 
-    compileSdkVersion 34 // default is flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += "src/main/kotlin"
     }
 
     defaultConfig {
         applicationId "pt.up.fe.ni.uni"
-        minSdkVersion 21 // default is flutter.minSdkVersion
-        targetSdkVersion 34 // default is flutter.targetSdkVersion
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
     signingConfigs {
         release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+            keyAlias keystoreProperties["keyAlias"]
+            keyPassword keystoreProperties["keyPassword"]
+            storeFile keystoreProperties["storeFile"] ? file(keystoreProperties["storeFile"]) : null
+            storePassword keystoreProperties["storePassword"]
         }
     }
 
@@ -77,9 +73,13 @@ android {
 }
 
 flutter {
-    source '../..'
+    source "../.."
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    // The following 3 lines are a workaround for the Flutter issue.
+    // Learn more: https://github.com/flutter/flutter/issues/110658
+    implementation "androidx.window:window:1.0.0"
+    implementation "androidx.window:window-java:1.0.0"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.2"
 }
diff --git a/uni/android/build.gradle b/uni/android/build.gradle
index db859f3a9..d2ffbffa4 100644
--- a/uni/android/build.gradle
+++ b/uni/android/build.gradle
@@ -1,18 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.0'
-    ext.android_plugin_version = '8.0.0'
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:$android_plugin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -20,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/uni/android/settings.gradle b/uni/android/settings.gradle
index 44e62bcf0..82f7f6e9a 100644
--- a/uni/android/settings.gradle
+++ b/uni/android/settings.gradle
@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader"
+    id "com.android.application" version "8.3.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+}
+
+include ":app"

From 8a12457648111775d9ea2c0ae518efb37e02eb7a Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 14:51:54 +0000
Subject: [PATCH 03/16] remove deprecated `package` attribute from
 AndroidManifests

---
 uni/android/app/src/debug/AndroidManifest.xml   | 3 +--
 uni/android/app/src/main/AndroidManifest.xml    | 3 +--
 uni/android/app/src/profile/AndroidManifest.xml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/uni/android/app/src/debug/AndroidManifest.xml b/uni/android/app/src/debug/AndroidManifest.xml
index 205191a23..399f6981d 100644
--- a/uni/android/app/src/debug/AndroidManifest.xml
+++ b/uni/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pt.up.fe.ni.uni">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/uni/android/app/src/main/AndroidManifest.xml b/uni/android/app/src/main/AndroidManifest.xml
index d4a8dab01..4c385d190 100644
--- a/uni/android/app/src/main/AndroidManifest.xml
+++ b/uni/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pt.up.fe.ni.uni">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="uni"
         android:name="${applicationName}"
diff --git a/uni/android/app/src/profile/AndroidManifest.xml b/uni/android/app/src/profile/AndroidManifest.xml
index 205191a23..399f6981d 100644
--- a/uni/android/app/src/profile/AndroidManifest.xml
+++ b/uni/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pt.up.fe.ni.uni">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

From d71f1a8e93bc21a90e83b402372b1458bda298c7 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 14:52:13 +0000
Subject: [PATCH 04/16] pubspec.yaml: Dart -> 3.3.0, Flutter -> 3.19.0

---
 uni/pubspec.lock | 44 ++++++++++++++++++++++++++++++++++----------
 uni/pubspec.yaml |  4 ++--
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/uni/pubspec.lock b/uni/pubspec.lock
index 98b792ff1..159a12ad5 100644
--- a/uni/pubspec.lock
+++ b/uni/pubspec.lock
@@ -581,6 +581,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lists:
     dependency: transitive
     description:
@@ -617,18 +641,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   material_design_icons_flutter:
     dependency: "direct main"
     description:
@@ -641,10 +665,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -738,10 +762,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -1428,5 +1452,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.0"
diff --git a/uni/pubspec.yaml b/uni/pubspec.yaml
index 3001d28cc..9e124e977 100644
--- a/uni/pubspec.yaml
+++ b/uni/pubspec.yaml
@@ -11,8 +11,8 @@ version: 1.9.0-beta.10+272
 
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-  flutter: 3.13.7
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: 3.19.0
 
 dependencies:
   add_2_calendar: ^3.0.1

From 971145d3065938288ade21e6859affe8ddd38dbf Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:00:47 +0000
Subject: [PATCH 05/16] CI: update `format_lint_test.yaml`

---
 .github/workflows/format_lint_test.yaml | 64 +++++++++++++++++--------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/format_lint_test.yaml b/.github/workflows/format_lint_test.yaml
index 6cced7e1f..eff6dbffa 100644
--- a/.github/workflows/format_lint_test.yaml
+++ b/.github/workflows/format_lint_test.yaml
@@ -4,52 +4,66 @@ on:
     branches: [master, develop]
 
 env:
-  FLUTTER_VERSION: 3.13.7
   JAVA_VERSION: 17.x
 
 jobs:
   format:
-    name: "Format"
+    name: Format
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./uni
     steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - uses: mikefarah/yq@master
+        name: Get Flutter version
+        id: get_flutter_version
         with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cmd: yq '.environment.flutter' pubspec.yaml
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: ${{ steps.get_flutter_version.outputs.result }}
 
       - run: dart format $(find . -type f -name "*.dart" -a -not -name "*.g.dart" -a -not -name "*.mocks.dart") --set-exit-if-changed
 
   lint:
-    name: "Lint"
+    name: Lint
     runs-on: ubuntu-latest
     needs: format
     defaults:
       run:
         working-directory: ./uni
     steps:
-      - uses: actions/checkout@v4
+      - name: Clone repository
+        uses: actions/checkout@v4
+
       - uses: actions/setup-java@v3
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: "zulu"
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          distribution: zulu
 
-      - name: Cache pub dependencies
-        uses: actions/cache@v3
+      - uses: mikefarah/yq@master
+        name: Get Flutter version
+        id: get_flutter_version
+        with:
+          cmd: yq '.environment.flutter' pubspec.yaml
+  
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          path: ${{ env.FLUTTER_HOME }}/.pub-cache
-          key: ${{ runner.os }}-pub-${{ github.ref }}-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: ${{ runner.os }}-pub-${{ github.ref }}-
+          channel: stable
+          flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          architecture: x64
 
       - run: flutter analyze .
 
   test:
-    name: "Test"
+    name: Test
     runs-on: ubuntu-latest
     needs: lint
     defaults:
@@ -60,10 +74,20 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: "zulu"
-      - uses: subosito/flutter-action@v2
+          distribution: zulu
+
+      - uses: mikefarah/yq@master
+        name: Get Flutter version
+        id: get_flutter_version
+        with:
+          cmd: yq '.environment.flutter' pubspec.yaml
+    
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: stable
+          flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          architecture: x64
 
       - name: Test with coverage
         run: flutter test --coverage

From e17fe734dd2e41c6c76b56040ebc94b224383f86 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:01:53 +0000
Subject: [PATCH 06/16] CI: update `deploy.yaml`

---
 .github/workflows/deploy.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index e4a8799ed..025dc33c9 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -18,7 +18,6 @@ jobs:
     env:
       PROPERTIES_PATH: "android/key.properties"
       JAVA_VERSION: "17.x"
-      FLUTTER_VERSION: "3.13.7"
       APP_VERSION_PATH: "app_version.txt"
       PUBSPEC_PATH: "pubspec.yaml"
     defaults:
@@ -106,9 +105,19 @@ jobs:
         with:
           java-version: ${{env.JAVA_VERSION}}
           distribution: "zulu"
-      - uses: subosito/flutter-action@v2
+
+      - uses: mikefarah/yq@master
+        name: Get Flutter version
+        id: get_flutter_version
+        with:
+          cmd: yq '.environment.flutter' pubspec.yaml
+          
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: stable
+          flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          architecture: x64
 
       - name: Download Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > /tmp/key.jks
@@ -174,4 +183,4 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: |
           echo '${{ secrets.NIAEFEUPBOT_PAT }}' | gh auth login --with-token
-          gh workflow run 'Deploy Action' --ref develop
\ No newline at end of file
+          gh workflow run 'Deploy Action' --ref develop

From a023b3fb356f3c93c51e1d72552f0189304813e6 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:03:36 +0000
Subject: [PATCH 07/16] explain why we enable `coreLibraryDesugaringEnabled`

---
 uni/android/app/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uni/android/app/build.gradle b/uni/android/app/build.gradle
index ad7afbcdf..59ab8fcaa 100644
--- a/uni/android/app/build.gradle
+++ b/uni/android/app/build.gradle
@@ -37,6 +37,8 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+
+        // This is required by flutter_local_notifications. See its README.
         coreLibraryDesugaringEnabled true
     }
 

From d8b354c836128d724e313a432799bfe15e2d4259 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:06:10 +0000
Subject: [PATCH 08/16] CI: remove redundant `architecture` field from
 `subosit/flutter-action` calls

---
 .github/workflows/deploy.yaml           | 1 -
 .github/workflows/format_lint_test.yaml | 2 --
 2 files changed, 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 025dc33c9..f2ed9a13d 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -117,7 +117,6 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
-          architecture: x64
 
       - name: Download Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > /tmp/key.jks
diff --git a/.github/workflows/format_lint_test.yaml b/.github/workflows/format_lint_test.yaml
index eff6dbffa..dc2a17924 100644
--- a/.github/workflows/format_lint_test.yaml
+++ b/.github/workflows/format_lint_test.yaml
@@ -58,7 +58,6 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
-          architecture: x64
 
       - run: flutter analyze .
 
@@ -87,7 +86,6 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
-          architecture: x64
 
       - name: Test with coverage
         run: flutter test --coverage

From dccf1aaeb4ec58fb23056e1be543d61882d0e1e3 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:07:18 +0000
Subject: [PATCH 09/16] CI: fix path to `pubspec.yaml`

---
 .github/workflows/deploy.yaml           | 2 +-
 .github/workflows/format_lint_test.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index f2ed9a13d..fd14be22a 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -110,7 +110,7 @@ jobs:
         name: Get Flutter version
         id: get_flutter_version
         with:
-          cmd: yq '.environment.flutter' pubspec.yaml
+          cmd: yq '.environment.flutter' uni/pubspec.yaml
           
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
diff --git a/.github/workflows/format_lint_test.yaml b/.github/workflows/format_lint_test.yaml
index dc2a17924..3c7e96bef 100644
--- a/.github/workflows/format_lint_test.yaml
+++ b/.github/workflows/format_lint_test.yaml
@@ -21,7 +21,7 @@ jobs:
         name: Get Flutter version
         id: get_flutter_version
         with:
-          cmd: yq '.environment.flutter' pubspec.yaml
+          cmd: yq '.environment.flutter' uni/pubspec.yaml
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -51,7 +51,7 @@ jobs:
         name: Get Flutter version
         id: get_flutter_version
         with:
-          cmd: yq '.environment.flutter' pubspec.yaml
+          cmd: yq '.environment.flutter' uni/pubspec.yaml
   
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -79,7 +79,7 @@ jobs:
         name: Get Flutter version
         id: get_flutter_version
         with:
-          cmd: yq '.environment.flutter' pubspec.yaml
+          cmd: yq '.environment.flutter' uni/pubspec.yaml
     
       - name: Set up Flutter
         uses: subosito/flutter-action@v2

From 9582f29c6a69e4067d6cc77b7d960ec2b8bd43c0 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 15:27:54 +0000
Subject: [PATCH 10/16] fix all deprecation messages except
 `WillPopScope`-related

---
 uni/lib/view/bug_report/widgets/form.dart           |  8 +++++---
 .../view/common_widgets/last_update_timestamp.dart  | 13 ++++++-------
 uni/lib/view/profile/widgets/account_info_card.dart |  2 +-
 uni/lib/view/profile/widgets/reference_section.dart |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/uni/lib/view/bug_report/widgets/form.dart b/uni/lib/view/bug_report/widgets/form.dart
index 8d957ef94..3b82a3d81 100644
--- a/uni/lib/view/bug_report/widgets/form.dart
+++ b/uni/lib/view/bug_report/widgets/form.dart
@@ -240,6 +240,8 @@ class BugReportFormState extends State<BugReportForm> {
   /// report is created in the project repository.
   /// If unsuccessful, the user receives an error message.
   Future<void> submitBugReport() async {
+    final s = S.of(context);
+
     setState(() {
       _isButtonTapped = true;
     });
@@ -256,18 +258,18 @@ class BugReportFormState extends State<BugReportForm> {
     try {
       await submitSentryEvent(bugReport);
       Logger().i('Successfully submitted bug report.');
-      if (context.mounted) toastMsg = S.of(context).success;
+      if (context.mounted) toastMsg = s.success;
       status = true;
     } catch (e, stackTrace) {
       await Sentry.captureException(e, stackTrace: stackTrace);
       Logger().e('Error while posting bug report:$e');
-      if (context.mounted) toastMsg = S.of(context).sent_error;
+      if (context.mounted) toastMsg = s.sent_error;
       status = false;
     }
 
     clearForm();
 
-    if (context.mounted) {
+    if (mounted) {
       FocusScope.of(context).requestFocus(FocusNode());
       status
           ? await ToastMessage.success(context, toastMsg)
diff --git a/uni/lib/view/common_widgets/last_update_timestamp.dart b/uni/lib/view/common_widgets/last_update_timestamp.dart
index 4e70543fe..3912aec73 100644
--- a/uni/lib/view/common_widgets/last_update_timestamp.dart
+++ b/uni/lib/view/common_widgets/last_update_timestamp.dart
@@ -24,13 +24,12 @@ class _LastUpdateTimeStampState<T extends StateProviderNotifier<dynamic>>
     super.initState();
     Timer.periodic(
       const Duration(seconds: 60),
-      (timer) => {
-        if (mounted)
-          {
-            setState(() {
-              currentTime = DateTime.now();
-            }),
-          },
+      (timer) {
+        if (mounted) {
+          setState(() {
+            currentTime = DateTime.now();
+          });
+        }
       },
     );
   }
diff --git a/uni/lib/view/profile/widgets/account_info_card.dart b/uni/lib/view/profile/widgets/account_info_card.dart
index b2fe21eee..2d78d24ee 100644
--- a/uni/lib/view/profile/widgets/account_info_card.dart
+++ b/uni/lib/view/profile/widgets/account_info_card.dart
@@ -145,7 +145,7 @@ class ReferenceList extends StatelessWidget {
         child: Text(
           S.of(context).no_references,
           style: Theme.of(context).textTheme.titleSmall,
-          textScaleFactor: 0.96,
+          textScaler: const TextScaler.linear(0.96),
         ),
       );
     }
diff --git a/uni/lib/view/profile/widgets/reference_section.dart b/uni/lib/view/profile/widgets/reference_section.dart
index d59b942f9..530ce54b9 100644
--- a/uni/lib/view/profile/widgets/reference_section.dart
+++ b/uni/lib/view/profile/widgets/reference_section.dart
@@ -43,7 +43,7 @@ class InfoText extends StatelessWidget {
   Widget build(BuildContext context) {
     return Text(
       text,
-      textScaleFactor: 0.9,
+      textScaler: const TextScaler.linear(0.9),
       style: Theme.of(context).textTheme.titleSmall?.copyWith(
             color: color,
           ),

From 988b055843803ff3ebdc1386a275138ce47b9593 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:01:25 +0000
Subject: [PATCH 11/16] CI: remove some whitespaces

---
 .github/workflows/format_lint_test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/format_lint_test.yaml b/.github/workflows/format_lint_test.yaml
index 3c7e96bef..42eed3dd8 100644
--- a/.github/workflows/format_lint_test.yaml
+++ b/.github/workflows/format_lint_test.yaml
@@ -52,7 +52,7 @@ jobs:
         id: get_flutter_version
         with:
           cmd: yq '.environment.flutter' uni/pubspec.yaml
-  
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
@@ -80,7 +80,7 @@ jobs:
         id: get_flutter_version
         with:
           cmd: yq '.environment.flutter' uni/pubspec.yaml
-    
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:

From a70b49a9b6c311ba2ae6bb024979a2652fa7acd1 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:10:18 +0000
Subject: [PATCH 12/16] BackButtonExitWrapper: migrate `WillPopScope` ->
 `PopScope`

---
 .../view/home/widgets/exit_app_dialog.dart    | 28 +++++++++----------
 uni/lib/view/login/login.dart                 |  3 ++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/uni/lib/view/home/widgets/exit_app_dialog.dart b/uni/lib/view/home/widgets/exit_app_dialog.dart
index 02ac6f88c..4c3a5cea1 100644
--- a/uni/lib/view/home/widgets/exit_app_dialog.dart
+++ b/uni/lib/view/home/widgets/exit_app_dialog.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:uni/generated/l10n.dart';
 
@@ -14,10 +12,14 @@ class BackButtonExitWrapper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () {
-        final userActionCompleter = Completer<bool>();
-        showDialog<void>(
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (didPop) async {
+        if (didPop) {
+          return;
+        }
+
+        final shouldPop = await showDialog<bool>(
           context: context,
           builder: (context) => AlertDialog(
             title: Text(
@@ -26,23 +28,19 @@ class BackButtonExitWrapper extends StatelessWidget {
             ),
             actions: <Widget>[
               ElevatedButton(
-                onPressed: () {
-                  userActionCompleter.complete(false);
-                  Navigator.of(context).pop(false);
-                },
+                onPressed: () => Navigator.of(context).pop(false),
                 child: Text(S.of(context).no),
               ),
               ElevatedButton(
-                onPressed: () {
-                  userActionCompleter.complete(true);
-                  Navigator.of(context).pop(false);
-                },
+                onPressed: () => Navigator.of(context).pop(true),
                 child: Text(S.of(context).yes),
               ),
             ],
           ),
         );
-        return userActionCompleter.future;
+        if ((shouldPop ?? false) && context.mounted) {
+          Navigator.of(context).pop();
+        }
       },
       child: child,
     );
diff --git a/uni/lib/view/login/login.dart b/uni/lib/view/login/login.dart
index d2126aa06..7a18e8ddf 100644
--- a/uni/lib/view/login/login.dart
+++ b/uni/lib/view/login/login.dart
@@ -65,6 +65,9 @@ class LoginPageViewState extends State<LoginPageView> {
             context,
             '/${NavigationItem.navPersonalArea.route}',
           );
+          if (!mounted) {
+            return;
+          }
           setState(() {
             _loggingIn = false;
           });

From 7caa1fccce9c7aa1614b97a7e411223d1ce16a06 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:10:34 +0000
Subject: [PATCH 13/16] Revert "BackButtonExitWrapper: migrate `WillPopScope`
 -> `PopScope`"

This reverts commit a70b49a9b6c311ba2ae6bb024979a2652fa7acd1.
---
 .../view/home/widgets/exit_app_dialog.dart    | 28 ++++++++++---------
 uni/lib/view/login/login.dart                 |  3 --
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/uni/lib/view/home/widgets/exit_app_dialog.dart b/uni/lib/view/home/widgets/exit_app_dialog.dart
index 4c3a5cea1..02ac6f88c 100644
--- a/uni/lib/view/home/widgets/exit_app_dialog.dart
+++ b/uni/lib/view/home/widgets/exit_app_dialog.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:uni/generated/l10n.dart';
 
@@ -12,14 +14,10 @@ class BackButtonExitWrapper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return PopScope(
-      canPop: false,
-      onPopInvoked: (didPop) async {
-        if (didPop) {
-          return;
-        }
-
-        final shouldPop = await showDialog<bool>(
+    return WillPopScope(
+      onWillPop: () {
+        final userActionCompleter = Completer<bool>();
+        showDialog<void>(
           context: context,
           builder: (context) => AlertDialog(
             title: Text(
@@ -28,19 +26,23 @@ class BackButtonExitWrapper extends StatelessWidget {
             ),
             actions: <Widget>[
               ElevatedButton(
-                onPressed: () => Navigator.of(context).pop(false),
+                onPressed: () {
+                  userActionCompleter.complete(false);
+                  Navigator.of(context).pop(false);
+                },
                 child: Text(S.of(context).no),
               ),
               ElevatedButton(
-                onPressed: () => Navigator.of(context).pop(true),
+                onPressed: () {
+                  userActionCompleter.complete(true);
+                  Navigator.of(context).pop(false);
+                },
                 child: Text(S.of(context).yes),
               ),
             ],
           ),
         );
-        if ((shouldPop ?? false) && context.mounted) {
-          Navigator.of(context).pop();
-        }
+        return userActionCompleter.future;
       },
       child: child,
     );
diff --git a/uni/lib/view/login/login.dart b/uni/lib/view/login/login.dart
index 7a18e8ddf..d2126aa06 100644
--- a/uni/lib/view/login/login.dart
+++ b/uni/lib/view/login/login.dart
@@ -65,9 +65,6 @@ class LoginPageViewState extends State<LoginPageView> {
             context,
             '/${NavigationItem.navPersonalArea.route}',
           );
-          if (!mounted) {
-            return;
-          }
           setState(() {
             _loggingIn = false;
           });

From fbee6a0f7f3f95ae364a2c6db5b4c978e0490dba Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:21:48 +0000
Subject: [PATCH 14/16] BackButtonExitWrapper: ignore WillPopScope deprecation

---
 uni/lib/view/home/widgets/exit_app_dialog.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uni/lib/view/home/widgets/exit_app_dialog.dart b/uni/lib/view/home/widgets/exit_app_dialog.dart
index 02ac6f88c..5454f6e3e 100644
--- a/uni/lib/view/home/widgets/exit_app_dialog.dart
+++ b/uni/lib/view/home/widgets/exit_app_dialog.dart
@@ -14,6 +14,7 @@ class BackButtonExitWrapper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    // ignore: deprecated_member_use, see #1209
     return WillPopScope(
       onWillPop: () {
         final userActionCompleter = Completer<bool>();

From 521aca8630681343f7edcc4e0522547dad36ae71 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:23:08 +0000
Subject: [PATCH 15/16] CI: `cache: true` for subosito/flutter-action

---
 .github/workflows/deploy.yaml           | 1 +
 .github/workflows/format_lint_test.yaml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index fd14be22a..3ca1b962e 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -117,6 +117,7 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          cache: true
 
       - name: Download Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > /tmp/key.jks
diff --git a/.github/workflows/format_lint_test.yaml b/.github/workflows/format_lint_test.yaml
index 42eed3dd8..cd29d4602 100644
--- a/.github/workflows/format_lint_test.yaml
+++ b/.github/workflows/format_lint_test.yaml
@@ -28,6 +28,7 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          cache: true
 
       - run: dart format $(find . -type f -name "*.dart" -a -not -name "*.g.dart" -a -not -name "*.mocks.dart") --set-exit-if-changed
 
@@ -58,6 +59,7 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          cache: true
 
       - run: flutter analyze .
 
@@ -86,6 +88,7 @@ jobs:
         with:
           channel: stable
           flutter-version: ${{ steps.get_flutter_version.outputs.result }}
+          cache: true
 
       - name: Test with coverage
         run: flutter test --coverage

From 61fbebe65e6c88016d4f249811faaac2f5f354a3 Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Thu, 21 Mar 2024 16:58:29 +0000
Subject: [PATCH 16/16] ToastMessage: ignore WillPopScope deprecation

---
 uni/lib/view/common_widgets/toast_message.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uni/lib/view/common_widgets/toast_message.dart b/uni/lib/view/common_widgets/toast_message.dart
index f8d7d7ee1..ca8271bf8 100644
--- a/uni/lib/view/common_widgets/toast_message.dart
+++ b/uni/lib/view/common_widgets/toast_message.dart
@@ -25,6 +25,7 @@ class MessageToast extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    // ignore: deprecated_member_use, see #1210
     return WillPopScope(
       onWillPop: () async => false,
       child: Dialog(