Update Versions, Add Splash Screen for Web, Cleanup (#191)

TUM-Dev · Jan 3, 2024 · e673af5 · e673af5
1 parent 3e186d7
commit e673af5
Show file tree

Hide file tree

Showing 34 changed files with 105 additions and 21 deletions.
diff --git a/assets/images/logos/tum-logo-white.png b/assets/images/logos/tum-logo-white.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/100.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/100.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/1024.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/114.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/120.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/144.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/144.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/152.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/152.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/167.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/167.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/180.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/20.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/20.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/29.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/40.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/50.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/50.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/57.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/58.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/60.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/72.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/72.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/76.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/76.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/80.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/87.png
diff --git a/ios/Runner/Assets.xcassets/AppIcon2.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon2.appiconset/Contents.json
diff --git a/lib/navigaTumComponent/services/navigatum_service.dart b/lib/navigaTumComponent/services/navigatum_service.dart
@@ -29,8 +29,8 @@ class NavigaTumService {
     String id,
     Ref ref,
   ) async {
-    final response = await getIt<RESTClient>()
-        .get<NavigaTumNavigationDetails, NavigaTumApi>(
+    final response =
+        await getIt<RESTClient>().get<NavigaTumNavigationDetails, NavigaTumApi>(
       NavigaTumApi(
         navigaTumApiService: NavigaTumApiServiceDetails(
           id: id,

diff --git a/lib/navigation.dart b/lib/navigation.dart
@@ -66,6 +66,7 @@ class _NavigationState extends ConsumerState<Navigation> {
       ),
       floatingActionButton: getIt<NavigationService>().floatingActionButton(
         ref.watch(currentIndex),
+        ref,
         context,
       ),
       body: PageView(

diff --git a/lib/navigation_service.dart b/lib/navigation_service.dart
@@ -11,6 +11,10 @@ import 'package:campus_flutter/settingsComponent/views/settings_scaffold.dart';
 import 'package:campus_flutter/base/extensions/context.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'base/enums/credentials.dart';
+import 'loginComponent/viewModels/login_viewmodel.dart';
 
 class NavigationService {
   double? _navigationBarHeight;
@@ -75,18 +79,22 @@ class NavigationService {
     }
   }
 
-  Widget? floatingActionButton(int index, BuildContext context) {
+  Widget? floatingActionButton(int index, WidgetRef ref, BuildContext context) {
     switch (index) {
       case 3:
-        return FloatingActionButton(
-          onPressed: () => Navigator.push(
-            context,
-            MaterialPageRoute(
-              builder: (context) => const EventCreationScaffold(),
+        if (ref.read(loginViewModel).credentials.value == Credentials.tumId) {
+          return FloatingActionButton(
+            onPressed: () => Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => const EventCreationScaffold(),
+              ),
             ),
-          ),
-          child: const Icon(Icons.add),
-        );
+            child: const Icon(Icons.add),
+          );
+        } else {
+          return null;
+        }
       default:
         return null;
     }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: campus_flutter
 description: A new Flutter project.
 publish_to: 'none'
-version: 4.4.1
+version: 4.5.0
 
 environment:
   sdk: '>=3.0.0 <4.0.0'

diff --git a/web/index.html b/web/index.html
@@ -1,6 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
+<!DOCTYPE html><html><head>
     <!--
       If you are serving your web app in a path other than the root, change the
       href value below to reflect the base path you are serving from.
@@ -23,11 +21,11 @@
     <!-- iOS meta tags & icons -->
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-title" content="campus_flutter">
+    <meta name="apple-mobile-web-app-title" content="TUM Campus App">
     <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
     <!-- Favicon -->
-    <link rel="icon" type="image/png" href="favicon.png"/>
+    <link rel="icon" type="image/png" href="favicon.png">
 
     <title>campus_flutter</title>
     <link rel="manifest" href="manifest.json">
@@ -37,15 +35,92 @@
         var serviceWorkerVersion = null;
     </script>
     <!-- This script adds the flutter initialization JS code -->
-    <script src="flutter.js" defer></script>
+    <script src="flutter.js" defer=""></script>
 
     <!-- Needed for Google Maps Package -->
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAxUbnUMsXWVzeptXiLuNDMGpGEVFHLT4Y"></script>
     <!--<script
           src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAxUbnUMsXWVzeptXiLuNDMGpGEVFHLT4Y&libraries=core,maps,places,geocoding,routes,marker,geometry,elevation,streetView,journeySharing,drawing,visualization">
   </script>-->
+  <style id="splash-screen-style">
+    html {
+      height: 100%
+    }
+
+    body {
+      margin: 0;
+      min-height: 100%;
+      background-color: #0064BC;
+          background-size: 100% 100%;
+    }
+
+    .center {
+      margin: 0;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -ms-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
+    }
+
+    .contain {
+      display:block;
+      width:100%; height:100%;
+      object-fit: contain;
+    }
+
+    .stretch {
+      display:block;
+      width:100%; height:100%;
+    }
+
+    .cover {
+      display:block;
+      width:100%; height:100%;
+      object-fit: cover;
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      -ms-transform: translate(-50%, 0);
+      transform: translate(-50%, 0);
+    }
+
+    .bottomLeft {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+    }
+
+    .bottomRight {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      body {
+        background-color: #3070B3;
+          }
+    }
+  </style>
+  <script id="splash-screen-script">
+    function removeSplashFromWeb() {
+      document.getElementById("splash")?.remove();
+      document.getElementById("splash-branding")?.remove();
+      document.body.style.background = "transparent";
+    }
+  </script>
+  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
 </head>
 <body>
+  <picture id="splash">
+      <source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light)">
+      <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
+      <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
+  </picture>
 <script>
     window.addEventListener('load', function (ev) {
         // Download main.dart.js
@@ -61,5 +136,6 @@
         });
     });
 </script>
-</body>
-</html>
+
+
+</body></html>
diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png
diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png
diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png
diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png
diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png
diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png
diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png
diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png