From 0a86cfe56475ac1e9c2d7d9aa2fa5b65c5d588ea Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 10 Mar 2017 23:27:37 +0100
Subject: [PATCH] remove the custom color definitions

---
 app/src/main/res/drawable-v21/selector.xml | 17 -----------------
 app/src/main/res/drawable/divider.xml      | 11 -----------
 app/src/main/res/drawable/selector.xml     |  5 -----
 app/src/main/res/values/colors.xml         |  7 -------
 app/src/main/res/values/styles.xml         | 14 +++++++-------
 5 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v21/selector.xml
 delete mode 100644 app/src/main/res/drawable/divider.xml
 delete mode 100644 app/src/main/res/drawable/selector.xml

diff --git a/app/src/main/res/drawable-v21/selector.xml b/app/src/main/res/drawable-v21/selector.xml
deleted file mode 100644
index a24cfe2b..00000000
--- a/app/src/main/res/drawable-v21/selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <selector>
-            <item
-                android:drawable="@color/activated_item_foreground"
-                android:state_selected="true"/>
-        </selector>
-    </item>
-    <item>
-        <ripple android:color="@color/pressed_item_foreground">
-            <item android:id="@android:id/mask">
-                <color android:color="@android:color/white"/>
-            </item>
-        </ripple>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
deleted file mode 100644
index 50b3dc49..00000000
--- a/app/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp"/>
-
-    <solid android:color="@color/divider_grey"/>
-
-</shape>
diff --git a/app/src/main/res/drawable/selector.xml b/app/src/main/res/drawable/selector.xml
deleted file mode 100644
index c7e60e3f..00000000
--- a/app/src/main/res/drawable/selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/pressed_item_foreground" android:state_pressed="true"/>
-    <item android:drawable="@color/activated_item_foreground" android:state_selected="true"/>
-</selector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3847f8e6..d781ec5f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#fff68630</color>
-    <color name="colorPrimaryDark">#ffe27725</color>
-    <color name="colorAccent">@color/colorPrimary</color>
 
-    <color name="lightGrey">#33000000</color>
-    <color name="pressed_item_foreground">#08000000</color>
-    <color name="activated_item_foreground">#44888888</color>
-    <color name="divider_grey">#44cccccc</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 682ebbb8..1a8c6b56 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,24 +1,24 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
         <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
         <item name="android:textSize">@dimen/normal_text_size</item>
     </style>
 
     <style name="AppTheme.Dark" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
         <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
         <item name="android:textSize">@dimen/normal_text_size</item>
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
     <style name="AppTheme.ActionBarStyle" parent="@style/Base.Widget.AppCompat.ActionBar">
-        <item name="background">@color/colorPrimary</item>
+        <item name="background">@color/color_primary</item>
         <item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
     </style>