X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=1b659ff7d866485d8874b1efcfadafc5d7084186;hb=0fb03702b44e99bef2a5674d96f025595aed4274;hp=0a2efe9fe6e598d6ea410a3d202809f635dbc73b;hpb=93896a91bb9f92a9921f180844871727c60f99fe;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 0a2efe9f..1b659ff7 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -54,6 +54,8 @@ public final class Data {
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
     public static MutableLiveData<Currency.Position> currencySymbolPosition =
             new MutableLiveData<>();
+    public static MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
+    public static MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
     private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static Locker profilesLocker = new Locker();
     private static RetrieveTransactionsTask retrieveTransactionsTask;
@@ -171,10 +173,21 @@ public final class Data {
                 locale.toString(), currency.toString(), symbol));
         String formatted = formatter.format(1234.56f);
         Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted));
-        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);
     }