Merge pull request #848 from mhss1/develop

Added Arabic translation.
Ivy-Apps · May 6, 2022 · c72f951 · c72f951
2 parents d3b9ee4 + 949ba75
commit c72f951
Show file tree

Hide file tree

Showing 7 changed files with 450 additions and 12 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/planned/list/PlannedPaymentsLazyColumn.kt b/app/src/main/java/com/ivy/wallet/ui/planned/list/PlannedPaymentsLazyColumn.kt
@@ -1,6 +1,7 @@
 package com.ivy.wallet.ui.planned.list
 
 import androidx.compose.foundation.layout.*
+import androidx.compose.ui.res.stringResource
 import androidx.compose.foundation.lazy.*
 import androidx.compose.material.Text
 import androidx.compose.runtime.*

diff --git a/app/src/main/java/com/ivy/wallet/ui/reports/ReportScreen.kt b/app/src/main/java/com/ivy/wallet/ui/reports/ReportScreen.kt
@@ -23,6 +23,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.insets.systemBarsPadding
 import com.ivy.design.api.navigation
 import com.ivy.design.l0_system.UI
+import androidx.compose.ui.res.stringResource
 import com.ivy.design.l0_system.style
 import com.ivy.wallet.R
 import com.ivy.wallet.domain.data.TransactionType
@@ -210,7 +211,6 @@ private fun BoxWithConstraintsScope.UI(
                     onEventHandler.invoke(ReportScreenEvent.OnPayOrGet(transaction = it))
                 },
                 emptyStateTitle = stringRes(R.string.no_transactions),
-
                 emptyStateText = stringRes(R.string.no_transactions_for_your_filter)
             )
         } else {

diff --git a/app/src/main/java/com/ivy/wallet/ui/search/SearchScreen.kt b/app/src/main/java/com/ivy/wallet/ui/search/SearchScreen.kt
@@ -1,5 +1,6 @@
 package com.ivy.wallet.ui.search
 
+import androidx.compose.ui.res.stringResource
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background

diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/modal/BudgetModal.kt b/app/src/main/java/com/ivy/wallet/ui/theme/modal/BudgetModal.kt
@@ -21,8 +21,10 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
 import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
+import com.ivy.wallet.R
 import com.ivy.wallet.domain.data.core.Account
 import com.ivy.wallet.domain.data.core.Budget
 import com.ivy.wallet.domain.data.core.Category
@@ -119,7 +121,7 @@ fun BoxWithConstraintsScope.BudgetModal(
             verticalAlignment = Alignment.CenterVertically
         ) {
             ModalTitle(
-                text = if (modal?.budget != null) "Edit budget" else "Create budget"
+                text = if (modal?.budget != null) stringResource(R.string.edit_budget) else stringResource(R.string.create_budget)
             )
 
             if (initialBudget != null) {
@@ -137,7 +139,7 @@ fun BoxWithConstraintsScope.BudgetModal(
         Spacer(Modifier.height(24.dp))
 
         ModalNameInput(
-            hint = "Budget name",
+            hint = stringResource(R.string.budget_name),
             autoFocusKeyboard = modal?.autoFocusKeyboard ?: true,
             textFieldValue = nameTextFieldValue,
             setTextFieldValue = {
@@ -158,7 +160,7 @@ fun BoxWithConstraintsScope.BudgetModal(
         Spacer(Modifier.height(24.dp))
 
         ModalAmountSection(
-            label = "BUDGET AMOUNT",
+            label = stringResource(R.string.budget_amount_uppercase),
             currency = modal?.baseCurrency ?: "",
             amount = amount,
             amountPaddingTop = 24.dp,
@@ -183,8 +185,8 @@ fun BoxWithConstraintsScope.BudgetModal(
 
     DeleteModal(
         visible = deleteModalVisible,
-        title = "Confirm deletion",
-        description = "Are you sure that you want to delete \"${nameTextFieldValue.text}\" budget?",
+        title = stringResource(R.string.confirm_deletion),
+        description = stringResource(R.string.confirm_budget_deletion_warning, nameTextFieldValue.text),
         dismiss = { deleteModalVisible = false }
     ) {
         if (initialBudget != null) {

diff --git a/app/src/main/java/com/ivy/wallet/utils/UtilExt.kt b/app/src/main/java/com/ivy/wallet/utils/UtilExt.kt
@@ -62,20 +62,24 @@ fun <T> MutableList<T>?.orEmpty(): MutableList<T> {
     return this ?: mutableListOf()
 }
 
-fun String.nullifyEmpty() = if (this.isBlank()) null else this
+fun String.nullifyEmpty() = this.ifBlank { null }
 
 fun getDefaultFIATCurrency(): Currency =
     Currency.getInstance(Locale.getDefault()) ?: Currency.getInstance("USD")
     ?: Currency.getInstance("usd") ?: Currency.getAvailableCurrencies().firstOrNull()
     ?: Currency.getInstance("EUR")
 
-fun String.toUpperCaseLocal() = this.toUpperCase(Locale.getDefault())
+fun String.toUpperCaseLocal() = this.uppercase(Locale.getDefault())
 
-fun String.toLowerCaseLocal() = this.toLowerCase(Locale.getDefault())
+fun String.toLowerCaseLocal() = this.lowercase(Locale.getDefault())
 
-fun String.uppercaseLocal(): String = this.toUpperCase(Locale.getDefault())
+fun String.uppercaseLocal(): String = this.uppercase(Locale.getDefault())
 
-fun String.capitalizeLocal(): String = this.capitalize(Locale.getDefault())
+fun String.capitalizeLocal(): String = this.replaceFirstChar {
+    if (it.isLowerCase()) it.titlecase(
+        Locale.getDefault()
+    ) else it.toString()
+}
 
 fun String.capitalizeWords(): String {
     return split(" ").joinToString(" ") { it.capitalizeLocal() }