Bump logger from 1.4.0 to 2.0.1 in /uni

.github/workflows/app_version_integrity.yaml

@@ -2,7 +2,7 @@ on: pull_request
 
 jobs:
   app_version_integrity:
-    name: "Check for app version change"
+    name: "Version integrity"
     runs-on: ubuntu-latest
     env:
       APP_VERSION_PATH: "uni/app_version.txt"

.github/workflows/format_lint_test.yaml

@@ -1,12 +1,15 @@
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches: [master, develop]
 
 env:
   FLUTTER_VERSION: 3.7.2
   JAVA_VERSION: 11.x
 
 jobs:
   format:
-    name: 'Format'
+    name: "Format"
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -20,7 +23,7 @@ jobs:
       - run: dart format $(find . -type f -name "*.dart" -a -not -name "*.g.dart") --set-exit-if-changed
 
   lint:
-    name: 'Lint'
+    name: "Lint"
     runs-on: ubuntu-latest
     needs: format
     defaults:
@@ -31,7 +34,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: 'zulu'
+          distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -46,7 +49,7 @@ jobs:
       - run: flutter analyze .
 
   test:
-    name: 'Test'
+    name: "Test"
     runs-on: ubuntu-latest
     needs: lint
     defaults:
@@ -57,9 +60,16 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: 'zulu'
+          distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
 
-      - run: flutter test --no-sound-null-safety
+      - name: Test with coverage
+        run: flutter test --coverage
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true

README.md

@@ -7,8 +7,9 @@
 <br>
 <br>
 
