From a4fe413537efb88a317a6e31e1a3cd80c8c7fa27 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Fri, 8 Feb 2019 10:37:04 -0800
Subject: [PATCH] Closes #412: Enforces consistent naming in colors.xml

---
 .../fenix/search/toolbar/ToolbarUIView.kt     |  4 +-
 .../drawable/home_search_background_dark.xml  |  4 +-
 .../home_search_background_dark_no_border.xml |  2 +-
 .../drawable/home_search_background_light.xml |  2 +-
 .../home_search_background_private.xml        |  4 +-
 .../home_search_background_private_dark.xml   |  4 +-
 ...arch_background_private_dark_no_border.xml |  2 +-
 app/src/main/res/drawable/ic_home_white.xml   |  2 +-
 .../res/drawable/ic_launcher_background.xml   |  2 +-
 ...ivate_browsing_button_white_background.xml |  2 +-
 .../main/res/layout/component_awesomebar.xml  |  4 +-
 app/src/main/res/layout/fragment_browser.xml  |  2 +-
 app/src/main/res/values/colors.xml            | 30 +++++++--------
 app/src/main/res/values/styles.xml            | 38 +++++++++----------
 14 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt
index dc5fccd7a..320b95dcd 100644
--- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt
@@ -44,10 +44,10 @@ class ToolbarUIView(
             browserActionMargin = resources.pxToDp(browserActionMarginDp)
             urlBoxView = urlBackground
 
-            textColor = ContextCompat.getColor(context, R.color.searchText)
+            textColor = ContextCompat.getColor(context, R.color.search_text)
             textSize = toolbarTextSizeSp
             hint = context.getString(R.string.search_hint)
-            hintColor = ContextCompat.getColor(context, R.color.searchText)
+            hintColor = ContextCompat.getColor(context, R.color.search_text)
 
             setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
                 override fun onTextChanged(text: String) {
diff --git a/app/src/main/res/drawable/home_search_background_dark.xml b/app/src/main/res/drawable/home_search_background_dark.xml
index bc17d0064..a8f228004 100644
--- a/app/src/main/res/drawable/home_search_background_dark.xml
+++ b/app/src/main/res/drawable/home_search_background_dark.xml
@@ -3,10 +3,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/searchDarkBackground"/>
+    <solid android:color="@color/search_dark_background"/>
 
     <stroke android:width="1dp"
-            android:color="@color/searchStrokeAlternative"/>
+            android:color="@color/search_stroke_alternative"/>
 
     <corners android:bottomRightRadius="8dp"
              android:bottomLeftRadius="8dp"
diff --git a/app/src/main/res/drawable/home_search_background_dark_no_border.xml b/app/src/main/res/drawable/home_search_background_dark_no_border.xml
index 1f6bf8a22..bb2e3b4df 100644
--- a/app/src/main/res/drawable/home_search_background_dark_no_border.xml
+++ b/app/src/main/res/drawable/home_search_background_dark_no_border.xml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/searchDarkBackgroundAlternative"/>
+    <solid android:color="@color/search_dark_background_alternative"/>
 
     <corners android:bottomRightRadius="8dp"
              android:bottomLeftRadius="8dp"
diff --git a/app/src/main/res/drawable/home_search_background_light.xml b/app/src/main/res/drawable/home_search_background_light.xml
index a28082eb8..9c39c1019 100644
--- a/app/src/main/res/drawable/home_search_background_light.xml
+++ b/app/src/main/res/drawable/home_search_background_light.xml
@@ -6,7 +6,7 @@
     <solid android:color="#FFFFFF"/>
 
     <stroke android:width="1dp"
-            android:color="@color/searchStroke"/>
+            android:color="@color/search_stroke"/>
 
     <corners android:radius="8dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_search_background_private.xml b/app/src/main/res/drawable/home_search_background_private.xml
index 3fe9a85fc..40724c932 100644
--- a/app/src/main/res/drawable/home_search_background_private.xml
+++ b/app/src/main/res/drawable/home_search_background_private.xml
@@ -3,10 +3,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/searchPrivateBackground"/>
+    <solid android:color="@color/search_private_background"/>
 
     <stroke android:width="1dp"
-            android:color="@color/searchStrokePrivate"/>
+            android:color="@color/search_stroke_private"/>
 
     <corners android:radius="8dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_search_background_private_dark.xml b/app/src/main/res/drawable/home_search_background_private_dark.xml
index 54a0af3f1..ad45433e8 100644
--- a/app/src/main/res/drawable/home_search_background_private_dark.xml
+++ b/app/src/main/res/drawable/home_search_background_private_dark.xml
@@ -3,10 +3,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/searchDarkPrivateBackground"/>
+    <solid android:color="@color/search_dark_private_background"/>
 
     <stroke android:width="1dp"
-        android:color="@color/searchStrokePrivate"/>
+        android:color="@color/search_stroke_private"/>
 
     <corners android:radius="8dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml b/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml
index d4f54cb0a..c71a3985b 100644
--- a/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml
+++ b/app/src/main/res/drawable/home_search_background_private_dark_no_border.xml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/searchDarkPrivateBackgroundAlternative"/>
+    <solid android:color="@color/search_dark_private_background_alternative"/>
 
     <corners android:bottomRightRadius="8dp"
         android:bottomLeftRadius="8dp"
diff --git a/app/src/main/res/drawable/ic_home_white.xml b/app/src/main/res/drawable/ic_home_white.xml
index bec75dd7c..d8211bfd3 100644
--- a/app/src/main/res/drawable/ic_home_white.xml
+++ b/app/src/main/res/drawable/ic_home_white.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="m21.457,11.1228 l-8.75,-8.0208c-0.3905,-0.3579 -1.0235,-0.3579 -1.414,0l-8.75,8.0208c-0.379,0.3597 -0.3736,0.9314 0.0122,1.285 0.3857,0.3536 1.0094,0.3586 1.4018,0.0112l1.043,-0.9561v6.9538c0,1.5188 1.3431,2.75 3,2.75h8c1.6569,0 3,-1.2312 3,-2.75v-6.9538l1.043,0.9561c0.3924,0.3474 1.0161,0.3424 1.4018,-0.0112 0.3857,-0.3536 0.3912,-0.9253 0.0122,-1.285zM17,18.4167c0,0.5063 -0.4477,0.9167 -1,0.9167 0.6667,0 0.1667,0 -1.5,0s-3.3333,0 -5,0h-1.5c-0.5523,0 -1,-0.4104 -1,-0.9167v-8.7872l5,-4.5833 5,4.5833z"
-      android:fillColor="@color/offwhite"/>
+      android:fillColor="@color/off_white"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index bc1e11d56..7d06d03da 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -8,7 +8,7 @@
     <path android:fillType="evenOdd"
         android:pathData="M0,0h108v108h-108z">
         <aapt:attr name="android:fillColor">
-            <solid android:color="@color/colorAccent"/>
+            <solid android:color="@color/color_accent"/>
         </aapt:attr>
     </path>
 </vector>
diff --git a/app/src/main/res/drawable/private_browsing_button_white_background.xml b/app/src/main/res/drawable/private_browsing_button_white_background.xml
index 86a28894f..72b71d81d 100644
--- a/app/src/main/res/drawable/private_browsing_button_white_background.xml
+++ b/app/src/main/res/drawable/private_browsing_button_white_background.xml
@@ -12,7 +12,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="@color/offwhite" />
+            <solid android:color="@color/off_white" />
             <corners android:radius="32dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/component_awesomebar.xml b/app/src/main/res/layout/component_awesomebar.xml
index 51433a8d8..00cc92f3a 100644
--- a/app/src/main/res/layout/component_awesomebar.xml
+++ b/app/src/main/res/layout/component_awesomebar.xml
@@ -17,5 +17,5 @@
         app:layout_constraintBottom_toTopOf="@id/pill_wrapper"
         mozac:awesomeBarTitleTextColor="?attr/awesomeBarTitleTextColor"
         mozac:awesomeBarDescriptionTextColor="?attr/awesomeBarDescriptionTextColor"
-        mozac:awesomeBarChipTextColor="@color/offwhite"
-        mozac:awesomeBarChipBackgroundColor="@color/photonBlue40" />
\ No newline at end of file
+        mozac:awesomeBarChipTextColor="@color/off_white"
+        mozac:awesomeBarChipBackgroundColor="@color/photonBlue40"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 8b2765248..ece8b4fdf 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:layout_gravity="bottom"
-            android:background="@color/offwhite"
+            android:background="@color/off_white"
             mozac:findInPageResultCountTextColor="?android:attr/colorPrimary"
             mozac:findInPageButtonsTint="?android:attr/colorPrimary"
             android:visibility="gone"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 88cb68eeb..506ff91e3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,22 +3,22 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
-    <color name="colorPrimary">#544CD9</color>
-    <color name="colorPrimaryDark">#202340</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="color_primary">#544CD9</color>
+    <color name="color_primary_dark">#202340</color>
+    <color name="color_accent">#D81B60</color>
 
-    <color name="awesomeBarTitleColor">#212121</color>
-    <color name="awesomeBarDescriptionColor">#6b6b6b</color>
-    <color name="searchDarkBackground">#F2F2F5</color>
-    <color name="searchDarkBackgroundAlternative">#E9E9ED</color>
-    <color name="searchPrivateBackground">#4f4e75</color>
-    <color name="searchDarkPrivateBackground">#42416b</color>
-    <color name="searchDarkPrivateBackgroundAlternative">#393863</color>
-    <color name="searchStroke">#c5c8d7</color>
-    <color name="searchStrokeAlternative">#0A202340</color>
-    <color name="searchStrokePrivate">#2d2e5f</color>
-    <color name="searchText">#0C0C0D</color>
-    <color name="offwhite">#f9f9fa</color>
+    <color name="awesome_bar_title_color">#212121</color>
+    <color name="awesome_bar_description_color">#6b6b6b</color>
+    <color name="search_dark_background">#F2F2F5</color>
+    <color name="search_dark_background_alternative">#E9E9ED</color>
+    <color name="search_private_background">#4f4e75</color>
+    <color name="search_dark_private_background">#42416b</color>
+    <color name="search_dark_private_background_alternative">#393863</color>
+    <color name="search_stroke">#c5c8d7</color>
+    <color name="search_stroke_alternative">#0A202340</color>
+    <color name="search_stroke_private">#2d2e5f</color>
+    <color name="search_text">#0C0C0D</color>
+    <color name="off_white">#f9f9fa</color>
     <color name="url_box_view">#E9E9ED</color>
     <color name="icons">#20233E</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index acb5cf351..f23634738 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,31 +7,31 @@
     <style name="LightThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-        <item name="android:colorPrimary">@color/offwhite</item>
+        <item name="android:colorPrimary">@color/off_white</item>
 
         <!-- Style the navigation bar -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <!-- Home fragment colors -->
-        <item name="homeBackgroundTopGradient">@color/offwhite</item>
-        <item name="homeBackgroundBottomGradient">@color/offwhite</item>
+        <item name="homeBackgroundTopGradient">@color/off_white</item>
+        <item name="homeBackgroundBottomGradient">@color/off_white</item>
         <item name="homeBackgroundGradient">@drawable/home_background_gradient</item>
         <item name="privateBrowsingButtonBackground">@drawable/private_browsing_button_white_background</item>
-        <item name="privateBrowsingButtonTint">@color/offwhite</item>
+        <item name="privateBrowsingButtonTint">@color/off_white</item>
         <item name="fenixLogo">@drawable/ic_logo_wordmark</item>
         <item name="menuButtonTint">@android:color/black</item>
         <item name="toolbarWrapperBackground">@drawable/home_search_background_light</item>
-        <item name="toolbarTextColor">@color/searchText</item>
+        <item name="toolbarTextColor">@color/search_text</item>
 
         <!-- Search fragment colors -->
-        <item name="searchBackground">@color/offwhite</item>
-        <item name="searchShortcutsTextColor">@color/awesomeBarTitleColor</item>
-        <item name="pillWrapperBackground">@color/offwhite</item>
-        <item name="awesomeBarTitleTextColor">@color/awesomeBarTitleColor</item>
-        <item name="awesomeBarDescriptionTextColor">@color/awesomeBarDescriptionColor</item>
+        <item name="searchBackground">@color/off_white</item>
+        <item name="searchShortcutsTextColor">@color/awesome_bar_title_color</item>
+        <item name="pillWrapperBackground">@color/off_white</item>
+        <item name="awesomeBarTitleTextColor">@color/awesome_bar_title_color</item>
+        <item name="awesomeBarDescriptionTextColor">@color/awesome_bar_description_color</item>
 
         <!-- Browser fragment colors -->
-        <item name="browserToolbarBackground">@color/offwhite</item>
+        <item name="browserToolbarBackground">@color/off_white</item>
         <item name="browserToolbarIcons">@color/icons</item>
         <item name="browserToolbarHomeIcon">@drawable/ic_home</item>
     </style>
@@ -54,22 +54,22 @@
         <item name="homeBackgroundBottomGradient">@color/private_browsing_bottom_gradient</item>
         <item name="homeBackgroundGradient">@drawable/home_background_gradient</item>
         <item name="privateBrowsingButtonBackground">@drawable/private_browsing_button_background</item>
-        <item name="privateBrowsingButtonTint">@color/offwhite</item>
+        <item name="privateBrowsingButtonTint">@color/off_white</item>
         <item name="fenixLogo">@drawable/ic_logo_wordmark_white</item>
-        <item name="menuButtonTint">@color/offwhite</item>
+        <item name="menuButtonTint">@color/off_white</item>
         <item name="toolbarWrapperBackground">@drawable/home_search_background_private</item>
-        <item name="toolbarTextColor">@color/offwhite</item>
+        <item name="toolbarTextColor">@color/off_white</item>
 
         <!-- Search fragment colors -->
         <item name="searchBackground">@color/private_browsing_bottom_gradient</item>
-        <item name="searchShortcutsTextColor">@color/offwhite</item>
+        <item name="searchShortcutsTextColor">@color/off_white</item>
         <item name="pillWrapperBackground">@color/private_browsing_top_gradient</item>
-        <item name="awesomeBarTitleTextColor">@color/offwhite</item>
+        <item name="awesomeBarTitleTextColor">@color/off_white</item>
         <item name="awesomeBarDescriptionTextColor">@color/photonGrey40</item>
 
         <!-- Browser fragment colors -->
         <item name="browserToolbarBackground">@color/private_browsing_bottom_gradient</item>
-        <item name="browserToolbarIcons">@color/offwhite</item>
+        <item name="browserToolbarIcons">@color/off_white</item>
         <item name="browserToolbarHomeIcon">@drawable/ic_home_white</item>
     </style>
 
@@ -84,8 +84,8 @@
     </style>
 
     <style name="SettingsThemeBase" parent="Theme.MaterialComponents.Light">
-        <item name="colorPrimary">@color/offwhite</item>
-        <item name="colorPrimaryDark">@color/offwhite</item>
+        <item name="colorPrimary">@color/off_white</item>
+        <item name="colorPrimaryDark">@color/off_white</item>
         <item name="colorAccent">@color/icons</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>