From 5dfb0082614a796717ff2fb6429e93ce3c755f7a Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 4 Jul 2019 11:18:59 +0200 Subject: [PATCH] Clean code --- .../android/model/realm/Player.kt | 10 -------- .../ui/fragment/data/PlayerDataFragment.kt | 22 ------------------ .../ui/view/rowrepresentable/PlayerRow.kt | 23 ------------------- 3 files changed, 55 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index 54ae9faa..608a625c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -72,16 +72,6 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent } } - //TODO:Aurel - /* - override fun editDescriptors(row: RowRepresentable): ArrayList? { - return when (row) { - SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.name)) - else -> null - } - } - */ - override fun updateValue(value: Any?, row: RowRepresentable) { when (row) { PlayerRow.NAME -> this.name = value as String? ?: "" diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt index 518f200b..8f9dc49c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt @@ -15,7 +15,6 @@ import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.rowrepresentable.PlayerRow import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow import net.pokeranalytics.android.util.NULL_TEXT -import timber.log.Timber import java.io.File /** @@ -80,30 +79,9 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou } } - //TODO:Aurel - /* - override fun editDescriptors(row: RowRepresentable): ArrayList? { - return when (row) { - SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.player.name)) - PlayerRow.SUMMARY -> row.editingDescriptors(mapOf("defaultValue" to this.player.summary)) - else -> null - } - } - */ - override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { - Timber.d("onRowSelected") when (row) { PlayerRow.IMAGE -> openPictureDialog() - /* - PlayerRow.SUMMARY -> { - /* - val data = editDescriptors(row) - InputFragment.buildAndShow(fragmentManager, row, this, data, isClearable = false, isDeletable = true) - */ - } - PlayerRow.NAME -> super.onRowSelected(position, row, fromAction) - */ else -> super.onRowSelected(position, row, fromAction) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerRow.kt index ea3960d7..2dfd7629 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/PlayerRow.kt @@ -60,27 +60,4 @@ enum class PlayerRow : RowRepresentable { InputFragment.buildAndShow(this, parent, data) } - - - //TODO:Aurel - /* - override fun editingDescriptors(map: Map): ArrayList? { - return when (this) { - SUMMARY -> { - val defaultValue: String? by map - arrayListOf(RowRepresentableEditDescriptor(defaultValue, R.string.summary)) - } - else -> super.editingDescriptors(map) - } - } - - override val bottomSheetType: BottomSheetType - get() { - return when (this) { - SUMMARY -> BottomSheetType.EDIT_TEXT_MULTI_LINES - else -> BottomSheetType.NONE - } - } - */ - } \ No newline at end of file