Redesign/course unit

.envrc

@@ -0,0 +1 @@
+use flake

flake.nix

@@ -0,0 +1,44 @@
+{
+  description = "A very basic flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+  };
+
+  outputs = { self, nixpkgs }: 
+    let
+      system = "x86_64-linux";
+
+      pkgs = import nixpkgs {
+        inherit system;
+        config = {
+          allowUnfree = true;
+          android_sdk.accept_license = true;
+        };
+      };
+
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        platformVersions = [ "31" "33" "34" ];
+        buildToolsVersions = [ "34.0.0" ];
+        includeNDK = true;
+        includeEmulator = true;
+        includeSystemImages = true;
+      };
+
+      androidSdk = androidComposition.androidsdk;
+    in {
+
+      devShell.${system} = pkgs.mkShell {
+        packages = with pkgs; [
+          flutter
+          jdk17
+          androidSdk
+        ];
+
+        shellHook = ''
+          export ANDROID_HOME="${androidSdk}/libexec/android-sdk"
+          export JAVA_HOME="${pkgs.jdk17}"
+        '';
+      };
+    };
+}

packages/uni_app/.envrc

@@ -0,0 +1 @@
+use flake ../..

packages/uni_app/android/app/build.gradle

@@ -76,6 +76,9 @@ android {
                 "proguard-rules.pro"
             )
         }
+        debug {
+            applicationIdSuffix ".dev"
+        }
     }
 }
 

packages/uni_app/android/app/src/debug/res/values/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">uni (dev)</string>
+</resources>

packages/uni_app/android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
-   <application
-        android:label="uni"
+    <application
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:allowBackup="false"
+    >
         <activity
             android:name=".MainActivity"
             android:exported="true"

packages/uni_app/android/app/src/main/res/values/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">uni</string>
+</resources>

packages/uni_app/app_version.txt

@@ -1 +1 @@
-1.10.0-beta.36+339
+1.10.0-beta.48+352

packages/uni_app/lib/controller/background_workers/background_callback.dart

@@ -1,14 +1,15 @@
 import 'package:logger/logger.dart';
-import 'package:tuple/tuple.dart';
 import 'package:uni/controller/background_workers/notifications.dart';
 import 'package:workmanager/workmanager.dart';
 
 /// This map contains the functions that a certain task type will run.
 /// the bool is all functions that are ran by backgroundfetch in iOS
 /// (they must not take any arguments, not checked)
 const taskMap = {
-  'pt.up.fe.ni.uni.notificationworker':
-      Tuple2(NotificationManager.updateAndTriggerNotifications, true),
+  'pt.up.fe.ni.uni.notificationworker': (
+    NotificationManager.updateAndTriggerNotifications,
+    true
+  ),
 };
 
 @pragma('vm:entry-point')
