Skip to content

Commit c953e9b

Browse files
committed
refactor: Cleanup AllActivityScreen code
1 parent 2e800ae commit c953e9b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
1313
import androidx.compose.material3.HorizontalDivider
1414
import androidx.compose.material3.MaterialTheme
1515
import androidx.compose.material3.Text
16-
import androidx.compose.material3.rememberDateRangePickerState
1716
import androidx.compose.runtime.Composable
1817
import androidx.compose.runtime.collectAsState
1918
import androidx.compose.runtime.getValue
@@ -46,21 +45,16 @@ fun AllActivityScreen(
4645
onBackCLick: () -> Unit,
4746
onActivityItemClick: (String) -> Unit,
4847
) {
49-
val dateRangeState = rememberDateRangePickerState()
50-
val appViewModel = appViewModel ?: return
48+
val app = appViewModel ?: return
5149

5250
ScreenColumn {
5351
AppTopBar(stringResource(R.string.wallet__activity_all), onBackCLick)
5452

5553
Column(modifier = Modifier.padding(horizontal = 16.dp)) {
5654
ActivityListFilter(
5755
viewModel = viewModel,
58-
onTagClick = {
59-
appViewModel.showSheet(BottomSheetType.ActivityTagSelector)
60-
},
61-
onDateRangeClick = {
62-
appViewModel.showSheet(BottomSheetType.ActivityDateRangeSelector)
63-
},
56+
onTagClick = { app.showSheet(BottomSheetType.ActivityTagSelector) },
57+
onDateRangeClick = { app.showSheet(BottomSheetType.ActivityDateRangeSelector) },
6458
)
6559
Spacer(modifier = Modifier.height(16.dp))
6660
val filteredActivities by viewModel.filteredActivities.collectAsState()
@@ -119,7 +113,9 @@ fun ActivityListWithHeaders(
119113
TertiaryButton(
120114
text = stringResource(R.string.wallet__activity_show_all),
121115
onClick = onAllActivityButtonClick,
122-
modifier = Modifier.wrapContentWidth().padding(top = 8.dp)
116+
modifier = Modifier
117+
.wrapContentWidth()
118+
.padding(top = 8.dp)
123119
)
124120
}
125121
}
@@ -152,7 +148,9 @@ fun ActivityList(
152148
TertiaryButton(
153149
text = stringResource(R.string.wallet__activity_show_all),
154150
onClick = onAllActivityClick,
155-
modifier = Modifier.wrapContentWidth().padding(top = 8.dp)
151+
modifier = Modifier
152+
.wrapContentWidth()
153+
.padding(top = 8.dp)
156154
)
157155
}
158156
}

0 commit comments

Comments
 (0)