X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=0bdbb1a229faa104af945fdab812ba4ad078ec45;hp=7687d237f2279da693d04d27a2448b0e02139b8d;hb=ee9dd748619dfc797517e25ac74e43ee6234067c;hpb=f397735f4ef56cc287e3345d23eac91909e3e2f3

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
index 7687d237..0bdbb1a2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -21,6 +21,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 
+import androidx.lifecycle.MutableLiveData;
+
 import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
@@ -29,17 +31,15 @@ import net.ktnx.mobileledger.utils.Locker;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.ObservableList;
-import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.lang.ref.WeakReference;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import androidx.lifecycle.MutableLiveData;
-
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public final class Data {
@@ -51,8 +51,11 @@ public final class Data {
     public static MutableLiveData<MobileLedgerProfile> profile = new MutableLiveData<>();
     public static MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
             new MutableLiveData<>(null);
-    public static ObservableValue<Boolean> optShowOnlyStarred = new ObservableValue<>();
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
+    public static MutableLiveData<Currency.Position> currencySymbolPosition =
+            new MutableLiveData<>();
+    public static MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
+    public static MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
     private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static Locker profilesLocker = new Locker();
     private static RetrieveTransactionsTask retrieveTransactionsTask;
@@ -71,17 +74,19 @@ public final class Data {
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+        MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid());
         stopTransactionsRetrieval();
-        profile.postValue(newProfile);
+        profile.setValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            if (prList == null)
+                throw new AssertionError();
             for (int i = 0; i < prList.size(); i++) {
                 MobileLedgerProfile p = prList.get(i);
-                if (p.equals(profile)) return i;
+                if (p.equals(profile))
+                    return i;
             }
 
             return -1;
@@ -91,10 +96,13 @@ public final class Data {
     public static int getProfileIndex(String profileUUID) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            if (prList == null)
+                throw new AssertionError();
             for (int i = 0; i < prList.size(); i++) {
                 MobileLedgerProfile p = prList.get(i);
-                if (p.getUuid().equals(profileUUID)) return i;
+                if (p.getUuid()
+                     .equals(profileUUID))
+                    return i;
             }
 
             return -1;
@@ -102,13 +110,15 @@ public final class Data {
     }
     public static int retrieveCurrentThemeIdFromDb() {
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        if (profileUUID == null) return -1;
+        if (profileUUID == null)
+            return -1;
 
         SQLiteDatabase db = App.getDatabase();
-        try (Cursor c = db
-                .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID}))
+        try (Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?",
+                new String[]{profileUUID}))
         {
-            if (c.moveToNext()) return c.getInt(0);
+            if (c.moveToNext())
+                return c.getInt(0);
         }
 
         return -1;
@@ -125,7 +135,8 @@ public final class Data {
             }
             else {
                 int i = getProfileIndex(profileUUID);
-                if (i == -1) i = 0;
+                if (i == -1)
+                    i = 0;
                 profile = prList.get(i);
             }
         }
@@ -136,6 +147,12 @@ public final class Data {
             Logger.debug("db", "Ignoring request for transaction retrieval - already active");
             return;
         }
+        MobileLedgerProfile pr = profile.getValue();
+        if (pr == null) {
+            Logger.debug("ui", "Ignoring refresh -- no current profile");
+            return;
+        }
+
         retrieveTransactionsTask =
                 new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());
         Logger.debug("db", "Created a background transaction retrieval task");
@@ -143,9 +160,38 @@ public final class Data {
         retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
     public static synchronized void stopTransactionsRetrieval() {
-        if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
+        if (retrieveTransactionsTask != null)
+            retrieveTransactionsTask.cancel(false);
     }
     public static void transactionRetrievalDone() {
         retrieveTransactionsTask = null;
     }
-}
+    public static void refreshCurrencyData(Locale locale) {
+        NumberFormat formatter = NumberFormat.getCurrencyInstance(locale);
+        java.util.Currency currency = formatter.getCurrency();
+        String symbol = currency.getSymbol();
+        Logger.debug("locale", String.format(
+                "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)",
+                locale.toString(), currency.toString(), symbol));
+        String formatted = formatter.format(1234.56f);
+        Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted));
+
+        if (formatted.startsWith(symbol)) {
+            currencySymbolPosition.setValue(Currency.Position.before);
+
+            // is the currency symbol directly followed by the first formatted digit?
+            final char canary = formatted.charAt(symbol.length());
+            currencyGap.setValue(canary != '1');
+        }
+        else if (formatted.endsWith(symbol)) {
+            currencySymbolPosition.setValue(Currency.Position.after);
+
+            // is the currency symbol directly preceded bu the last formatted digit?
+            final char canary = formatted.charAt(formatted.length() - symbol.length() - 1);
+            currencyGap.setValue(canary != '6');
+        }
+        else
+            currencySymbolPosition.setValue(Currency.Position.none);
+    }
+
+}
\ No newline at end of file