X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=a6d3fd9825dd4ce69e59712d1654986132d3ee9e;hb=d08ab8235d0fd152c772b2dd5ffa1ca5747f67b1;hp=2cc401980815d250341e3a1da65378c9c196c998;hpb=208de18485b4706d133ba820101ccf04ad20e947;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 2cc40198..a6d3fd98 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 @@ -31,6 +31,7 @@ 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.SimpleDate; import java.lang.ref.WeakReference; import java.text.NumberFormat; @@ -43,20 +44,28 @@ import java.util.concurrent.atomic.AtomicInteger; import static net.ktnx.mobileledger.utils.Logger.debug; public final class Data { - public static ObservableList transactions = + public static final 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 earliestTransactionDate = new MutableLiveData<>(null); - public static MutableLiveData accountFilter = new MutableLiveData<>(); - public static MutableLiveData currencySymbolPosition = + public static final MutableLiveData latestTransactionDate = + new MutableLiveData<>(null); + public static final MutableLiveData backgroundTasksRunning = + new MutableLiveData<>(false); + public static final MutableLiveData lastUpdateDate = new MutableLiveData<>(); + public static final MutableLiveData profile = new InertMutableLiveData<>(); + public static final MutableLiveData> profiles = + new MutableLiveData<>(null); + public static final MutableLiveData accountFilter = new MutableLiveData<>(); + public static final MutableLiveData currencySymbolPosition = new MutableLiveData<>(); - private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); - private static Locker profilesLocker = new Locker(); + public static final MutableLiveData currencyGap = new MutableLiveData<>(true); + public static final MutableLiveData locale = new MutableLiveData<>(Locale.getDefault()); + private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); + private static final Locker profilesLocker = new Locker(); + public static MutableLiveData foundTransactionItemIndex = new MutableLiveData<>(null); private static RetrieveTransactionsTask retrieveTransactionsTask; + public static final MutableLiveData drawerOpen = new MutableLiveData<>(false); public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -74,15 +83,17 @@ public final class Data { public static void setCurrentProfile(MobileLedgerProfile newProfile) { MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid()); stopTransactionsRetrieval(); - profile.postValue(newProfile); + 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; @@ -92,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; @@ -103,13 +117,15 @@ 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; @@ -126,7 +142,8 @@ public final class Data { } else { int i = getProfileIndex(profileUUID); - if (i == -1) i = 0; + if (i == -1) + i = 0; profile = prList.get(i); } } @@ -138,7 +155,10 @@ public final class Data { return; } MobileLedgerProfile pr = profile.getValue(); - if (pr == null) throw new IllegalStateException("No current profile"); + if (pr == null) { + Logger.debug("ui", "Ignoring refresh -- no current profile"); + return; + } retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue()); @@ -147,7 +167,8 @@ public final class Data { retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } public static synchronized void stopTransactionsRetrieval() { - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + if (retrieveTransactionsTask != null) + retrieveTransactionsTask.cancel(false); } public static void transactionRetrievalDone() { retrieveTransactionsTask = null; @@ -155,16 +176,27 @@ public final class Data { public static void refreshCurrencyData(Locale locale) { NumberFormat formatter = NumberFormat.getCurrencyInstance(locale); java.util.Currency currency = formatter.getCurrency(); - Logger.debug("locale", - String.format("Discovering currency symbol position for locale %s (currency is %s)", - locale.toString(), currency.toString())); + String symbol = currency.getSymbol(); + Logger.debug("locale", String.format( + "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)", + locale.toString(), currency.toString(), symbol)); String formatted = formatter.format(1234.56f); Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted)); - String symbol = currency.getSymbol(); - if (formatted.startsWith(symbol)) + + if (formatted.startsWith(symbol)) { currencySymbolPosition.setValue(Currency.Position.before); - else if (formatted.endsWith(symbol)) + + // 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); }