- mid commit

This commit is contained in:
2023-08-31 20:03:39 +01:00
parent 1d0498fe47
commit 21816430f5
2 changed files with 5 additions and 5 deletions

View File

@@ -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.data.legacydb.ShiftObject
import com.appttude.h_mal.farmr.model.ShiftType import com.appttude.h_mal.farmr.model.ShiftType
import com.appttude.h_mal.farmr.utils.ID 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.generateView
import com.appttude.h_mal.farmr.utils.navigateTo import com.appttude.h_mal.farmr.utils.navigateTo
import com.appttude.h_mal.farmr.utils.navigateToFragment import com.appttude.h_mal.farmr.utils.navigateToFragment
@@ -48,7 +49,7 @@ class ShiftListAdapter(
val typeText: String = data.type val typeText: String = data.type
val descriptionText: String = data.description val descriptionText: String = data.description
val dateText: String = data.date val dateText: String = data.date
val totalPayText: String = data.totalPay.toString() val totalPayText: String = data.totalPay.formatToTwoDp().toString()
descriptionTextView.text = descriptionText descriptionTextView.text = descriptionText
dateTextView.text = dateText dateTextView.text = dateText

View File

@@ -8,9 +8,8 @@ import java.util.Currency
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
fun String.formatToTwoDp(): Float { fun String.formatToTwoDp(): String {
val formattedString = String.format("%.2f", this) return String.format("%.2f", this)
return formattedString.toFloat()
} }
fun Float.formatToTwoDp(): Float { fun Float.formatToTwoDp(): Float {
@@ -27,7 +26,7 @@ fun Float.formatAsCurrencyString(): String? {
} }
fun Float.formatToTwoDpString(): String { fun Float.formatToTwoDpString(): String {
return formatToTwoDp().toString() return String.format("%.2f", this)
} }
fun String.dateStringIsValid(): Boolean { fun String.dateStringIsValid(): Boolean {