From 3f9431ec5abcaf82e84773528e7935370ffc4ce7 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Sep 2021 08:56:32 +0700
Subject: [PATCH 1/3] chore(android/engine): Set list backgrounds transparent

---
 android/KMEA/app/src/main/res/drawable/textview_item.xml      | 3 ++-
 android/KMEA/app/src/main/res/layout/list_row_layout1.xml     | 1 +
 android/KMEA/app/src/main/res/layout/list_row_layout2.xml     | 1 +
 android/KMEA/app/src/main/res/layout/list_row_layout4.xml     | 2 +-
 .../KMEA/app/src/main/res/layout/models_list_row_layout.xml   | 4 ++++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/res/drawable/textview_item.xml b/android/KMEA/app/src/main/res/drawable/textview_item.xml
index 00b8d97435..0492a75f1d 100644
--- a/android/KMEA/app/src/main/res/drawable/textview_item.xml
+++ b/android/KMEA/app/src/main/res/drawable/textview_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@android:color/darker_gray" />
-    <item android:color="@android:color/black"/>
+    <item android:color="@android:color/black" />
+    <item android:drawable="@android:color/transparent" />
 </selector>
\ No newline at end of file
diff --git a/android/KMEA/app/src/main/res/layout/list_row_layout1.xml b/android/KMEA/app/src/main/res/layout/list_row_layout1.xml
index dbf06e2dc6..59213b7267 100644
--- a/android/KMEA/app/src/main/res/layout/list_row_layout1.xml
+++ b/android/KMEA/app/src/main/res/layout/list_row_layout1.xml
@@ -28,6 +28,7 @@
     
     <ImageView
         android:id="@+id/image1"
+        android:background="@android:color/transparent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/android/KMEA/app/src/main/res/layout/list_row_layout2.xml b/android/KMEA/app/src/main/res/layout/list_row_layout2.xml
index 97728a7616..ca9501870a 100644
--- a/android/KMEA/app/src/main/res/layout/list_row_layout2.xml
+++ b/android/KMEA/app/src/main/res/layout/list_row_layout2.xml
@@ -33,6 +33,7 @@
     
     <ImageView
         android:id="@+id/image1"
+        android:background="@android:color/transparent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/android/KMEA/app/src/main/res/layout/list_row_layout4.xml b/android/KMEA/app/src/main/res/layout/list_row_layout4.xml
index e082a3ea50..9a7495d954 100644
--- a/android/KMEA/app/src/main/res/layout/list_row_layout4.xml
+++ b/android/KMEA/app/src/main/res/layout/list_row_layout4.xml
@@ -15,8 +15,8 @@
 
         <TextView
           android:id="@+id/text1"
-          android:textColor="@drawable/textview_item"
           android:background="@android:color/transparent"
+          android:textColor="@drawable/textview_item"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="15dp"
diff --git a/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml b/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml
index 6d105e7216..fd2da28219 100644
--- a/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml
+++ b/android/KMEA/app/src/main/res/layout/models_list_row_layout.xml
@@ -8,6 +8,7 @@
         android:id="@+id/image1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
         android:src="@drawable/ic_check"
         android:layout_alignParentStart="true"
         android:layout_marginStart="12dp"
@@ -16,6 +17,7 @@
         android:contentDescription="@string/image_view" />
 
     <LinearLayout
+        android:background="@android:color/transparent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="40dp"
@@ -26,6 +28,7 @@
         <TextView
             android:id="@+id/text1"
             android:textColor="@android:color/black"
+            android:background="@android:color/transparent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
@@ -39,6 +42,7 @@
         android:id="@+id/image2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
         android:src="@drawable/ic_arrow_forward"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"

From de3d5536833636ff43f09ed6250b6b4acc6fee68 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Sep 2021 10:44:17 +0700
Subject: [PATCH 2/3] chore(android/engine): Style back arrow black

---
 android/KMEA/app/src/main/res/layout/list_toolbar.xml | 1 +
 android/KMEA/app/src/main/res/values/styles.xml       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/android/KMEA/app/src/main/res/layout/list_toolbar.xml b/android/KMEA/app/src/main/res/layout/list_toolbar.xml
index 58b7b4b942..fe200ce6a2 100644
--- a/android/KMEA/app/src/main/res/layout/list_toolbar.xml
+++ b/android/KMEA/app/src/main/res/layout/list_toolbar.xml
@@ -2,6 +2,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_appbar"
+    app:theme="@style/AppTheme.ToolbarBackArrow"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:elevation="0dp">
diff --git a/android/KMEA/app/src/main/res/values/styles.xml b/android/KMEA/app/src/main/res/values/styles.xml
index 53a4f8aad0..e21242fea9 100644
--- a/android/KMEA/app/src/main/res/values/styles.xml
+++ b/android/KMEA/app/src/main/res/values/styles.xml
@@ -34,6 +34,10 @@
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
+    <style name="AppTheme.ToolbarBackArrow" parent="AppTheme">
+      <item name="android:textColorSecondary">@android:color/black</item>
+    </style>
+
     <style name="AppTheme.Light.ListView" parent="android:style/Widget.ListView">
         <item name="android:listSelector">@drawable/list_item</item>
         <item name="android:textColor">@android:color/black</item>

From d66260cb9880789f4864dd1ffe2423756ccc1277 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 13 Sep 2021 07:16:42 +0700
Subject: [PATCH 3/3] fix(android/engine): Consolidate items

---
 android/KMEA/app/src/main/res/drawable/textview_item.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/res/drawable/textview_item.xml b/android/KMEA/app/src/main/res/drawable/textview_item.xml
index 0492a75f1d..16bebf48da 100644
--- a/android/KMEA/app/src/main/res/drawable/textview_item.xml
+++ b/android/KMEA/app/src/main/res/drawable/textview_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@android:color/darker_gray" />
-    <item android:color="@android:color/black" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:drawable="@android:color/transparent" android:color="@android:color/black" />
 </selector>
\ No newline at end of file