From f229eac421b959454409c77eaf8328302cb4c78b Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 10 Jun 2022 09:49:54 +0530 Subject: [PATCH] Use device locale's separator by default --- .../kotlin/com/simplemobiletools/calculator/helpers/Config.kt | 2 +- .../calculator/helpers/NumberFormatHelper.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Config.kt index 004a3863..a5e47c8b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Config.kt @@ -9,6 +9,6 @@ class Config(context: Context) : BaseConfig(context) { } var useCommaAsDecimalMark: Boolean - get() = prefs.getBoolean(USE_COMMA_AS_DECIMAL_MARK, false) + get() = prefs.getBoolean(USE_COMMA_AS_DECIMAL_MARK, getDecimalSeparator() == COMMA) set(useCommaAsDecimalMark) = prefs.edit().putBoolean(USE_COMMA_AS_DECIMAL_MARK, useCommaAsDecimalMark).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/NumberFormatHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/NumberFormatHelper.kt index eb8d3e9f..32eb8be1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/NumberFormatHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/NumberFormatHelper.kt @@ -29,3 +29,7 @@ class NumberFormatHelper( return str.replace(groupingSeparator, "").replace(decimalSeparator, DOT) } } + +fun getDecimalSeparator(): String { + return DecimalFormatSymbols.getInstance().decimalSeparator.toString() +}