Implement new color palette

cyb3rko · Feb 5, 2023 · b40f254 · b40f254
1 parent 46c0d64
commit b40f254
Show file tree

Hide file tree

Showing 12 changed files with 133 additions and 47 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name=".App"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"

diff --git a/app/src/main/kotlin/com/cyb3rko/pincredible/App.kt b/app/src/main/kotlin/com/cyb3rko/pincredible/App.kt
diff --git a/app/src/main/res/drawable/cell_shape_red.xml b/app/src/main/res/drawable/cell_shape_red.xml
@@ -6,7 +6,7 @@
         android:width="0.75dp"
         android:color="@color/black" />
 
-    <solid android:color="#f44336" />
+    <solid android:color="@color/table_cell_pink" />
 
     <corners android:radius="5dp" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_red_selected.xml b/app/src/main/res/drawable/cell_shape_red_selected.xml
@@ -6,7 +6,7 @@
         android:width="3dp"
         android:color="@color/table_cell_selected" />
 
-    <solid android:color="#f44336" />
+    <solid android:color="@color/table_cell_pink" />
 
     <corners android:radius="5dp" />
 </shape>
diff --git a/app/src/main/res/drawable/colored_ic_git.xml b/app/src/main/res/drawable/colored_ic_git.xml
@@ -2,4 +2,4 @@
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_git"
-    android:tint="@color/material_dynamic_neutral90" />
+    android:tint="@color/app_bar_icon" />
diff --git a/app/src/main/res/drawable/colored_ic_information.xml b/app/src/main/res/drawable/colored_ic_information.xml
@@ -2,4 +2,4 @@
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_information"
-    android:tint="@color/material_dynamic_neutral90" />
+    android:tint="@color/app_bar_icon" />
diff --git a/app/src/main/res/drawable/colored_ic_information_scaled.xml b/app/src/main/res/drawable/colored_ic_information_scaled.xml
@@ -2,4 +2,4 @@
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_information_scaled"
-    android:tint="@color/material_dynamic_neutral90" />
+    android:tint="@color/app_bar_icon" />
diff --git a/app/src/main/res/drawable/colored_ic_security.xml b/app/src/main/res/drawable/colored_ic_security.xml
@@ -2,4 +2,4 @@
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_security"
-    android:tint="@color/material_dynamic_neutral90" />
+    android:tint="@color/app_bar_icon" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="app_bar_icon">@color/md_theme_dark_onSurfaceVariant</color>
     <color name="base_dynamic_color">@color/white</color>
     <color name="table_cell_selected">@color/white</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,31 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="Base.Theme.PINcredible" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,14 +4,75 @@
     <color name="white">#FFFFFFFF</color>
     <color name="gray">#5A5A5A</color>
 
-    <color name="primary">#4FC3F7</color>
-    <color name="secondary">#7986CB</color>
-
-    <color name="log_cyan">#00BCD4</color>
-    <color name="log_orange">#FF9800</color>
-    <color name="log_green">#4CAF50</color>
-
+    <color name="app_bar_icon">@color/md_theme_light_onSurfaceVariant</color>
     <color name="base_dynamic_color">@color/black</color>
     <color name="table_cell_text">@color/black</color>
     <color name="table_cell_selected">@color/gray</color>
+    <color name="table_cell_cyan">#00C0C6</color>
+    <color name="table_cell_green">#7eff00</color>
+    <color name="table_cell_orange">#ffa500</color>
+    <color name="table_cell_pink">#ff0e00</color>
+    <color name="table_cell_yellow">#F0FF00</color>
+
+    <color name="seed">#F0FF00</color>
+    <color name="md_theme_light_primary">#5D6300</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#DFED00</color>
+    <color name="md_theme_light_onPrimaryContainer">#1B1D00</color>
+    <color name="md_theme_light_secondary">#5F6044</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#E4E5C1</color>
+    <color name="md_theme_light_onSecondaryContainer">#1B1D07</color>
+    <color name="md_theme_light_tertiary">#006783</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#BCE9FF</color>
+    <color name="md_theme_light_onTertiaryContainer">#001F29</color>
+    <color name="md_theme_light_error">#BA1A1A</color>
+    <color name="md_theme_light_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_background">#FEFFD5</color>
+    <color name="md_theme_light_onBackground">#1C1C17</color>
+    <color name="md_theme_light_surface">#FEFFD5</color>
+    <color name="md_theme_light_onSurface">#1C1C17</color>
+    <color name="md_theme_light_surfaceVariant">#E5E3D2</color>
+    <color name="md_theme_light_onSurfaceVariant">#47483B</color>
+    <color name="md_theme_light_outline">#787869</color>
+    <color name="md_theme_light_inverseOnSurface">#F4F1E8</color>
+    <color name="md_theme_light_inverseSurface">#31312B</color>
+    <color name="md_theme_light_inversePrimary">#C3D000</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#5D6300</color>
+    <color name="md_theme_light_outlineVariant">#C9C7B6</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_dark_primary">#C3D000</color>
+    <color name="md_theme_dark_onPrimary">#2F3300</color>
+    <color name="md_theme_dark_primaryContainer">#464A00</color>
+    <color name="md_theme_dark_onPrimaryContainer">#DFED00</color>
+    <color name="md_theme_dark_secondary">#C8C9A6</color>
+    <color name="md_theme_dark_onSecondary">#303219</color>
+    <color name="md_theme_dark_secondaryContainer">#47492E</color>
+    <color name="md_theme_dark_onSecondaryContainer">#E4E5C1</color>
+    <color name="md_theme_dark_tertiary">#61D4FF</color>
+    <color name="md_theme_dark_onTertiary">#003545</color>
+    <color name="md_theme_dark_tertiaryContainer">#004D63</color>
+    <color name="md_theme_dark_onTertiaryContainer">#BCE9FF</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">#1C1C17</color>
+    <color name="md_theme_dark_onBackground">#E5E2DA</color>
+    <color name="md_theme_dark_surface">#1C1C17</color>
+    <color name="md_theme_dark_onSurface">#E5E2DA</color>
+    <color name="md_theme_dark_surfaceVariant">#47483B</color>
+    <color name="md_theme_dark_onSurfaceVariant">#C9C7B6</color>
+    <color name="md_theme_dark_outline">#929182</color>
+    <color name="md_theme_dark_inverseOnSurface">#1C1C17</color>
+    <color name="md_theme_dark_inverseSurface">#E5E2DA</color>
+    <color name="md_theme_dark_inversePrimary">#5D6300</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#C3D000</color>
+    <color name="md_theme_dark_outlineVariant">#47483B</color>
+    <color name="md_theme_dark_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,13 +1,37 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Base.Theme.PINcredible" parent="Theme.Material3.Dark.NoActionBar">
-
+    <style name="Base.Theme.PINcredible" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
     </style>
 
     <style name="Theme.PINcredible" parent="Base.Theme.PINcredible" />
 
     <style name="TextAppearance.Toolbar.Subtitle" parent="TextAppearance.Material3.ActionBar.Subtitle">
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#878787</item>
     </style>
 </resources>