From ad7a4f94232a714a8edde8dff1c300e59be95a46 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Thu, 6 Dec 2018 21:29:31 +0000
Subject: [PATCH 01/16] table for storing account balance

---
 app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
index 1f5801a7..7c2a8e2d 100644
--- a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
@@ -29,6 +29,9 @@ class MobileLedgerDB {
         db.execSQL("create index if not exists idx_accounts_name on accounts(name);");
         db.execSQL("create table if not exists options(name varchar, value varchar);");
         db.execSQL("create unique index if not exists idx_options_name on options(name);");
+        db.execSQL("create table if not exists account_values(account varchar not null, currency varchar not null, value decimal(18,2) not null);");
+        db.execSQL("create index if not exists idx_account_values_account on account_values(account);");
+        db.execSQL("create unique index if not exists un_account_values on account_values(account,currency);");
     }
 
     static void applyRevisions(Resources rm) {
-- 
2.39.2


From 977ec47877ac3bd6f1b61b3edea8ad63cee7b982 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Thu, 6 Dec 2018 21:29:36 +0000
Subject: [PATCH 02/16] fill account balance while storing account data

---
 .../mobileledger/RetrieveAccountsTask.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index 3c48f2ed..a2590300 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -40,15 +40,19 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                 }
                 else {
                     db.beginTransaction();
+                    db.execSQL("delete from account_values;");
                     db.execSQL("delete from accounts;");
 
                     try {
                         String line;
+                        String last_account_name = null;
                         BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
                         // %3A is '='
                         Pattern re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+                        Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">([\\d.,]+)(?:\\s+(\\S+))?</span>");
                         int count = 0;
                         while ((line = buf.readLine()) != null) {
+
                             Matcher m = re.matcher(line);
                             while (m.find()) {
                                 String acct_encoded = m.group(1);
@@ -58,6 +62,21 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
 
                                 db.execSQL("insert into accounts(name) values(?)", new Object[]{acct_name} );
                                 publishProgress(++count);
+
+                                last_account_name = acct_name;
+                            }
+
+                            if (last_account_name == null) continue;
+
+                            m = value_re.matcher(line);
+                            while (m.find()) {
+                                String value = m.group(1);
+                                String currency = m.group(2);
+                                if(currency == null) currency="";
+                                value = value.replace(',', '.');
+                                Log.d("db", "curr="+currency+", value="+value);
+                                db.execSQL("insert into account_values(account, currency, value) values(?, ?, ?);",
+                                        new Object[]{last_account_name, currency, Float.valueOf(value)});
                             }
                         }
 
-- 
2.39.2


From 20a38ff76b57205c41085815389bf314320dc159 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:29:20 +0000
Subject: [PATCH 03/16] account amounts parser improvements

allow spaces before numbers, allow sign

detect row end -- avoids parsing the total balance as part of last
account's data
---
 .../net/ktnx/mobileledger/RetrieveAccountsTask.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index a2590300..8f6b32d7 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -49,12 +49,13 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                         BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
                         // %3A is '='
                         Pattern re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
-                        Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">([\\d.,]+)(?:\\s+(\\S+))?</span>");
+                        Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
+                        Pattern tr_re = Pattern.compile("</tr>");
                         int count = 0;
                         while ((line = buf.readLine()) != null) {
 
                             Matcher m = re.matcher(line);
-                            while (m.find()) {
+                            if (m.find()) {
                                 String acct_encoded = m.group(1);
                                 String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
                                 acct_name = acct_name.replace("\"", "");
@@ -64,6 +65,14 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 publishProgress(++count);
 
                                 last_account_name = acct_name;
+
+                                continue;
+                            }
+
+                            Matcher tr_m = tr_re.matcher(line);
+                            if (tr_m.find()) {
+                                last_account_name = null;
+                                continue;
                             }
 
                             if (last_account_name == null) continue;
-- 
2.39.2


From 2eef3d1f54426bcf8c769f5ececbb5300e975df6 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:42:31 +0000
Subject: [PATCH 05/16] working DB revision application

---
 .../net/ktnx/mobileledger/MobileLedgerDB.java | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
index 7c2a8e2d..2254cae7 100644
--- a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
@@ -2,15 +2,18 @@ package net.ktnx.mobileledger;
 
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Locale;
 
 class MobileLedgerDB {
     static final String DATABASE_NAME = "accounts";
+    static final String OPT_DB_REVISION = "db_revision";
     private static String db_filename;
     static SQLiteDatabase db;
 
@@ -34,16 +37,28 @@ class MobileLedgerDB {
         db.execSQL("create unique index if not exists un_account_values on account_values(account,currency);");
     }
 
-    static void applyRevisions(Resources rm) {
-        int next_ver = Integer.parseInt(get_option_value("db_version", "0")) + 1;
+    static void applyRevisions(Resources rm, String pkg_name) {
+        int cur_ver = Integer.parseInt(get_option_value(OPT_DB_REVISION, "0"));
 
-        while (applyRevision(rm, next_ver)) {
-            next_ver++;
+        Log.d("db", "Current DB revision is "+String.valueOf(cur_ver));
+
+        while (applyRevision(rm, pkg_name, cur_ver+1)) {
+            cur_ver++;
         }
+
+        Log.d("db", "Database revision is "+String.valueOf(cur_ver)+" now");
     }
-    private static boolean applyRevision(Resources rm, int next_ver) {
-        try (InputStream res = rm.openRawResource(next_ver)) {
-            Log.d("db", "Applying revision " + String.valueOf(next_ver));
+    private static boolean applyRevision(Resources rm, String pkg_name, int rev_no) {
+        String rev_file = String.format(Locale.US, "sql_%d", rev_no);
+
+        db.beginTransaction();
+        int res_id = rm.getIdentifier(rev_file, "raw", pkg_name);
+        if (res_id == 0) {
+            Log.d("db", String.format(Locale.US, "No resource for revision %d", rev_no));
+            return false;
+        }
+        try (InputStream res = rm.openRawResource(res_id)) {
+            Log.d("db", "Applying revision " + String.valueOf(rev_no));
             InputStreamReader isr = new InputStreamReader(res);
             BufferedReader reader = new BufferedReader(isr);
 
@@ -52,8 +67,18 @@ class MobileLedgerDB {
                 db.execSQL(line);
             }
 
+            set_option_value(OPT_DB_REVISION, rev_no);
             db.setTransactionSuccessful();
-        } catch (Exception e) {
+        } catch (Resources.NotFoundException e) {
+            Log.d("db", "SQL revision "+String.valueOf(rev_no)+" not found");
+            return false;
+        }
+        catch (SQLException e) {
+            Log.e("db", String.format(Locale.US, "Error applying revision %d: %s", rev_no, e.getMessage()));
+            return false;
+        }
+        catch (Exception e) {
+            Log.w("db", "Error reading revision" + String.valueOf(rev_no)+": "+e.getMessage());
             return false;
         }
         finally {
-- 
2.39.2


From 050409daee8a5a9f3448e6ce30efb08a8c960d78 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:42:34 +0000
Subject: [PATCH 06/16] automativ DB revision application during startup

---
 app/src/main/java/net/ktnx/mobileledger/AccountSummary.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index bd73cd07..a53b2eac 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -123,6 +123,8 @@ public class AccountSummary extends AppCompatActivity {
         }
         MobileLedgerDB.initDB();
 
+        MobileLedgerDB.applyRevisions(getResources(), getPackageName());
+
         account_list_last_updated = MobileLedgerDB.get_option_value("last_refresh", (long) 0);
 
     }
-- 
2.39.2


From 29c3a6071119270c9cdb5402293f9ba92eec61f1 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:42:40 +0000
Subject: [PATCH 07/16] first DB revision! add a keep flag to accounts/values
 to ease synchronization

---
 app/src/main/res/raw/sql_1.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/raw/sql_1.sql

diff --git a/app/src/main/res/raw/sql_1.sql b/app/src/main/res/raw/sql_1.sql
new file mode 100644
index 00000000..2dfa1417
--- /dev/null
+++ b/app/src/main/res/raw/sql_1.sql
@@ -0,0 +1,2 @@
+alter table accounts add keep boolean;
+alter table account_values add keep boolean;
\ No newline at end of file
-- 
2.39.2


From 094a00b47627fd768008046db40a4d9ff7e5950a Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:55:43 +0000
Subject: [PATCH 08/16] fix snack-bar showing in case of account update errors

---
 .../main/java/net/ktnx/mobileledger/AccountSummary.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index a53b2eac..882403ec 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -161,9 +161,11 @@ public class AccountSummary extends AppCompatActivity {
                 pb.setVisibility(GONE);
                 pt.setVisibility(GONE);
                 mRefresh.setVisible(true);
-                if (this.error != 0)
-                    Snackbar.make(drawer, rm.getString(this.error), Snackbar.LENGTH_LONG );
-                else
+                if (this.error != 0) {
+                    String err_text = rm.getString(this.error);
+                    Log.d("visual", String.format("showing snackbar: %s", err_text));
+                    Snackbar.make(drawer, err_text, Snackbar.LENGTH_LONG ).show();
+                } else
                     set_option_value("last_refresh", new Date().getTime() );
             }
         };
-- 
2.39.2


From 102232aaa4e22cd942ed305952c618f460b410fe Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:55:50 +0000
Subject: [PATCH 09/16] fix a hanging db transaction wen applying DB revisions

---
 app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
index 2254cae7..141b4a32 100644
--- a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
@@ -51,12 +51,12 @@ class MobileLedgerDB {
     private static boolean applyRevision(Resources rm, String pkg_name, int rev_no) {
         String rev_file = String.format(Locale.US, "sql_%d", rev_no);
 
-        db.beginTransaction();
         int res_id = rm.getIdentifier(rev_file, "raw", pkg_name);
         if (res_id == 0) {
             Log.d("db", String.format(Locale.US, "No resource for revision %d", rev_no));
             return false;
         }
+        db.beginTransaction();
         try (InputStream res = rm.openRawResource(res_id)) {
             Log.d("db", "Applying revision " + String.valueOf(rev_no));
             InputStreamReader isr = new InputStreamReader(res);
-- 
2.39.2


From b92c4052269edfc2f976ecdc3d58044cd6d9935e Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:56:15 +0000
Subject: [PATCH 10/16] update_accounts: put all execSQL in the try{} block

---
 .../java/net/ktnx/mobileledger/RetrieveAccountsTask.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index 8f6b32d7..b3ad5778 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -40,10 +40,11 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                 }
                 else {
                     db.beginTransaction();
-                    db.execSQL("delete from account_values;");
-                    db.execSQL("delete from accounts;");
 
                     try {
+                        db.execSQL("update account_values set keep=0;");
+                        db.execSQL("update accounts set keep=0;");
+
                         String line;
                         String last_account_name = null;
                         BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
-- 
2.39.2


From c84b0a8df3e90430f032f3b4b58726aec8f6d029 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:56:17 +0000
Subject: [PATCH 11/16] assert there is no transaction running

---
 .../main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index b3ad5778..f1511f80 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -39,6 +39,8 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                     throw new IOException(String.valueOf(R.string.err_http_error));
                 }
                 else {
+                    if (db.inTransaction()) throw new AssertionError();
+
                     db.beginTransaction();
 
                     try {
-- 
2.39.2


From 2e50c2cb25c89fa2ba11ba6bec0c79aca995277a Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:56:34 +0000
Subject: [PATCH 12/16] account_update: replace delete/insert with three stage
 mark for removal, update/insert, remove marked process

not to remove/insert all the rows every time
---
 .../java/net/ktnx/mobileledger/RetrieveAccountsTask.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index f1511f80..670b1493 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -64,7 +64,7 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 acct_name = acct_name.replace("\"", "");
                                 Log.d("account-parser", acct_name);
 
-                                db.execSQL("insert into accounts(name) values(?)", new Object[]{acct_name} );
+                                db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
                                 publishProgress(++count);
 
                                 last_account_name = acct_name;
@@ -87,11 +87,13 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 if(currency == null) currency="";
                                 value = value.replace(',', '.');
                                 Log.d("db", "curr="+currency+", value="+value);
-                                db.execSQL("insert into account_values(account, currency, value) values(?, ?, ?);",
+                                db.execSQL("insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
                                         new Object[]{last_account_name, currency, Float.valueOf(value)});
                             }
                         }
 
+                        db.execSQL("delete from account_values where keep=0;");
+                        db.execSQL("delete from accounts where keep=0;");
                         db.setTransactionSuccessful();
                     }
                     finally {
-- 
2.39.2


From 4a80939836e8e3c3a63ca1d5e905f8f1e03fb122 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 05:56:44 +0000
Subject: [PATCH 13/16] use the global reference instead of passing it to
 execute()

---
 .../main/java/net/ktnx/mobileledger/AccountSummary.java   | 3 +--
 .../java/net/ktnx/mobileledger/RetrieveAccountsTask.java  | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index 882403ec..ec122cd4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -22,7 +22,6 @@ import android.widget.TextView;
 import java.util.Date;
 
 import static android.view.View.GONE;
-import static net.ktnx.mobileledger.MobileLedgerDB.db;
 import static net.ktnx.mobileledger.MobileLedgerDB.set_option_value;
 
 public class AccountSummary extends AppCompatActivity {
@@ -171,7 +170,7 @@ public class AccountSummary extends AppCompatActivity {
         };
 
         task.setPref(PreferenceManager.getDefaultSharedPreferences(this));
-        task.execute(db);
+        task.execute();
 
     }
 }
diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index 670b1493..0956f638 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -1,7 +1,6 @@
 package net.ktnx.mobileledger;
 
 import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -14,7 +13,9 @@ import java.net.URLDecoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, Integer, Void> {
+import static net.ktnx.mobileledger.MobileLedgerDB.db;
+
+abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, Integer, Void> {
     int error;
 
     private SharedPreferences pref;
@@ -25,8 +26,7 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
         error = 0;
     }
 
-    protected Void doInBackground(SQLiteDatabase... sqLiteDatabases) {
-        final SQLiteDatabase db = sqLiteDatabases[0];
+    protected Void doInBackground(Void... params) {
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection( pref, "add");
             http.setAllowUserInteraction(false);
-- 
2.39.2


From 65c5cdc30c7bcf5cf8d39df1dc20abba8d476670 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 18:37:52 +0000
Subject: [PATCH 14/16] update accounts table visual upon refreshilg the
 account data from the backend

---
 .../net/ktnx/mobileledger/AccountSummary.java | 66 ++++++++++++++++++-
 .../res/layout/content_account_summary.xml    | 44 ++++++-------
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/styles.xml            | 21 ++++++
 4 files changed, 108 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index ec122cd4..e19b8add 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -1,8 +1,10 @@
 package net.ktnx.mobileledger;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.res.Resources;
+import android.database.Cursor;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -13,15 +15,22 @@ import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
 import java.util.Date;
 
 import static android.view.View.GONE;
+import static net.ktnx.mobileledger.MobileLedgerDB.db;
 import static net.ktnx.mobileledger.MobileLedgerDB.set_option_value;
 
 public class AccountSummary extends AppCompatActivity {
@@ -89,7 +98,7 @@ public class AccountSummary extends AppCompatActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.account_summary, menu);
-        mRefresh = (MenuItem) menu.findItem(R.id.menu_acc_summary_refresh);
+        mRefresh = menu.findItem(R.id.menu_acc_summary_refresh);
         assert mRefresh != null;
         return true;
     }
@@ -164,8 +173,11 @@ public class AccountSummary extends AppCompatActivity {
                     String err_text = rm.getString(this.error);
                     Log.d("visual", String.format("showing snackbar: %s", err_text));
                     Snackbar.make(drawer, err_text, Snackbar.LENGTH_LONG ).show();
-                } else
+                }
+                else {
                     set_option_value("last_refresh", new Date().getTime() );
+                    update_account_table();
+                }
             }
         };
 
@@ -173,4 +185,54 @@ public class AccountSummary extends AppCompatActivity {
         task.execute();
 
     }
+
+    public int dp2px(float dp) {
+        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics()));
+    }
+
+    @SuppressLint("DefaultLocale")
+    private void update_account_table() {
+        LinearLayout root = findViewById(R.id.account_root);
+        root.removeAllViewsInLayout();
+
+        try (Cursor cursor = db.rawQuery("SELECT name FROM accounts ORDER BY name;", null)) {
+            boolean even = false;
+            while (cursor.moveToNext()) {
+                String acc_name = cursor.getString(0);
+
+                TableLayout t = new TableLayout(this);
+                TableRow r = new TableRow(this);
+                r.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+                if (even)
+                    r.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg, getTheme()));
+                even = !even;
+
+                TextView acc_tv = new TextView(this, null, R.style.account_summary_account_name);
+                acc_tv.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 9f));
+                acc_tv.setText(acc_name);
+                r.addView(acc_tv);
+
+                TextView amt_tv = new TextView(this, null, R.style.account_summary_amounts);
+                amt_tv.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+                amt_tv.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
+                amt_tv.setMinWidth(dp2px(40f));
+                StringBuilder amt_text = new StringBuilder();
+                try (Cursor cAmounts = db.rawQuery("SELECT currency, value FROM account_values WHERE account = ?", new String[]{acc_name})) {
+                    while (cAmounts.moveToNext()) {
+                        String curr = cAmounts.getString(0);
+                        Float amt = cAmounts.getFloat(1);
+                        if (amt_text.length() != 0) amt_text.append('\n');
+                        amt_text.append(String.format("%s %1.2f", curr, amt));
+                    }
+                }
+                amt_tv.setText(amt_text.toString());
+
+                r.addView(amt_tv);
+
+                t.addView(r);
+
+                root.addView(t);
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/content_account_summary.xml b/app/src/main/res/layout/content_account_summary.xml
index dfda28d1..89114417 100644
--- a/app/src/main/res/layout/content_account_summary.xml
+++ b/app/src/main/res/layout/content_account_summary.xml
@@ -2,6 +2,7 @@
 <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:id="@+id/content_account_summary_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
@@ -16,7 +17,8 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="HardcodedText" />
 
     <ProgressBar
         android:id="@+id/progressBar"
@@ -32,41 +34,39 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <ScrollView
+        android:id="@+id/account_root_scroller"
         android:layout_width="match_parent"
-        android:layout_height="325dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="40dp"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:paddingEnd="@dimen/activity_horizontal_margin"
         app:layout_constraintBottom_toTopOf="@+id/textProgress"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            android:id="@+id/account_root"
             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">
+            <TableLayout style="@style/account_summary_account_entry_table">
 
-                <LinearLayout
+                <TableRow
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_height="match_parent"
+                    android:background="@color/table_row_even_bg">
 
-                    <ScrollView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:id="@+id/textView"
+                        style="@style/account_summary_account_name"
+                        android:text="TextView" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical" />
-                    </ScrollView>
-                </LinearLayout>
-            </ScrollView>
+                    <TextView
+                        android:id="@+id/textView2"
+                        style="@style/account_summary_amounts"
+                        android:text="123.45" />
+                </TableRow>
 
+            </TableLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c9f43903..0b00bf98 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#9c27b0</color>
     <color name="colorPrimaryDark">#4a148c</color>
     <color name="colorAccent">#4db6ac</color>
+    <color name="table_row_even_bg">#289d29b1</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2ed9b110..e08c79c2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,4 +27,25 @@
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
     </style>
 
+    <style name="account_summary_account_name">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">9</item>
+    </style>
+
+    <style name="account_summary_amounts">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:width">0dp</item>
+        <item name="android:minWidth">40dp</item>
+        <item name="android:textAlignment">viewEnd</item>
+    </style>
+
+    <style name="account_summary_account_entry_table">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
 </resources>
-- 
2.39.2


From ab77ad93534a325f1135f0fae72ea7a15265142a Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 18:37:58 +0000
Subject: [PATCH 15/16] update accounts table upon start

---
 app/src/main/java/net/ktnx/mobileledger/AccountSummary.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index e19b8add..9620a69a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -66,6 +66,7 @@ public class AccountSummary extends AppCompatActivity {
         }
 
         prepare_db();
+        update_account_table();
         update_accounts(false);
     }
 
-- 
2.39.2


From 7e41ae1d0d50379d8f96f5687a2633a62e34ae8b Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 7 Dec 2018 18:39:49 +0000
Subject: [PATCH 16/16] rename to better reflect purpose

---
 .../net/ktnx/mobileledger/AccountSummary.java |  2 +-
 .../mobileledger/NewTransactionActivity.java  |  2 +-
 .../res/layout/activity_account_summary.xml   | 49 +++++++------------
 .../layout/activity_latest_transactions.xml   | 29 -----------
 .../res/layout/activity_new_transaction.xml   | 41 ++++++++++++++++
 ...ctions.xml => app_bar_account_summary.xml} |  0
 .../res/layout/content_account_summary.xml    |  2 +-
 .../res/layout/content_new_transaction.xml    |  2 +-
 8 files changed, 63 insertions(+), 64 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_latest_transactions.xml
 create mode 100644 app/src/main/res/layout/activity_new_transaction.xml
 rename app/src/main/res/layout/{app_bar_latest_transactions.xml => app_bar_account_summary.xml} (100%)

diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
index 9620a69a..a516722f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
+++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java
@@ -46,7 +46,7 @@ public class AccountSummary extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_latest_transactions);
+        setContentView(R.layout.activity_account_summary);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index a9d6097a..dca8d463 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_account_summary);
+        setContentView(R.layout.activity_new_transaction);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
diff --git a/app/src/main/res/layout/activity_account_summary.xml b/app/src/main/res/layout/activity_account_summary.xml
index d5f20877..6154fd61 100644
--- a/app/src/main/res/layout/activity_account_summary.xml
+++ b/app/src/main/res/layout/activity_account_summary.xml
@@ -1,42 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".NewTransactionActivity">
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
 
-    <android.support.design.widget.AppBarLayout
+    <include
+        layout="@layout/app_bar_account_summary"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="match_parent" />
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_new_transaction" />
-
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
+    <android.support.design.widget.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        >
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true">
 
-        <ProgressBar
-            android:id="@+id/save_transaction_progress"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_margin="4dp"
-            android:indeterminate="true"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        <include
+            layout="@layout/drawer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </android.support.design.widget.NavigationView>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_latest_transactions.xml b/app/src/main/res/layout/activity_latest_transactions.xml
deleted file mode 100644
index 1c82d931..00000000
--- a/app/src/main/res/layout/activity_latest_transactions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_latest_transactions"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true">
-
-        <include
-            layout="@layout/drawer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </android.support.design.widget.NavigationView>
-
-</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml
new file mode 100644
index 00000000..ba67cc34
--- /dev/null
+++ b/app/src/main/res/layout/activity_new_transaction.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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"
+    tools:context=".NewTransactionActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_new_transaction" />
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/save_transaction_progress"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_margin="4dp"
+            android:indeterminate="true"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </android.support.constraint.ConstraintLayout>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_latest_transactions.xml b/app/src/main/res/layout/app_bar_account_summary.xml
similarity index 100%
rename from app/src/main/res/layout/app_bar_latest_transactions.xml
rename to app/src/main/res/layout/app_bar_account_summary.xml
diff --git a/app/src/main/res/layout/content_account_summary.xml b/app/src/main/res/layout/content_account_summary.xml
index 89114417..cde4d6a5 100644
--- a/app/src/main/res/layout/content_account_summary.xml
+++ b/app/src/main/res/layout/content_account_summary.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context=".AccountSummary"
-    tools:showIn="@layout/app_bar_latest_transactions">
+    tools:showIn="@layout/app_bar_account_summary">
 
     <TextView
         android:id="@+id/textProgress"
diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index 0d284493..b4b6babe 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_account_summary">
+    tools:showIn="@layout/activity_new_transaction">
 
     <ScrollView
         android:id="@+id/transaction_details"
-- 
2.39.2