From df73f1ed65030f18261383b4a921b9dc51cd5850 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 28 May 2019 12:40:44 +0200
Subject: [PATCH] Fixes + custom field entry formatting

---
 .../java/net/pokeranalytics/android/model/realm/CustomField.kt | 2 +-
 .../net/pokeranalytics/android/model/realm/CustomFieldEntry.kt | 3 ++-
 .../android/ui/fragment/data/CustomFieldDataFragment.kt        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
index 719c3656..94361aa0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
@@ -120,7 +120,7 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
-			CustomFieldRow.TYPE -> this.type = (value as Type?)?.ordinal ?: Type.LIST.ordinal
+			CustomFieldRow.TYPE -> this.type = (value as Type?)?.uniqueIdentifier ?: Type.LIST.uniqueIdentifier
 			CustomFieldRow.COPY_ON_DUPLICATE -> this.duplicateValue = value as Boolean? ?: false
 		}
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
index 91244e50..f6703266 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
@@ -20,6 +20,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.extensions.toCurrency
+import java.text.NumberFormat
 import java.util.*
 import java.util.Currency
 
@@ -136,7 +137,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
                 numericValue?.toCurrency(currency) ?: run { NULL_TEXT }
 			}
             CustomField.Type.NUMBER.uniqueIdentifier -> {
-                numericValue?.toString() ?: run { NULL_TEXT }
+	            NumberFormat.getInstance().format(this.numericValue)
             }
 			else -> {
 				value
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
index cdb038ae..ce0c32ad 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
@@ -265,7 +265,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 	 * Update UI
 	 */
 	private fun updateUI() {
-		if (customField.type == CustomField.Type.LIST.ordinal) {
+		if (customField.type == CustomField.Type.LIST.uniqueIdentifier) {
 			bottomBar.animate().translationY(0f.px)
 				.setInterpolator(FastOutSlowInInterpolator())
 				.start()