Update color scheme for dark/light mode and remove beta message (#333)

Co-authored-by: Kordian Bruck <kordianbruck@users.noreply.github.com>

Author: FlorianDev

assets/translations/de.json

@@ -110,6 +110,8 @@
     "other": "{} freie Räume"
   },
   "mealPlans": "Essenspläne",
+  "studentCardUnavailableSummer": "Dein Studierendenausweiß ist derzeit nicht verfügbar. Er wird zu Beginn des Sommersemesters am {} verfügbar sein.",
+  "studentCardUnavailableWinter": "Dein Studierendenausweiß ist derzeit nicht verfügbar. Er wird zu Beginn des Wintersemesters am {} verfügbar sein.",
   "noEntriesFound": "Keine {} gefunden!",
   "enterQueryStart": "Stelle eine Suchanfrage",
   "personalLectures": "Persönliche Vorlesungen",
@@ -176,7 +178,7 @@
   "delete": "Löschen",
   "deviceSettings": "Geräte-Einstellungen",
   "edit": "Editieren",
-  "digitalStudentCard": "Digitale StudentCard",
+  "digitalStudentCard": "StudentCard",
   "currentlyInBeta": "Aktuell in Testphase mit eingeschränkter Funktionalität!",
   "validUntil": "Gültig bis",
   "libraryBarcode": "Bibliotheks-Barcode",

assets/translations/en.json

@@ -110,6 +110,8 @@
     "other": "{} free rooms"
   },
   "mealPlans": "Meal Plans",
+  "studentCardUnavailableSummer": "Your Student Card is currently not available. It will become available at the start of the Summer Semester on {}.",
+  "studentCardUnavailableWinter": "Your Student Card is currently not available. It will become available at the start of the start of the Winter Semester on {}.",
   "noEntriesFound": "No {} Found!",
   "enterQueryStart": "Enter a Query to Start",
   "personalLectures": "Personal Lectures",
@@ -176,7 +178,7 @@
   "delete": "Delete",
   "deviceSettings": "Device Settings",
   "edit": "Edit",
-  "digitalStudentCard": "Digital StudentCard",
+  "digitalStudentCard": "StudentCard",
   "currentlyInBeta": "Currently in Beta with Limited Functionality!",
   "validUntil": "Valid until",
   "libraryBarcode": "Library Barcode",

lib/base/theme/constants.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 const Color primaryLightColor = Color(0xff0064BC);
-const Color primaryDarkColor = Color(0xff3070B3);
+const Color primaryDarkColor = Color.fromARGB(255, 100, 160, 200);
 const Color lightBackground = Color(0xfff2f2f7);
 const Color darkBackground = Color(0xff191919);
 const Color lightGray = Color(0xffAAAAAA);

lib/navigation_service.dart

@@ -28,8 +28,12 @@ class NavigationService {
   Widget title(int index, BuildContext context) {
     switch (index) {
       case 0:
+        final isDark = Theme.of(context).brightness == Brightness.dark;
+
         return Image.asset(
-          'assets/images/logos/tum-logo-blue.png',
+          isDark
+              ? 'assets/images/logos/tum-logo-white.png'
+              : 'assets/images/logos/tum-logo-blue.png',
           fit: BoxFit.cover,
           height: 20,
         );

lib/studentCardComponent/views/information_view.dart

@@ -69,26 +69,43 @@ class InformationView extends StatelessWidget {
     );
   }
 
+
   Widget _titleLogo(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        const Spacer(flex: 2),
-        _tumLogo(),
-        const Spacer(),
-        _title(context),
-        const Spacer(flex: 2),
-      ],
-    );
-  }
+  return Row(
+    children: [
+      Expanded(
+        flex: 1, // 1/3 of the width
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.only( right: 10.0),
+            child: _tumLogo(context),
+          ),
+        ),
+      ),
+      Expanded(
+        flex: 2, // 2/3 of the width
+        child: Center(
+          child: _title(context),
+        ),
+      ),
+    ],
+  );
+}
 
