Merge branch 'ui/redesign' into redesign/exams_page

NIAEFEUP · Dec 27, 2024 · 598d3f3 · 598d3f3
2 parents 8f33af3 + bb17f36
commit 598d3f3
Show file tree

Hide file tree

Showing 15 changed files with 362 additions and 181 deletions.
diff --git a/packages/uni_app/app_version.txt b/packages/uni_app/app_version.txt
@@ -1 +1 @@
-1.10.0-beta.35+338
+1.10.0-beta.36+339
diff --git a/packages/uni_app/lib/model/entities/login_exceptions.dart b/packages/uni_app/lib/model/entities/login_exceptions.dart
diff --git a/packages/uni_app/lib/session/exception.dart b/packages/uni_app/lib/session/exception.dart
@@ -1,4 +1,5 @@
 enum AuthenticationExceptionType {
+  internetError,
   wrongCredentials,
   expiredCredentials,
   other,

diff --git a/packages/uni_app/lib/session/flows/credentials/request.dart b/packages/uni_app/lib/session/flows/credentials/request.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'package:http/http.dart' as http;
 import 'package:uni/controller/fetchers/faculties_fetcher.dart';
 import 'package:uni/session/exception.dart';
@@ -35,11 +36,20 @@ class CredentialsSessionRequest extends SessionRequest {
           'Failed to authenticate user',
           AuthenticationExceptionType.expiredCredentials,
         );
-      } else {
+      } else if (failureReason == LoginFailureReason.internetError) {
+        throw const AuthenticationException(
+          'Failed to authenticate user',
+          AuthenticationExceptionType.internetError,
+        );
+      } else if (failureReason == LoginFailureReason.wrongCredentials) {
         throw const AuthenticationException(
           'Failed to authenticate user',
           AuthenticationExceptionType.wrongCredentials,
         );
+      } else {
+        throw const AuthenticationException(
+          'Failed to authenticate user',
+        );
       }
     }
 

diff --git a/packages/uni_app/lib/sigarra/endpoints/html/authentication/login/response.dart b/packages/uni_app/lib/sigarra/endpoints/html/authentication/login/response.dart
@@ -8,6 +8,7 @@ class LoginResponse extends SigarraResponse {
 
 enum LoginFailureReason {
   serverError,
+  internetError,
   wrongCredentials,
   expiredCredentials,
   blockedAccount,

diff --git a/packages/uni_app/lib/view/login/login.dart b/packages/uni_app/lib/view/login/login.dart
@@ -9,9 +9,9 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:uni/app_links/uni_app_links.dart';
 import 'package:uni/controller/networking/url_launcher.dart';
 import 'package:uni/generated/l10n.dart';
-import 'package:uni/model/entities/login_exceptions.dart';
 import 'package:uni/model/providers/startup/session_provider.dart';
 import 'package:uni/model/providers/state_providers.dart';
+import 'package:uni/session/exception.dart';
 import 'package:uni/session/flows/credentials/initiator.dart';
 import 'package:uni/session/flows/federated/initiator.dart';
 import 'package:uni/utils/constants.dart';
@@ -99,36 +99,51 @@ class LoginPageViewState extends State<LoginPageView>
             _loggingIn = false;
           });
         }
-      } catch (err, st) {
+      } on AuthenticationException catch (err, st) {
         setState(() {
           _loggingIn = false;
         });
-        if (err is ExpiredCredentialsException) {
-          _updatePasswordDialog();
-        } else if (err is InternetStatusException) {
-          if (mounted) {
-            unawaited(
-              ToastMessage.warning(
-                context,
-                S.of(context).internet_status_exception,
-              ),
-            );
-          }
-        } else if (err is WrongCredentialsException) {
-          if (mounted) {
-            unawaited(
-              ToastMessage.error(
-                context,
-                S.of(context).wrong_credentials_exception,
-              ),
-            );
-          }
-        } else {
-          Logger().e(err, stackTrace: st);
-          unawaited(Sentry.captureException(err, stackTrace: st));
-          if (mounted) {
-            unawaited(ToastMessage.error(context, S.of(context).failed_login));
-          }
+
+        switch (err.type) {
+          case AuthenticationExceptionType.expiredCredentials:
+            _updatePasswordDialog();
+          case AuthenticationExceptionType.internetError:
+            if (mounted) {
+              unawaited(
+                ToastMessage.warning(
+                  context,
+                  S.of(context).internet_status_exception,
+                ),
+              );
+            }
+          case AuthenticationExceptionType.wrongCredentials:
+            if (mounted) {
+              unawaited(
+                ToastMessage.error(
+                  context,
+                  S.of(context).wrong_credentials_exception,
+                ),
+              );
+            }
+          default:
+            Logger().e(err, stackTrace: st);
+            unawaited(Sentry.captureException(err, stackTrace: st));
+            if (mounted) {
+              unawaited(
+                ToastMessage.error(context, S.of(context).failed_login),
+              );
+            }
+        }
+      }
+      // Handles other unexpected exceptions
+      catch (err, st) {
+        setState(() {
+          _loggingIn = false;
+        });
+        Logger().e(err, stackTrace: st);
+        unawaited(Sentry.captureException(err, stackTrace: st));
+        if (mounted) {
+          unawaited(ToastMessage.error(context, S.of(context).failed_login));
         }
       }
     }

