Improvements (#165)

mdrlzy · web-flow · commit b4df5406e621 · 2025-11-30T01:51:22.000+05:00
* Fix modification of pinned calculations

* Move Reuse action from dialog to item click

* Fix popups: prevent popup from reopening on second click

* Bump compileSdk, targetSdk to 36

* Keep reuse option in bottom sheet

* Fix ru title in quick bottom sheet

* Fix tap/long press descriptions in quick onboarding

* Bump ark about to 0.2.1
diff --git a/core/presentation/src/main/res/values-ru/strings.xml b/core/presentation/src/main/res/values-ru/strings.xml
@@ -145,7 +145,7 @@
     <string name="delete">Удалить</string>
     <string name="re_use">Повторно использовать</string>
     <string name="edit">Редактировать</string>
-    <string name="options">Параметры</string>
+    <string name="options">Опции</string>
     <string name="oops_request_time_out">Упс, время запроса истекло!</string>
     <string name="check_connection_and_refresh">Пожалуйста, проверьте ваше соединение и обновите страницу, чтобы попробовать снова.</string>
     <string name="refresh">Обновить</string>
@@ -182,7 +182,7 @@
     <string name="onboarding_quick_calc_2_desc">Быстро удалите расчёт, проведя пальцем влево.</string>
     <string name="onboarding_quick_calc_3_title">Проведите пальцем по закрепленному расчёту вправо, чтобы открепить</string>
     <string name="onboarding_quick_calc_3_desc">Открепите расчёт, чтобы переместить его в историю расчётов.</string>
-    <string name="onboarding_quick_calc_4_title">Контекстное меню расчёта</string>
-    <string name="onboarding_quick_calc_4_desc">Нажмите, чтобы открыть полное меню.</string>
+    <string name="onboarding_quick_calc_4_title">Нажмите, чтобы переиспользовать расчёт</string>
+    <string name="onboarding_quick_calc_4_desc">Удерживайте, чтобы открыть полное меню.</string>
 
 </resources>
diff --git a/core/presentation/src/main/res/values/strings.xml b/core/presentation/src/main/res/values/strings.xml
@@ -185,8 +185,8 @@
     <string name="onboarding_quick_calc_2_desc">Delete a calculation quickly by swiping left.</string>
     <string name="onboarding_quick_calc_3_title">Swipe the pinned calculation to the right to unpin</string>
     <string name="onboarding_quick_calc_3_desc">Unpin a calculation to move it to calculation history.</string>
-    <string name="onboarding_quick_calc_4_title">Calculation context menu</string>
-    <string name="onboarding_quick_calc_4_desc">Tap to show the complete menu.</string>
+    <string name="onboarding_quick_calc_4_title">Tap to reuse the calculation</string>
+    <string name="onboarding_quick_calc_4_desc">Long press to show the complete menu.</string>
 
 
 </resources>
diff --git a/feature/pairalert/src/main/java/dev/arkbuilders/rate/feature/pairalert/presentation/add/AddPairAlertScreen.kt b/feature/pairalert/src/main/java/dev/arkbuilders/rate/feature/pairalert/presentation/add/AddPairAlertScreen.kt
@@ -185,7 +185,7 @@ private fun Content(
                 ) {
                     Popup(
                         offset = IntOffset(0, 0),
-                        properties = PopupProperties(),
+                        properties = PopupProperties(focusable = true),
                         onDismissRequest = { showGroupsPopup = false },
                     ) {
                         GroupSelectPopup(
diff --git a/feature/portfolio/src/main/java/dev/arkbuilders/rate/feature/portfolio/presentation/add/AddAssetScreen.kt b/feature/portfolio/src/main/java/dev/arkbuilders/rate/feature/portfolio/presentation/add/AddAssetScreen.kt
@@ -203,7 +203,7 @@ private fun Content(
                 ) {
                     Popup(
                         offset = IntOffset(0, 0),
-                        properties = PopupProperties(),
+                        properties = PopupProperties(focusable = true),
                         onDismissRequest = { showGroupsPopup = false },
                     ) {
                         GroupSelectPopup(
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/add/AddQuickScreen.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/add/AddQuickScreen.kt
@@ -241,7 +241,7 @@ private fun Content(
                     ) {
                         Popup(
                             offset = IntOffset(0, 0),
-                            properties = PopupProperties(),
+                            properties = PopupProperties(focusable = true),
                             onDismissRequest = { showGroupsPopup = false },
                         ) {
                             GroupSelectPopup(
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/add/AddQuickViewModel.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/add/AddQuickViewModel.kt
@@ -220,6 +220,13 @@ class AddQuickViewModel(
                     0
                 }
 
+            val pinnedDate =
+                if (id == quickCalculationId) {
+                    quickRepo.getById(id)?.pinnedDate
+                } else {
+                    null
+                }
+
             val group = groupRepo.getByNameOrCreateNew(state.group.name, GroupFeatureType.Quick)
 
             val quick =
@@ -229,7 +236,7 @@ class AddQuickViewModel(
                     amount = from.value.toBigDecimalArk(),
                     to = state.currencies.drop(1).map { it.toAmount() },
                     calculatedDate = OffsetDateTime.now(),
-                    pinnedDate = null,
+                    pinnedDate = pinnedDate,
                     group = group,
                 )
             val newId = quickRepo.insert(quick)
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/HandleQuickSideEffect.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/HandleQuickSideEffect.kt
@@ -8,6 +8,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshotFlow
+import com.ramcosta.composedestinations.generated.quick.destinations.AddQuickScreenDestination
+import com.ramcosta.composedestinations.generated.quick.destinations.AddQuickScreenDestination.invoke
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import dev.arkbuilders.rate.core.presentation.CoreRString
 import dev.arkbuilders.rate.core.presentation.R
 import dev.arkbuilders.rate.core.presentation.ui.NotifyAddedSnackbarVisuals
@@ -35,6 +38,7 @@ fun HandleQuickSideEffects(
     pagerState: PagerState,
     snackState: SnackbarHostState,
     ctx: Context,
+    navigator: DestinationsNavigator,
     externalNavigator: QuickExternalNavigator,
 ) {
     val selectTabEffect = remember { mutableStateOf<QuickScreenEffect.SelectTab?>(null) }
@@ -44,10 +48,13 @@ fun HandleQuickSideEffects(
             selectTabEffect.value = effect
         } else {
             handleQuickSideEffect(
+                state = state,
                 effect = effect,
                 viewModel = viewModel,
+                pagerState = pagerState,
                 snackState = snackState,
                 ctx = ctx,
+                navigator = navigator,
                 externalNavigator = externalNavigator,
             )
         }
@@ -82,10 +89,13 @@ fun HandleQuickSideEffects(
 }
 
 suspend fun handleQuickSideEffect(
+    state: QuickScreenState,
     effect: QuickScreenEffect,
     viewModel: QuickViewModel,
+    pagerState: PagerState,
     snackState: SnackbarHostState,
     ctx: Context,
+    navigator: DestinationsNavigator,
     externalNavigator: QuickExternalNavigator,
 ) {
     when (effect) {
@@ -146,5 +156,24 @@ suspend fun handleQuickSideEffect(
         }
         QuickScreenEffect.NavigateToCalculationOnboarding ->
             externalNavigator.navigateToCalcOnboarding()
+
+        is QuickScreenEffect.NavigateToEdit -> {
+            navigator.navigate(
+                AddQuickScreenDestination(
+                    quickCalculationId = effect.calc.id,
+                    reuseNotEdit = false,
+                    groupId = state.pages.getOrNull(pagerState.currentPage)?.group?.id,
+                ),
+            )
+        }
+        is QuickScreenEffect.NavigateToReuse -> {
+            navigator.navigate(
+                AddQuickScreenDestination(
+                    quickCalculationId = effect.calc.id,
+                    reuseNotEdit = true,
+                    groupId = state.pages.getOrNull(pagerState.currentPage)?.group?.id,
+                ),
+            )
+        }
     }
 }
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickItem.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickItem.kt
@@ -1,8 +1,12 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package dev.arkbuilders.rate.feature.quick.presentation.main
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -43,6 +47,7 @@ fun QuickItem(
     to: List<Amount>,
     dateText: String,
     onClick: () -> Unit,
+    onLongClick: () -> Unit,
 ) {
     var expanded by remember {
         mutableStateOf(false)
@@ -53,9 +58,10 @@ fun QuickItem(
             Modifier
                 .fillMaxWidth()
                 .background(Color.White)
-                .clickable {
-                    onClick()
-                },
+                .combinedClickable(
+                    onClick = { onClick() },
+                    onLongClick = { onLongClick() },
+                ),
     ) {
         val (icons, content, chevron) = createRefs()
         Row(
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickScreen.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickScreen.kt
@@ -109,6 +109,7 @@ fun QuickScreen(
         pagerState = pagerState,
         snackState = snackState,
         ctx = ctx,
+        navigator = navigator,
         externalNavigator = externalNavigator,
     )
 
@@ -151,6 +152,9 @@ fun QuickScreen(
                         onFilterChanged = viewModel::onFilterChanged,
                         onDelete = viewModel::onDelete,
                         onClick = {
+                            viewModel.onReuse(it)
+                        },
+                        onLongClick = {
                             viewModel.onShowGroupOptions(it)
                         },
                         onPin = viewModel::onPin,
@@ -173,23 +177,8 @@ fun QuickScreen(
                 calculation = it.calculation,
                 onPin = viewModel::onPin,
                 onUnpin = viewModel::onUnpin,
-                onEdit = {
-                    navigator.navigate(
-                        AddQuickScreenDestination(
-                            quickCalculationId = it.id,
-                            reuseNotEdit = false,
-                            groupId = getCurrentGroup()?.id,
-                        ),
-                    )
-                },
-                onReuse = {
-                    navigator.navigate(
-                        AddQuickScreenDestination(
-                            quickCalculationId = it.id,
-                            groupId = getCurrentGroup()?.id,
-                        ),
-                    )
-                },
+                onEdit = viewModel::onEdit,
+                onReuse = viewModel::onReuse,
                 onDelete = viewModel::onDelete,
                 onDismiss = {
                     scope.launch {
@@ -256,6 +245,7 @@ private fun Content(
     onFilterChanged: (String) -> Unit,
     onDelete: (QuickCalculation) -> Unit,
     onClick: (QuickCalculation) -> Unit,
+    onLongClick: (QuickCalculation) -> Unit = {},
     onPin: (QuickCalculation) -> Unit,
     onUnpin: (QuickCalculation) -> Unit,
     onNewCode: (CurrencyCode) -> Unit,
@@ -288,6 +278,7 @@ private fun Content(
                     notPinned = state.pages.first().notPinned,
                     onDelete = onDelete,
                     onClick = onClick,
+                    onLongClick = onLongClick,
                     onPin = onPin,
                     onUnpin = onUnpin,
                     onNewCode = onNewCode,
@@ -305,6 +296,7 @@ private fun Content(
                         notPinned = state.pages[index].notPinned,
                         onDelete = onDelete,
                         onClick = onClick,
+                        onLongClick = onLongClick,
                         onPin = onPin,
                         onUnpin = onUnpin,
                         onNewCode = onNewCode,
@@ -325,6 +317,7 @@ private fun GroupPage(
     onPin: (QuickCalculation) -> Unit,
     onUnpin: (QuickCalculation) -> Unit,
     onClick: (QuickCalculation) -> Unit = {},
+    onLongClick: (QuickCalculation) -> Unit = {},
     onNewCode: (CurrencyCode) -> Unit,
 ) {
     val ctx = LocalContext.current
@@ -345,6 +338,7 @@ private fun GroupPage(
                                     it.refreshDate,
                                 ),
                             onClick = { onClick(it.calculation) },
+                            onLongClick = { onLongClick(it.calculation) },
                         )
                     },
                     calculation = it.calculation,
@@ -370,6 +364,7 @@ private fun GroupPage(
                                     it.calculatedDate,
                                 ),
                             onClick = { onClick(it) },
+                            onLongClick = { onLongClick(it) },
                         )
                     },
                     calculation = it,
@@ -404,5 +399,6 @@ private fun PreviewItem() {
         to = listOf(Amount("USD", 30.0.toBigDecimal())),
         dateText = "Calculated on",
         onClick = {},
+        onLongClick = {},
     )
 }
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickViewModel.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickViewModel.kt
@@ -61,6 +61,10 @@ sealed class QuickScreenEffect {
 
     data class ShowRemovedSnackbar(val calculation: QuickCalculation) : QuickScreenEffect()
 
+    data class NavigateToEdit(val calc: QuickCalculation) : QuickScreenEffect()
+
+    data class NavigateToReuse(val calc: QuickCalculation) : QuickScreenEffect()
+
     data object LaunchInAppReview : QuickScreenEffect()
 
     data class SelectTab(val groupId: Long) : QuickScreenEffect()
@@ -192,6 +196,16 @@ class QuickViewModel(
             quickRepo.insert(newCalculation)
         }
 
+    fun onEdit(calc: QuickCalculation) =
+        intent {
+            postSideEffect(QuickScreenEffect.NavigateToEdit(calc))
+        }
+
+    fun onReuse(calc: QuickCalculation) =
+        intent {
+            postSideEffect(QuickScreenEffect.NavigateToReuse(calc))
+        }
+
     fun onFilterChanged(filter: String) =
         blockingIntent {
             reduce {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,10 +3,10 @@ kotlin = "2.1.20"
 agp = "8.1.4"
 coreKtx = "1.15.0"
 minSdk = "26"
-compileSdk = "35"
+compileSdk = "36"
 ksp = "2.1.20-1.0.32"
 
-arkAbout = "0.2.0"
+arkAbout = "0.2.1"
 activityCompose = "1.10.1"
 composeDestinationsVersion = "2.1.0"
 arrowFxCoroutines = "1.2.1"

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,13 @@ class AddQuickViewModel(`
`220`	`220`	`0`
`221`	`221`	`}`
`222`	`222`
	`223`	`+ val pinnedDate =`
	`224`	`+ if (id == quickCalculationId) {`
	`225`	`+ quickRepo.getById(id)?.pinnedDate`
	`226`	`+ } else {`
	`227`	`+ null`
	`228`	`+ }`
	`229`	`+`
`223`	`230`	`val group = groupRepo.getByNameOrCreateNew(state.group.name, GroupFeatureType.Quick)`
`224`	`231`
`225`	`232`	`val quick =`
`@@ -229,7 +236,7 @@ class AddQuickViewModel(`
`229`	`236`	`amount = from.value.toBigDecimalArk(),`
`230`	`237`	`to = state.currencies.drop(1).map { it.toAmount() },`
`231`	`238`	`calculatedDate = OffsetDateTime.now(),`
`232`		`- pinnedDate = null,`
	`239`	`+ pinnedDate = pinnedDate,`
`233`	`240`	`group = group,`
`234`	`241`	`)`
`235`	`242`	`val newId = quickRepo.insert(quick)`