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=91a3e6d663881474bbe6231ad0564b063226e380;hp=c14bc3f15c3bdd122aee8cbb45ec066b7015aa3d;hb=HEAD;hpb=f5d585d79f8c263476c8fb78ada15f04472d9a91

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 c14bc3f1..91a3e6d6 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -17,7 +17,6 @@
 
 package net.ktnx.mobileledger.model;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
@@ -30,6 +29,9 @@ import net.ktnx.mobileledger.db.Profile;
 import net.ktnx.mobileledger.utils.Locker;
 import net.ktnx.mobileledger.utils.Logger;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -60,15 +62,21 @@ public final class Data {
     public static final MutableLiveData<String> lastTransactionsUpdateText =
             new MutableLiveData<>();
     public static final MutableLiveData<String> lastAccountsUpdateText = new MutableLiveData<>();
-    private static final MutableLiveData<Profile> profile = new InertMutableLiveData<>();
+    public static final String decimalDot = ".";
+
+    private static final MutableLiveData<Profile> profile = new MutableLiveData<>();
     private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static final Locker profilesLocker = new Locker();
     private static NumberFormat numberFormatter;
+    private static String decimalSeparator = "";
 
     static {
         locale.setValue(Locale.getDefault());
     }
 
+    public static String getDecimalSeparator() {
+        return decimalSeparator;
+    }
     @Nullable
     public static Profile getProfile() {
         return profile.getValue();
@@ -87,10 +95,10 @@ public final class Data {
                         cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
-    public static void setCurrentProfile(@NonNull Profile newProfile) {
+    public static void setCurrentProfile(Profile newProfile) {
         profile.setValue(newProfile);
     }
-    public static void postCurrentProfile(@NonNull Profile newProfile) {
+    public static void postCurrentProfile(Profile newProfile) {
         profile.postValue(newProfile);
     }
     public static void refreshCurrencyData(Locale locale) {
@@ -123,16 +131,20 @@ public final class Data {
         NumberFormat newNumberFormatter = NumberFormat.getNumberInstance();
         newNumberFormatter.setParseIntegerOnly(false);
         newNumberFormatter.setGroupingUsed(true);
-        newNumberFormatter.setGroupingUsed(true);
         newNumberFormatter.setMinimumIntegerDigits(1);
         newNumberFormatter.setMinimumFractionDigits(2);
 
         numberFormatter = newNumberFormatter;
+
+        decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance(locale)
+                                                              .getMonetaryDecimalSeparator());
     }
+    @NotNull
     public static String formatCurrency(float number) {
         NumberFormat formatter = NumberFormat.getCurrencyInstance(locale.getValue());
         return formatter.format(number);
     }
+    @NotNull
     public static String formatNumber(float number) {
         return numberFormatter.format(number);
     }