Migrate to Flutter 2.

.github/linter/Dangerfile

@@ -15,6 +15,19 @@ if github.pr_body.length < 5
   warn "Please provide a summary in the Pull Request description"
 end
 
+files = git.added_files + git.modified_files
+files.each do |f|
+    diff = git.diff_for_file(f)
+    # Check for uses of S.of(context) or similar
+    if f =~ /.*\.dart/ and diff.patch =~ /^\+.*S\.of\(.+\)/m
+        File.readlines(f).each_with_index do |line, index|
+            if line =~ /S\.of\(.+\)/
+                warn("Use S.current instead of S.of(context)", file: f, line: index+1)
+            end
+        end
+    end
+end
+
 # Analyze documentation
 textlint.config_file = '.github/linter/.textlintrc'
 textlint.max_severity = "warn"

.github/workflows/deploy.yml

@@ -51,8 +51,7 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.24.x'
-        channel: 'beta'
+        channel: 'stable'
 
     - name: Get packages
       run: flutter pub get
@@ -91,8 +90,7 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.24.x'
-        channel: 'beta'
+        channel: 'stable'
 
     - name: Get packages
       run: flutter pub get
@@ -115,11 +113,11 @@ jobs:
     - name: Build release APK
       run: flutter build apk --release
 
-    - name: Create a Release APK
-      uses: ncipollo/release-action@v1
-      with:
-        artifacts: "build/app/outputs/apk/release/*.apk"
-        token: ${{ secrets.RELEASE_TOKEN }}
+      - name: Create a Release APK
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "build/app/outputs/apk/release/*.apk"
+          token: ${{ secrets.RELEASE_TOKEN }}
 
   android:
     name: Deploy to Google Play
@@ -133,8 +131,7 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.24.x'
-        channel: 'beta'
+        channel: 'stable'
 
     - name: Get packages
       run: flutter pub get

.github/workflows/lint.yml

@@ -1,90 +1,86 @@
 on:
   push:
     branches:
-      - master
+    - master
   pull_request:
 
 name: Linter
 jobs:
   format:
-      name: Format
-      runs-on: ubuntu-latest
-      steps:
-      - uses: actions/checkout@v1
-      - uses: subosito/flutter-action@v1
-        with:
-          flutter-version: '1.24.x'
-          channel: 'beta'
-      - name: Check formattting
-        run: |
-          if find . -name *.dart -not -path "./lib/generated/*" -exec flutter format --set-exit-if-changed --dry-run {} +
-          then
-            echo "The code formatting is nice and tidy."
-          else
-            echo "Please fix the formatting of the files listed above."
-            exit 1
-          fi
-
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: 'stable'
+    - name: Check formattting
+      run: |
+        if find . -name *.dart -not -path "./lib/generated/*" -exec flutter format --set-exit-if-changed --dry-run {} +
+        then
+          echo "The code formatting is nice and tidy."
+        else
+          echo "Please fix the formatting of the files listed above."
+          exit 1
+        fi
   analysis:
     name: Lint
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     steps:
-      - uses: actions/checkout@v1
-      - uses: subosito/flutter-action@v1
-        with:
-          flutter-version: '1.24.x'
-          channel: 'beta'
-      - name: Install dependencies
-        run: flutter pub get
-      - name: Run linter
-        run: flutter analyze
+    - uses: actions/checkout@v1
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: 'stable'
+    - name: Install dependencies
+      run: flutter pub get
+    - name: Run linter
+      run: flutter analyze
 
   code_review:
