Implement price formatter

app/src/main/java/com/techchallenge/marketim/ui/orders/OrdersAdapter.kt

@@ -12,7 +12,6 @@ import com.techchallenge.core.util.ext.rotate
 import com.techchallenge.core.util.ext.setDrawable
 import com.techchallenge.core.util.ext.toMonthName
 import com.techchallenge.core.util.ext.use
-import com.techchallenge.core.util.ext.withCurrency
 import com.techchallenge.data.ResponseViewItem
 import com.techchallenge.marketim.R
 import com.techchallenge.marketim.databinding.ViewOrdersLayoutBinding
@@ -41,11 +40,11 @@ class OrdersAdapter : DelegateAdapter {
                     tvMonth.text = month.toMonthName()
                     tvMarketName.text = marketName
                     tvOrderName.text = orderName
-                    tvPrice.text = productPrice.withCurrency()
+                    tvPrice.text = productPrice
                     tvStatusText.text = productState.type
                     ivStatus.setDrawable(productState.color)
                     tvDetail.text = productDetailRawViewItem.orderDetail
-                    tvDetailPrice.text = productDetailRawViewItem.summaryPrice.withCurrency()
+                    tvDetailPrice.text = productDetailRawViewItem.summaryPrice
 
                     ivExpandCollapseArrow.setOnClickListener {
                         setIsExpanded(getIsExpanded().not())

app/src/main/res/layout/view_orders_layout.xml

@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/tvDate"
-        android:layout_width="100dp"
+        android:layout_width="96dp"
         android:layout_height="wrap_content"
         android:fontFamily="@font/google_sans"
         android:gravity="center"

core/src/main/java/com/techchallenge/core/CoreModule.kt

@@ -6,6 +6,8 @@ import com.techchallenge.core.util.executors.MarketimComputationThread
 import com.techchallenge.core.util.executors.MarketimExecutionThread
 import com.techchallenge.core.util.executors.MarketimPostExecutionThread
 import com.techchallenge.core.util.executors.PostExecutionThread
+import com.techchallenge.core.util.price.MarketPriceFormatter
+import com.techchallenge.core.util.price.PriceFormatter
 import com.techchallenge.core.util.validator.PasswordValidator
 import com.techchallenge.core.util.validator.UsernameValidator
 import com.techchallenge.core.util.validator.Validator
@@ -32,12 +34,18 @@ abstract class CoreModule {
     @Binds
     @Singleton
     @Named(USERNAME)
-    internal abstract fun provideUsernameValidator(usernameValidator: UsernameValidator): Validator<String>
+    internal abstract fun provideUsernameValidator(usernameValidator: UsernameValidator):
+            Validator<String>
 
     @Binds
     @Singleton
     @Named(PASSWORD)
-    internal abstract fun providePasswordValidator(passwordValidator: PasswordValidator): Validator<String>
+    internal abstract fun providePasswordValidator(passwordValidator: PasswordValidator):
+            Validator<String>
+
+    @Binds
+    @Singleton
+    abstract fun providePriceFormatter(marketPriceFormatter: MarketPriceFormatter): PriceFormatter
 
     companion object {
         const val USERNAME = "UsernameValidator"

core/src/main/java/com/techchallenge/core/util/ext/String.kt

@@ -4,8 +4,10 @@ import org.threeten.bp.Month
 import org.threeten.bp.format.TextStyle.FULL_STANDALONE
 import java.util.Locale
 
+private const val NON_NUMERIC_REGEX = "[^0-9.,]"
+
 fun String.toMonthName(): String {
     return Month.of(this.toInt()).getDisplayName(FULL_STANDALONE, Locale.getDefault())
 }
 
-fun String.withCurrency() = "$this TL"
+fun String.removeNonDigitCharacters() = replace(NON_NUMERIC_REGEX.toRegex(), "")

core/src/main/java/com/techchallenge/core/util/price/MarketPriceFormatter.kt

@@ -0,0 +1,27 @@
+package com.techchallenge.core.util.price
+
+import com.techchallenge.core.util.ext.removeNonDigitCharacters
+import javax.inject.Inject
+
+class MarketPriceFormatter @Inject constructor() : PriceFormatter {
+    override fun format(price: Float?): String {
+        return if (price != null) String.format(PATTERN_PRICE, price) else EMPTY
+    }
+
+    override fun format(price: String?): String {
+        val priceOnlyDigits = price?.removeNonDigitCharacters()
+        return if (!priceOnlyDigits.isNullOrEmpty()) {
+            format(priceOnlyDigits.replace(DOT, COMMA).toFloat())
+        } else {
+            EMPTY
+        }
+    }
+
+    companion object {
+        private const val CURRENCY = "TL"
+        private const val PATTERN_PRICE = "%.2f $CURRENCY"
+        private const val EMPTY = ""
+        private const val COMMA = ","
+        private const val DOT = "."
+    }
+}

core/src/main/java/com/techchallenge/core/util/price/PriceFormatter.kt

@@ -0,0 +1,6 @@
+package com.techchallenge.core.util.price
+
+interface PriceFormatter {
+    fun format(price: Float?): String
+    fun format(price: String?): String
+}

data/src/main/java/com/techchallenge/data/MarketimViewItemMapper.kt

@@ -1,23 +1,26 @@
 package com.techchallenge.data
 
 import com.techchallenge.core.util.mapper.Mapper
+import com.techchallenge.core.util.price.PriceFormatter
 import com.techchallenge.data.ProductState.INVALID
 import javax.inject.Inject
 
-class MarketimViewItemMapper @Inject constructor() : Mapper<Response, ResponseViewItem> {
+class MarketimViewItemMapper @Inject constructor(
+    private val priceFormatter: PriceFormatter
+) : Mapper<Response, ResponseViewItem> {
 
     override fun invoke(input: Response) = with(input) {
         val productDetailViewItem = ProductDetailRawViewItem(
             productDetail?.orderDetail.toString(),
-            productDetail?.summaryPrice.toString()
+            priceFormatter.format(productDetail?.summaryPrice)
         )
 
         ResponseViewItem(
             date.toString(),
             month.toString(),
             marketName.toString(),
             orderName.toString(),
-            productPrice.toString(),
+            priceFormatter.format(productPrice),
             productState ?: INVALID,
             productDetailViewItem
         )