From 8d6a15c4d5e03d191925845f2ebb667624f58703 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Sun, 23 Apr 2023 21:40:04 +0200
Subject: [PATCH] Added colour to StudIPEvent.kt to implement at a later date
 in an effort to prepare the app for release without needing to migrate (=
 nuke) the database once the functionality will be implemented

---
 .../com/denizk0461/studip/db/AppDatabase.kt   |   2 +-
 .../denizk0461/studip/model/StudIPColour.kt   |  26 +++
 .../denizk0461/studip/model/StudIPEvent.kt    |   2 +-
 app/src/main/res/layout/content_main.xml      |   1 +
 app/src/main/res/layout/fragment_settings.xml | 159 +++++++++++++-----
 app/src/main/res/values-de/strings.xml        |  14 +-
 app/src/main/res/values-night/themes.xml      |   4 +
 app/src/main/res/values/attrs.xml             |  12 +-
 app/src/main/res/values/strings.xml           |  10 +-
 app/src/main/res/values/themes.xml            |   4 +
 10 files changed, 168 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/java/com/denizk0461/studip/model/StudIPColour.kt

diff --git a/app/src/main/java/com/denizk0461/studip/db/AppDatabase.kt b/app/src/main/java/com/denizk0461/studip/db/AppDatabase.kt
index 4605b8b..baf4290 100644
--- a/app/src/main/java/com/denizk0461/studip/db/AppDatabase.kt
+++ b/app/src/main/java/com/denizk0461/studip/db/AppDatabase.kt
@@ -17,7 +17,7 @@ import com.denizk0461.studip.model.*
         OfferCategory::class,
         OfferItem::class
     ],
