From 60a85a18cc2074b87721173798497260dbc800e5 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Thu, 6 Dec 2018 21:05:36 +0000
Subject: [PATCH] home is account summary, latest transactions is a new item

the account summary has some boilerplate views for now
---
 app/src/main/AndroidManifest.xml              | 12 +--
 ...tTransactions.java => AccountSummary.java} |  2 +-
 .../mobileledger/NewTransactionActivity.java  |  2 +-
 .../ktnx/mobileledger/SettingsActivity.java   |  2 +-
 .../res/drawable/ic_event_note_black_24dp.xml | 10 +++
 ...ction.xml => activity_account_summary.xml} |  0
 .../layout/app_bar_latest_transactions.xml    |  4 +-
 .../res/layout/content_account_summary.xml    | 73 +++++++++++++++++++
 .../layout/content_latest_transactions.xml    | 34 ---------
 .../res/layout/content_new_transaction.xml    |  2 +-
 app/src/main/res/layout/drawer.xml            |  9 ++-
 app/src/main/res/values-bg/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 13 files changed, 105 insertions(+), 47 deletions(-)
 rename app/src/main/java/net/ktnx/mobileledger/{LatestTransactions.java => AccountSummary.java} (98%)
 create mode 100644 app/src/main/res/drawable/ic_event_note_black_24dp.xml
 rename app/src/main/res/layout/{activity_new_transaction.xml => activity_account_summary.xml} (100%)
 create mode 100644 app/src/main/res/layout/content_account_summary.xml
 delete mode 100644 app/src/main/res/layout/content_latest_transactions.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b981e478..926fc763 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
         android:theme="@style/AppTheme"
         android:fullBackupContent="@xml/backup_descriptor">
         <activity
-            android:name=".LatestTransactions"
-            android:label="@string/app_name"
+            android:name=".AccountSummary"
+            android:label="@string/account_summary_title"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,19 +25,19 @@
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".LatestTransactions">
+            android:parentActivityName=".AccountSummary">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.ktnx.mobileledger.LatestTransactions" />
+                android:value="net.ktnx.mobileledger.AccountSummary" />
         </activity>
         <activity
             android:name=".NewTransactionActivity"
             android:label="@string/title_activity_new_transaction"
-            android:parentActivityName=".LatestTransactions"
+            android:parentActivityName=".AccountSummary"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.ktnx.mobileledger.LatestTransactions" />
+                android:value="net.ktnx.mobileledger.AccountSummary" />
         </activity>
     </application>
 
diff --git a/app/src/main/java/net/ktnx/mobileledger/LatestTransactions.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
similarity index 98%
rename from app/src/main/java/net/ktnx/mobileledger/LatestTransactions.java
rename to app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index 27ea5cd2..e8cf0398 100644
--- a/app/src/main/java/net/ktnx/mobileledger/LatestTransactions.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -25,7 +25,7 @@ import static android.view.View.GONE;
 import static net.ktnx.mobileledger.MobileLedgerDB.db;
 import static net.ktnx.mobileledger.MobileLedgerDB.set_option_value;
 
