Use null-safe package for text highlighting.

.github/linter/Dangerfile

@@ -13,6 +13,19 @@ flutter_lint.only_modified_files = true
 flutter_lint.report_path = "flutter_analyze_report.txt"
 flutter_lint.lint(inline_mode: true)
 
+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

@@ -73,7 +73,14 @@ jobs:
       env:
         ANDROID_KEYS_SECRET_PASSPHRASE: ${{ secrets.ANDROID_KEYS_SECRET_PASSPHRASE }}
 
-    - name: Build APK
+    # Apparently there's a known issue where there are some missing files if you don't build the debug/profile version first
+    # https://techshits.com/flutter-error-transforms-input-file-does-not-exist/
+    - name: Build debug APK
+      run: flutter build apk --debug
+    - name: Build profile APK
+      run: flutter build apk --profile
+
+    - name: Build release APK
       run: flutter build apk --release
 
     - name: Create a Release APK

CONTRIBUTING.md

@@ -56,9 +56,9 @@ auditore/fix_md_typo
 torvalds/android_speedups
 ```
 ### Merging
-When developing a new feature or working on a bug, your pull request will end up containing fixup commits (commits that change the same line of code repeatedly) or too fine-grained commits. An issue that can arise from this is that the main branch history will become poluted with unnecessary commits. To avoid it, we implement and enforce a squash policy.
+When developing a new feature or working on a bug, your pull request will end up containing fix-up commits (commits that change the same line of code repeatedly) or too fine-grained commits. An issue that can arise from this is that the main branch history will become polluted with unnecessary commits. To avoid it, we implement and enforce a squash policy.
 All commits that are merged into the main development branch have to be squashed ahead of the merge.
-You can do so by pressing "squash and merge" in GitHub (_recommended_), or, alternetively, following the generic local squash routine outlined bellow:
+You can do so by pressing "squash and merge" in GitHub (_recommended_), or, alternatively, following the generic local squash routine outlined bellow:
 ```
 git checkout your_branch_name
 git rebase -i HEAD~n
@@ -239,7 +239,7 @@ A user can define their own websites, that only they have access to. These will
 
 Anyone can **create** a new user (a new document in this collection) _if the `permissionLevel` of the created user is 0, null or not set at all_.
 
-Authenticated users can only **read**, **delete** and **update** their own document (including its subcollections) and no one else's. However, they cannot modify the `permissionLevel` field.
+Authenticated users can only **read**, **delete** and **update** their own document (including its sub-collections) and no one else's. However, they cannot modify the `permissionLevel` field.
 
 </details>
 

README.md