@@ -25,16 +26,16 @@ Future<void> workerStartCallback() async {
       // by the iOS scheduler.
       if (taskName == Workmanager.iOSBackgroundTask) {
         taskMap.forEach((key, value) async {
-          if (value.item2) {
+          if (value.$2) {
             Logger().d('''[$key]: Start executing job...''');
-            await value.item1();
+            await value.$1();
           }
         });
         return true;
       }
       // try to keep the usage of this function BELOW +-30 seconds
       // to not be punished by the scheduler in future runs.
-      await taskMap[taskName]!.item1();
+      await taskMap[taskName]!.$1();
     } catch (err, st) {
       Logger().e(
         'Error while running $taskName job:',

packages/uni_app/lib/controller/background_workers/notifications.dart

@@ -6,7 +6,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:logger/logger.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:tuple/tuple.dart';
 import 'package:uni/controller/background_workers/notifications/tuition_notification.dart';
 import 'package:uni/controller/local_storage/notification_timeout_storage.dart';
 import 'package:uni/controller/local_storage/preferences_controller.dart';
@@ -28,12 +27,12 @@ abstract class Notification {
   String uniqueID;
   Duration timeout;
 
-  Future<Tuple2<String, String>> buildNotificationContent(Session session);
+  Future<(String, String)> buildNotificationContent(Session session);
 
   Future<bool> shouldDisplay(Session session);
 
   void displayNotification(
-    Tuple2<String, String> content,
+    (String, String) content,
     FlutterLocalNotificationsPlugin localNotificationsPlugin,
   );
 

packages/uni_app/lib/controller/background_workers/notifications/tuition_notification.dart

@@ -1,5 +1,4 @@
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:tuple/tuple.dart';
 import 'package:uni/controller/background_workers/notifications.dart';
 import 'package:uni/controller/fetchers/fees_fetcher.dart';
 import 'package:uni/controller/local_storage/preferences_controller.dart';
@@ -13,20 +12,20 @@ class TuitionNotification extends Notification {
   late DateTime _dueDate;
 
   @override
-  Future<Tuple2<String, String>> buildNotificationContent(
+  Future<(String, String)> buildNotificationContent(
     Session session,
   ) async {
     // We must add one day because the time limit is actually at 23:59 and
     // not at 00:00 of the same day
     if (_dueDate.add(const Duration(days: 1)).isBefore(DateTime.now())) {
       final duration = DateTime.now().difference(_dueDate);
       if (duration.inDays == 0) {
-        return const Tuple2(
+        return const (
           '⚠️ Ainda não pagaste as propinas ⚠️',
           'O prazo para pagar as propinas acabou ontem',
         );
       }
-      return Tuple2(
+      return (
         '⚠️ Ainda não pagaste as propinas ⚠️',
         duration.toFormattedString(
           'Já passou {} desde a data limite',
@@ -36,12 +35,12 @@ class TuitionNotification extends Notification {
     }
     final duration = _dueDate.difference(DateTime.now());
     if (duration.inDays == 0) {
-      return const Tuple2(
+      return const (
         'O prazo limite para as propinas está a acabar',
         'Hoje acaba o prazo para pagamento das propinas!',
       );
     }
-    return Tuple2(
+    return (
       'O prazo limite para as propinas está a acabar',
       duration.toFormattedString(
         'Falta {} para a data limite',
@@ -72,7 +71,7 @@ class TuitionNotification extends Notification {
 
   @override
   void displayNotification(
-    Tuple2<String, String> content,
+    (String, String) content,
     FlutterLocalNotificationsPlugin localNotificationsPlugin,
   ) {
     const androidNotificationDetails = AndroidNotificationDetails(
@@ -95,8 +94,8 @@ class TuitionNotification extends Notification {
 
     localNotificationsPlugin.show(
       2,
-      content.item1,
-      content.item2,
+      content.$1,
+      content.$2,
       notificationDetails,
     );
   }

packages/uni_app/lib/controller/fetchers/library_occupation_fetcher.dart

@@ -3,20 +3,19 @@ import 'dart:convert';
 import 'package:collection/collection.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
-import 'package:tuple/tuple.dart';
 import 'package:uni/model/entities/library_occupation.dart';
 
 /// Fetch the library occupation from Google Sheets
 class LibraryOccupationFetcher {
   String baseUrl = 'https://webapi.affluences.com/api/fillRate?';
 
-  static const List<Tuple2<String, int>> floorMaxSeats = [
-    Tuple2('BruV6IlujdwAe1', 72),
-    Tuple2('cEhyzJZvC5nHSr', 114),
-    Tuple2('iceVfgwZWaZRhV', 114),
-    Tuple2('1yLPz9X0CNsg27', 114),
-    Tuple2('keu1j5zERlQn90', 40),
-    Tuple2('bY7K1v43HiAq55', 90),
+  static const List<(String, int)> floorMaxSeats = [
+    ('BruV6IlujdwAe1', 72),
+    ('cEhyzJZvC5nHSr', 114),
+    ('iceVfgwZWaZRhV', 114),
+    ('1yLPz9X0CNsg27', 114),
+    ('keu1j5zERlQn90', 40),
+    ('bY7K1v43HiAq55', 90),
   ];
 
   Future<LibraryOccupation> getLibraryOccupation() async {
@@ -26,14 +25,13 @@ class LibraryOccupationFetcher {
       floorMaxSeats.mapIndexed((i, entry) async {
         final url = Uri.parse(baseUrl).replace(
           queryParameters: {
-            'token': entry.item1,
+            'token': entry.$1,
           },
         );
 
         final response = await http.get(url);
 
-        final floorOccupation =
-            processFloorOccupation(response, entry.item2, i);
+        final floorOccupation = processFloorOccupation(response, entry.$2, i);
 
         libraryOccupation.addFloor(floorOccupation);
       }),

packages/uni_app/lib/controller/local_storage/database/app_calendar_database.dart

@@ -21,10 +21,7 @@ class CalendarDatabase extends AppDatabase<List<CalendarEvent>> {
     final List<Map<String, dynamic>> maps = await db.query('calendar');
 
     return List.generate(maps.length, (i) {
-      return CalendarEvent(
-        maps[i]['name'] as String,
-        maps[i]['date'] as String,
-      );
+      return CalendarEvent.fromJson(maps[i]);
     });
   }
 

packages/uni_app/lib/controller/local_storage/database/app_course_units_database.dart

@@ -22,23 +22,7 @@ class AppCourseUnitsDatabase extends AppDatabase<List<CourseUnit>> {
     final db = await getDatabase();
     final List<Map<String, dynamic>> maps = await db.query('course_units');
     return List.generate(maps.length, (i) {
-      return CourseUnit(
-        id: maps[i]['ucurr_id'] as int?,
-        code: maps[i]['ucurr_codigo'] as String,
-        abbreviation: maps[i]['ucurr_sigla'] as String,
-        name: maps[i]['ucurr_nome'] as String,
-        curricularYear: maps[i]['ano'] as int?,
-        occurrId: maps[i]['ocorr_id'] as int,
-        semesterCode: maps[i]['per_codigo'] as String?,
-        semesterName: maps[i]['per_nome'] as String?,
-        type: maps[i]['tipo'] as String?,
-        status: maps[i]['estado'] as String?,
-        grade: maps[i]['resultado_melhor'] as String?,
-        ectsGrade: maps[i]['ectsGrade'] as String?,
-        result: maps[i]['resultado_insc'] as String?,
-        ects: maps[i]['creditos_ects'] as double?,
-        schoolYear: maps[i]['schoolYear'] as String?,
-      );
+      return CourseUnit.fromJson(maps[i]);
     });
   }
 

packages/uni_app/lib/controller/local_storage/database/app_courses_database.dart

@@ -23,18 +23,7 @@ class AppCoursesDatabase extends AppDatabase<List<Course>> {
 
     // Convert the List<Map<String, dynamic> into a List<Course>.
     return List.generate(maps.length, (i) {
-      return Course(
-        id: maps[i]['cur_id'] as int? ?? 0,
-        festId: maps[i]['fest_id'] as int? ?? 0,
-        name: maps[i]['cur_nome'] as String?,
-        abbreviation: maps[i]['abbreviation'] as String?,
-        currYear: maps[i]['ano_curricular'] as String?,
-        firstEnrollment: maps[i]['fest_a_lect_1_insc'] as int? ?? 0,
-        state: maps[i]['state'] as String?,
-        faculty: maps[i]['inst_sigla'] as String?,
-        finishedEcts: maps[i]['finishedEcts'] as double? ?? 0,
-        currentAverage: maps[i]['currentAverage'] as double? ?? 0,
-      );
+      return Course.fromJson(maps[i]);
     });
   }
 

packages/uni_app/lib/controller/local_storage/database/app_lectures_database.dart

@@ -28,16 +28,7 @@ CREATE TABLE lectures(subject TEXT, typeClass TEXT,
     final List<Map<String, dynamic>> maps = await db.query('lectures');
 
     return List.generate(maps.length, (i) {
-      return Lecture(
-        maps[i]['subject'] as String,
-        maps[i]['typeClass'] as String,
-        DateTime.parse(maps[i]['startTime'] as String),
-        DateTime.parse(maps[i]['endTime'] as String),
-        maps[i]['room'] as String,
-        maps[i]['teacher'] as String,
-        maps[i]['classNumber'] as String,
-        maps[i]['occurrId'] as int,
-      );
+      return Lecture.fromJson(maps[i]);
     });
   }
 

packages/uni_app/lib/controller/local_storage/database/app_library_occupation_database.dart

@@ -26,11 +26,7 @@ class LibraryOccupationDatabase extends AppDatabase<LibraryOccupation> {
 
     for (var i = 0; i < maps.length; i++) {
       occupation.addFloor(
-        FloorOccupation(
-          maps[i]['number'] as int,
-          maps[i]['occupation'] as int,
-          maps[i]['capacity'] as int,
-        ),
+        FloorOccupation.fromJson(maps[i]),
       );
     }
 

packages/uni_app/lib/controller/local_storage/database/app_references_database.dart

@@ -26,13 +26,7 @@ class AppReferencesDatabase extends AppDatabase<List<Reference>> {
     final List<Map<String, dynamic>> maps = await db.query('refs');
 
     return List.generate(maps.length, (i) {
-      return Reference(
-        maps[i]['description'] as String,
-        DateTime.parse(maps[i]['limitDate'] as String),
-        maps[i]['entity'] as int,
-        maps[i]['reference'] as int,
-        maps[i]['amount'] as double,
-      );
+      return Reference.fromJson(maps[i]);
     });
   }
 

packages/uni_app/lib/controller/local_storage/database/app_user_database.dart

@@ -23,7 +23,7 @@ class AppUserDataDatabase extends AppDatabase<Profile> {
     for (final keymap in data.keymapValues()) {
       await insertInDatabase(
         'userdata',
-        {'name': keymap.item1, 'value': keymap.item2},
+        {'name': keymap.$1, 'value': keymap.$2},
       );
     }
   }