From 38d0c15d3395a7b50ef30cee5e579bbc45a62baa Mon Sep 17 00:00:00 2001
From: TM <tjmcard@gmail.com>
Date: Mon, 16 Oct 2023 00:31:36 -0700
Subject: [PATCH 1/4] Create different icons for each build variant

Added color values for DEBUG and BENCHMARK build variants.
---
 app/src/benchmark/res/values-night/colors.xml | 20 ++++++++++++++++
 app/src/benchmark/res/values/colors.xml       | 23 +++++++++++++++++++
 app/src/debug/res/values-night/colors.xml     | 20 ++++++++++++++++
 app/src/debug/res/values/colors.xml           | 23 +++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 app/src/benchmark/res/values-night/colors.xml
 create mode 100644 app/src/benchmark/res/values/colors.xml
 create mode 100644 app/src/debug/res/values-night/colors.xml
 create mode 100644 app/src/debug/res/values/colors.xml

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
new file mode 100644
index 000000000..e2c4fc0b1
--- /dev/null
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <color name="ic_launcher_background_tint">#2296F3</color>
+    <color name="ic_launcher_foreground_tint">#FFFFFF</color>
+</resources>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
new file mode 100644
index 000000000..7da2e4639
--- /dev/null
+++ b/app/src/benchmark/res/values/colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Status bar -->
+    <color name="black30">#4D000000</color>
+
+    <color name="ic_launcher_background_tint">#2296F3</color>
+    <color name="ic_launcher_foreground_tint">#000000</color>
+</resources>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
new file mode 100644
index 000000000..62ae86f86
--- /dev/null
+++ b/app/src/debug/res/values-night/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <color name="ic_launcher_background_tint">#FFFFFF</color>
+    <color name="ic_launcher_foreground_tint">#2296F3</color>
+</resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
new file mode 100644
index 000000000..b07b3c4ce
--- /dev/null
+++ b/app/src/debug/res/values/colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Status bar -->
+    <color name="black30">#4D000000</color>
+
+    <color name="ic_launcher_background_tint">#000000</color>
+    <color name="ic_launcher_foreground_tint">#2296F3</color>
+</resources>

From afb427b9c5190a75c840ed938b1aca34e08e1cc3 Mon Sep 17 00:00:00 2001
From: TM <tjmcard@gmail.com>
Date: Tue, 17 Oct 2023 11:03:46 -0700
Subject: [PATCH 2/4] Use colors from design palette in build variant icons

---
 app/src/benchmark/res/values-night/colors.xml | 6 ++++--
 app/src/benchmark/res/values/colors.xml       | 5 +++--
 app/src/debug/res/values-night/colors.xml     | 4 +++-
 app/src/debug/res/values/colors.xml           | 3 ++-
 app/src/main/res/values/themes.xml            | 1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
index e2c4fc0b1..8d39d7588 100644
--- a/app/src/benchmark/res/values-night/colors.xml
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
-    <color name="ic_launcher_background_tint">#2296F3</color>
-    <color name="ic_launcher_foreground_tint">#FFFFFF</color>
+    <color name="blue40">#FF006780</color>
+
+    <color name="ic_launcher_background_tint">#FFFFFF</color>
+    <color name="ic_launcher_foreground_tint">@color/blue40</color>
 </resources>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index 7da2e4639..184477d97 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -17,7 +17,8 @@
 <resources>
     <!-- Status bar -->
     <color name="black30">#4D000000</color>
+    <color name="blue40">#FF006780</color>
 
-    <color name="ic_launcher_background_tint">#2296F3</color>
-    <color name="ic_launcher_foreground_tint">#000000</color>
+    <color name="ic_launcher_background_tint">#000000</color>
+    <color name="ic_launcher_foreground_tint">@color/blue40</color>
 </resources>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
index 62ae86f86..17eda47b6 100644
--- a/app/src/debug/res/values-night/colors.xml
+++ b/app/src/debug/res/values-night/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <color name="orange40">#FFA23F16</color>
+
     <color name="ic_launcher_background_tint">#FFFFFF</color>
-    <color name="ic_launcher_foreground_tint">#2296F3</color>
+    <color name="ic_launcher_foreground_tint">@color/orange40</color>
 </resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index b07b3c4ce..8fde71bfc 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -17,7 +17,8 @@
 <resources>
     <!-- Status bar -->
     <color name="black30">#4D000000</color>
+    <color name="orange40">#FFA23F16</color>
 
     <color name="ic_launcher_background_tint">#000000</color>
-    <color name="ic_launcher_foreground_tint">#2296F3</color>
+    <color name="ic_launcher_foreground_tint">@color/orange40</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7cdd25527..c75ef8a98 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -33,4 +33,5 @@
         <item name="postSplashScreenTheme">@style/Theme.Nia</item>
     </style>
 
+
 </resources>

From 9b83237bfdd1e45c977226009b3cb54126f176f8 Mon Sep 17 00:00:00 2001
From: TM <tjmcard@gmail.com>
Date: Wed, 18 Oct 2023 18:21:37 -0700
Subject: [PATCH 3/4] Removed Comments

---
 app/src/benchmark/res/values/colors.xml | 1 -
 app/src/debug/res/values/colors.xml     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index 184477d97..78797a661 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -15,7 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Status bar -->
     <color name="black30">#4D000000</color>
     <color name="blue40">#FF006780</color>
 
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index 8fde71bfc..dc5364335 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -15,7 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Status bar -->
     <color name="black30">#4D000000</color>
     <color name="orange40">#FFA23F16</color>
 

From d3d5b02428fabb2bd0ae9207d26c070cf91920b6 Mon Sep 17 00:00:00 2001
From: TM <tjmcard@gmail.com>
Date: Thu, 19 Oct 2023 15:47:23 -0700
Subject: [PATCH 4/4] Inline color values for app icons

---
 app/src/benchmark/res/values-night/colors.xml | 4 +---
 app/src/benchmark/res/values/colors.xml       | 5 +----
 app/src/debug/res/values-night/colors.xml     | 4 +---
 app/src/debug/res/values/colors.xml           | 5 +----
 app/src/main/res/values/themes.xml            | 1 -
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
index 8d39d7588..677eb4e03 100644
--- a/app/src/benchmark/res/values-night/colors.xml
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -15,8 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="blue40">#FF006780</color>
-
     <color name="ic_launcher_background_tint">#FFFFFF</color>
-    <color name="ic_launcher_foreground_tint">@color/blue40</color>
+    <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index 78797a661..d33b7ba72 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -15,9 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="black30">#4D000000</color>
-    <color name="blue40">#FF006780</color>
-
     <color name="ic_launcher_background_tint">#000000</color>
-    <color name="ic_launcher_foreground_tint">@color/blue40</color>
+    <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
index 17eda47b6..d6a4c98e0 100644
--- a/app/src/debug/res/values-night/colors.xml
+++ b/app/src/debug/res/values-night/colors.xml
@@ -15,8 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="orange40">#FFA23F16</color>
-
     <color name="ic_launcher_background_tint">#FFFFFF</color>
-    <color name="ic_launcher_foreground_tint">@color/orange40</color>
+    <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index dc5364335..6365ddb3f 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -15,9 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="black30">#4D000000</color>
-    <color name="orange40">#FFA23F16</color>
-
     <color name="ic_launcher_background_tint">#000000</color>
-    <color name="ic_launcher_foreground_tint">@color/orange40</color>
+    <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c75ef8a98..7cdd25527 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -33,5 +33,4 @@
         <item name="postSplashScreenTheme">@style/Theme.Nia</item>
     </style>
 
-
 </resources>