auto-completion for the transaction description

diff --git a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
index a4a078e7eb5b501c1a33dc8853847dfafa0d5ab3..021ee45544c2eee4bf16a21cbf1970f1a1b3cbec 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/MobileLedgerDB.java
@@ -14,6 +14,8 @@ import java.util.Locale;
 class MobileLedgerDB {
     static final String DATABASE_NAME = "accounts";
     static final String OPT_DB_REVISION = "db_revision";
+    static final String ACCOUNTS_TABLE = "accounts";
+    static final String DESCRIPTION_HISTORY_TABLE = "description_history";
     private static String db_filename;
     static SQLiteDatabase db;
 

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index 2327ce494d371263617a608d0628bcc5b5d4ecb9..f86780408206b050bfeee566593619d7aeabf50d 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -53,7 +53,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     private TableLayout table;
     private ProgressBar progress;
     private TextView text_date;
-    private TextView text_descr;
+    private AutoCompleteTextView text_descr;
     private static SaveTransactionTask saver;
     private MenuItem mSave;
 
@@ -66,10 +66,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
         text_date = findViewById(R.id.new_transaction_date);
         text_descr = findViewById(R.id.new_transaction_description);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            text_descr.setAutofillHints("");
-        }
+        hook_autocompletion_adapter(text_descr, MobileLedgerDB.DESCRIPTION_HISTORY_TABLE, "description");
 
         progress = findViewById(R.id.save_transaction_progress);
 
@@ -77,10 +74,10 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         table = findViewById(R.id.new_transaction_accounts_table);
         for (int i = 0; i < table.getChildCount(); i++) {
             TableRow row = (TableRow) table.getChildAt(i);
-            TextView acc_name_view = (TextView) row.getChildAt(0);
+            AutoCompleteTextView acc_name_view = (AutoCompleteTextView) row.getChildAt(0);
             TextView amount_view = (TextView) row.getChildAt(1);
             hook_swipe_listener(row);
-            hook_autocompletion_adapter(row);
+            hook_autocompletion_adapter(acc_name_view, MobileLedgerDB.ACCOUNTS_TABLE, "name");
             hook_text_change_listener(acc_name_view);
             hook_text_change_listener(amount_view);
 //            Log.d("swipe", "hooked to row "+i);
@@ -183,12 +180,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     }
 
     @TargetApi(Build.VERSION_CODES.N)
-    private void hook_autocompletion_adapter(final TableRow row) {
-        String[] from = {"name"};
+    private void hook_autocompletion_adapter(final AutoCompleteTextView view, final String table, final String field) {
+        String[] from = {field};
         int[] to = {android.R.id.text1};
         SQLiteDatabase db = MobileLedgerDB.db;
 
-        AutoCompleteTextView acc = (AutoCompleteTextView) row.getChildAt(0);
         SimpleCursorAdapter adapter = new SimpleCursorAdapter(this, android.R.layout.simple_dropdown_item_1line, null, from, to, 0);
         adapter.setStringConversionColumn(1);
 
@@ -199,17 +195,17 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
                 String str = constraint.toString().toUpperCase();
                 Log.d("autocompletion", "Looking for "+str);
-                String[] col_names = {FontsContract.Columns._ID, "name"};
+                String[] col_names = {FontsContract.Columns._ID, field};
                 MatrixCursor c = new MatrixCursor(col_names);
 
-                Cursor matches = db.rawQuery("SELECT name FROM accounts WHERE UPPER(name) LIKE '%'||?||'%' ORDER BY name;", new String[]{str});
+                Cursor matches = db.rawQuery(String.format("SELECT %s FROM %s WHERE UPPER(%s) LIKE '%%'||?||'%%' ORDER BY 1;", field, table, field), new String[]{str});
 
                 try {
                     int i = 0;
                     while (matches.moveToNext()) {
-                        String name = matches.getString(0);
-                        Log.d("autocompletion-match", name);
-                        c.newRow().add(i++).add(name);
+                        String match = matches.getString(0);
+                        Log.d("autocompletion", String.format("match: %s", match));
+                        c.newRow().add(i++).add(match);
                     }
                 }
                 finally {
@@ -223,7 +219,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
         adapter.setFilterQueryProvider(provider);
 
-        acc.setAdapter(adapter);
+        view.setAdapter(adapter);
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -267,7 +263,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         if (focus) acc.requestFocus();
 
         hook_swipe_listener(row);
-        hook_autocompletion_adapter(row);
+        hook_autocompletion_adapter(acc, MobileLedgerDB.ACCOUNTS_TABLE, "name");
         hook_text_change_listener(acc);
         hook_text_change_listener(amt);
     }

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index 33f1e9c901cd926d88063c5adb58c204988cced6..d90eda15dabe74349e46bfddc1f8b3598c7190e9 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -56,7 +56,7 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, In
                         Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
                         Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
                         Pattern tr_re = Pattern.compile("</tr>");
-                        Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\b");
+                        Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
                         Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
                         int count = 0;
                         while ((line = buf.readLine()) != null) {
@@ -115,7 +115,7 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, In
 
                         db.execSQL("delete from account_values where keep=0;");
                         db.execSQL("delete from accounts where keep=0;");
-                        db.execSQL("delete from description_history where keep=0;");
+//                        db.execSQL("delete from description_history where keep=0;");
                         db.setTransactionSuccessful();
                     }
                     finally {

diff --git a/app/src/main/res/layout/content_new_transaction.xml b/app/src/main/res/layout/content_new_transaction.xml
index 89e3c2cecca001d3ce9e22e79a57dea8c7d0afbd..32756060f9209a6b7725b8879078c76f807abb46 100644 (file)
--- a/app/src/main/res/layout/content_new_transaction.xml
+++ b/app/src/main/res/layout/content_new_transaction.xml
@@ -38,12 +38,11 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <EditText
+                <AutoCompleteTextView
                     android:id="@+id/new_transaction_description"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:autofillHints=""
                     android:ems="10"
                     android:hint="@string/new_transaction_description_hint"
                     android:inputType="textPersonName"