Skip to content

Commit e67a24e

Browse files
committed
remove drawer from discover and search
1 parent f8ace72 commit e67a24e

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ import androidx.compose.foundation.lazy.grid.GridCells
1313
import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
1414
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
1515
import androidx.compose.material3.Card
16-
import androidx.compose.material3.DrawerState
1716
import androidx.compose.material3.ListItem
1817
import androidx.compose.material3.Scaffold
1918
import androidx.compose.material3.Text
2019
import androidx.compose.runtime.Composable
2120
import androidx.compose.runtime.getValue
2221
import androidx.compose.runtime.remember
23-
import androidx.compose.runtime.rememberCoroutineScope
2422
import androidx.compose.ui.Alignment
2523
import androidx.compose.ui.Modifier
2624
import androidx.compose.ui.res.stringResource
@@ -46,19 +44,15 @@ import dev.dimension.flare.ui.presenter.home.DiscoverPresenter
4644
import dev.dimension.flare.ui.presenter.home.DiscoverState
4745
import dev.dimension.flare.ui.presenter.invoke
4846
import dev.dimension.flare.ui.screen.destinations.ProfileRouteDestination
47+
import dev.dimension.flare.ui.screen.destinations.QuickMenuDialogRouteDestination
4948
import dev.dimension.flare.ui.theme.screenHorizontalPadding
50-
import kotlinx.coroutines.launch
5149
import org.koin.compose.koinInject
5250

5351
@Destination(
5452
wrappers = [ThemeWrapper::class],
5553
)
5654
@Composable
57-
internal fun DiscoverRoute(
58-
navigator: DestinationsNavigator,
59-
drawerState: DrawerState,
60-
) {
61-
val scope = rememberCoroutineScope()
55+
internal fun DiscoverRoute(navigator: DestinationsNavigator) {
6256
val state by producePresenter("discoverSearchPresenter") { discoverSearchPresenter() }
6357
Scaffold(
6458
topBar = {
@@ -71,9 +65,7 @@ internal fun DiscoverRoute(
7165
DiscoverSearch(
7266
state = state,
7367
onAccountClick = {
74-
scope.launch {
75-
drawerState.open()
76-
}
68+
navigator.navigate(QuickMenuDialogRouteDestination)
7769
},
7870
)
7971
}

app/src/main/java/dev/dimension/flare/ui/screen/home/SearchScreen.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.material.icons.Icons
1313
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1414
import androidx.compose.material.icons.filled.Search
1515
import androidx.compose.material3.Card
16-
import androidx.compose.material3.DrawerState
1716
import androidx.compose.material3.ExperimentalMaterial3Api
1817
import androidx.compose.material3.Icon
1918
import androidx.compose.material3.IconButton
@@ -24,7 +23,6 @@ import androidx.compose.runtime.Composable
2423
import androidx.compose.runtime.getValue
2524
import androidx.compose.runtime.mutableStateOf
2625
import androidx.compose.runtime.remember
27-
import androidx.compose.runtime.rememberCoroutineScope
2826
import androidx.compose.runtime.setValue
2927
import androidx.compose.ui.Modifier
3028
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -56,11 +54,11 @@ import dev.dimension.flare.ui.presenter.home.ActiveAccountState
5654
import dev.dimension.flare.ui.presenter.home.SearchPresenter
5755
import dev.dimension.flare.ui.presenter.home.SearchState
5856
import dev.dimension.flare.ui.presenter.invoke
57+
import dev.dimension.flare.ui.screen.destinations.QuickMenuDialogRouteDestination
5958
import dev.dimension.flare.ui.screen.profile.CommonProfileHeader
6059
import dev.dimension.flare.ui.screen.profile.ProfileHeaderLoading
6160
import dev.dimension.flare.ui.theme.screenHorizontalPadding
6261
import io.ktor.http.decodeURLQueryComponent
63-
import kotlinx.coroutines.launch
6462
import org.koin.compose.koinInject
6563

6664
@Destination(
@@ -78,16 +76,12 @@ import org.koin.compose.koinInject
7876
fun SearchRoute(
7977
keyword: String,
8078
navigator: DestinationsNavigator,
81-
drawerState: DrawerState,
8279
) {
83-
val scope = rememberCoroutineScope()
8480
SearchScreen(
8581
initialQuery = keyword,
8682
onBack = { navigator.navigateUp() },
8783
onAccountClick = {
88-
scope.launch {
89-
drawerState.open()
90-
}
84+
navigator.navigate(QuickMenuDialogRouteDestination)
9185
},
9286
)
9387
}

0 commit comments

Comments
 (0)