From a9d8b2e6a4c45a62ae0b5cbf1e7682886f4360d1 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Tue, 22 Mar 2022 09:36:01 +0100
Subject: Use system theme colors. #5082

---
 app/src/main/res/values/colors.xml  | 35 ++++++++++++-----------------------
 app/src/main/res/values/strings.xml |  2 +-
 app/src/main/res/values/themes.xml  |  9 ++++-----
 3 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2bf09cc..1ffc641 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-
+    <!--themable -->
+    <color name="primary">@lineageos.platform:color/color_default_primary</color>
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
 
-    <color name="black_text">#DE000000</color>
-    <color name="black_text_2">#BD000000</color>
+    <color name="primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
 
-    <color name="grey_text">#99000000</color>
-    <color name="grey_text_2">#61000000</color>
-    <color name="grey_divider">#14212121</color>
-    <color name="grey_overlay">#66FFFFFF</color>
+<!--    <color name="divider">@lineageos.platform:color/color_default_divider</color>-->
 
+    <!-- fixed -->
     <color name="red_off">@lineageos.platform:color/color_default_red1</color>
-    <color name="green_on">#169659</color>
-    <color name="green_valid">#2CC766</color>
 
 
-    <color name="e_blue2">@lineageos.platform:color/color_default_blue1</color>
+    <!-- Custom -->
     <color name="dark_color">#263238</color>
-    <color name="blue_unselected">#AADCFE</color>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
-
+    <color name="white">#FFFFFFFF</color>
+    <color name="grey_overlay">#66FFFFFF</color>
+    <color name="green_valid">#2CC766</color>
+    <color name="blue_unselected">#AADCFE</color> <!-- used in combination with accent color ! -->
+    <color name="divider">#14212121</color>
 
     <!-- Widget -->
     <color name="on_surface_high_emphasis">#DEFFFFFF</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2a6d21d..4024175 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,7 +118,7 @@
     <string name="app_widget_description">This is an app widget description</string>
 
     <!-- Widget -->
-    <string name="widget_title">@id/app_title</string>
+    <string name="widget_title">@string/app_name</string>
     <string name="widget_state_title_on">Your online privacy is protected</string>
     <string name="widget_state_title_off">Your online privacy is unprotected</string>
     <string name="widget_state_trackers_label">@string/dashboard_state_trackers_label</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1e20ab1..9bc2442 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,13 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.PrivacyCentralApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">#007fff</item>
-        <item name="colorAccent">#007fff</item>
-        <item name="colorSecondary">#007fff</item>
-        <item name="colorControlNormal">#007fff</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorAccent">@color/accent</item>
+
         <!-- Status bar color. -->
         <!-- Customize your theme here. -->
-        <item name="android:textColor">@color/black_text</item>
+        <item name="android:textColor">@color/primary_text</item>
         <item name="android:textSize">16sp</item>
     </style>
 
-- 
cgit v1.2.1