X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=3520711bff846952c7c2c6bc61b73cdb706fb730;hb=93545c6fbf1244fbd96ecfc50e1115dbdc25f9ae;hp=4d0e52a57eb2ecc09ff2fb8f34b097bf206f858b;hpb=6790483dc667a4a44f2c47a3cb61a8c952aa038b;p=mobile-ledger.git

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 4d0e52a5..3520711b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * 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
@@ -35,6 +35,8 @@ import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -67,6 +69,7 @@ public final class Data {
             new InertMutableLiveData<>();
     private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static final Locker profilesLocker = new Locker();
+    private static NumberFormat numberFormatter;
 
     static {
         locale.setValue(Locale.getDefault());
@@ -91,11 +94,11 @@ public final class Data {
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+        MLDB.setLongOption(MLDB.OPT_PROFILE_ID, newProfile.getId());
         profile.setValue(newProfile);
     }
     public static void postCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+        MLDB.setLongOption(MLDB.OPT_PROFILE_ID, newProfile.getId());
         profile.postValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
@@ -113,15 +116,14 @@ public final class Data {
         }
     }
     @SuppressWarnings("WeakerAccess")
-    public static int getProfileIndex(String profileUUID) {
+    public static int getProfileIndex(long profileId) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
             if (prList == null)
                 throw new AssertionError();
             for (int i = 0; i < prList.size(); i++) {
                 MobileLedgerProfile p = prList.get(i);
-                if (p.getUuid()
-                     .equals(profileUUID))
+                if (p.getId() == profileId)
                     return i;
             }
 
@@ -129,13 +131,13 @@ public final class Data {
         }
     }
     public static int retrieveCurrentThemeIdFromDb() {
-        String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        if (profileUUID == null)
+        long profileId = MLDB.getLongOption(MLDB.OPT_PROFILE_ID, 0);
+        if (profileId == 0)
             return -1;
 
         SQLiteDatabase db = App.getDatabase();
         try (Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?",
-                new String[]{profileUUID}))
+                new String[]{String.valueOf(profileId)}))
         {
             if (c.moveToNext())
                 return c.getInt(0);
@@ -144,18 +146,18 @@ public final class Data {
         return -1;
     }
     @Nullable
-    public static MobileLedgerProfile getProfile(String profileUUID) {
+    public static MobileLedgerProfile getProfile(long profileId) {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
             if ((prList == null) || prList.isEmpty()) {
                 readLock.close();
                 try (LockHolder ignored = profilesLocker.lockForWriting()) {
-                    profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+                    profile = MobileLedgerProfile.loadAllFromDB(profileId);
                 }
             }
             else {
-                int i = getProfileIndex(profileUUID);
+                int i = getProfileIndex(profileId);
                 if (i == -1)
                     i = 0;
                 profile = prList.get(i);
@@ -189,11 +191,23 @@ public final class Data {
         }
         else
             currencySymbolPosition.setValue(Currency.Position.none);
+
+        NumberFormat newNumberFormatter = NumberFormat.getNumberInstance();
+        newNumberFormatter.setParseIntegerOnly(false);
+        newNumberFormatter.setGroupingUsed(true);
+        newNumberFormatter.setGroupingUsed(true);
+        newNumberFormatter.setMinimumIntegerDigits(1);
+        newNumberFormatter.setMinimumFractionDigits(2);
+
+        numberFormatter = newNumberFormatter;
     }
-    public static String formatNumber(float number) {
+    public static String formatCurrency(float number) {
         NumberFormat formatter = NumberFormat.getCurrencyInstance(locale.getValue());
         return formatter.format(number);
     }
+    public static String formatNumber(float number) {
+        return numberFormatter.format(number);
+    }
     public static void observeProfile(LifecycleOwner lifecycleOwner,
                                       Observer<MobileLedgerProfile> observer) {
         profile.observe(lifecycleOwner, observer);
@@ -203,8 +217,8 @@ public final class Data {
         if (currentProfile != null)
             return currentProfile;
 
-        String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        MobileLedgerProfile startupProfile = getProfile(profileUUID);
+        long profileId = MLDB.getLongOption(MLDB.OPT_PROFILE_ID, 0);
+        MobileLedgerProfile startupProfile = getProfile(profileId);
         if (startupProfile != null)
             setCurrentProfile(startupProfile);
         Logger.debug("profile", "initProfile() returning " + startupProfile);
@@ -214,4 +228,12 @@ public final class Data {
     public static void removeProfileObservers(LifecycleOwner owner) {
         profile.removeObservers(owner);
     }
+    public static float parseNumber(String str) throws ParseException {
+        ParsePosition pos = new ParsePosition(0);
+        Number parsed = numberFormatter.parse(str);
+        if (parsed == null || pos.getErrorIndex() > -1)
+            throw new ParseException("Error parsing '" + str + "'", pos.getErrorIndex());
+
+        return parsed.floatValue();
+    }
 }
\ No newline at end of file