Prefixing sherlock to all colors used in sherlock

ajitsing · Apr 24, 2017 · 50785f1 · 50785f1
1 parent 75303f1
commit 50785f1
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/sherlock/src/main/java/com/singhajit/sherlock/core/investigation/CrashReporter.java b/sherlock/src/main/java/com/singhajit/sherlock/core/investigation/CrashReporter.java
@@ -39,7 +39,7 @@ public void report(CrashViewModel crashViewModel) {
         .setAutoCancel(true);
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      notificationBuilder.setColor(ContextCompat.getColor(context, R.color.colorAccent));
+      notificationBuilder.setColor(ContextCompat.getColor(context, R.color.sherlock_colorAccent));
     }
 
     NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

diff --git a/sherlock/src/main/res/layout/app_info_row.xml b/sherlock/src/main/res/layout/app_info_row.xml
@@ -20,7 +20,7 @@
       android:layout_height="wrap_content"
       android:layout_gravity="start"
       android:text="@{appInfo.attr}"
-      android:textColor="@color/colorAccent"/>
+      android:textColor="@color/sherlock_colorAccent"/>
 
     <TextView
       android:layout_width="match_parent"

diff --git a/sherlock/src/main/res/layout/crash_activity.xml b/sherlock/src/main/res/layout/crash_activity.xml
@@ -66,7 +66,7 @@
               android:layout_height="wrap_content"
               android:layout_margin="10dp"
               android:text="@{viewModel.exactLocationOfCrash}"
-              android:textColor="@color/colorAccent"
+              android:textColor="@color/sherlock_colorAccent"
               android:textSize="15sp"
               android:textStyle="bold"
               tools:text="Place of crash"/>
@@ -102,7 +102,7 @@
               android:layout_height="wrap_content"
               android:layout_marginBottom="10dp"
               android:text="@string/stack_trace"
-              android:textColor="@color/colorAccent"
+              android:textColor="@color/sherlock_colorAccent"
               android:textSize="15sp"
               android:textStyle="bold"/>
 
@@ -146,7 +146,7 @@
               android:layout_height="wrap_content"
               android:layout_marginBottom="10dp"
               android:text="@string/about_phone"
-              android:textColor="@color/colorAccent"
+              android:textColor="@color/sherlock_colorAccent"
               android:textSize="15sp"
               android:textStyle="bold"/>
 
@@ -183,7 +183,7 @@
               android:layout_height="wrap_content"
               android:layout_marginBottom="10dp"
               android:text="@string/about_app"
-              android:textColor="@color/colorAccent"
+              android:textColor="@color/sherlock_colorAccent"
               android:textSize="15sp"
               android:textStyle="bold"/>
 

diff --git a/sherlock/src/main/res/layout/crash_card.xml b/sherlock/src/main/res/layout/crash_card.xml
@@ -43,7 +43,7 @@
           android:layout_height="wrap_content"
           android:layout_marginBottom="10dp"
           android:text="@{viewModel.place}"
-          android:textColor="@color/colorAccent"/>
+          android:textColor="@color/sherlock_colorAccent"/>
 
         <TextView
           android:layout_width="wrap_content"

diff --git a/sherlock/src/main/res/layout/crash_list_activity.xml b/sherlock/src/main/res/layout/crash_list_activity.xml
@@ -35,7 +35,7 @@
       android:visibility="@{viewModel.crashNotFoundViewState.visibility}"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/white"
+      android:background="@color/sherlock_white"
       android:orientation="vertical"
       android:paddingTop="50dp">
 

diff --git a/sherlock/src/main/res/layout/device_info.xml b/sherlock/src/main/res/layout/device_info.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:text="@string/name"
-        android:textColor="@color/colorAccent"/>
+        android:textColor="@color/sherlock_colorAccent"/>
 
       <TextView
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:text="@string/brand"
-        android:textColor="@color/colorAccent"/>
+        android:textColor="@color/sherlock_colorAccent"/>
 
       <TextView
         android:layout_width="match_parent"
@@ -70,7 +70,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:text="@string/android_api_version"
-        android:textColor="@color/colorAccent"/>
+        android:textColor="@color/sherlock_colorAccent"/>
 
       <TextView
         android:layout_width="match_parent"

diff --git a/sherlock/src/main/res/values/colors.xml b/sherlock/src/main/res/values/colors.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="colorPrimary">#D32F2F</color>
-  <color name="colorPrimaryDark">#B71C1C</color>
-  <color name="colorAccent">#5B3758</color>
+  <color name="sherlock_colorPrimary">#D32F2F</color>
+  <color name="sherlock_colorPrimaryDark">#B71C1C</color>
+  <color name="sherlock_colorAccent">#5B3758</color>
 
-  <color name="white">#FFFFFF</color>
-  <color name="light_black">#2e2828</color>
-  <color name="grey">#ededed</color>
+  <color name="sherlock_white">#FFFFFF</color>
 </resources>
diff --git a/sherlock/src/main/res/values/styles.xml b/sherlock/src/main/res/values/styles.xml
@@ -6,9 +6,9 @@
   <style name="Sherlock.Base" parent="Theme.AppCompat.Light.DarkActionBar">
     <item name="windowNoTitle">true</item>
     <item name="windowActionBar">false</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
+    <item name="colorPrimary">@color/sherlock_colorPrimary</item>
+    <item name="colorPrimaryDark">@color/sherlock_colorPrimaryDark</item>
+    <item name="colorAccent">@color/sherlock_colorAccent</item>
   </style>
 
   <style name="CardViewStyle" parent="Theme.AppCompat.Light">
@@ -18,6 +18,6 @@
     <item name="contentPaddingTop">12dp</item>
     <item name="contentPaddingLeft">8dp</item>
     <item name="contentPaddingRight">8dp</item>
-    <item name="cardBackgroundColor">@color/white</item>
+    <item name="cardBackgroundColor">@color/sherlock_white</item>
   </style>
 </resources>