X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FNewTransactionActivity.java;h=fe2a14b2f176fb7b8a35eb01acb62e641c9c5a15;hb=b8375619cb422a232fa0a0f790304e727353760d;hp=1ff9431b8f8cd2e25364dd3112097585e2fef98d;hpb=0ebd3063793b5951b3c651f23b289762df798439;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index 1ff9431b..fe2a14b2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -1,18 +1,28 @@
 package net.ktnx.mobileledger;
 
+import android.annotation.TargetApi;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.FontsContract;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.InputType;
+import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
+import android.widget.FilterQueryProvider;
+import android.widget.SimpleCursorAdapter;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 
@@ -40,6 +50,7 @@ public class NewTransactionActivity extends AppCompatActivity {
         table = findViewById(R.id.new_transaction_accounts_table);
         for (int i = 0; i < table.getChildCount(); i++) {
             hook_swipe_listener((TableRow)table.getChildAt(i));
+            hook_autocompletion_adapter((TableRow)table.getChildAt(i));
 //            Log.d("swipe", "hooked to row "+i);
         }
     }
@@ -67,6 +78,50 @@ public class NewTransactionActivity extends AppCompatActivity {
         });
     }
 
+    @TargetApi(Build.VERSION_CODES.N)
+    private void hook_autocompletion_adapter(final TableRow row) {
+        String[] from = {"name"};
+        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);
+
+        FilterQueryProvider provider = new FilterQueryProvider() {
+            @Override
+            public Cursor runQuery(CharSequence constraint) {
+                if (constraint == null) return null;
+
+                String str = constraint.toString().toUpperCase();
+                Log.d("autocompletion", "Looking for "+str);
+                String[] col_names = {FontsContract.Columns._ID, "name"};
+                MatrixCursor c = new MatrixCursor(col_names);
+
+                Cursor matches = db.rawQuery("SELECT name FROM accounts WHERE UPPER(name) LIKE '%'||?||'%' ORDER BY name;", 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);
+                    }
+                }
+                finally {
+                    matches.close();
+                }
+
+                return c;
+
+            }
+        };
+
+        adapter.setFilterQueryProvider(provider);
+
+        acc.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);
@@ -81,6 +136,9 @@ public class NewTransactionActivity extends AppCompatActivity {
 //                .setAction("Action", null).show();
     }
 
+    public int dp2px(float dp) {
+        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics()));
+    }
     public void addTransactionAccountFromMenu(MenuItem item) {
         final AutoCompleteTextView acc = new AutoCompleteTextView(this);
         acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT, 9f));
@@ -92,7 +150,7 @@ public class NewTransactionActivity extends AppCompatActivity {
         amt.setHint(R.string.new_transaction_amount_hint);
         amt.setWidth(0);
         amt.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL );
-        amt.setMinWidth(64);
+        amt.setMinWidth(dp2px(40));
         amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
 
         final TableRow row = new TableRow(this);
@@ -104,6 +162,7 @@ public class NewTransactionActivity extends AppCompatActivity {
         acc.requestFocus();
 
         hook_swipe_listener(row);
+        hook_autocompletion_adapter(row);
     }
 
 }