Merge pull request #592 from MadridSquad/refactor/review-format

refactor : review format in series

Author: ahmedhgabr

presentation/src/main/java/com/madrid/presentation/screens/detailsScreen/reviewsScreen/ReviewScreen.kt

@@ -24,6 +24,7 @@ import com.madrid.presentation.navigation.LocalNavController
 import com.madrid.presentation.screens.detailsScreen.reviewsScreen.composables.ReviewCard
 import com.madrid.presentation.viewModel.detailsViewModel.review.ReviewsScreenUiState
 import com.madrid.presentation.viewModel.detailsViewModel.review.ReviewsScreenViewModel
+import com.madrid.presentation.viewModel.shared.parser.formatDate
 
 @Composable
 fun ReviewsScreen(viewModel: ReviewsScreenViewModel = hiltViewModel()) {
@@ -67,7 +68,7 @@ fun ReviewsScreenContent(
                         reviewerName = review.reviewerName,
                         reviewerImageUrl = review.reviewerImageUrl.toString(),
                         rating = review.rating,
-                        date = review.date,
+                        date = formatDate(review.date),
                         content = review.content,
                         modifier = Modifier.fillMaxWidth()
                     )

presentation/src/main/java/com/madrid/presentation/viewModel/detailsViewModel/seriesDetails/SeriesDetailsViewModel.kt

@@ -26,6 +26,8 @@ import com.madrid.presentation.navigation.Destinations
 import com.madrid.presentation.viewModel.base.BaseViewModel
 import com.madrid.presentation.viewModel.detailsViewModel.SeeAllType
 import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetailsUiState
+import com.madrid.presentation.viewModel.detailsViewModel.review.ReviewUiState
+import com.madrid.presentation.viewModel.detailsViewModel.review.toReviewUiState
 import com.madrid.presentation.viewModel.shared.parser.formatDateKotlinx
 import com.madrid.presentation.viewModel.shared.parser.formatRate
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -388,13 +390,12 @@ class SeriesDetailsViewModel @Inject constructor(
         }
     }
 
