From 21816430f5a2ccba039eef14fa36b167ed10fb82 Mon Sep 17 00:00:00 2001 From: "h.malik144@gmail.com" Date: Thu, 31 Aug 2023 20:03:39 +0100 Subject: [PATCH] - mid commit --- .../java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt | 3 ++- .../main/java/com/appttude/h_mal/farmr/utils/Formatting.kt | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt b/app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt index e7dbeed..588dac0 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt @@ -14,6 +14,7 @@ import com.appttude.h_mal.farmr.base.BaseRecyclerAdapter import com.appttude.h_mal.farmr.data.legacydb.ShiftObject import com.appttude.h_mal.farmr.model.ShiftType import com.appttude.h_mal.farmr.utils.ID +import com.appttude.h_mal.farmr.utils.formatToTwoDp import com.appttude.h_mal.farmr.utils.generateView import com.appttude.h_mal.farmr.utils.navigateTo import com.appttude.h_mal.farmr.utils.navigateToFragment @@ -48,7 +49,7 @@ class ShiftListAdapter( val typeText: String = data.type val descriptionText: String = data.description val dateText: String = data.date - val totalPayText: String = data.totalPay.toString() + val totalPayText: String = data.totalPay.formatToTwoDp().toString() descriptionTextView.text = descriptionText dateTextView.text = dateText diff --git a/app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt b/app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt index 5b007e1..3e77c47 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt @@ -8,9 +8,8 @@ import java.util.Currency import java.util.Date import java.util.Locale -fun String.formatToTwoDp(): Float { - val formattedString = String.format("%.2f", this) - return formattedString.toFloat() +fun String.formatToTwoDp(): String { + return String.format("%.2f", this) } fun Float.formatToTwoDp(): Float { @@ -27,7 +26,7 @@ fun Float.formatAsCurrencyString(): String? { } fun Float.formatToTwoDpString(): String { - return formatToTwoDp().toString() + return String.format("%.2f", this) } fun String.dateStringIsValid(): Boolean {