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=74e274d672d82e78d3d48b6b9975702294bc3283;hp=223a61e8aa7ebe621a2df2b3b051c2d589a31378;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hpb=112fd782066d4eb759a104eaf7116b310e0d47d5 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 223a61e8..74e274d6 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 © 2020 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 @@ -19,43 +19,54 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.os.AsyncTask; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Observer; import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; -import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.LockHolder; 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.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 = + public static final MutableLiveData backgroundTasksRunning = + new MutableLiveData<>(false); + public static final MutableLiveData backgroundTaskProgress = + new MutableLiveData<>(); + public static final MutableLiveData> profiles = new MutableLiveData<>(null); - 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(); - private static RetrieveTransactionsTask retrieveTransactionsTask; + 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); + private static final MutableLiveData profile = + new InertMutableLiveData<>(); + private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); + private static final Locker profilesLocker = new Locker(); + + static { + locale.setValue(Locale.getDefault()); + } + + @NonNull + public static MobileLedgerProfile getProfile() { + return Objects.requireNonNull(profile.getValue()); + } public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -70,18 +81,19 @@ public final class Data { cnt)); backgroundTasksRunning.postValue(cnt > 0); } - public static void setCurrentProfile(MobileLedgerProfile newProfile) { - MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid()); - stopTransactionsRetrieval(); - profile.postValue(newProfile); + public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) { + MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); + profile.setValue(newProfile); } public static int getProfileIndex(MobileLedgerProfile profile) { try (LockHolder ignored = profilesLocker.lockForReading()) { List prList = profiles.getValue(); - if (prList == null) throw new AssertionError(); + 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 +103,13 @@ public final class Data { public static int getProfileIndex(String profileUUID) { try (LockHolder ignored = profilesLocker.lockForReading()) { List prList = profiles.getValue(); - if (prList == null) throw new AssertionError(); + 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,17 +117,20 @@ 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; } + @Nullable public static MobileLedgerProfile getProfile(String profileUUID) { MobileLedgerProfile profile; try (LockHolder readLock = profilesLocker.lockForReading()) { @@ -125,30 +143,58 @@ public final class Data { } else { int i = getProfileIndex(profileUUID); - if (i == -1) i = 0; + if (i == -1) + i = 0; profile = prList.get(i); } } return profile; } - public synchronized static void scheduleTransactionListRetrieval(MainActivity activity) { - if (retrieveTransactionsTask != null) { - Logger.debug("db", "Ignoring request for transaction retrieval - already active"); - return; + 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)); + + 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'); } - MobileLedgerProfile pr = profile.getValue(); - if (pr == null) throw new IllegalStateException("No current profile"); + else if (formatted.endsWith(symbol)) { + currencySymbolPosition.setValue(Currency.Position.after); - retrieveTransactionsTask = - new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue()); - Logger.debug("db", "Created a background transaction retrieval task"); + // 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); + } - retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + public static void observeProfile(LifecycleOwner lifecycleOwner, + Observer observer) { + profile.observe(lifecycleOwner, observer); } - public static synchronized void stopTransactionsRetrieval() { - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + 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); + return startupProfile; } - public static void transactionRetrievalDone() { - retrieveTransactionsTask = null; + + public static void removeProfileObservers(LifecycleOwner owner) { + profile.removeObservers(owner); } -} +} \ No newline at end of file