X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=35f39358c46efa6d0634bea443c6a5bb01501af5;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=5e08297e3752ca9e0576c9e6e9fd0aa6a75332dd;hpb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;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 5e08297e..35f39358 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 © 2019 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 @@ -17,38 +17,61 @@ package net.ktnx.mobileledger.model; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Observer; -import net.ktnx.mobileledger.utils.LockHolder; +import net.ktnx.mobileledger.async.RetrieveTransactionsTask; +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.ObservableList; -import net.ktnx.mobileledger.utils.ObservableValue; -import java.util.ArrayList; +import java.text.NumberFormat; +import java.text.ParseException; +import java.text.ParsePosition; import java.util.Date; +import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; -import androidx.lifecycle.MutableLiveData; - import static net.ktnx.mobileledger.utils.Logger.debug; public final class Data { - public static ObservableList transactions = - new ObservableList<>(new ArrayList<>()); - public static ObservableList accounts = new ObservableList<>(new ArrayList<>()); - public static MutableLiveData backgroundTasksRunning = new MutableLiveData<>(false); - public static MutableLiveData lastUpdateDate = new MutableLiveData<>(); - public static MutableLiveData profile = new MutableLiveData<>(); - public static MutableLiveData> profiles = - new MutableLiveData<>(new ArrayList<>()); - public static ObservableValue optShowOnlyStarred = new ObservableValue<>(); - public static MutableLiveData accountFilter = new MutableLiveData<>(); - private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); - private static Locker profilesLocker = new Locker(); + public static final MutableLiveData backgroundTasksRunning = + new MutableLiveData<>(false); + public static final MutableLiveData backgroundTaskProgress = + new MutableLiveData<>(); + public static final LiveData> profiles = DB.get().getProfileDAO().getAllOrdered(); + public static final MutableLiveData currencySymbolPosition = + new MutableLiveData<>(); + public static final MutableLiveData currencyGap = new MutableLiveData<>(true); + public static final MutableLiveData locale = new MutableLiveData<>(); + public static final MutableLiveData drawerOpen = new MutableLiveData<>(false); + public static final MutableLiveData lastUpdateDate = new MutableLiveData<>(null); + public static final MutableLiveData lastUpdateTransactionCount = + new MutableLiveData<>(0); + public static final MutableLiveData lastUpdateAccountCount = new MutableLiveData<>(0); + public static final MutableLiveData lastTransactionsUpdateText = + new MutableLiveData<>(); + public static final MutableLiveData lastAccountsUpdateText = new MutableLiveData<>(); + private static final MutableLiveData profile = + 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()); + } + + @NonNull + public static Profile getProfile() { + return Objects.requireNonNull(profile.getValue()); + } public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -63,65 +86,68 @@ public final class Data { cnt)); backgroundTasksRunning.postValue(cnt > 0); } - public static void setCurrentProfile(MobileLedgerProfile newProfile) { - MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); + public static void setCurrentProfile(@NonNull Profile newProfile) { + profile.setValue(newProfile); + } + public static void postCurrentProfile(@NonNull Profile newProfile) { profile.postValue(newProfile); } - public static int getProfileIndex(MobileLedgerProfile profile) { - try (LockHolder ignored = profilesLocker.lockForReading()) { - List prList = profiles.getValue(); - assert prList != null; - for (int i = 0; i < prList.size(); i++) { - MobileLedgerProfile p = prList.get(i); - if (p.equals(profile)) return i; - } + public static void refreshCurrencyData(Locale locale) { + NumberFormat formatter = NumberFormat.getCurrencyInstance(locale); + java.util.Currency currency = formatter.getCurrency(); + String symbol = currency != null ? currency.getSymbol() : ""; + Logger.debug("locale", String.format( + "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)", + locale.toString(), currency != null ? currency.toString() : "", symbol)); + String formatted = formatter.format(1234.56f); + Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted)); - return -1; - } - } - @SuppressWarnings("WeakerAccess") - public static int getProfileIndex(String profileUUID) { - try (LockHolder ignored = profilesLocker.lockForReading()) { - List prList = profiles.getValue(); - assert prList != null; - for (int i = 0; i < prList.size(); i++) { - MobileLedgerProfile p = prList.get(i); - if (p.getUuid().equals(profileUUID)) return i; - } + if (formatted.startsWith(symbol)) { + currencySymbolPosition.setValue(Currency.Position.before); - return -1; + // is the currency symbol directly followed by the first formatted digit? + final char canary = formatted.charAt(symbol.length()); + currencyGap.setValue(canary != '1'); } - } - public static int retrieveCurrentThemeIdFromDb() { - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - if (profileUUID == null) return -1; + else if (formatted.endsWith(symbol)) { + currencySymbolPosition.setValue(Currency.Position.after); - SQLiteDatabase db = MLDB.getDatabase(); - try (Cursor c = db - .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) - { - if (c.moveToNext()) return c.getInt(0); + // 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); + + NumberFormat newNumberFormatter = NumberFormat.getNumberInstance(); + newNumberFormatter.setParseIntegerOnly(false); + newNumberFormatter.setGroupingUsed(true); + newNumberFormatter.setGroupingUsed(true); + newNumberFormatter.setMinimumIntegerDigits(1); + newNumberFormatter.setMinimumFractionDigits(2); - return -1; + numberFormatter = newNumberFormatter; } - public static MobileLedgerProfile getProfile(String profileUUID) { - MobileLedgerProfile profile; - try (LockHolder readLock = profilesLocker.lockForReading()) { - List prList = profiles.getValue(); - assert prList != null; - if (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 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 observer) { + profile.observe(lifecycleOwner, observer); + } + 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