From a0fda22705c81e5ec5b6a3bc35168dc85f8c72f6 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Fri, 5 May 2023 13:09:27 +0200
Subject: [PATCH] finally fixed that fucking pink fucking TimePickerDialog
 fucking button fuck fuck fuck

---
 app/build.gradle                              |   2 +-
 app/src/main/res/layout/fragment_canteen.xml  |   3 +-
 app/src/main/res/layout/fragment_event.xml    |   3 +-
 app/src/main/res/layout/fragment_settings.xml |   4 +-
 .../main/res/layout/sheet_schedule_update.xml |   6 +-
 app/src/main/res/values-night/themes.xml      |  10 +
 app/src/main/res/values/colors.xml            | 171 ++++++++++++------
 app/src/main/res/values/themes.xml            |  10 +
 8 files changed, 146 insertions(+), 63 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ed568b..f1247aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.fragment:fragment-ktx:1.6.0-beta01'
diff --git a/app/src/main/res/layout/fragment_canteen.xml b/app/src/main/res/layout/fragment_canteen.xml
index 7e82a7a..00d6bd6 100644
--- a/app/src/main/res/layout/fragment_canteen.xml
+++ b/app/src/main/res/layout/fragment_canteen.xml
@@ -25,8 +25,9 @@
                 android:text="@string/title_food"
                 android:textSize="28sp"
                 android:fontFamily="@font/lato_bolditalic"
-                android:layout_marginTop="16dp"
                 android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
                 android:singleLine="true"
                 android:ellipsize="marquee"
                 android:marqueeRepeatLimit="marquee_forever"
diff --git a/app/src/main/res/layout/fragment_event.xml b/app/src/main/res/layout/fragment_event.xml
index 4f88b7b..aee3840 100644
--- a/app/src/main/res/layout/fragment_event.xml
+++ b/app/src/main/res/layout/fragment_event.xml
@@ -19,8 +19,9 @@
             android:text="@string/title_schedule"
             android:textSize="28sp"
             android:fontFamily="@font/lato_bolditalic"
-            android:layout_marginTop="16dp"
             android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
 
         <com.google.android.material.tabs.TabLayout
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 2885e3c..83806bd 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -19,6 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
             android:fontFamily="@font/lato_bolditalic"
             android:text="@string/title_settings"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
@@ -35,7 +36,8 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
 
             <!-- Stud.IP schedule settings -->
             <com.google.android.material.card.MaterialCardView
diff --git a/app/src/main/res/layout/sheet_schedule_update.xml b/app/src/main/res/layout/sheet_schedule_update.xml
index a86fbc7..1fb3e49 100644
--- a/app/src/main/res/layout/sheet_schedule_update.xml
+++ b/app/src/main/res/layout/sheet_schedule_update.xml
@@ -61,7 +61,7 @@
                 android:id="@+id/text_layout_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
+                android:layout_marginBottom="4dp"
                 android:hint="@string/sheet_schedule_update_title_hint"
                 app:boxStrokeColor="@color/selector_text_input"
                 app:hintTextColor="@color/selector_text_input">
@@ -88,8 +88,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginEnd="8dp"
                     android:maxLines="1"
                     android:scrollHorizontally="true"
                     android:hint="@string/sheet_schedule_update_lecturers_hint"
@@ -113,7 +112,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_marginBottom="8dp"
                     android:maxLines="1"
                     android:scrollHorizontally="true"
                     android:hint="@string/sheet_schedule_update_room_hint"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 147a69e..7ce8f7d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -80,9 +80,19 @@
         <item name="colorOnPrimaryGame">@color/game_dark_onPrimary</item>
         <item name="colorContainerGame">@color/game_dark_container</item>
         <item name="colorOnContainerGame">@color/game_dark_onContainer</item>
+
+        <item name="materialTimePickerTheme">@style/TimePickerTheme</item>
     </style>
 
     <style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
         <item name="dividerColor">@color/md_theme_dark_outlineVariant</item>
     </style>
+
+    <style name="TimePickerTheme" parent="ThemeOverlay.MaterialComponents.TimePicker">
+        <item name="borderlessButtonStyle">@style/TimePickerButtonStyle</item>
+    </style>
+
+    <style name="TimePickerButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/md_theme_dark_primary</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9cc6198..161e7f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,67 +4,128 @@
     <color name="white">#ffffff</color>
 
     <!-- auto-generated using https://m3.material.io/theme-builder#/custom -->
