@@ -23,13 +23,10 @@ import androidx.compose.ui.tooling.preview.Preview
2323import androidx.compose.ui.unit.dp
2424import androidx.lifecycle.compose.collectAsStateWithLifecycle
2525import com.synonym.bitkitcore.Activity
26- import dev.chrisbanes.haze.hazeSource
2726import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
28- import dev.chrisbanes.haze.rememberHazeState
2927import to.bitkit.R
3028import to.bitkit.ui.appViewModel
3129import to.bitkit.ui.components.Sheet
32- import to.bitkit.ui.components.TabBar
3330import to.bitkit.ui.scaffold.AppTopBar
3431import to.bitkit.ui.scaffold.DrawerNavIcon
3532import to.bitkit.ui.screens.wallets.activity.components.ActivityListFilter
@@ -39,7 +36,6 @@ import to.bitkit.ui.screens.wallets.activity.utils.previewActivityItems
3936import to.bitkit.ui.shared.util.screen
4037import to.bitkit.ui.theme.AppThemeSurface
4138import to.bitkit.viewmodels.ActivityListViewModel
42- import to.bitkit.viewmodels.AppViewModel
4339
4440@OptIn(ExperimentalMaterial3Api ::class )
4541@Composable
@@ -80,39 +76,6 @@ fun AllActivityScreen(
8076 )
8177}
8278
83- @OptIn(ExperimentalMaterial3Api ::class , ExperimentalHazeMaterialsApi ::class )
84- @Composable
85- fun AllActivityScreenWithTabBar (
86- viewModel : ActivityListViewModel ,
87- appViewModel : AppViewModel ,
88- onBack : () -> Unit ,
89- onScanClick : () -> Unit ,
90- onActivityItemClick : (String ) -> Unit ,
91- ) {
92- val hazeState = rememberHazeState()
93-
94- Box (modifier = Modifier .fillMaxSize()) {
95- Box (
96- modifier = Modifier
97- .fillMaxSize()
98- .hazeSource(hazeState)
99- ) {
100- AllActivityScreen (
101- viewModel = viewModel,
102- onBack = onBack,
103- onActivityItemClick = onActivityItemClick,
104- )
105- }
106-
107- TabBar (
108- hazeState = hazeState,
109- onSendClick = { appViewModel.showSheet(Sheet .Send ()) },
110- onReceiveClick = { appViewModel.showSheet(Sheet .Receive ) },
111- onScanClick = onScanClick,
112- )
113- }
114- }
115-
11679@Composable
11780@OptIn(ExperimentalHazeMaterialsApi ::class )
11881private fun AllActivityScreenContent (
0 commit comments