Solving conflict

feature/top10
Laurent 7 years ago
parent dd9b1c9434
commit ffadfef143
  1. 6
      app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt

@ -117,12 +117,8 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
return when (row) { return when (row) {
SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.bankroll.name)) SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.bankroll.name))
BankrollRow.RATE -> { BankrollRow.RATE -> {
val rate = this.bankroll.currency?.rate ?: 1.0
this.bankroll.currency?.rate?.let { rate ->
row.editingDescriptors(mapOf("defaultValue" to rate.toRate())) row.editingDescriptors(mapOf("defaultValue" to rate.toRate()))
} ?: run {
row.editingDescriptors(mapOf())
}
} }
else -> null else -> null
} }

Loading…
Cancel
Save