-    <color name="seed">#c85848</color>
-    <color name="md_theme_light_primary">#A33D2F</color>
-    <color name="md_theme_light_onPrimary">@color/white</color>
-    <color name="md_theme_light_primaryContainer">#FFDAD4</color>
-    <color name="md_theme_light_onPrimaryContainer">#410000</color>
-    <color name="md_theme_light_secondary">#775651</color>
-    <color name="md_theme_light_onSecondary">@color/white</color>
-    <color name="md_theme_light_secondaryContainer">#FFDAD4</color>
-    <color name="md_theme_light_onSecondaryContainer">#2C1511</color>
-    <color name="md_theme_light_tertiary">#705C2E</color>
-    <color name="md_theme_light_onTertiary">@color/white</color>
-    <color name="md_theme_light_tertiaryContainer">#FBDFA6</color>
-    <color name="md_theme_light_onTertiaryContainer">#251A00</color>
+    <color name="seed">#79b564</color>
+    <color name="md_theme_light_primary">#336B23</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#B3F39B</color>
+    <color name="md_theme_light_onPrimaryContainer">#032100</color>
+    <color name="md_theme_light_secondary">#54624D</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#D7E7CC</color>
+    <color name="md_theme_light_onSecondaryContainer">#121F0E</color>
+    <color name="md_theme_light_tertiary">#386668</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#BCEBED</color>
+    <color name="md_theme_light_onTertiaryContainer">#002021</color>
     <color name="md_theme_light_error">#BA1A1A</color>
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
-    <color name="md_theme_light_onError">@color/white</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FFFBFF</color>
-    <color name="md_theme_light_onBackground">#201A19</color>
-    <color name="md_theme_light_surface">#FFFBFF</color>
-    <color name="md_theme_light_onSurface">#201A19</color>
-    <color name="md_theme_light_surfaceVariant">#F5DDDA</color>
-    <color name="md_theme_light_onSurfaceVariant">#534341</color>
-    <color name="md_theme_light_outline">#857370</color>
-    <color name="md_theme_light_inverseOnSurface">#FBEEEC</color>
-    <color name="md_theme_light_inverseSurface">#362F2E</color>
-    <color name="md_theme_light_inversePrimary">#FFB4A8</color>
-    <color name="md_theme_light_shadow">@color/black</color>
-    <color name="md_theme_light_surfaceTint">#A33D2F</color>
-    <color name="md_theme_light_outlineVariant">#D8C2BE</color>
-    <color name="md_theme_light_scrim">@color/black</color>
-    <color name="md_theme_dark_primary">#FFB4A8</color>
-    <color name="md_theme_dark_onPrimary">#630E07</color>
-    <color name="md_theme_dark_primaryContainer">#83251A</color>
-    <color name="md_theme_dark_onPrimaryContainer">#FFDAD4</color>
-    <color name="md_theme_dark_secondary">#E7BDB6</color>
-    <color name="md_theme_dark_onSecondary">#442925</color>
-    <color name="md_theme_dark_secondaryContainer">#5D3F3A</color>
-    <color name="md_theme_dark_onSecondaryContainer">#FFDAD4</color>
-    <color name="md_theme_dark_tertiary">#DEC48C</color>
-    <color name="md_theme_dark_onTertiary">#3E2E04</color>
-    <color name="md_theme_dark_tertiaryContainer">#564419</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FBDFA6</color>
+    <color name="md_theme_light_background">#FDFDF6</color>
+    <color name="md_theme_light_onBackground">#1A1C18</color>
+    <color name="md_theme_light_surface">#FDFDF6</color>
+    <color name="md_theme_light_onSurface">#1A1C18</color>
+    <color name="md_theme_light_surfaceVariant">#DFE4D7</color>
+    <color name="md_theme_light_onSurfaceVariant">#43483F</color>
+    <color name="md_theme_light_outline">#73796E</color>
+    <color name="md_theme_light_inverseOnSurface">#F1F1EA</color>
+    <color name="md_theme_light_inverseSurface">#2F312D</color>
+    <color name="md_theme_light_inversePrimary">#98D781</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#336B23</color>
+    <color name="md_theme_light_outlineVariant">#C3C8BC</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_dark_primary">#98D781</color>
+    <color name="md_theme_dark_onPrimary">#083900</color>
+    <color name="md_theme_dark_primaryContainer">#1A520C</color>
+    <color name="md_theme_dark_onPrimaryContainer">#B3F39B</color>
+    <color name="md_theme_dark_secondary">#BCCBB1</color>
+    <color name="md_theme_dark_onSecondary">#273421</color>
+    <color name="md_theme_dark_secondaryContainer">#3D4B36</color>
+    <color name="md_theme_dark_onSecondaryContainer">#D7E7CC</color>
+    <color name="md_theme_dark_tertiary">#A0CFD1</color>
+    <color name="md_theme_dark_onTertiary">#003739</color>
+    <color name="md_theme_dark_tertiaryContainer">#1E4E50</color>
+    <color name="md_theme_dark_onTertiaryContainer">#BCEBED</color>
     <color name="md_theme_dark_error">#FFB4AB</color>
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_dark_background">#201A19</color>
-    <color name="md_theme_dark_onBackground">#EDE0DD</color>
-    <color name="md_theme_dark_surface">#201A19</color>
-    <color name="md_theme_dark_onSurface">#EDE0DD</color>
-    <color name="md_theme_dark_surfaceVariant">#534341</color>
-    <color name="md_theme_dark_onSurfaceVariant">#D8C2BE</color>
-    <color name="md_theme_dark_outline">#A08C89</color>
-    <color name="md_theme_dark_inverseOnSurface">#201A19</color>
-    <color name="md_theme_dark_inverseSurface">#EDE0DD</color>
-    <color name="md_theme_dark_inversePrimary">#A33D2F</color>
-    <color name="md_theme_dark_shadow">@color/black</color>
-    <color name="md_theme_dark_surfaceTint">#FFB4A8</color>
-    <color name="md_theme_dark_outlineVariant">#534341</color>
-    <color name="md_theme_dark_scrim">@color/black</color>
+    <color name="md_theme_dark_background">#1A1C18</color>
+    <color name="md_theme_dark_onBackground">#E3E3DC</color>
+    <color name="md_theme_dark_surface">#1A1C18</color>
+    <color name="md_theme_dark_onSurface">#E3E3DC</color>
+    <color name="md_theme_dark_surfaceVariant">#43483F</color>
+    <color name="md_theme_dark_onSurfaceVariant">#C3C8BC</color>
+    <color name="md_theme_dark_outline">#8D9387</color>
+    <color name="md_theme_dark_inverseOnSurface">#1A1C18</color>
+    <color name="md_theme_dark_inverseSurface">#E3E3DC</color>
+    <color name="md_theme_dark_inversePrimary">#336B23</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#98D781</color>
+    <color name="md_theme_dark_outlineVariant">#43483F</color>
+    <color name="md_theme_dark_scrim">#000000</color>
+<!--    <color name="seed">#c85848</color>-->
+<!--    <color name="md_theme_light_primary">#A33D2F</color>-->
+<!--    <color name="md_theme_light_onPrimary">@color/white</color>-->
+<!--    <color name="md_theme_light_primaryContainer">#FFDAD4</color>-->
+<!--    <color name="md_theme_light_onPrimaryContainer">#410000</color>-->
+<!--    <color name="md_theme_light_secondary">#775651</color>-->
+<!--    <color name="md_theme_light_onSecondary">@color/white</color>-->
+<!--    <color name="md_theme_light_secondaryContainer">#FFDAD4</color>-->
+<!--    <color name="md_theme_light_onSecondaryContainer">#2C1511</color>-->
+<!--    <color name="md_theme_light_tertiary">#705C2E</color>-->
+<!--    <color name="md_theme_light_onTertiary">@color/white</color>-->
+<!--    <color name="md_theme_light_tertiaryContainer">#FBDFA6</color>-->
+<!--    <color name="md_theme_light_onTertiaryContainer">#251A00</color>-->
+<!--    <color name="md_theme_light_error">#BA1A1A</color>-->
+<!--    <color name="md_theme_light_errorContainer">#FFDAD6</color>-->
+<!--    <color name="md_theme_light_onError">@color/white</color>-->
+<!--    <color name="md_theme_light_onErrorContainer">#410002</color>-->
+<!--    <color name="md_theme_light_background">#FFFBFF</color>-->
+<!--    <color name="md_theme_light_onBackground">#201A19</color>-->
+<!--    <color name="md_theme_light_surface">#FFFBFF</color>-->
+<!--    <color name="md_theme_light_onSurface">#201A19</color>-->
+<!--    <color name="md_theme_light_surfaceVariant">#F5DDDA</color>-->
+<!--    <color name="md_theme_light_onSurfaceVariant">#534341</color>-->
+<!--    <color name="md_theme_light_outline">#857370</color>-->
+<!--    <color name="md_theme_light_inverseOnSurface">#FBEEEC</color>-->
+<!--    <color name="md_theme_light_inverseSurface">#362F2E</color>-->
+<!--    <color name="md_theme_light_inversePrimary">#FFB4A8</color>-->
+<!--    <color name="md_theme_light_shadow">@color/black</color>-->
+<!--    <color name="md_theme_light_surfaceTint">#A33D2F</color>-->
+<!--    <color name="md_theme_light_outlineVariant">#D8C2BE</color>-->
+<!--    <color name="md_theme_light_scrim">@color/black</color>-->
+<!--    <color name="md_theme_dark_primary">#FFB4A8</color>-->
+<!--    <color name="md_theme_dark_onPrimary">#630E07</color>-->
+<!--    <color name="md_theme_dark_primaryContainer">#83251A</color>-->
+<!--    <color name="md_theme_dark_onPrimaryContainer">#FFDAD4</color>-->
+<!--    <color name="md_theme_dark_secondary">#E7BDB6</color>-->
+<!--    <color name="md_theme_dark_onSecondary">#442925</color>-->
+<!--    <color name="md_theme_dark_secondaryContainer">#5D3F3A</color>-->
+<!--    <color name="md_theme_dark_onSecondaryContainer">#FFDAD4</color>-->
+<!--    <color name="md_theme_dark_tertiary">#DEC48C</color>-->
+<!--    <color name="md_theme_dark_onTertiary">#3E2E04</color>-->
+<!--    <color name="md_theme_dark_tertiaryContainer">#564419</color>-->
+<!--    <color name="md_theme_dark_onTertiaryContainer">#FBDFA6</color>-->
+<!--    <color name="md_theme_dark_error">#FFB4AB</color>-->
+<!--    <color name="md_theme_dark_errorContainer">#93000A</color>-->
+<!--    <color name="md_theme_dark_onError">#690005</color>-->
+<!--    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>-->
+<!--    <color name="md_theme_dark_background">#201A19</color>-->
+<!--    <color name="md_theme_dark_onBackground">#EDE0DD</color>-->
+<!--    <color name="md_theme_dark_surface">#201A19</color>-->
+<!--    <color name="md_theme_dark_onSurface">#EDE0DD</color>-->
+<!--    <color name="md_theme_dark_surfaceVariant">#534341</color>-->
+<!--    <color name="md_theme_dark_onSurfaceVariant">#D8C2BE</color>-->
+<!--    <color name="md_theme_dark_outline">#A08C89</color>-->
+<!--    <color name="md_theme_dark_inverseOnSurface">#201A19</color>-->
+<!--    <color name="md_theme_dark_inverseSurface">#EDE0DD</color>-->
+<!--    <color name="md_theme_dark_inversePrimary">#A33D2F</color>-->
+<!--    <color name="md_theme_dark_shadow">@color/black</color>-->
+<!--    <color name="md_theme_dark_surfaceTint">#FFB4A8</color>-->
+<!--    <color name="md_theme_dark_outlineVariant">#534341</color>-->
+<!--    <color name="md_theme_dark_scrim">@color/black</color>-->
 
     <!-- dietary preference colours generated using https://m3.material.io/theme-builder#/custom -->
     <!-- fair / animal welfare - custom colour -->
