From 245d9ce0c608ec210a5a0c65c865069643952104 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Thu, 30 May 2019 15:42:02 +0200 Subject: [PATCH] remove ibm.icu and position related number formatter replaced by a basic implementation using new strings. EN & FR included --- .../components/bottomsheet/BottomSheetSumFragment.kt | 2 +- app/src/main/res/values-fr/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index 0b63c3ee..a672e2c3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -6,13 +6,13 @@ import android.view.LayoutInflater import android.view.View import android.view.inputmethod.EditorInfo import androidx.core.widget.addTextChangedListener -import com.ibm.icu.text.NumberFormat import kotlinx.android.synthetic.main.bottom_sheet_sum.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import net.pokeranalytics.android.R import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException import net.pokeranalytics.android.util.extensions.round import net.pokeranalytics.android.util.extensions.toCurrency +import java.text.NumberFormat class BottomSheetSumFragment : BottomSheetFragment() { diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 33452198..6f35506e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,6 +18,10 @@ À partir de Jusqu\'à + ère + ème + ème + ème Adresse diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 309edcec..a647dc4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,7 +58,10 @@ From To - + st + nd + rd + th