-    private fun onSuccessLoadReviews(reviews: List<Review>) {
-        updateState {
-            it.copy(
-                reviews = reviews.map { review -> review.toUiState() },
-                seeAllType = SeeAllType.Review
-            )
+    private fun onSuccessLoadReviews(domainReviews: List<Review>) {
+
+        updateState { currentState -> currentState.copy(reviews = domainReviews.map { review ->
+            review.toReviewUiState() })
         }
+
     }
 
     private fun onSuccessLoadTrailer(trailers: List<Trailer>) {

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/ConvertToArabicDigits.kt

@@ -0,0 +1,11 @@
+package com.madrid.presentation.viewModel.shared.parser
+
+fun convertEnglishDigitsToArabic(englishNumberString: String): String {
+    val arabicDigitsMap = mapOf(
+        '0' to '٠', '1' to '١', '2' to '٢', '3' to '٣', '4' to '٤',
+        '5' to '٥', '6' to '٦', '7' to '٧', '8' to '٨', '9' to '٩'
+    )
+    return englishNumberString.map { char ->
+        arabicDigitsMap[char] ?: char
+    }.joinToString("")
+}

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/DateFormaterForEpisode.kt

@@ -1,6 +1,7 @@
 package com.madrid.presentation.viewModel.shared.parser
 
 import kotlinx.datetime.toLocalDate
+import java.util.Locale
 
 fun String.formatYearKtx(): String = runCatching {
     this.toLocalDate().year.toString()
@@ -10,5 +11,21 @@ fun String.formatFullDateKtx(): String = runCatching {
     val date = this.toLocalDate()
     val monthName = date.month.name.lowercase()
         .replaceFirstChar { it.uppercase() }
+    val language = Locale.getDefault().toLanguageTag()
+    if (language == "ar") {
+        val monthsMap = mapOf(
+            "en" to listOf(
+                "January", "February", "March", "April", "May", "June",
+                "July", "August", "September", "October", "November", "December"
+            ),
+            "ar" to listOf(
+                "يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو",
+                "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"
+            )
+        )
+        val months = monthsMap["ar"]!!
+        val monthNameAr = months[date.monthNumber - 1]
+        return convertEnglishDigitsToArabic("${date.dayOfMonth} $monthNameAr ${date.year}")
+    }
     "$monthName ${date.dayOfMonth}, ${date.year}"
 }.getOrElse { "" }

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/RateFormatter.kt

@@ -7,22 +7,25 @@ import kotlin.math.floor
 
 
 fun formatRate(rate: Double): String {
-    return try {
+    try {
         val numericRate = rate
         val truncated = floor(numericRate * 10) / 10
-        if (truncated == truncated.toInt().toDouble()) {
+        val result = if (truncated == truncated.toInt().toDouble()) {
             truncated.toInt().toString()
         } else {
             DecimalFormat("#.#").format(truncated)
         }
+        return when (Locale.getDefault().toLanguageTag()) {
+            "ar" -> convertEnglishDigitsToArabic(result)
+            else -> result
+        }
     } catch (e: Exception) {
-        rate.toString()
+        return rate.toString()
     }
 }
 
 fun formatDate(dateString: String?): String {
     if (dateString.isNullOrEmpty()) return ""
-
     return try {
         val inputFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
         val outputFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/formatDateKotlinx.kt

@@ -2,19 +2,29 @@ package com.madrid.presentation.viewModel.shared.parser
 
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.toLocalDate
+import java.util.Locale
 
 
 fun formatDateKotlinx(dateString: String): String {
-    try{
+    try {
         val date: LocalDate = dateString.toLocalDate()
-
         val month = date.monthNumber.toString().padStart(2, '0')
         val day = date.dayOfMonth.toString().padStart(2, '0')
         val year = date.year.toString()
 
-        return "$month/$day/$year"
-    }
-    catch (e: Exception) {
+        val language = Locale.getDefault().toLanguageTag()
+        return when (language) {
+            "en" -> {
+                "$month/$day/$year"
+            }
+            "ar" -> {
+                convertEnglishDigitsToArabic("$year/$month/$day")
+            }
+            else -> {
+                "$day/$month/$year"
+            }
+        }
+    } catch (e: Exception) {
         return ""
     }
 }

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/formatDateOfBirth.kt

@@ -1,11 +1,21 @@
 package com.madrid.presentation.viewModel.shared.parser
 
+import java.util.Locale
+
 fun formatDateOfBirth(rawDate: String): String {
-    val months = listOf(
-        "January", "February", "March", "April", "May", "June",
-        "July", "August", "September", "October", "November", "December"
+    val monthsMap = mapOf(
+        "en" to listOf(
+            "January", "February", "March", "April", "May", "June",
+            "July", "August", "September", "October", "November", "December"
+        ),
+        "ar" to listOf(
+            "يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو",
+            "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"
+        )
     )
 
+    val localeTag = Locale.getDefault().toLanguageTag()
+
     return try {
         val parts = rawDate.split("-")
         if (parts.size != 3) return "Unknown"
@@ -14,8 +24,12 @@ fun formatDateOfBirth(rawDate: String): String {
         val monthIndex = parts[1].toIntOrNull()?.minus(1) ?: return "Unknown"
         val day = parts[2].toIntOrNull() ?: return "Unknown"
 
+        val months = monthsMap[localeTag.substring(0, 2)] ?: monthsMap["en"]!!
         val monthName = months.getOrNull(monthIndex) ?: return "Unknown"
-        "$monthName $day, $year"
+        return when (localeTag) {
+            "ar" -> convertEnglishDigitsToArabic("$day $monthName $year")
+            else -> "$monthName $day, $year"
+        }
     } catch (e: Exception) {
         "Unknown"
     }

presentation/src/main/java/com/madrid/presentation/viewModel/shared/parser/formatDuration.kt

@@ -1,13 +1,24 @@
 package com.madrid.presentation.viewModel.shared.parser
 
+import java.util.Locale
+
 
 fun formatDuration(durationInMinutes: String): String {
     val minutes = durationInMinutes.toIntOrNull() ?: return "Unknown"
     val hours = minutes / 60
     val remainingMinutes = minutes % 60
-    return if (hours > 0) {
-        "${hours}h ${remainingMinutes}min"
-    } else {
-        "${remainingMinutes}min"
+
+    val localeTag = Locale.getDefault().toLanguageTag()
+    return when (localeTag) {
+        "ar" -> {
+            val hourPart = if (hours > 0) "$hours ساعة " else ""
+            val minutePart = if (remainingMinutes > 0) "$remainingMinutes دقيقة" else ""
+            convertEnglishDigitsToArabic((hourPart + minutePart).trim().ifEmpty { "0 دقيقة" })
+        }
+        else -> {
+            val hourPart = if (hours > 0) "$hours h " else ""
+            val minutePart = if (remainingMinutes > 0) "$remainingMinutes min" else ""
+            (hourPart + minutePart).trim().ifEmpty { "0 min" }
+        }
     }
 }