From 3a8407814d025bd7a496fcf7dbea1b8fc67488da Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 10 May 2019 12:32:15 +0200 Subject: [PATCH] Improve custom field values update --- .../java/net/pokeranalytics/android/model/realm/CustomField.kt | 2 ++ .../android/ui/fragment/data/CustomFieldDataFragment.kt | 3 +-- 2 files changed, 3 insertions(+), 2 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 e5ad1468..a082b513 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 @@ -65,6 +65,8 @@ open class CustomField : RealmObject(), Manageable, StaticRowRepresentableDataSo 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.COPY_ON_DUPLICATE -> this.duplicateValue = value as Boolean? ?: false } } 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 b4adce52..403796d5 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 @@ -46,7 +46,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa override fun boolForRow(row: RowRepresentable): Boolean { return when (row) { - CustomFieldRow.COPY_ON_DUPLICATE -> false + CustomFieldRow.COPY_ON_DUPLICATE -> customField.duplicateValue else -> super.boolForRow(row) } } @@ -73,7 +73,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa override fun onRowValueChanged(value: Any?, row: RowRepresentable) { super.onRowValueChanged(value, row) - Timber.d("onRowValueChanged: $row => $value") //rowRepresentableAdapter.refreshRow(row)