-  Widget _tumLogo() {
-    return Image.asset(
-      'assets/images/logos/tum-logo-blue.png',
+Widget _tumLogo(BuildContext context) {
+  final isDark = Theme.of(context).brightness == Brightness.dark;
+
+  return Padding(
+    padding: const EdgeInsets.all(0.0),
+    child: Image.asset(
+      isDark
+          ? 'assets/images/logos/tum-logo-white.png'
+          : 'assets/images/logos/tum-logo-blue.png',
       fit: BoxFit.contain,
       height: 25,
-    );
-  }
+    ),
+  );
+}
 
   Widget _profileImage() {
     return Expanded(
@@ -106,7 +123,7 @@ class InformationView extends StatelessWidget {
       context.tr("digitalStudentCard"),
       style: Theme.of(
         context,
-      ).textTheme.titleLarge?.apply(color: context.primaryColor),
+      ).textTheme.titleLarge?.apply(color: Theme.of(context).colorScheme.onSurface),
     );
   }
 
@@ -115,7 +132,7 @@ class InformationView extends StatelessWidget {
       studentCard.name,
       style: Theme.of(
         context,
-      ).textTheme.titleLarge?.copyWith(color: context.primaryColor),
+      ).textTheme.titleLarge?.copyWith(color: Theme.of(context).colorScheme.onSurface),
     );
   }
 

lib/studentCardComponent/views/student_card_view.dart

@@ -1,7 +1,6 @@
 import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/errorHandling/error_handling_router.dart';
 import 'package:campus_flutter/base/extensions/context.dart';
-import 'package:campus_flutter/base/util/card_with_padding.dart';
 import 'package:campus_flutter/base/util/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/util/last_updated_text.dart';
 import 'package:campus_flutter/studentCardComponent/viewModel/student_card_viewmodel.dart';
@@ -30,16 +29,14 @@ class StudentCardView extends ConsumerWidget {
             return Column(
               children: [
                 _header(lastFetched, context, ref),
-                _warningCard(context),
                 InformationView(studentCard: data),
                 if (data.libraryCode ?? data.libraryID case final payload?)
                   BarCodeView(payload: payload),
               ],
             );
           } else {
-            return Center(
-              child: Text(context.tr("noEntriesFound", args: ["StudentCard"])),
-            );
+            return 
+              studentCardMessage(context);
           }
         } else if (snapshot.hasError) {
           return ErrorHandlingRouter(
@@ -73,25 +70,45 @@ class StudentCardView extends ConsumerWidget {
     );
   }
 
-  Widget _warningCard(BuildContext context) {
-    return CardWithPadding(
-      elevation: 0,
-      color: context.primaryColor.withValues(alpha: 0.2),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Icon(Icons.warning, color: context.primaryColor),
-          const Padding(padding: EdgeInsets.symmetric(horizontal: 8.0)),
-          Expanded(
-            child: Text(
-              context.tr("currentlyInBeta"),
-              style: TextStyle(color: context.primaryColor),
-              textAlign: TextAlign.center,
-            ),
-          ),
-        ],
-      ),
+}
+Widget studentCardMessage(BuildContext context) {
+  final now = DateTime.now();
+
+  // Sommersemester beginnt 01.04., Wintersemester beginnt 01.10.
+  final startSummer = DateTime(now.year, 4, 1);
+  final startWinter = DateTime(now.year, 10, 1);
+
+  String message;
+  String semesterStartDate;
+
+  if (now.isBefore(startSummer)) {
+    // Nächstes Semester ist Sommersemester
+    semesterStartDate = "01.04.";
+    message = context.tr(
+      "studentCardUnavailableSummer",
+      args: [semesterStartDate],
+    );
+  } else if (now.isBefore(startWinter)) {
+    // Nächstes Semester ist Wintersemester
+    semesterStartDate = "01.10.";
+    message = context.tr(
+      "studentCardUnavailableWinter",
+      args: [semesterStartDate],
+    );
+  } else {
+    // Nach 01.10., nächstes Semester ist wieder Sommersemester im nächsten Jahr
+    semesterStartDate = "01.04."; // Optional: kann auch Jahr anhängen
+    message = context.tr(
+      "studentCardUnavailableSummer",
+      args: [semesterStartDate],
     );
   }
-}
+
+return Center(
+  child: Text(
+    message,
+    textAlign: TextAlign.center,
+    style: Theme.of(context).textTheme.titleLarge, // larger than bodyMedium
+  ),
+);
+}

pubspec.yaml

@@ -113,6 +113,7 @@ flutter:
     - assets/translations/
     - assets/mapStyles/
     - assets/images/logos/tum-logo-blue.png
+    - assets/images/logos/tum-logo-white.png
     - assets/images/logos/tum-logo-blue-text.png
     - assets/images/logos/tum-logo-rainbow.png
     - assets/images/placeholders/portrait_placeholder.png