chore: Cleanup in filter sheets

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt

@@ -9,12 +9,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clip
@@ -25,6 +22,7 @@ import androidx.compose.ui.input.pointer.util.VelocityTracker
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import to.bitkit.R
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.BottomSheetType
@@ -37,7 +35,6 @@ import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.viewmodels.ActivityListViewModel
 import uniffi.bitkitcore.Activity
-import androidx.compose.runtime.DisposableEffect
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -47,13 +44,13 @@ fun AllActivityScreen(
     onActivityItemClick: (String) -> Unit,
 ) {
     val app = appViewModel ?: return
-    val filteredActivities by viewModel.filteredActivities.collectAsState()
+    val filteredActivities by viewModel.filteredActivities.collectAsStateWithLifecycle()
 
-    val searchText by viewModel.searchText.collectAsState()
-    val selectedTags by viewModel.selectedTags.collectAsState()
-    val startDate by viewModel.startDate.collectAsState()
+    val searchText by viewModel.searchText.collectAsStateWithLifecycle()
+    val selectedTags by viewModel.selectedTags.collectAsStateWithLifecycle()
+    val startDate by viewModel.startDate.collectAsStateWithLifecycle()
 
-    val selectedTab by viewModel.selectedTab.collectAsState()
+    val selectedTab by viewModel.selectedTab.collectAsStateWithLifecycle()
     val tabs = ActivityTab.entries
     val currentTabIndex = tabs.indexOf(selectedTab)
 

app/src/main/java/to/bitkit/ui/screens/wallets/activity/DateRangeSelectorSheet.kt

@@ -22,8 +22,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import to.bitkit.R
 import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.PrimaryButton
@@ -80,32 +82,33 @@ private fun DateRangeSelectorSheetContent(
     ) {
         DateRangePicker(
             state = dateRangeState,
-            modifier = Modifier.weight(1f),
             showModeToggle = false,
             colors = DatePickerDefaults.colors(
                 containerColor = Color.Transparent,
                 selectedDayContainerColor = Colors.Brand,
                 dayInSelectionRangeContainerColor = Colors.Brand16,
             ),
+            modifier = Modifier.weight(1f)
         )
-        Spacer(modifier = Modifier.height(32.dp))
+
+        Spacer(modifier = Modifier.height(16.dp))
         Row(
             horizontalArrangement = Arrangement.spacedBy(16.dp),
             modifier = Modifier
-                .padding(vertical = 16.dp)
                 .fillMaxWidth(),
         ) {
             SecondaryButton(
                 onClick = onClearClick,
-                text = "Clear",
+                text = stringResource(R.string.wallet__filter_clear),
                 modifier = Modifier.weight(1f),
             )
             PrimaryButton(
                 onClick = onApplyClick,
-                text = "Apply",
+                text = stringResource(R.string.wallet__filter_apply),
                 modifier = Modifier.weight(1f),
             )
         }
+        Spacer(modifier = Modifier.height(16.dp))
     }
 }
 

app/src/main/java/to/bitkit/ui/screens/wallets/activity/TagSelectorSheet.kt

@@ -15,13 +15,13 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import to.bitkit.R
 import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.appViewModel
@@ -37,8 +37,8 @@ import to.bitkit.ui.theme.AppThemeSurface
 fun TagSelectorSheet() {
     val activity = activityListViewModel ?: return
     val app = appViewModel ?: return
-    val availableTags by activity.availableTags.collectAsState()
-    val selectedTags by activity.selectedTags.collectAsState()
+    val availableTags by activity.availableTags.collectAsStateWithLifecycle()
+    val selectedTags by activity.selectedTags.collectAsStateWithLifecycle()
 
     TagSelectorSheetContent(
         availableTags = availableTags,
@@ -92,23 +92,24 @@ private fun TagSelectorSheetContent(
         }
 
         Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(16.dp))
         Row(
             horizontalArrangement = Arrangement.spacedBy(16.dp),
             modifier = Modifier
-                .padding(vertical = 16.dp)
-                .fillMaxWidth(),
+                .fillMaxWidth()
         ) {
             SecondaryButton(
                 onClick = onClearClick,
-                text = "Clear",
+                text = stringResource(R.string.wallet__filter_clear),
                 modifier = Modifier.weight(1f),
             )
             PrimaryButton(
                 onClick = onApplyClick,
-                text = "Apply",
+                text = stringResource(R.string.wallet__filter_apply),
                 modifier = Modifier.weight(1f),
             )
         }
+        Spacer(modifier = Modifier.height(16.dp))
     }
 }