@@ -158,5 +219,5 @@
     <color name="game_dark_container">#7f292e</color>
     <color name="game_dark_onContainer">#ffdad9</color>
     
-    <color name="brightfuckingpink">#FF46BB</color> <!-- for debug purposes -->
+<!--    <color name="brightfuckingpink">#FF46BB</color> &lt;!&ndash; for debug purposes &ndash;&gt;-->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e4cda17..d7cb7bf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -80,6 +80,8 @@
         <item name="colorOnPrimaryGame">@color/game_light_onPrimary</item>
         <item name="colorContainerGame">@color/game_light_container</item>
         <item name="colorOnContainerGame">@color/game_light_onContainer</item>
+
+        <item name="materialTimePickerTheme">@style/TimePickerTheme</item>
     </style>
 
     <style name="Theme.StudIPTimetable" parent="Base.Theme.StudIPTimetable" />
@@ -92,4 +94,12 @@
         <item name="checkedIconEnabled">false</item>
         <item name="checkedIcon">@null</item>
     </style>
+
+    <style name="TimePickerTheme" parent="ThemeOverlay.MaterialComponents.TimePicker">
+        <item name="borderlessButtonStyle">@style/TimePickerButtonStyle</item>
+    </style>
+
+    <style name="TimePickerButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/md_theme_light_primary</item>
+    </style>
 </resources>
\ No newline at end of file