Pfe master fixed

.gitignore

@@ -18,7 +18,7 @@ app_untranslated_messages.yaml
 
 # Flutter test
 test/**/failures/
-test/mock/**/*.mocks.dart
+*.mocks.dart
 
 # Certificates and secrets
 assets/certificates/

analysis_options.yaml

@@ -9,4 +9,4 @@ linter:
 analyzer:
   exclude:
     - "lib/generated"
-    - "test/mock/services/*.mocks.dart"
+    - "*.mocks.dart"

ios/Podfile.lock

@@ -329,14 +329,14 @@ SPEC CHECKSUMS:
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  rive_common: c537b4eed761e903a9403d93c347b69bd7a4762f
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  rive_common: cbbac3192af00d7341f19dae2f26298e9e37d99e
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftyXMLParser: 027d9e6fb54a38d95dccec025bcea9693f699c47
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
+  webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
 
 PODFILE CHECKSUM: 18f1615a0bcd417392c9107b3e8dc59c76a68dac
 

ios/Runner.xcodeproj/project.pbxproj

@@ -376,6 +376,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1400;
 				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
@@ -783,6 +784,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -793,6 +795,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -864,6 +867,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -874,6 +878,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -919,6 +924,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -929,6 +935,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

lib/features/app/error/outage/outage_view.dart

@@ -3,131 +3,70 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_build_image.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_build_social_media.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
-import 'package:notredame/constants/urls.dart';
+import 'package:notredame/utils/utils.dart';
 import 'package:notredame/features/app/error/outage/outage_viewmodel.dart';
 import 'package:notredame/utils/app_theme.dart';
