From 89e0fa95e3fca65277711a762f0643c974481e0a Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sat, 8 Dec 2018 08:15:26 +0000
Subject: [PATCH] note the 'Account summary' item in the navigation drawer when
 the Account summary starts

---
 .../main/java/net/ktnx/mobileledger/AccountSummary.java  | 9 +++++++++
 app/src/main/res/layout/content_new_transaction.xml      | 3 ++-
 app/src/main/res/layout/drawer.xml                       | 8 ++++----
 app/src/main/res/values/colors.xml                       | 1 +
 app/src/main/res/values/styles.xml                       | 2 ++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index 2b05c1b3..0973590c 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -75,6 +75,15 @@ public class AccountSummary extends AppCompatActivity {
         update_accounts(false);
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        LinearLayout grp = drawer.findViewById(R.id.nav_actions);
+        for (int i = 0; i < grp.getChildCount(); i++)
+            grp.getChildAt(i).setBackgroundColor(getResources().getColor(R.color.drawer_background, getTheme()));
+        drawer.findViewById(R.id.nav_account_summary).setBackgroundColor(getResources().getColor(R.color.table_row_even_bg, getTheme()));
+    }
+
     public void fab_new_transaction_clicked(View view) {
         Intent intent = new Intent(this, NewTransactionActivity.class);
         startActivity(intent);
diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index b4b6babe..89e3c2ce 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -70,7 +70,8 @@
                         android:width="0dp"
                         android:hint="@string/new_transaction_account_hint"
                         android:nextFocusDown="@id/new_transaction_amt_1"
-                        android:nextFocusForward="@id/new_transaction_amt_1" />
+                        android:nextFocusForward="@id/new_transaction_amt_1"
+                        android:textColorLink="@android:color/background_light" />
 
                     <EditText
                         android:id="@+id/new_transaction_amt_1"
diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
index 6687d0da..3dc96fd4 100644
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -7,7 +7,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true">
+        android:layout_alignParentTop="true"
+        android:background="@color/drawer_background">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -20,11 +21,10 @@
                 android:layout_height="wrap_content" />
 
             <LinearLayout
+                android:id="@+id/nav_actions"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/nav_account_summary"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0b00bf98..6bf02667 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,5 @@
     <color name="colorPrimaryDark">#4a148c</color>
     <color name="colorAccent">#4db6ac</color>
     <color name="table_row_even_bg">#289d29b1</color>
+    <color name="drawer_background">#ffffffff</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7d26c558..cbd324f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,6 +24,8 @@
         <item name="android:drawablePadding">32dp</item>
         <item name="android:focusable">auto</item>
         <item name="android:gravity">center_vertical|start</item>
+        <item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/activity_horizontal_margin</item>
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
     </style>
 
-- 
2.39.2