-      name: Code Review
-      runs-on: ubuntu-latest
-      if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-      steps:
-        - uses: actions/checkout@v1
-        - uses: subosito/flutter-action@v1
-          with:
-            flutter-version: '1.24.x'
-            channel: 'beta'
-        - name: Install dependencies
-          run: flutter pub get
-        - name: Run linter
-          run: flutter analyze > flutter_analyze_report.txt
-          continue-on-error: true
-        - name: Install Ruby
-          uses: actions/setup-ruby@v1
-          with:
-            ruby-version: "2.6"
-        - uses: actions/cache@v1
-          with:
-            path: vendor/bundle
-            key: ${{ runner.os }}-gems-${{ hashFiles('.github/linter/Gemfile') }}
-            restore-keys: |
-              ${{ runner.os }}-gems-
-        - name: Install Node
-          uses: actions/setup-node@v1
-          with:
-            node-version: '12'
-        - name: Install Node packages
-          run: npm install .github/linter
-        - name: Install Python
-          uses: actions/setup-python@v2
-          with:
-            python-version: '3.x'
-        - name: Install proselint
-          run: pip install proselint
-        - name: Set up proselint config
-          run: cp .github/linter/.proselintrc ~/.proselintrc
-        - name: Run danger on generated report
-          uses: MeilCli/danger-action@v5
-          with:
-            danger_file: .github/linter/Dangerfile
-            plugins_file: .github/linter/Gemfile
-            install_path: 'vendor/bundle'
-            danger_id: "danger-pr"
-          env:
-            DANGER_GITHUB_API_TOKEN: ${{ secrets.BOT_TOKEN }}
+    name: Code Review
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+    steps:
+    - uses: actions/checkout@v1
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: 'stable'
+    - name: Install dependencies
+      run: flutter pub get
+    - name: Run linter
+      run: flutter analyze > flutter_analyze_report.txt
+      continue-on-error: true
+    - name: Install Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "2.6"
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gems-${{ hashFiles('.github/linter/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-gems-
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: '12'
+    - name: Install Node packages
+      run: npm install .github/linter
+    - name: Install Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install proselint
+      run: pip install proselint
+    - name: Set up proselint config
+      run: cp .github/linter/.proselintrc ~/.proselintrc
+    - name: Run danger on generated report
+      uses: MeilCli/danger-action@v5
+      with:
+        danger_file: .github/linter/Dangerfile
+        plugins_file: .github/linter/Gemfile
+        install_path: 'vendor/bundle'
+        danger_id: "danger-pr"
+      env:
+        DANGER_GITHUB_API_TOKEN: ${{ secrets.BOT_TOKEN }}

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - master
+    - master
   pull_request:
 
 name: Tests
@@ -11,46 +11,45 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '12.x'
-      - uses: subosito/flutter-action@v1
-        with:
-          flutter-version: '1.24.x'
-          channel: 'beta'
-
-      - name: Get packages
-        run: flutter pub get
-
-      - name: Run tests
-        run: flutter test --coverage
-
-      - name: Upload test artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: application
-          path: .
+    - uses: actions/checkout@v1
+    - uses: actions/setup-java@v1
+      with:
+        java-version: '12.x'
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: 'stable'
+
+    - name: Get packages
+      run: flutter pub get
+
+    - name: Run tests
+      run: flutter test --coverage
+
+    - name: Upload test artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: application
+        path: .
 
   coverage:
     name: Coverage
-    needs: [test]
+    needs: [ test ]
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+    - uses: actions/checkout@v1
 
-      - name: Download test artifact
-        uses: actions/download-artifact@v1
-        with:
-          name: application
+    - name: Download test artifact
+      uses: actions/download-artifact@v1
+      with:
+        name: application
 
-      - name: Install lcov
-        run: sudo apt install -y lcov
+    - name: Install lcov
+      run: sudo apt install -y lcov
 
-      - name: Prepare coverage
-        working-directory: application
-        run: genhtml coverage/lcov.info -o coverage
+    - name: Prepare coverage
+      working-directory: application
+      run: genhtml coverage/lcov.info -o coverage
 
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1

CONTRIBUTING.md

@@ -85,7 +85,7 @@ Future improvements on the app are tracked in Github's **Projects** and **Issues
 When mentioning an issue in code using a *TODO* comment, consider using the format:
  ```TODO(GitHub username): Description, #issueID```
 
-As mentioned in [flutter_style_todos](https://dart-lang.github.io/linter/lints/flutter_style_todos.html) lint, the person mentioned in the *TODO* is the person most familiar with the issue, **and not necesarily the one who is assigned to solve it**. 
+As mentioned in [flutter_style_todos](https://dart-lang.github.io/linter/lints/flutter_style_todos.html) lint, the person mentioned in the *TODO* is the person most familiar with the issue, **and not necesarily the one who is assigned to solve it**.
 
 ## Development tips
 
@@ -109,11 +109,13 @@ As mentioned in [flutter_style_todos](https://dart-lang.github.io/linter/lints/f
     * To switch to debug config on web, in the [web/index.html](web/index.html) file, replace `firebaseConfig.release` with `firebaseConfig.debug`.
     * For simplicity, you could call the default "main.dart" configuration in Android Studio "Debug", duplicate it and call the second one "Release", with `--release` as an argument. For example:
     <img src=screenshots/other/release_configuration.png>
-    
+
 * On Android, ACS UPB Mobile uses **a separate (development) environment in debug mode**. That means a completely different Firebase project - separate data, including user info. Some important notes:
   - This is not used automatically on iOS and web (#105), but on web you can manually switch to the dev environment by replacing `firebaseConfig.release` with `firebaseConfig.debug` in the [web/index.html](web/index.html) file.
   - If you want to copy the data from the production environment into the development environment, you need to follow the export/import instructions from the Firebase [docs](https://firebase.google.com/docs/firestore/manage-data/export-import#export_data). This can help debug builds to match prod better, but this **should NEVER be used to copy user data**. Everything in the users/ collection should stay on the production project (and it would not work anyway, since the user IDs don't match the users in dev).
 
+- On Android, ACS UPB Mobile uses **a separate (development) environment in debug mode**. That means a completely different Firebase project - separate data, including user info. This is not used automatically on iOS and web (#105), but on web you can manually switch to the dev environment by replacing `firebaseConfig.release` with `firebaseConfig.debug` in the [web/index.html](web/index.html) file.
+
   | :exclamation: | You should ALWAYS use the separate development environment for testing the app when modifying any kind of data, so as not to risk breaking something in the production database. |
   |---------------|:---------------|
 

analysis_options.yaml

@@ -13,7 +13,11 @@ linter:
   rules:
     always_put_required_named_parameters_first: true
     avoid_bool_literals_in_conditional_expressions: true
+    # TODO: Enable this when we set up proper error handling
+    avoid_catches_without_on_clauses: false
     avoid_classes_with_only_static_members: false
+    # TODO: Enable this when we set up proper error handling
+    avoid_dynamic_calls: false
     avoid_field_initializers_in_const_classes: true
     avoid_function_literals_in_foreach_calls: true
     avoid_positional_boolean_parameters: true

android/app/build.gradle

@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,8 +45,8 @@ android {
 
     defaultConfig {
         applicationId "ro.pub.acs.acs_upb_mobile"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 19
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger() + 10000
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ro.pub.acs.acs_upb_mobile">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="ACS UPB Mobile"
         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"