From a69c96adbe347425bb2f21b120781e1e10638798 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 8 Mar 2019 10:13:15 +0000
Subject: [PATCH] Refactoring

---
 ...ground_dark.xml => activatable_item_background_dark.xml} | 0
 ...ound_light.xml => activatable_item_background_light.xml} | 0
 app/src/main/res/layout/item_account.xml                    | 2 +-
 app/src/main/res/layout/item_answer.xml                     | 2 +-
 app/src/main/res/layout/item_attachment.xml                 | 2 +-
 app/src/main/res/layout/item_folder.xml                     | 2 +-
 app/src/main/res/layout/item_identity.xml                   | 2 +-
 app/src/main/res/layout/item_image.xml                      | 2 +-
 app/src/main/res/layout/item_message_compact.xml            | 5 ++---
 app/src/main/res/layout/item_message_normal.xml             | 5 ++---
 app/src/main/res/layout/item_rule.xml                       | 2 +-
 app/src/main/res/values/styles.xml                          | 6 +++---
 12 files changed, 14 insertions(+), 16 deletions(-)
 rename app/src/main/res/drawable/{item_background_dark.xml => activatable_item_background_dark.xml} (100%)
 rename app/src/main/res/drawable/{item_background_light.xml => activatable_item_background_light.xml} (100%)

diff --git a/app/src/main/res/drawable/item_background_dark.xml b/app/src/main/res/drawable/activatable_item_background_dark.xml
similarity index 100%
rename from app/src/main/res/drawable/item_background_dark.xml
rename to app/src/main/res/drawable/activatable_item_background_dark.xml
diff --git a/app/src/main/res/drawable/item_background_light.xml b/app/src/main/res/drawable/activatable_item_background_light.xml
similarity index 100%
rename from app/src/main/res/drawable/item_background_light.xml
rename to app/src/main/res/drawable/activatable_item_background_light.xml
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 06aed61640..19ecb5de5d 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground">
 
         <View
diff --git a/app/src/main/res/layout/item_answer.xml b/app/src/main/res/layout/item_answer.xml
index 0cf388368f..881e5c3e3d 100644
--- a/app/src/main/res/layout/item_answer.xml
+++ b/app/src/main/res/layout/item_answer.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground">
 
         <TextView
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index e90dfb3bab..1a83e08a8a 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground"
         android:paddingTop="6dp"
         android:paddingBottom="6dp">
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index dbed0e7db8..9fb240cffe 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground">
 
         <View
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index 67a8f0690c..fe1b7a0808 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground">
 
         <View
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index 504afa9097..afbdc9fd34 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground"
         android:padding="6dp">
 
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 57499702da..5ce4a69fe6 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -8,11 +8,10 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:descendantFocusability="beforeDescendants"
         android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:focusableInTouchMode="true">
 
         <TextView
             android:id="@+id/tvDay"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index f235fc4ab6..f67103e513 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -8,11 +8,10 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:descendantFocusability="beforeDescendants"
         android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:focusableInTouchMode="true">
 
         <TextView
             android:id="@+id/tvDay"
diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml
index 5a4e0f717f..9b433cf9a8 100644
--- a/app/src/main/res/layout/item_rule.xml
+++ b/app/src/main/res/layout/item_rule.xml
@@ -8,7 +8,7 @@
         android:id="@+id/clItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/drawableItemBackground"
+        android:background="?attr/activatableItemBackground"
         android:foreground="?attr/selectableItemBackground">
 
         <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8a3f74f621..412f0dccc2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
     <attr name="colorDrawerScrim" format="reference" />
     <attr name="colorDrawerText" format="reference" />
     <attr name="colorDrawerBackground" format="reference" />
-    <attr name="drawableItemBackground" format="reference" />
+    <attr name="activatableItemBackground" format="reference" />
 
     <style name="AppThemeLight" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowDisablePreview">true</item>
@@ -21,7 +21,7 @@
         <item name="colorDrawerText">@color/lightColorDrawerText</item>
         <item name="colorDrawerBackground">@color/lightColorDrawerBackground</item>
 
-        <item name="drawableItemBackground">@drawable/item_background_light</item>
+        <item name="activatableItemBackground">@drawable/activatable_item_background_light</item>
 
         <item name="android:checkboxStyle">@style/checkboxStyle</item>
         <item name="android:buttonStyle">@style/buttonStyle</item>
@@ -43,7 +43,7 @@
         <item name="colorDrawerText">@color/darkColorDrawerText</item>
         <item name="colorDrawerBackground">@color/darkColorDrawerBackground</item>
 
-        <item name="drawableItemBackground">@drawable/item_background_dark</item>
+        <item name="activatableItemBackground">@drawable/activatable_item_background_dark</item>
 
         <item name="android:checkboxStyle">@style/checkboxStyle</item>
         <item name="android:buttonStyle">@style/buttonStyle</item>