@@ -37,7 +37,12 @@ https://user-images.githubusercontent.com/25504811/120929790-1bc24080-c6f3-11eb-
 * [Anghel Andrei](https://github.com/AnghelAndrei28)
 * [Bogdan Piele](https://github.com/bogpie)
 * [Bogdan Iuga](https://github.com/iugabogdan98)
+* [Andrei Mirică](https://github.com/AndreiMirica19)
 * [Andreea-Giorgiana Adăscăliței](https://github.com/AndreeaAdascalitei)
+* [Ștefan-Alin Pahonțu](https://github.com/stafy2912)
+* [Alexandra Pavel](https://github.com/AlexandraPavel)
+* [Ștefan-Dragoș Badea](https://github.com/GhiaraD)
+* [Ștefan-Andrei Popa](https://github.com/AndreiPopa21)
 
 ## Building from source with Android Studio
 

android/app/src/main/AndroidManifest.xml

@@ -43,5 +43,10 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Allowing cleartext traffic is necessary because professor pictures from
+             aii.pub.ro are under http, not https. -->
+        <meta-data android:name="io.flutter.network-policy"
+            android:resource="@xml/network_security_config"/>
     </application>
 </manifest>

android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">aii.pub.ro</domain>
+    </domain-config>
+</network-security-config>

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.3'  // Google Services plugin
     }

android/fastlane/metadata/android/en-GB/changelogs/10019.txt

@@ -0,0 +1,8 @@
+Improved
+  - Filtering UI and bottom navigation bar are now nicer⭐
+  - Teachers on the People page are now sorted by last name
+  - Did some internal ✨magic✨ to improve the app
+
+Fixed
+  - Bug where some filter options would show as selected even though they were not
+  - Default filter options when adding a new event were sometimes empty

android/fastlane/metadata/android/en-US/changelogs/10019.txt

@@ -0,0 +1,8 @@
+Improved
+  - Filtering UI and bottom navigation bar are now nicer⭐
+  - Teachers on the People page are now sorted by last name
+  - Did some internal ✨magic✨ to improve the app
+
+Fixed
+  - Bug where some filter options would show as selected even though they were not
+  - Default filter options when adding a new event were sometimes empty

android/fastlane/metadata/android/ro/changelogs/10019.txt

@@ -0,0 +1,8 @@
+Îmbunătățit
+  - Paginile de filtrare și bara de navigare arată mai frumos⭐
+  - Profesorii de pe pagina Persoane sunt acum sortați după numele de familie
+  - Puțină ✨magie✨ internă ca să îmbunătățim aplicația
+
+Rezolvat
+  - Uneori apăreau selectate opțiuni din filtru fără să fi fost apăsate
+  - Opțiunile de filtru default uneori erau goale la adăugarea de evenimente

ios/Podfile.lock

@@ -236,6 +236,9 @@ PODS:
   - Firebase/Firestore (6.33.0):
     - Firebase/CoreOnly
     - FirebaseFirestore (~> 1.18.0)
+  - Firebase/RemoteConfig (6.33.0):
+    - Firebase/CoreOnly
+    - FirebaseRemoteConfig (~> 4.9.0)
   - Firebase/Storage (6.33.0):
     - Firebase/CoreOnly
     - FirebaseStorage (~> 3.9.0)
@@ -251,11 +254,18 @@ PODS:
   - firebase_core (0.5.3):
     - Firebase/CoreOnly (~> 6.33.0)
     - Flutter
+  - firebase_remote_config (0.4.3):
+    - Firebase/CoreOnly (~> 6.33.0)
+    - Firebase/RemoteConfig (~> 6.33.0)
+    - firebase_core
+    - Flutter
   - firebase_storage (5.2.0):
     - Firebase/CoreOnly (~> 6.33.0)
     - Firebase/Storage (~> 6.33.0)
     - firebase_core
     - Flutter
+  - FirebaseABTesting (4.2.0):
+    - FirebaseCore (~> 6.10)
   - FirebaseAnalytics (6.8.3):
     - FirebaseCore (~> 6.10)
     - FirebaseInstallations (~> 1.6)
@@ -296,10 +306,18 @@ PODS:
     - GoogleUtilities/Environment (~> 6.7)
     - GoogleUtilities/UserDefaults (~> 6.7)
     - PromisesObjC (~> 1.2)
+  - FirebaseRemoteConfig (4.9.1):
+    - FirebaseABTesting (~> 4.2)
+    - FirebaseCore (~> 6.10)
+    - FirebaseInstallations (~> 1.6)
+    - GoogleUtilities/Environment (~> 6.7)
+    - "GoogleUtilities/NSData+zlib (~> 6.7)"
   - FirebaseStorage (3.9.1):
     - FirebaseCore (~> 6.10)
     - GTMSessionFetcher/Core (~> 1.1)
   - Flutter (1.0.0)
+  - flutter_web_browser (0.13.1):
+    - Flutter
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -363,8 +381,6 @@ PODS:
     - nanopb/encode (= 1.30906.0)
   - nanopb/decode (1.30906.0)
   - nanopb/encode (1.30906.0)
-  - package_info (0.0.1):
-    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider (0.0.1):
@@ -383,10 +399,11 @@ DEPENDENCIES:
   - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
   - Flutter (from `Flutter`)
+  - flutter_web_browser (from `.symlinks/plugins/flutter_web_browser/ios`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
-  - package_info (from `.symlinks/plugins/package_info/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
@@ -398,12 +415,14 @@ SPEC REPOS:
     - abseil
     - BoringSSL-GRPC
     - Firebase
+    - FirebaseABTesting
     - FirebaseAnalytics
     - FirebaseAuth
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseFirestore
     - FirebaseInstallations
+    - FirebaseRemoteConfig
     - FirebaseStorage
     - FMDB
     - GoogleAppMeasurement
@@ -425,14 +444,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_auth/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_remote_config:
+    :path: ".symlinks/plugins/firebase_remote_config/ios"
   firebase_storage:
     :path: ".symlinks/plugins/firebase_storage/ios"
   Flutter:
     :path: Flutter
+  flutter_web_browser:
+    :path: ".symlinks/plugins/flutter_web_browser/ios"
   image_picker:
     :path: ".symlinks/plugins/image_picker/ios"
-  package_info:
-    :path: ".symlinks/plugins/package_info/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider:
@@ -452,15 +473,19 @@ SPEC CHECKSUMS:
   firebase_analytics: 9118044ffb98bee71d84733fc594f5134fe4bc1b
   firebase_auth: d5159db3873478d1ac839af7b10d2f831516136a
   firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
+  firebase_remote_config: 259817aa1d7db2d84f01d1536b4f847dd2058e47
   firebase_storage: a023e199edb807d8481c8aa722c8516f462ffab2
+  FirebaseABTesting: 8a9d8df3acc2b43f4a22014ddf9f601bca6af699
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
   FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
   FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
   FirebaseFirestore: adff4877869ca91a11250cc0989a6cd56bad163f
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
+  FirebaseRemoteConfig: 35a729305f254fb15a2e541d4b36f3a379da7fdc
   FirebaseStorage: 15e0f15ef3c7fec3d1899d68623e47d4447066b4
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  flutter_web_browser: cf735f704b5d72449e6ea1cb65a7da102aa9123a
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
@@ -471,7 +496,6 @@ SPEC CHECKSUMS:
   image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
   leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151

ios/Runner.xcodeproj/project.pbxproj

@@ -261,12 +261,12 @@
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/abseil/absl.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_web_browser/flutter_web_browser.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
 				"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
 				"${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
-				"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
@@ -282,12 +282,12 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_browser.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",

ios/Runner/Info.plist

@@ -45,5 +45,11 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<!-- We need to allow HTTP because teacher photos on aii.pub.ro cannot be accessed through HTTPS. -->
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

lib/authentication/view/edit_profile_page.dart

@@ -128,7 +128,7 @@ class _EditProfilePageState extends State<EditProfilePage> {
         AppButton(
           key: const ValueKey('change_password_button'),
           text: S.current.actionChangePassword.toUpperCase(),
-          color: Theme.of(context).accentColor,
+          color: Theme.of(context).primaryColor,
           width: 130,
           onTap: () async {
             if (changePasswordKey.currentState.validate()) {
@@ -204,7 +204,7 @@ class _EditProfilePageState extends State<EditProfilePage> {
         AppButton(
           key: const ValueKey('change_email_button'),
           text: S.current.actionChangeEmail,
-          color: Theme.of(context).accentColor,
+          color: Theme.of(context).primaryColor,
           width: 130,
           onTap: () async {
             final authProvider =
@@ -292,10 +292,10 @@ class _EditProfilePageState extends State<EditProfilePage> {
                 bool result = true;
                 if (isVerified == false &&
                     emailController.text + emailDomain != authProvider.email) {
-                  await showDialog(
-                          context: context,
-                          builder: _changeEmailConfirmationDialog)
-                      .then((value) => result = value ?? false);
+                  await showDialog<bool>(
+                    context: context,
+                    builder: _changeEmailConfirmationDialog,
+                  ).then((value) => result = value ?? false);
                 }
                 if (uploadedImage != null) {
                   imageAsPNG = await convertToPNG(uploadedImage);
@@ -307,9 +307,7 @@ class _EditProfilePageState extends State<EditProfilePage> {
                 if (result) {
                   if (await authProvider.updateProfile(info)) {
                     AppToast.show(S.current.messageEditProfileSuccess);
-                    if (!mounted) {
-                      return;
-                    }
+                    if (!mounted) return;
                     Navigator.pop(context);
                   }
                 }
@@ -318,9 +316,9 @@ class _EditProfilePageState extends State<EditProfilePage> {
         AppScaffoldAction(
           icon: Icons.more_vert_outlined,
           items: {
-            S.current.actionChangePassword: () =>
-                showDialog(context: context, builder: _changePasswordDialog),
-            S.current.actionDeleteAccount: () => showDialog(
+            S.current.actionChangePassword: () => showDialog<dynamic>(
+                context: context, builder: _changePasswordDialog),
+            S.current.actionDeleteAccount: () => showDialog<dynamic>(
                 context: context, builder: _deletionConfirmationDialog)
           },
         )