-import 'package:notredame/utils/utils.dart';
 
 class OutageView extends StatelessWidget {
   @override
-  Widget build(BuildContext context) => ViewModelBuilder<
-          OutageViewModel>.nonReactive(
-      viewModelBuilder: () => OutageViewModel(),
-      builder: (context, model, child) => Scaffold(
-            backgroundColor: Utils.getColorByBrightness(
-                context, AppTheme.etsLightRed, AppTheme.primaryDark),
-            body: Stack(
-              children: [
-                SafeArea(
-                  minimum: const EdgeInsets.all(20),
-                  child: Column(
-                    children: <Widget>[
-                      SizedBox(
-                        height: model.getImagePlacement(context),
-                      ),
-                      Hero(
-                          tag: 'ets_logo',
-                          child: Image.asset(
-                            "assets/animations/outage.gif",
-                            excludeFromSemantics: true,
-                            width: 500,
-                            color:
-                                Theme.of(context).brightness == Brightness.light
-                                    ? Colors.white
-                                    : AppTheme.etsLightRed,
-                          )),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      SizedBox(height: model.getTextPlacement(context)),
-                      Text(
-                        AppIntl.of(context)!.service_outage,
-                        textAlign: TextAlign.center,
-                        style:
-                            const TextStyle(fontSize: 18, color: Colors.white),
-                      ),
-                      SizedBox(height: model.getButtonPlacement(context)),
-                      ElevatedButton(
-                        onPressed: () {
-                          model.tapRefreshButton(context);
-                        },
-                        child: Text(
-                          AppIntl.of(context)!.service_outage_refresh,
-                          style: const TextStyle(fontSize: 17),
-                        ),
-                      ),
-                      Expanded(
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.end,
-                          children: [
-                            SizedBox(
-                              height: model.getContactTextPlacement(context),
-                              child: Text(
-                                AppIntl.of(context)!.service_outage_contact,
-                                textAlign: TextAlign.center,
-                                style: const TextStyle(color: Colors.white),
-                              ),
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                              crossAxisAlignment: CrossAxisAlignment.end,
-                              children: [
-                                IconButton(
-                                    icon: const FaIcon(
-                                      FontAwesomeIcons.earthAmericas,
-                                      color: Colors.white,
-                                    ),
-                                    onPressed: () => Utils.launchURL(
-                                        Urls.clubWebsite,
-                                        AppIntl.of(context)!)),
-                                IconButton(
-                                    icon: const FaIcon(
-                                      FontAwesomeIcons.github,
-                                      color: Colors.white,
-                                    ),
-                                    onPressed: () => Utils.launchURL(
-                                        Urls.clubGithub, AppIntl.of(context)!)),
-                                IconButton(
-                                    icon: const FaIcon(
-                                      Icons.mail_outline,
-                                      color: Colors.white,
-                                    ),
-                                    onPressed: () => Utils.launchURL(
-                                        Urls.clubEmail, AppIntl.of(context)!)),
-                                IconButton(
-                                    icon: const FaIcon(
-                                      FontAwesomeIcons.discord,
-                                      color: Colors.white,
-                                    ),
-                                    onPressed: () => Utils.launchURL(
-                                        Urls.clubDiscord,
-                                        AppIntl.of(context)!)),
-                              ],
+  Widget build(BuildContext context) =>
+      ViewModelBuilder<OutageViewModel>.nonReactive(
+          viewModelBuilder: () => OutageViewModel(),
+          builder: (context, model, child) => Scaffold(
+                backgroundColor: Utils.getColorByBrightness(
+                    context, AppTheme.etsLightRed, AppTheme.primaryDark),
+                body: Stack(
+                  children: [
+                    SafeArea(
+                      minimum: const EdgeInsets.all(20),
+                      child: Column(
+                        children: <Widget>[
+                          SizedBox(
+                            height: model.getImagePlacement(context),
+                          ),
+                          outageImageSection(context),
+                          SizedBox(height: model.getTextPlacement(context)),
+                          Text(
+                            AppIntl.of(context)!.service_outage,
+                            textAlign: TextAlign.center,
+                            style: const TextStyle(
+                                fontSize: 18, color: Colors.white),
+                          ),
+                          SizedBox(height: model.getButtonPlacement(context)),
+                          ElevatedButton(
+                            onPressed: () {
+                              model.tapRefreshButton(context);
+                            },
+                            child: Text(
+                              AppIntl.of(context)!.service_outage_refresh,
+                              style: const TextStyle(fontSize: 17),
                             ),
-                          ],
+                          ),
+                          Expanded(
+                            child: outageSocialSection(model, context),
+                          ),
+                        ],
+                      ),
+                    ),
+                    SafeArea(
+                      child: Align(
+                        alignment: Alignment.topRight,
+                        child: GestureDetector(
+                          onTap: () => model.triggerTap(context),
+                          child: Container(
+                            width: 60,
+                            height: 60,
+                            color: Colors.transparent,
+                          ),
                         ),
                       ),
-                    ],
-                  ),
+                    )
+                  ],
                 ),
-                SafeArea(
-                  child: Align(
-                    alignment: Alignment.topRight,
-                    child: GestureDetector(
-                      onTap: () => model.triggerTap(context),
-                      child: Container(
-                        width: 60,
-                        height: 60,
-                        color: Colors.transparent,
-                      ),
-                    ),
-                  ),
-                )
-              ],
-            ),
-          ));
+              ));
 }

lib/features/app/error/outage/outage_viewmodel.dart

@@ -20,15 +20,15 @@ class OutageViewModel extends BaseViewModel {
   }
 
   double getTextPlacement(BuildContext context) {
-    return MediaQuery.of(context).size.height * 0.20;
+    return MediaQuery.of(context).size.height * 0.15;
   }
 
   double getButtonPlacement(BuildContext context) {
     return MediaQuery.of(context).size.height * 0.08;
   }
 
   double getContactTextPlacement(BuildContext context) {
-    return MediaQuery.of(context).size.height * 0.04;
+    return MediaQuery.of(context).size.height * 0.10;
   }
 
   void tapRefreshButton(BuildContext context) {

lib/features/app/error/outage/widgets/outage_build_image.dart

@@ -0,0 +1,18 @@
+// Flutter imports:
+import 'package:flutter/material.dart';
+
+// Project imports:
+import 'package:notredame/utils/app_theme.dart';
+
+Widget outageImageSection(BuildContext context) {
+  return Hero(
+      tag: 'ets_logo',
+      child: Image.asset(
+        "assets/animations/outage.gif",
+        excludeFromSemantics: true,
+        width: 500,
+        color: Theme.of(context).brightness == Brightness.light
+            ? Colors.white
+            : AppTheme.etsLightRed,
+      ));
+}

lib/features/app/error/outage/widgets/outage_build_social_media.dart

@@ -0,0 +1,61 @@
+// Flutter imports:
+import 'package:flutter/material.dart';
+
+// Package imports:
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
+// Project imports:
+import 'package:notredame/constants/urls.dart';
+import 'package:notredame/features/app/error/outage/outage_viewmodel.dart';
+import 'package:notredame/utils/utils.dart';
+
+Widget outageSocialSection(OutageViewModel model, BuildContext context) {
+  return Column(
+    mainAxisAlignment: MainAxisAlignment.end,
+    children: [
+      SizedBox(
+        height: model.getContactTextPlacement(context),
+        child: Text(
+          AppIntl.of(context)!.service_outage_contact,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: Colors.white),
+        ),
+      ),
+      Row(
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        crossAxisAlignment: CrossAxisAlignment.end,
+        children: [
+          IconButton(
+              icon: const FaIcon(
+                FontAwesomeIcons.earthAmericas,
+                color: Colors.white,
+              ),
+              onPressed: () =>
+                  Utils.launchURL(Urls.clubWebsite, AppIntl.of(context)!)),
+          IconButton(
+              icon: const FaIcon(
+                FontAwesomeIcons.github,
+                color: Colors.white,
+              ),
+              onPressed: () =>
+                  Utils.launchURL(Urls.clubGithub, AppIntl.of(context)!)),
+          IconButton(
+              icon: const FaIcon(
+                Icons.mail_outline,
+                color: Colors.white,
+              ),
+              onPressed: () =>
+                  Utils.launchURL(Urls.clubEmail, AppIntl.of(context)!)),
+          IconButton(
+              icon: const FaIcon(
+                FontAwesomeIcons.discord,
+                color: Colors.white,
+              ),
+              onPressed: () =>
+                  Utils.launchURL(Urls.clubDiscord, AppIntl.of(context)!)),
+        ],
+      ),
+    ],
+  );
+}

lib/features/app/repository/author_repository.dart

@@ -3,6 +3,8 @@ import 'package:notredame/features/ets/events/api-client/hello_api_client.dart';
 import 'package:notredame/features/ets/events/api-client/models/organizer.dart';
 import 'package:notredame/utils/locator.dart';
 
+// Project imports:
+
 /// Repository to access authors
 class AuthorRepository {
   static const String tag = "AuthorRepository";

lib/features/app/widgets/base_scaffold.dart

@@ -10,8 +10,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 // Project imports:
 import 'package:notredame/features/app/integration/networking_service.dart';
-import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/features/app/widgets/bottom_bar.dart';
+import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/utils/app_theme.dart';
 import 'package:notredame/utils/loading.dart';
 import 'package:notredame/utils/locator.dart';