-public class LatestTransactions extends AppCompatActivity {
+public class AccountSummary extends AppCompatActivity {
     DrawerLayout drawer;
 
     private static long account_list_last_updated;
diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index dca8d463..a9d6097a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -60,7 +60,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_transaction);
+        setContentView(R.layout.activity_account_summary);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
diff --git a/app/src/main/java/net/ktnx/mobileledger/SettingsActivity.java b/app/src/main/java/net/ktnx/mobileledger/SettingsActivity.java
index 9e49c46f..7d84fe0c 100644
--- a/app/src/main/java/net/ktnx/mobileledger/SettingsActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/SettingsActivity.java
@@ -42,7 +42,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = (preference, value) -> {
         String stringValue = value.toString();
 
-        LatestTransactions.preferences_changed();
+        AccountSummary.preferences_changed();
 
         if (preference instanceof ListPreference) {
             // For list preferences, look up the correct display value in
diff --git a/app/src/main/res/drawable/ic_event_note_black_24dp.xml b/app/src/main/res/drawable/ic_event_note_black_24dp.xml
new file mode 100644
index 00000000..94381597
--- /dev/null
+++ b/app/src/main/res/drawable/ic_event_note_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#313131"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,10L7,10v2h10v-2zM19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM14,14L7,14v2h7v-2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_account_summary.xml
similarity index 100%
rename from app/src/main/res/layout/activity_new_transaction.xml
rename to app/src/main/res/layout/activity_account_summary.xml
diff --git a/app/src/main/res/layout/app_bar_latest_transactions.xml b/app/src/main/res/layout/app_bar_latest_transactions.xml
index 45daa4e2..05591be8 100644
--- a/app/src/main/res/layout/app_bar_latest_transactions.xml
+++ b/app/src/main/res/layout/app_bar_latest_transactions.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LatestTransactions">
+    tools:context=".AccountSummary">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -20,7 +20,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_latest_transactions" />
+    <include layout="@layout/content_account_summary" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/btn_add_transaction"
diff --git a/app/src/main/res/layout/content_account_summary.xml b/app/src/main/res/layout/content_account_summary.xml
new file mode 100644
index 00000000..dfda28d1
--- /dev/null
+++ b/app/src/main/res/layout/content_account_summary.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".AccountSummary"
+    tools:showIn="@layout/app_bar_latest_transactions">
+
+    <TextView
+        android:id="@+id/textProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/textProgress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="325dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintBottom_toTopOf="@+id/textProgress"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <ScrollView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical" />
+                    </ScrollView>
+                </LinearLayout>
+            </ScrollView>
+
+        </LinearLayout>
+    </ScrollView>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_latest_transactions.xml b/app/src/main/res/layout/content_latest_transactions.xml
deleted file mode 100644
index 1eb4c385..00000000
--- a/app/src/main/res/layout/content_latest_transactions.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".LatestTransactions"
-    tools:showIn="@layout/app_bar_latest_transactions">
-
-    <TextView
-        android:id="@+id/textProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="16dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/textProgress"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index b4b6babe..0d284493 100644
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context=".NewTransactionActivity"
-    tools:showIn="@layout/activity_new_transaction">
+    tools:showIn="@layout/activity_account_summary">
 
     <ScrollView
         android:id="@+id/transaction_details"
diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
index 64ae9e5f..6687d0da 100644
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -27,9 +27,15 @@
                 android:paddingEnd="16dp">
 
                 <TextView
-                    android:id="@+id/textView4"
+                    android:id="@+id/nav_account_summary"
                     style="@style/nav_button"
                     android:drawableStart="@drawable/ic_home_black_24dp"
+                    android:text="@string/account_summary_title" />
+
+                <TextView
+                    android:id="@+id/nav_latest_transactions"
+                    style="@style/nav_button"
+                    android:drawableStart="@drawable/ic_event_note_black_24dp"
                     android:text="@string/nav_latest_transactions_title" />
 
                 <TextView
@@ -37,6 +43,7 @@
                     style="@style/nav_button"
                     android:drawableStart="@drawable/ic_assignment_black_24dp"
                     android:text="@string/nav_reports_title" />
+
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index b6d39b1d..ab25a3fa 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -24,4 +24,5 @@
     <string name="new_transaction_description_hint">Описание</string>
     <string name="progress_N_accounts_loaded">Заредени са %d сметки</string>
     <string name="action_submit_transaction_title">Запазване</string>
+    <string name="account_summary_title">Сметките накратко</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24bd8ecd..75e444d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,4 +68,5 @@
     <string name="progress_N_accounts_loaded">%d accounts loaded</string>
     <string name="new_transaction_description_hint">Description</string>
     <string name="action_submit_transaction_title">Save</string>
+    <string name="account_summary_title">Account Summary</string>
 </resources>
-- 
2.39.2