From cc6a17ef5706123b18de154f2e1a98582b30bec7 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 25 Mar 2019 09:28:47 +0100 Subject: [PATCH] fix crash with key buyin in session edit descriptors --- .../android/ui/view/rowrepresentable/SessionRow.kt | 4 ++-- .../pokeranalytics/android/util/extensions/DateExtension.kt | 2 +- .../android/util/extensions/NumbersExtension.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt index c3aca78c..92c431a6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt @@ -160,7 +160,7 @@ enum class SessionRow : RowRepresentable { BUY_IN -> { val bb: Double? by map val fee: Double? by map - val buyin: Double? by map + val ratedBuyin: Double? by map val data = arrayListOf() if (bb != null) { data.add(RowRepresentableEditDescriptor(100.0 * (bb?: 0.0))) @@ -173,7 +173,7 @@ enum class SessionRow : RowRepresentable { data.add(RowRepresentableEditDescriptor(0)) } - data.add(RowRepresentableEditDescriptor(buyin)) + data.add(RowRepresentableEditDescriptor(ratedBuyin)) data.add( RowRepresentableEditDescriptor( "", diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt index d24c1712..6ef27c60 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt @@ -91,7 +91,7 @@ fun Date.getFormattedDuration(toDate: Date) : String { val hours = (difference / (1000 * 60 * 60)) val minutes = (difference / (1000 * 60)) % 60 - val hoursStr = if (hours < 10) "0$hours" else "$hours" + val hoursStr = "$hours" val minutesStr = if (minutes < 10) "0$minutes" else "$minutes" return "$hoursStr:$minutesStr" diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt index d98df6b0..77287988 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt @@ -41,7 +41,7 @@ fun Long.toMinutes() : String { val hours = totalMinutes / 60 val minutesLeft = totalMinutes % 60 var duration = "" - duration += if (hours < 10) "0$hours" else hours.toString() + duration += hours.toString() duration += ":" duration += if (minutesLeft < 10) "0$minutesLeft" else minutesLeft.toString() return duration