X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FNewTransactionActivity.java;h=f86780408206b050bfeee566593619d7aeabf50d;hp=a9d6097a163eecb78e988fbf9f97526c9be45db7;hb=48d2f79edc48f9aa504b5d0214429a8e5017bf3e;hpb=60a85a18cc2074b87721173798497260dbc800e5

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index a9d6097a..f8678040 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -53,23 +53,20 @@ 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;
 
     @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);
 
         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,18 +74,34 @@ 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);
         }
     }
 
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(R.anim.dummy, R.anim.slide_out_right);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     public void save_transaction() {
-        mSave.setVisible(false);
+        if (mSave != null) mSave.setVisible(false);
         toggle_all_editing(false);
         progress.setVisibility(View.VISIBLE);
 
@@ -167,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);
 
@@ -183,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 {
@@ -207,14 +219,14 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
         adapter.setFilterQueryProvider(provider);
 
-        acc.setAdapter(adapter);
+        view.setAdapter(adapter);
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.new_transaction, menu);
         mSave = menu.findItem(R.id.action_submit_transaction);
-        assert mSave != null;
+        if (mSave == null) throw new AssertionError();
 
         return true;
     }
@@ -251,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);
     }
@@ -291,9 +303,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         }
 
         if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) {
-            mSave.setVisible(true);
+            if (mSave != null) mSave.setVisible(true);
         } else {
-            mSave.setVisible(false);
+            if (mSave != null) mSave.setVisible(false);
         }
     }