-    version = 11,
+    version = 12,
 )
 abstract class AppDatabase : RoomDatabase() {
 
diff --git a/app/src/main/java/com/denizk0461/studip/model/StudIPColour.kt b/app/src/main/java/com/denizk0461/studip/model/StudIPColour.kt
new file mode 100644
index 0000000..b11f650
--- /dev/null
+++ b/app/src/main/java/com/denizk0461/studip/model/StudIPColour.kt
@@ -0,0 +1,26 @@
+package com.denizk0461.studip.model
+
+import com.denizk0461.studip.R
+
+/**
+ * Enumeration used to save and apply custom colours to Stud.IP events.
+ * TODO finish implementation
+ *
+ * @param colourId  resource ID of the colour
+ */
+enum class StudIPColour(val colourId: Int) {
+
+    DEFAULT(R.attr.scheduleColorDefault);
+
+    companion object {
+
+        /**
+         * Retrieve a StudIPColour object by its ordinal.
+         *
+         * @param ordinal   numeric position of the colour in the enumeration
+         * @return          enum object
+         */
+        fun getEnumValue(ordinal: Int): StudIPColour =
+            StudIPColour.values()[ordinal]
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt b/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt
index 84e77fe..30e8dbf 100644
--- a/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt
+++ b/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt
@@ -24,7 +24,7 @@ data class StudIPEvent(
     val day: Int,
     val timeslotStart: String,
     val timeslotEnd: String,
-    val colour: String = "000000",
+    val colour: Int = 0,
 ) {
 
     /**
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 531b59a..2079686 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -43,6 +43,7 @@
         android:layout_height="wrap_content"
         app:menu="@menu/nav_view_items"
         app:labelVisibilityMode="selected"
+        app:itemTextColor="?attr/colorOnSurfaceVariant"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 226cb94..9813f70 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -11,6 +11,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <!-- Stud.IP schedule settings -->
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,7 +31,7 @@
                     android:layout_marginBottom="8dp"
                     android:textSize="22sp"
                     android:fontFamily="@font/lato_bolditalic"
-                    android:text="@string/settings_misc"
+                    android:text="@string/settings_schedule"
                     android:layout_marginTop="16dp"
                     android:layout_marginHorizontal="16dp"/>
 
@@ -40,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"/>
 
-                <!-- App version -->
+                <!-- Refresh schedule -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/button_refresh_schedule"
                     android:layout_width="match_parent"
@@ -67,49 +68,6 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- Academic quarter -->
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/layout_quarter"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="16dp"
-                    android:paddingVertical="8dp">
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/switch_quarter"
-                        android:layout_marginEnd="8dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="16sp"
-                            android:fontFamily="@font/lato_bolditalic"
-                            android:text="@string/settings_quarter_title"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="16sp"
-                            android:text="@string/settings_quarter_subtitle"/>
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <com.google.android.material.materialswitch.MaterialSwitch
-                        android:id="@+id/switch_quarter"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"/>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
                 <!-- Highlight course -->
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layout_highlight"
@@ -153,6 +111,117 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- canteen settings -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="4dp"
+            style="@style/Widget.Material3.CardView.Outlined">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:textSize="22sp"
+                    android:fontFamily="@font/lato_bolditalic"
+                    android:text="@string/settings_canteen"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginHorizontal="16dp"/>
+
+                <com.google.android.material.divider.MaterialDivider
+                    style="@style/DividerTheme"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="16dp"/>
+
+                <!-- Allergens -->
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/layout_allergens"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="8dp">
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/switch_allergens"
+                        android:layout_marginEnd="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="16sp"
+                            android:fontFamily="@font/lato_bolditalic"
+                            android:text="@string/settings_allergens_title"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="16sp"
+                            android:text="@string/settings_allergens_subtitle"/>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/switch_allergens"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"/>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- miscellaneous settings -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="4dp"
+            style="@style/Widget.Material3.CardView.Outlined">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="8dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:textSize="22sp"
+                    android:fontFamily="@font/lato_bolditalic"
+                    android:text="@string/settings_misc"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginHorizontal="16dp"/>
+
+                <com.google.android.material.divider.MaterialDivider
+                    style="@style/DividerTheme"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="16dp"/>
+
                 <!-- Data handling -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/button_data_handling"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1d7fef7..c3d5e2c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,7 +8,7 @@
     <string name="friday">FREITAG</string>
 
     <string name="title_schedule">Dein Stundenplan</string>
-    <string name="title_food">Mensen-Angebote</string>
+    <string name="title_food">Mensenangebote</string>
     <string name="title_settings">App-Einstellungen</string>
 
     <string name="mensa_uni">Uni-Mensa</string>
@@ -81,22 +81,26 @@
     <string name="allergens_contains">Enthält: %s.</string>
 
     <string name="nav_schedule">Stundenplan</string>
-    <string name="nav_food">Mensen</string>
+    <string name="nav_food">Mensa</string>
     <string name="nav_settings">Einstellungen</string>
 
     <string name="toast_fetch_finished">Dein Stundenplan wurde aktualisiert!</string>
 
     <string name="settings_general">Allgemein</string>
+    <string name="settings_schedule">Stud.IP-Stundenplan</string>
+    <string name="settings_canteen">Mensenangebote</string>
     <string name="settings_misc">Sonstiges</string>
 
     <string name="refresh_schedule_title">Aktualisiere deinen Stud.IP-Stundenplan</string>
     <string name="refresh_schedule_subtitle">Dies wird alle Anpassungen löschen!</string>
-    <string name="settings_quarter_title">Nutze akademisches Viertel</string>
-    <string name="settings_quarter_subtitle">Wo es passt</string>
     <string name="settings_highlight_title">Markiere meinen nächsten Kurs</string>
     <string name="settings_highlight_subtitle">Funktioniert nur wenn Kurse sich nicht überschneiden!</string>
+    <string name="settings_quarter_title">Nutze akademisches Viertel</string>
+    <string name="settings_quarter_subtitle">Wo es passt</string>
+    <string name="settings_allergens_title">Markiere Allergene mit einem Stern*</string>
+    <string name="settings_allergens_subtitle">Wird auch für Zusatzstoffe genutzt</string>
     <string name="settings_data_title">Was passiert mit meinen Daten?</string>
-    <string name="settings_data_subtitle">Stiehlst du meinen Login?</string>
+    <string name="settings_data_subtitle">Stiehlst du meinen Stud.IP-Login?</string>
     <string name="settings_app_version">App-Verison</string>
 
     <string name="with_love">mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__*</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fd01bbc..5e4606b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -29,6 +29,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
 
         <item name="android:textColor">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="android:scrollbarThumbVertical">@color/md_theme_dark_onSurfaceVariant</item>
+
+        <!-- is this correct? -->
+        <item name="scheduleColorDefault">@color/md_theme_light_background</item>
     </style>
 
     <style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f367da8..f2387da 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="colorNavHighlight" format="color" />
-    <attr name="colorPrimaryOnContrast" format="color" />
-    <attr name="colorPrimary" format="color" />
-    <attr name="colorPrimaryTranslucent" format="color" />
-    <attr name="colorOnPrimary" format="color" />
-    <attr name="colorText" format="color" />
-    <attr name="colorTextHint" format="color" />
-    <attr name="colorTextHintLighter" format="color" />
-    <attr name="colorBackground" format="color" />
-    <attr name="colorCardBackground" format="color" />
-    <attr name="colorSwitchTrack" format="color" />
+    <attr name="scheduleColorDefault" type="color"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d69ce3..1cab1af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,16 +87,20 @@
     <string name="toast_fetch_finished">Your schedule has been refreshed!</string>
 
     <string name="settings_general">General</string>
+    <string name="settings_schedule">Stud.IP Schedule</string>
+    <string name="settings_canteen">Canteen Offers</string>
     <string name="settings_misc">Miscellaneous</string>
 
     <string name="refresh_schedule_title">Refresh your Stud.IP schedule</string>
     <string name="refresh_schedule_subtitle">This will clear any customisations!</string>
-    <string name="settings_quarter_title">Use academic quarter</string>
-    <string name="settings_quarter_subtitle">Where applicable</string>
     <string name="settings_highlight_title">Highlight next course</string>
     <string name="settings_highlight_subtitle">Only works properly if courses don\'t overlap!</string>
+    <string name="settings_quarter_title">Use academic quarter</string>
+    <string name="settings_quarter_subtitle">Where applicable</string>
+    <string name="settings_allergens_title">Mark allergens with a star*</string>
+    <string name="settings_allergens_subtitle">Also applies to additives</string>
     <string name="settings_data_title">What happens with my data?</string>
-    <string name="settings_data_subtitle">Will you steal my login?</string>
+    <string name="settings_data_subtitle">Will you steal my Stud.IP login?</string>
     <string name="settings_app_version">App Version</string>
 
     <string name="with_love">with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__*</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0fd597e..662f485 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,6 +29,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
 
         <item name="android:textColor">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="android:scrollbarThumbVertical">@color/md_theme_light_onSurfaceVariant</item>
+
+        <!-- is this correct? -->
+        <item name="scheduleColorDefault">@color/md_theme_dark_background</item>
     </style>
 
     <style name="Theme.StudIPTimetable" parent="Base.Theme.StudIPTimetable" />