From 1aa00d5b6b86f34be4c97613f568a43044de1485 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 14 Aug 2018 20:12:25 +0000
Subject: [PATCH] Prepare item selection

---
 .idea/caches/build_file_checksums.ser           | Bin 535 -> 535 bytes
 app/build.gradle                                |  11 ++++++-----
 .../main/res/drawable/item_background_dark.xml  |   5 +++++
 .../main/res/drawable/item_background_light.xml |   5 +++++
 app/src/main/res/layout/item_account.xml        |   4 ++--
 app/src/main/res/layout/item_folder.xml         |   4 ++--
 app/src/main/res/layout/item_identity.xml       |   4 ++--
 app/src/main/res/layout/item_message.xml        |   3 ++-
 app/src/main/res/values/colors.xml              |   2 ++
 app/src/main/res/values/styles.xml              |   5 +++++
 10 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable/item_background_dark.xml
 create mode 100644 app/src/main/res/drawable/item_background_light.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9b73e9c0988b0299ddfa8af5bc56ad201a0d0bae..cda1b10fb0caddc065ce03f94fd8a1deffddfde4 100644
GIT binary patch
delta 32
ocmbQvGM#0@3}!2)vm0k;GYWcI7kU@X-n%C7QVCb#Yz40h0L73Dc>n+a

delta 32
qcmV+*0N?+Y1eXMmm;*V(GO?R$0TF@5xczE#q_&_z-BU`N*PVFf)DLa|

diff --git a/app/build.gradle b/app/build.gradle
index 520c34c17d..140f66210d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
+    def support_version = "1.0.0-alpha1"
     def androidx_version = "2.0.0-alpha1"
     def javamail_version = "1.6.0"
     def jsoup_version = "1.11.3"
@@ -52,13 +53,13 @@ dependencies {
     // https://developer.android.com/topic/libraries/support-library/revisions.html
     // https://developer.android.com/topic/libraries/support-library/packages
     // https://developer.android.com/topic/libraries/support-library/refactor
-    implementation "androidx.appcompat:appcompat:1.0.0-alpha1"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.0.0-alpha1"
-    implementation "com.google.android.material:material:1.0.0-alpha1"
-    implementation "androidx.browser:browser:1.0.0-alpha1"
+    implementation "androidx.appcompat:appcompat:$support_version"
+    implementation "androidx.recyclerview:recyclerview:$support_version"
+    implementation "com.google.android.material:material:$support_version"
+    implementation "androidx.browser:browser:$support_version"
 
     // https://developer.android.com/topic/libraries/architecture/adding-components.html
+    implementation "androidx.constraintlayout:constraintlayout:$androidx_version"
     implementation "androidx.lifecycle:lifecycle-extensions:$androidx_version"
     implementation "androidx.room:room-runtime:$androidx_version"
     implementation "androidx.paging:paging-runtime:$androidx_version"
diff --git a/app/src/main/res/drawable/item_background_dark.xml b/app/src/main/res/drawable/item_background_dark.xml
new file mode 100644
index 0000000000..599daabefd
--- /dev/null
+++ b/app/src/main/res/drawable/item_background_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/darkColorItemSelected" android:state_activated="true" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/drawable/item_background_light.xml b/app/src/main/res/drawable/item_background_light.xml
new file mode 100644
index 0000000000..5a00473632
--- /dev/null
+++ b/app/src/main/res/drawable/item_background_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/lightColorItemSelected" android:state_activated="true" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index f335438bc0..6bf713db6f 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="6dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/ivPrimary"
@@ -95,6 +94,7 @@
         android:id="@+id/vSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginBottom="6dp"
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index c07454f265..97c1c2d05a 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="6dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/ivEdit"
@@ -108,6 +107,7 @@
         android:id="@+id/vSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginBottom="6dp"
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index 80e57dcb79..69e2a61077 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="6dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/ivPrimary"
@@ -69,6 +68,7 @@
         android:id="@+id/vSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginBottom="6dp"
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 618b9ba7b5..1dee0efe96 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="6dp">
+    android:background="?attr/drawableItemBackground">
 
     <TextView
         android:id="@+id/tvFrom"
@@ -94,6 +94,7 @@
         android:id="@+id/vSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginBottom="6dp"
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c4e00b3b76..3e56225c13 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,12 +8,14 @@
     <color name="colorActionForegroundDisabled">#ccc</color>
 
     <color name="lightColorUnread">#000</color>
+    <color name="lightColorItemSelected">#ccc</color>
     <color name="lightColorSeparator">#ffaaaaaa</color>
     <color name="lightColorDrawerScrim">#99000000</color>
     <color name="lightColorDrawerText">#111</color>
     <color name="lightColorDrawerBackground">#eee</color>
 
     <color name="darkColorUnread">#fff</color>
+    <color name="darkColorItemSelected">#555</color>
     <color name="darkColorSeparator">#ff878787</color>
     <color name="darkColorDrawerScrim">#997f7f7f</color>
     <color name="darkColorDrawerText">#fff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9d52b955f9..d684a396c8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,6 +4,7 @@
     <attr name="colorDrawerScrim" format="reference" />
     <attr name="colorDrawerText" format="reference" />
     <attr name="colorDrawerBackground" format="reference" />
+    <attr name="drawableItemBackground" format="reference" />
 
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowDisablePreview">true</item>
@@ -17,6 +18,8 @@
         <item name="colorDrawerScrim">@color/lightColorDrawerScrim</item>
         <item name="colorDrawerText">@color/lightColorDrawerText</item>
         <item name="colorDrawerBackground">@color/lightColorDrawerBackground</item>
+
+        <item name="drawableItemBackground">@drawable/item_background_light</item>
     </style>
 
     <style name="AppThemeDark" parent="Theme.AppCompat">
@@ -31,6 +34,8 @@
         <item name="colorDrawerScrim">@color/darkColorDrawerScrim</item>
         <item name="colorDrawerText">@color/darkColorDrawerText</item>
         <item name="colorDrawerBackground">@color/darkColorDrawerBackground</item>
+
+        <item name="drawableItemBackground">@drawable/item_background_dark</item>
     </style>
 
     <style name="Theme.Transparent" parent="Theme.AppCompat">