-[![Build badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/format_lint_test.yaml?style=for-the-badge)](https://github.com/NIAEFEUP/uni/actions)
-[![Deploy badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/deploy.yaml?label=Deploy&style=for-the-badge)](https://github.com/NIAEFEUP/uni/actions)
+[![Build badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/format_lint_test.yaml?style=for-the-badge&branch=develop)](https://github.com/NIAEFEUP/uni/actions)
+[![Deploy badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/deploy.yaml?label=Deploy&style=for-the-badge&branch=develop)](https://github.com/NIAEFEUP/uni/actions)
+[![Codecov branch](https://img.shields.io/codecov/c/github/NIAEFEUP/uni/develop?style=for-the-badge)](https://app.codecov.io/gh/NIAEFEUP/uni/)
 
 [![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg?style=for-the-badge)](https://pub.dev/packages/very_good_analysis)
 [![License badge](https://img.shields.io/github/license/NIAEFEUP/uni?style=for-the-badge)](https://github.com/NIAEFEUP/uni/blob/develop/LICENSE)

codecov.yml

@@ -0,0 +1,37 @@
+# see https://docs.codecov.io/docs/codecov-yaml
+# Validation check:
+# $ curl --data-binary @codecov.yml https://codecov.io/validate
+
+ignore:
+  - "**/*.g.dart"
+  - "!**/lib/**" # ignore all files outside of lib
+
+codecov:
+  require_ci_to_pass: yes
+  notify:
+    wait_for_ci: yes
+
+coverage:
+  precision: 0  # 2 = xx.xx%, 0 = xx%
+  round: up # how coverage is rounded: down/up/nearest
+  range: 40...100 # custom range of coverage colors from red -> yellow -> green
+  status:
+    project:
+      default:
+        informational: true
+        target: 70% # specify the target coverage for each commit status
+        threshold: 10% # allow this decrease on project
+        if_ci_failed: error
+    patch:
+      default:
+        informational: true
+        threshold: 50% # allow this decrease on patch
+    changes: false
+
+github_checks:
+    annotations: false
+
+comment:
+  layout: header, diff
+  require_changes: false
+  behavior: default

uni/.gitignore

@@ -101,12 +101,14 @@ unlinked_spec.ds
 **/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
+**/ios/Podfile
 
 # macOS
 **/Flutter/ephemeral/
 **/Pods/
 **/macos/Flutter/GeneratedPluginRegistrant.swift
 **/macos/Flutter/ephemeral
+**/macos/Podfile
 **/xcuserdata/
 
 # Windows

uni/analysis_options.yaml

@@ -3,8 +3,7 @@ include: package:very_good_analysis/analysis_options.yaml
 analyzer:
   # Exclude auto-generated files from dart analysis
   exclude:
-    - '**.g.dart'
-    - '**.freezed.dart'
+    - "**.g.dart"
 
 # Custom linter rules. A list of all rules can be found at
 # https://dart-lang.github.io/linter/lints/options/options.html
@@ -13,4 +12,3 @@ linter:
     public_member_api_docs: false
     avoid_equals_and_hash_code_on_mutable_classes: false
     one_member_abstracts: false
-

uni/app_version.txt

@@ -1 +1 @@
-1.5.46+164
+1.5.56+174

uni/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -199,6 +199,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -213,6 +214,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -339,7 +341,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -418,7 +420,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -467,7 +469,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

uni/ios/Runner/Info.plist

@@ -73,5 +73,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

uni/lib/controller/logout.dart → uni/lib/controller/cleanup.dart

@@ -14,9 +14,8 @@ import 'package:uni/controller/local_storage/app_shared_preferences.dart';
 import 'package:uni/controller/local_storage/app_user_database.dart';
 import 'package:uni/controller/networking/network_router.dart';
 import 'package:uni/model/providers/state_providers.dart';
-import 'package:uni/view/common_widgets/pages_layouts/general/general.dart';
 
-Future<void> logout(BuildContext context) async {
+Future<void> cleanupStoredData(BuildContext context) async {
   StateProviders.fromContext(context).markAsNotInitialized();
 
   final prefs = await SharedPreferences.getInstance();
@@ -41,6 +40,4 @@ Future<void> logout(BuildContext context) async {
   if (directory.existsSync()) {
     directory.deleteSync(recursive: true);
   }
-  GeneralPageViewState.profileImageProvider = null;
-  PaintingBinding.instance.imageCache.clear();
 }

uni/lib/controller/local_storage/app_shared_preferences.dart

@@ -32,6 +32,7 @@ class AppSharedPreferences {
     FavoriteWidgetType.busStops
   ];
   static const String hiddenExams = 'hidden_exams';
+  static const String favoriteRestaurants = 'favorite_restaurants';
   static const String filteredExamsTypes = 'filtered_exam_types';
   static final List<String> defaultFilteredExamTypes = Exam.displayedTypes;
 
@@ -183,6 +184,20 @@ class AppSharedPreferences {
         .toList();
   }
 
+  static Future<void> saveFavoriteRestaurants(
+    List<String> newFavoriteRestaurants,
+  ) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setStringList(favoriteRestaurants, newFavoriteRestaurants);
+  }
+
+  static Future<List<String>> getFavoriteRestaurants() async {
+    final prefs = await SharedPreferences.getInstance();
+    final storedFavoriteRestaurants =
+        prefs.getStringList(favoriteRestaurants) ?? [];
+    return storedFavoriteRestaurants;
+  }
+
   static Future<void> saveHiddenExams(List<String> newHiddenExams) async {
     final prefs = await SharedPreferences.getInstance();
     await prefs.setStringList(hiddenExams, newHiddenExams);

uni/lib/controller/local_storage/file_offline_storage.dart

@@ -3,21 +3,26 @@ import 'dart:io';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:http/http.dart' as http;
+import 'package:logger/logger.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:uni/controller/networking/network_router.dart';
 
+import 'package:uni/model/entities/session.dart';
+
 /// The offline image storage location on the device.
 Future<String> get _localPath async {
   final directory = await getTemporaryDirectory();
   return directory.path;
 }
 
 /// Gets cached image named [localFileName].
-/// If not found or too old, downloads it from [url] with [headers].
+/// If not found or too old, downloads it from [url].
+/// The headers are retrieved from [session], then [headers] if provided.
 Future<File?> loadFileFromStorageOrRetrieveNew(
   String localFileName,
   String url,
-  Map<String, String> headers, {
+  Session? session, {
+  Map<String, String>? headers,
   int staleDays = 7,
   bool forceRetrieval = false,
 }) async {
@@ -32,27 +37,43 @@ Future<File?> loadFileFromStorageOrRetrieveNew(
               .lastModifiedSync()
               .add(Duration(days: staleDays))
               .isBefore(DateTime.now()));
+
   if (fileExists && !fileIsStale) {
     return file;
   }
+
   if (await Connectivity().checkConnectivity() != ConnectivityResult.none) {
-    final downloadedFile = await _downloadAndSaveFile(targetPath, url, headers);
+    final downloadedFile =
+        await _downloadAndSaveFile(targetPath, url, session, headers);
     if (downloadedFile != null) {
+      Logger().d('Downloaded $localFileName from remote');
       return downloadedFile;
     }
   }
-  return fileExists ? file : null;
+
+  if (fileExists) {
+    Logger().d('Loaded stale $localFileName from local storage');
+    return file;
+  }
+
+  Logger().w('Failed to load $localFileName');
+  return null;
 }
 
 /// Downloads the image located at [url] and saves it in [filePath].
 Future<File?> _downloadAndSaveFile(
   String filePath,
   String url,
-  Map<String, String> headers,
+  Session? session,
+  Map<String, String>? headers,
 ) async {
-  final response = await http.get(url.toUri(), headers: headers);
+  final response = session == null
+      ? await http.get(url.toUri(), headers: headers)
+      : await NetworkRouter.getWithCookies(url, {}, session);
+
   if (response.statusCode == 200) {
     return File(filePath).writeAsBytes(response.bodyBytes);
   }
+
   return null;
 }

uni/lib/controller/networking/network_router.dart

@@ -159,7 +159,7 @@ class NetworkRouter {
         final newSession = await reLoginFromSession(session);
 
         if (newSession == null) {
-          NavigationService.logout();
+          NavigationService.logoutAndPopHistory(null);
           return Future.error('Login failed');
         }
         session