diff --git a/packages/uni_app/pubspec.yaml b/packages/uni_app/pubspec.yaml
@@ -7,7 +7,7 @@ publish_to: "none" # We do not publish to pub.dev
 # To change it manually, override the value in app_version.txt.
 # The app version code is automatically also bumped by CI.
 # Do not change it manually.
-version: 1.10.0-beta.35+338
+version: 1.10.0-beta.36+339
 
 environment:
   sdk: ">=3.4.0 <4.0.0"

diff --git a/packages/uni_ui/lib/cards/course_grade_card.dart b/packages/uni_ui/lib/cards/course_grade_card.dart
@@ -26,14 +26,14 @@ class CourseGradeCard extends StatelessWidget {
             children: [
               Text(
                 courseName,
-                style: theme.textTheme.titleLarge,
+                style: theme.textTheme.bodySmall,
                 overflow: TextOverflow.ellipsis,
               ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Text("${ects} ECTS", style: theme.textTheme.bodyLarge),
-                  Text("${grade.toInt()}", style: theme.textTheme.bodyLarge)
+                  Text("${ects} ECTS", style: theme.textTheme.bodySmall),
+                  Text("${grade.toInt()}", style: theme.textTheme.bodySmall)
                 ],
               )
             ],

diff --git a/packages/uni_ui/lib/cards/exam_card.dart b/packages/uni_ui/lib/cards/exam_card.dart
@@ -49,7 +49,7 @@ class ExamCard extends StatelessWidget {
                       Text(
                         acronym,
                         overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.headlineMedium!,
+                        style: Theme.of(context).textTheme.headlineSmall!,
                       ),
                       const SizedBox(width: 8),
                       Badge(
@@ -62,7 +62,7 @@ class ExamCard extends StatelessWidget {
                   Text(
                     name,
                     overflow: TextOverflow.ellipsis,
-                    style: Theme.of(context).textTheme.titleLarge!,
+                    style: Theme.of(context).textTheme.bodySmall!,
                   ),
                   const SizedBox(height: 5),
                   Row(
@@ -75,7 +75,7 @@ class ExamCard extends StatelessWidget {
                       const SizedBox(width: 4),
                       Text(
                         startTime ?? "--:--",
-                        style: Theme.of(context).textTheme.bodyMedium!,
+                        style: Theme.of(context).textTheme.labelSmall!,
                       ),
                       const SizedBox(width: 8),
                       if (!rooms.isEmpty)
@@ -101,7 +101,7 @@ class ExamCard extends StatelessWidget {
                             scrollDirection: Axis.horizontal,
                             child: Text(
                               rooms.join(" "),
-                              style: Theme.of(context).textTheme.bodyMedium,
+                              style: Theme.of(context).textTheme.labelSmall,
                             ),
                           ),
                         ),

diff --git a/packages/uni_ui/lib/cards/service_card.dart b/packages/uni_ui/lib/cards/service_card.dart
@@ -24,7 +24,7 @@ class ServiceCard extends StatelessWidget {
               Text(
                 name,
                 overflow: TextOverflow.ellipsis,
-                style: Theme.of(context).textTheme.headlineMedium!,
+                style: Theme.of(context).textTheme.headlineSmall!,
               ),
             ],
           ),
@@ -42,7 +42,7 @@ class ServiceCard extends StatelessWidget {
                 children: openingHours.map((hour) {
                   return Text(
                     hour,
-                    style: Theme.of(context).textTheme.bodySmall,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   );
                 }).toList(),
               )