From 25d07d0ce97d0d0ecfea3f9c303a95af65709a95 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Tue, 4 Apr 2023 09:31:39 -0400
Subject: [PATCH] Design header adjustments for "Choose Class"

Dark mode: button is Gray10, text is Gray400
Light mode: button is Gray 700, text is Gray200
---
 Habitica/res/values-night/colors.xml                  |  6 +++++-
 Habitica/res/values/colors.xml                        |  5 ++++-
 .../android/habitica/ui/theme/HabiticaTheme.kt        | 11 +++++++++++
 .../android/habitica/ui/views/AppHeaderView.kt        |  7 +++++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index 77630a668..b2e4fc7ed 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -51,11 +51,15 @@
     <color name="text_brand_white">@color/white</color>
     <color name="text_red_maroon">@color/red_100</color>
     <color name="lightly_tinted_background">@color/brand_50</color>
-    <color name="text_green10_green500">@color/green_500</color>
     <color name="dialog_background">@color/gray_10</color>
     <color name="armoire_text">@color/gray_400</color>
 
 
     <color name="widget_background">#2B203A</color>
     <color name="text_gold">@color/yellow_100</color>
+
+    <color name="text_green10_green500">@color/green_500</color>
+    <color name="gray200_gray400">@color/gray_400</color>
+    <color name="gray700_gray10">@color/gray_10</color>
+
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index f6a676970..afdd21852 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -123,6 +123,9 @@
     <color name="lightly_tinted_background">@color/brand_700</color>
     <color name="dialog_background">@color/white</color>
     <color name="error_banner_background">@color/maroon_5</color>
-    <color name="text_green10_green500">@color/green_10</color>
     <color name="text_gold">@color/yellow_1</color>
+
+    <color name="text_green10_green500">@color/green_10</color>
+    <color name="gray200_gray400">@color/gray_200</color>
+    <color name="gray700_gray10">@color/gray_700</color>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
index debc0f55c..8d473b0a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
@@ -205,6 +205,17 @@ class HabiticaColors(
             colorResource(if (hasIcon) R.color.content_background else R.color.content_background_offset)
         }
     }
+
+    @Composable
+    fun basicTextColor(): Color {
+        return colorResource(R.color.gray200_gray400)
+    }
+
+    @Composable
+    fun basicButtonColor(): Color {
+        return colorResource(R.color.gray700_gray10)
+    }
+
 }
 
 class HabiticaTypography {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
index 0332c7d2c..0c720238f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -177,7 +177,7 @@ fun AppHeaderView(
                         )
                     } else if (user?.preferences?.disableClasses != true && user?.flags?.classSelected == false) {
                         HabiticaButton(
-                            background = MaterialTheme.colors.primarySurface,
+                            background = HabiticaTheme.colors.basicButtonColor(),
                             color = MaterialTheme.colors.onPrimary,
                             onClick = {
                                 MainNavigationController.navigate(R.id.classSelectionActivity)
@@ -186,7 +186,10 @@ fun AppHeaderView(
                             fontSize = 14.sp,
                             modifier = Modifier.height(28.dp)
                         ) {
-                            Text(stringResource(R.string.choose_class))
+                            Text(
+                                text = stringResource(R.string.choose_class),
+                                color = HabiticaTheme.colors.basicTextColor()
+                            )
                         }
                     } else {
                         Spacer(modifier = Modifier.weight(1f))