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=91a3e6d663881474bbe6231ad0564b063226e380;hp=c0f4cebaf81c7491185fd6cc7fbd2657727904e7;hb=HEAD;hpb=65a96105664ccb11f4332e2ddde5758befc7e498 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 c0f4ceba..91a3e6d6 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -17,31 +17,27 @@ package net.ktnx.mobileledger.model; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; - -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; -import net.ktnx.mobileledger.utils.LockHolder; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.utils.Locker; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; -import net.ktnx.mobileledger.utils.ObservableValue; +import org.jetbrains.annotations.NotNull; + +import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.text.ParseException; import java.text.ParsePosition; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -51,8 +47,9 @@ public final class Data { new MutableLiveData<>(false); public static final MutableLiveData backgroundTaskProgress = new MutableLiveData<>(); - public static final MutableLiveData> profiles = - new MutableLiveData<>(null); + public static final LiveData> profiles = DB.get() + .getProfileDAO() + .getAllOrdered(); public static final MutableLiveData currencySymbolPosition = new MutableLiveData<>(); public static final MutableLiveData currencyGap = new MutableLiveData<>(true); @@ -62,22 +59,27 @@ public final class Data { public static final MutableLiveData lastUpdateTransactionCount = new MutableLiveData<>(0); public static final MutableLiveData lastUpdateAccountCount = new MutableLiveData<>(0); - public static final ObservableValue lastTransactionsUpdateText = - new ObservableValue<>(); - public static final ObservableValue lastAccountsUpdateText = new ObservableValue<>(); - private static final MutableLiveData profile = - new InertMutableLiveData<>(); + public static final MutableLiveData lastTransactionsUpdateText = + new MutableLiveData<>(); + public static final MutableLiveData lastAccountsUpdateText = new MutableLiveData<>(); + public static final String decimalDot = "."; + + private static final MutableLiveData profile = new MutableLiveData<>(); private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); private static final Locker profilesLocker = new Locker(); private static NumberFormat numberFormatter; + private static String decimalSeparator = ""; static { locale.setValue(Locale.getDefault()); } - @NonNull - public static MobileLedgerProfile getProfile() { - return Objects.requireNonNull(profile.getValue()); + public static String getDecimalSeparator() { + return decimalSeparator; + } + @Nullable + public static Profile getProfile() { + return profile.getValue(); } public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); @@ -93,79 +95,12 @@ public final class Data { cnt)); backgroundTasksRunning.postValue(cnt > 0); } - public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) { - MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); + public static void setCurrentProfile(Profile newProfile) { profile.setValue(newProfile); } - public static void postCurrentProfile(@NonNull MobileLedgerProfile newProfile) { - MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); + public static void postCurrentProfile(Profile newProfile) { profile.postValue(newProfile); } - public static int getProfileIndex(MobileLedgerProfile profile) { - try (LockHolder ignored = profilesLocker.lockForReading()) { - List prList = profiles.getValue(); - 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; - } - - return -1; - } - } - @SuppressWarnings("WeakerAccess") - public static int getProfileIndex(String profileUUID) { - try (LockHolder ignored = profilesLocker.lockForReading()) { - List 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)) - return i; - } - - return -1; - } - } - public static int retrieveCurrentThemeIdFromDb() { - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - if (profileUUID == null) - return -1; - - SQLiteDatabase db = App.getDatabase(); - try (Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?", - new String[]{profileUUID})) - { - if (c.moveToNext()) - return c.getInt(0); - } - - return -1; - } - @Nullable - public static MobileLedgerProfile getProfile(String profileUUID) { - MobileLedgerProfile profile; - try (LockHolder readLock = profilesLocker.lockForReading()) { - List prList = profiles.getValue(); - if ((prList == null) || prList.isEmpty()) { - readLock.close(); - try (LockHolder ignored = profilesLocker.lockForWriting()) { - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); - } - } - else { - int i = getProfileIndex(profileUUID); - if (i == -1) - i = 0; - profile = prList.get(i); - } - } - return profile; - } public static void refreshCurrencyData(Locale locale) { NumberFormat formatter = NumberFormat.getCurrencyInstance(locale); java.util.Currency currency = formatter.getCurrency(); @@ -196,36 +131,26 @@ public final class Data { NumberFormat newNumberFormatter = NumberFormat.getNumberInstance(); newNumberFormatter.setParseIntegerOnly(false); newNumberFormatter.setGroupingUsed(true); - newNumberFormatter.setGroupingUsed(true); newNumberFormatter.setMinimumIntegerDigits(1); newNumberFormatter.setMinimumFractionDigits(2); numberFormatter = newNumberFormatter; + + decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance(locale) + .getMonetaryDecimalSeparator()); } + @NotNull public static String formatCurrency(float number) { NumberFormat formatter = NumberFormat.getCurrencyInstance(locale.getValue()); return formatter.format(number); } + @NotNull public static String formatNumber(float number) { return numberFormatter.format(number); } - public static void observeProfile(LifecycleOwner lifecycleOwner, - Observer observer) { + public static void observeProfile(LifecycleOwner lifecycleOwner, Observer observer) { profile.observe(lifecycleOwner, observer); } - public synchronized static MobileLedgerProfile initProfile() { - MobileLedgerProfile currentProfile = profile.getValue(); - if (currentProfile != null) - return currentProfile; - - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - MobileLedgerProfile startupProfile = getProfile(profileUUID); - if (startupProfile != null) - setCurrentProfile(startupProfile); - Logger.debug("profile", "initProfile() returning " + startupProfile); - return startupProfile; - } - public static void removeProfileObservers(LifecycleOwner owner) { profile.removeObservers(owner); }