Merge branch 'main' into fix-issue-3484

gradle/libs.versions.toml

@@ -17,8 +17,8 @@ paparazzi = "1.3.3"
 # Android
 min-sdk = "28"
 compile-sdk = "34"
-version-name = "2024.09.22"
-version-code = "199"
+version-name = "2024.09.29"
+version-code = "200"
 jvm-target = "17"
 
 

screen/features/src/main/java/com/ivy/features/FeaturesScreen.kt

@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.Card
@@ -25,10 +25,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
+import com.ivy.design.system.colors.IvyColors.Gray
 import com.ivy.navigation.navigation
 import com.ivy.navigation.screenScopedViewModel
 import kotlinx.collections.immutable.ImmutableList
@@ -63,7 +64,7 @@ private fun FeaturesUi(
         content = { innerPadding ->
             Content(
                 modifier = Modifier.padding(innerPadding),
-                features = uiState.features,
+                items = uiState.featureItemViewStates,
                 onToggleFeature = {
                     onEvent(FeaturesUiEvent.ToggleFeature(it))
                 }
@@ -104,8 +105,8 @@ private fun Title(
 
 @Composable
 private fun Content(
-    features: ImmutableList<FeatureUi>,
-    onToggleFeature: (Int) -> Unit,
+    items: ImmutableList<FeatureItemViewState>,
+    onToggleFeature: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(
@@ -116,19 +117,26 @@ private fun Content(
         ),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        itemsIndexed(features) { index, item ->
-            FeatureRow(
-                feature = item,
-                onToggleClick = { onToggleFeature(index) }
-            )
+        items(items) { item ->
+            when (item) {
+                is FeatureItemViewState.FeatureHeaderViewState -> {
+                    FeatureSectionDivider(text = item.name)
+                }
+
+                is FeatureItemViewState.FeatureToggleViewState -> {
+                    FeatureRow(
+                        feature = item,
+                        onToggleClick = { onToggleFeature(item.key) }
+                    )
+                }
+            }
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun FeatureRow(
-    feature: FeatureUi,
+    feature: FeatureItemViewState.FeatureToggleViewState,
     onToggleClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -159,3 +167,22 @@ private fun FeatureRow(
         }
     }
 }
+
+@Composable
+private fun FeatureSectionDivider(
+    text: String,
+    color: Color = Gray
+) {
+    Column {
+        Spacer(Modifier.height(16.dp))
+
+        Text(
+            modifier = Modifier.padding(start = 16.dp),
+            text = text,
+            style = MaterialTheme.typography.titleMedium.copy(
+                color = color,
+                fontWeight = FontWeight.Bold
+            )
+        )
+    }
+}

screen/features/src/main/java/com/ivy/features/FeaturesUiEvent.kt

@@ -1,5 +1,5 @@
 package com.ivy.features
 
 sealed interface FeaturesUiEvent {
-    data class ToggleFeature(val index: Int) : FeaturesUiEvent
+    data class ToggleFeature(val key: String) : FeaturesUiEvent
 }

screen/features/src/main/java/com/ivy/features/FeaturesUiState.kt

@@ -3,11 +3,16 @@ package com.ivy.features
 import kotlinx.collections.immutable.ImmutableList
 
 data class FeaturesUiState(
-    val features: ImmutableList<FeatureUi>,
+    val featureItemViewStates: ImmutableList<FeatureItemViewState>,
 )
 
-data class FeatureUi(
-    val name: String,
-    val enabled: Boolean,
-    val description: String?,
-)
+sealed interface FeatureItemViewState {
+    data class FeatureToggleViewState(
+        val key: String,
+        val name: String,
+        val enabled: Boolean,
+        val description: String?,
+    ) : FeatureItemViewState
+
+    data class FeatureHeaderViewState(val name: String) : FeatureItemViewState
+}

screen/features/src/main/java/com/ivy/features/FeaturesViewModel.kt

@@ -5,6 +5,8 @@ import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.viewModelScope
+import com.ivy.domain.features.BoolFeature
+import com.ivy.domain.features.FeatureGroup
 import com.ivy.ui.ComposeViewModel
 import com.ivy.domain.features.Features
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -23,23 +25,43 @@ class FeaturesViewModel @Inject constructor(
     @ApplicationContext
     private val context: Context
 ) : ComposeViewModel<FeaturesUiState, FeaturesUiEvent>() {
+
     @Composable
     override fun uiState(): FeaturesUiState {
         return FeaturesUiState(
-            features = getFeatures()
+            featureItemViewStates = getFeatures()
         )
     }
 
+    @SuppressLint("BuildListAdds")
     @Composable
-    fun getFeatures(): ImmutableList<FeatureUi> {
-        val allFeatures = features.allFeatures.map {
-            FeatureUi(
-                name = it.name ?: it.key,
-                description = it.description,
-                enabled = it.asEnabledState()
-            )
-        }
-        return allFeatures.toImmutableList()
+    fun getFeatures(): ImmutableList<FeatureItemViewState> {
+        return buildList {
+            val groups: Map<FeatureGroup?, BoolFeature> =
+                features.allFeatures
+                    .associateBy { it.group }
+                    .toSortedMap(compareBy { it?.name })
+
+            groups.forEach { group ->
+                add(
+                    FeatureItemViewState.FeatureHeaderViewState(
+                        name = group.key?.name ?: "Undefined"
+                    )
+                )
+                val featuresByGroup: List<FeatureItemViewState> = features
+                    .allFeatures
+                    .filter { it.group?.name == group.key?.name }
+                    .map {
+                        FeatureItemViewState.FeatureToggleViewState(
+                            key = it.key,
+                            name = it.name ?: it.key,
+                            description = it.description,
+                            enabled = it.asEnabledState()
+                        )
+                    }
+                addAll(featuresByGroup)
+            }
+        }.toImmutableList()
     }
 
     override fun onEvent(event: FeaturesUiEvent) {
@@ -50,9 +72,9 @@ class FeaturesViewModel @Inject constructor(
 
     private fun toggleFeature(event: FeaturesUiEvent.ToggleFeature) {
         viewModelScope.launch {
-            val feature = features.allFeatures[event.index]
-            val enabled = feature.enabledFlow(context).first() ?: false
-            feature.set(context, !enabled)
+            val feature = features.allFeatures.find { feature -> feature.key == event.key }
+            val enabled = feature?.enabledFlow(context)?.first() ?: false
+            feature?.set(context, !enabled)
         }
     }
 }

shared/domain/src/main/java/com/ivy/domain/features/BoolFeature.kt

@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.map
 @Immutable
 class BoolFeature(
     val key: String,
+    val group: FeatureGroup? = null,
     val name: String? = null,
     val description: String? = null,
     private val defaultValue: Boolean = false

shared/domain/src/main/java/com/ivy/domain/features/FeatureGroup.kt

@@ -0,0 +1,5 @@
+package com.ivy.domain.features
+
+enum class FeatureGroup {
+    Category, Account, Other
+}

shared/domain/src/main/java/com/ivy/domain/features/Features.kt

@@ -7,6 +7,7 @@ interface Features {
     val showTitleSuggestions: BoolFeature
     val showCategorySearchBar: BoolFeature
     val hideTotalBalance: BoolFeature
+    val showDecimalNumber: BoolFeature
 
     val allFeatures: List<BoolFeature>
 }

shared/domain/src/main/java/com/ivy/domain/features/IvyFeatures.kt

@@ -8,51 +8,69 @@ class IvyFeatures @Inject constructor() : Features {
 
     override val sortCategoriesAlphabetically = BoolFeature(
         key = "sort_categories_alphabetically",
+        group = FeatureGroup.Category,
         name = "Sort Categories Alphabetically",
         description = "Sort income and expenses" +
                 " categories alphabetically"
     )
 
     override val compactAccountsMode = BoolFeature(
         key = "compact_account_ui",
+        group = FeatureGroup.Account,
         name = "Compact account UI",
         description = "Enables more compact and dense UI for the \"Accounts\" tab"
     )
 
     override val compactCategoriesMode = BoolFeature(
         key = "compact_categories_ui",
+        group = FeatureGroup.Category,
         name = "Compact category UI",
         description = "Activates a more streamlined and space-efficient interface for the \"Categories\" Screen"
     )
 
     override val showTitleSuggestions = BoolFeature(
         key = "show_title_suggestions",
+        group = FeatureGroup.Other,
         name = "Show previous title suggestions",
         description = "Enables display of previous transaction titles when editing or creating a new transaction",
         defaultValue = true
     )
 
     override val showCategorySearchBar = BoolFeature(
         key = "search_categories",
+        group = FeatureGroup.Category,
         name = "Search categories",
         description = "Show search bar in category screen",
         defaultValue = true
     )
 
     override val hideTotalBalance = BoolFeature(
         key = "hide_total_balance",
+        group = FeatureGroup.Account,
         name = "Hide total balance",
         description = "Enable hide the total balance from the accounts tab",
         defaultValue = false
     )
 
+    override val showDecimalNumber = BoolFeature(
+        key = "show_decimal_number",
+        group = FeatureGroup.Other,
+        name = "Show Decimal Number",
+        description = "Whether to show the decimal part in amounts",
+        defaultValue = true
+    )
+
     override val allFeatures: List<BoolFeature>
         get() = listOf(
             sortCategoriesAlphabetically,
             compactAccountsMode,
             compactCategoriesMode,
             showTitleSuggestions,
             showCategorySearchBar,
-            hideTotalBalance
+            hideTotalBalance,
+            /* will be uncommented when this functionality
+             * will be available across the application in up-coming PRs
+            showDecimalNumber
+             */
         )
 }

shared/ui/core/src/main/java/com/ivy/ui/FormatMoneyUseCase.kt

@@ -0,0 +1,29 @@
+package com.ivy.ui
+
+import android.content.Context
+import com.ivy.domain.features.Features
+import com.ivy.ui.time.DevicePreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import javax.inject.Inject
+
+class FormatMoneyUseCase @Inject constructor(
+    private val features: Features,
+    private val devicePreferences: DevicePreferences,
+    @ApplicationContext private val context: Context
+) {
+
+    private val locale = devicePreferences.locale()
+    private val withoutDecimalFormatter = DecimalFormat("###,###", DecimalFormatSymbols(locale))
+    private val withDecimalFormatter = DecimalFormat("###,###.00", DecimalFormatSymbols(locale))
+
+    suspend fun format(value: Double): String {
+        val showDecimalPoint = features.showDecimalNumber.isEnabled(context)
+
+        return when (showDecimalPoint) {
+            true -> withDecimalFormatter.format(value)
+            false -> withoutDecimalFormatter.format(value)
+        }
+    }
+}