X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=442f610b469dc016dddf5e64b68c7a4e34059de1;hp=b35579361ea84fed32384b8256f88c5024b28c6b;hb=21b5399a3f4359ee2b8ff1395c2f892dafa8376b;hpb=633b0b0e42f15aaef50ea7201ff9768fa77dfd02

diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
index b3557936..442f610b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -1,18 +1,18 @@
 /*
  * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.utils;
@@ -34,6 +34,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.FilterQueryProvider;
 import android.widget.SimpleCursorAdapter;
 
+import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
 import net.ktnx.mobileledger.model.Data;
 
 import org.jetbrains.annotations.NonNls;
@@ -78,8 +79,8 @@ public final class MLDB {
     public static SQLiteDatabase getWritableDatabase() {
         return getDatabase(WRITE);
     }
-    static public int get_option_value(String name, int default_value) {
-        String s = get_option_value(name, String.valueOf(default_value));
+    static public int getIntOption(String name, int default_value) {
+        String s = getOption(name, String.valueOf(default_value));
         try {
             return Integer.parseInt(s);
         }
@@ -88,8 +89,8 @@ public final class MLDB {
             return default_value;
         }
     }
-    static public long get_option_value(String name, long default_value) {
-        String s = get_option_value(name, String.valueOf(default_value));
+    static public long getLongOption(String name, long default_value) {
+        String s = getOption(name, String.valueOf(default_value));
         try {
             return Long.parseLong(s);
         }
@@ -98,7 +99,7 @@ public final class MLDB {
             return default_value;
         }
     }
-    static public String get_option_value(String name, String default_value) {
+    static public String getOption(String name, String default_value) {
         Log.d("db", "about to fetch option " + name);
         SQLiteDatabase db = getReadableDatabase();
         try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
@@ -119,27 +120,29 @@ public final class MLDB {
             return default_value;
         }
     }
-    static public void set_option_value(String name, String value) {
+    static public void setOption(String name, String value) {
         Log.d("option", String.format("%s := %s", name, value));
         SQLiteDatabase db = MLDB.getWritableDatabase();
         db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
                 new String[]{NO_PROFILE, name, value});
     }
-    static public void set_option_value(String name, long value) {
-        set_option_value(name, String.valueOf(value));
+    static public void setLongOption(String name, long value) {
+        setOption(name, String.valueOf(value));
     }
     @TargetApi(Build.VERSION_CODES.N)
-    public static void hook_autocompletion_adapter(final Context context,
-                                                   final AutoCompleteTextView view,
-                                                   final String table, final String field,
-                                                   final boolean profileSpecific) {
-        hook_autocompletion_adapter(context, view, table, field, profileSpecific, null);
+    public static void hookAutocompletionAdapter(final Context context,
+                                                 final AutoCompleteTextView view,
+                                                 final String table, final String field,
+                                                 final boolean profileSpecific) {
+        hookAutocompletionAdapter(context, view, table, field, profileSpecific, null, null);
     }
     @TargetApi(Build.VERSION_CODES.N)
-    public static void hook_autocompletion_adapter(final Context context,
-                                                   final AutoCompleteTextView view, final String table, final String field,
-                                                   final boolean profileSpecific,
-                                                   final View nextView) {
+    public static void hookAutocompletionAdapter(final Context context,
+                                                 final AutoCompleteTextView view,
+                                                 final String table, final String field,
+                                                 final boolean profileSpecific,
+                                                 final View nextView,
+                                                 final DescriptionSelectedCallback callback) {
         String[] from = {field};
         int[] to = {android.R.id.text1};
         SimpleCursorAdapter adapter =
@@ -198,6 +201,9 @@ public final class MLDB {
         if (nextView != null) {
             view.setOnItemClickListener((parent, itemView, position, id) -> {
                 nextView.requestFocus(View.FOCUS_FORWARD);
+                if (callback != null) {
+                    callback.descriptionSelected(String.valueOf(view.getText()));
+                }
             });
         }
     }
@@ -215,8 +221,8 @@ public final class MLDB {
 }
 
 class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
-    public static final String DB_NAME = "mobile-ledger.db";
-    public static final int LATEST_REVISION = 16;
+    public static final String DB_NAME = "MoLe.db";
+    public static final int LATEST_REVISION = 17;
 
     private final Application mContext;