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=0414f0d8191dbef98994805f2446d7b5980f68d4;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hpb=986a0ed61bded7c0a4aba82b6f9f372023d3d3aa 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 0414f0d8..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,60 +19,97 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; +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.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.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<>()); - private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); - public static MutableLiveData backgroundTasksRunning = new MutableLiveData<>(false); - public static MutableLiveData lastUpdateDate = new MutableLiveData<>(); - public static ObservableValue profile = new ObservableValue<>(); - public static ObservableList profiles = - new ObservableList<>(new ArrayList<>()); - public static ObservableValue optShowOnlyStarred = new ObservableValue<>(); - public static MutableLiveData accountFilter = new MutableLiveData<>(); + 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 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(); - Log.d("data", String.format("background task count is %d after incrementing", cnt)); + debug("data", + String.format(Locale.ENGLISH, "background task count is %d after incrementing", + cnt)); backgroundTasksRunning.postValue(cnt > 0); } public static void backgroundTaskFinished() { int cnt = backgroundTaskCount.decrementAndGet(); - Log.d("data", String.format("background task count is %d after decrementing", cnt)); + debug("data", + String.format(Locale.ENGLISH, "background task count is %d after decrementing", + cnt)); backgroundTasksRunning.postValue(cnt > 0); } - public static void setCurrentProfile(MobileLedgerProfile newProfile) { + public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) { MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); - profile.set(newProfile); + profile.setValue(newProfile); } public static int getProfileIndex(MobileLedgerProfile profile) { - try (LockHolder lh = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); - if (p.equals(profile)) return i; + 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 lh = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); - if (p.getUuid().equals(profileUUID)) return i; + 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; @@ -80,29 +117,84 @@ 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 = MLDB.getDatabase(); - try (Cursor c = db - .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) + 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); + if (c.moveToNext()) + return c.getInt(0); } return -1; } + @Nullable public static MobileLedgerProfile getProfile(String profileUUID) { MobileLedgerProfile profile; - if (profiles.isEmpty()) { - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); - } - else { - try (LockHolder lh = profiles.lockForReading()) { + 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 = profiles.get(i); + 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(); + 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'); + } + 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); + } + + 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); + return startupProfile; + } + + public static void removeProfileObservers(LifecycleOwner owner) { + profile.removeObservers(owner); + } +} \ No newline at end of file