From 9e36e0d9c6bedec3238717fe694fd0bf16480bb9 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 16 Aug 2017 01:20:36 -0500
Subject: ConfigActivity: Make the two-pane layout more readable

Highlight the selected configuration, and add a border between the two
panes.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/drawable/list_item_background.xml      | 5 +++++
 app/src/main/res/drawable/list_item_background_anim.xml | 5 +++++
 app/src/main/res/layout-land/config_activity.xml        | 3 +++
 app/src/main/res/layout/config_detail_fragment.xml      | 3 ++-
 app/src/main/res/layout/config_edit_fragment.xml        | 3 ++-
 app/src/main/res/layout/config_list_item.xml            | 1 +
 app/src/main/res/layout/placeholder_fragment.xml        | 1 +
 app/src/main/res/values/colors.xml                      | 5 +++++
 8 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/list_item_background.xml
 create mode 100644 app/src/main/res/drawable/list_item_background_anim.xml
 create mode 100644 app/src/main/res/values/colors.xml

(limited to 'app/src/main')

diff --git a/app/src/main/res/drawable/list_item_background.xml b/app/src/main/res/drawable/list_item_background.xml
new file mode 100644
index 00000000..f005ac1d
--- /dev/null
+++ b/app/src/main/res/drawable/list_item_background.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/list_item_activated" android:state_activated="true" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/drawable/list_item_background_anim.xml b/app/src/main/res/drawable/list_item_background_anim.xml
new file mode 100644
index 00000000..2e962eb1
--- /dev/null
+++ b/app/src/main/res/drawable/list_item_background_anim.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/list_item_ripple">
+    <item android:drawable="@drawable/list_item_background" />
+</ripple>
diff --git a/app/src/main/res/layout-land/config_activity.xml b/app/src/main/res/layout-land/config_activity.xml
index b9c729fa..6b327e01 100644
--- a/app/src/main/res/layout-land/config_activity.xml
+++ b/app/src/main/res/layout-land/config_activity.xml
@@ -17,5 +17,8 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="2"
+        android:background="?android:attr/colorPrimary"
+        android:paddingEnd="0dp"
+        android:paddingStart="4dp"
         tools:ignore="InconsistentLayout" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/config_detail_fragment.xml b/app/src/main/res/layout/config_detail_fragment.xml
index 1bae0450..add03c08 100644
--- a/app/src/main/res/layout/config_detail_fragment.xml
+++ b/app/src/main/res/layout/config_detail_fragment.xml
@@ -10,7 +10,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?android:attr/colorBackground">
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/config_edit_fragment.xml b/app/src/main/res/layout/config_edit_fragment.xml
index 3351c008..285215fb 100644
--- a/app/src/main/res/layout/config_edit_fragment.xml
+++ b/app/src/main/res/layout/config_edit_fragment.xml
@@ -10,7 +10,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?android:attr/colorBackground">
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/config_list_item.xml b/app/src/main/res/layout/config_list_item.xml
index 33f447c8..52bd385c 100644
--- a/app/src/main/res/layout/config_list_item.xml
+++ b/app/src/main/res/layout/config_list_item.xml
@@ -11,6 +11,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/list_item_background_anim"
         android:padding="16dp">
 
         <TextView
diff --git a/app/src/main/res/layout/placeholder_fragment.xml b/app/src/main/res/layout/placeholder_fragment.xml
index bb89ef1a..c519b994 100644
--- a/app/src/main/res/layout/placeholder_fragment.xml
+++ b/app/src/main/res/layout/placeholder_fragment.xml
@@ -2,5 +2,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground"
     android:gravity="center"
     android:text="@string/placeholder_text" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..47a2d2b4
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
+    <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
+</resources>
-- 
cgit v1.2.3