diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt index 630002fe..d52653b8 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt @@ -20,7 +20,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -28,12 +27,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.util.fastForEachIndexed import com.huanchengfly.tieba.post.R -import com.huanchengfly.tieba.post.activities.NewSearchActivity import com.huanchengfly.tieba.post.arch.GlobalEvent import com.huanchengfly.tieba.post.arch.emitGlobalEvent import com.huanchengfly.tieba.post.arch.onGlobalEvent -import com.huanchengfly.tieba.post.goToActivity import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme +import com.huanchengfly.tieba.post.ui.page.LocalNavigator +import com.huanchengfly.tieba.post.ui.page.destinations.SearchPageDestination import com.huanchengfly.tieba.post.ui.page.main.explore.concern.ConcernPage import com.huanchengfly.tieba.post.ui.page.main.explore.hot.HotPage import com.huanchengfly.tieba.post.ui.page.main.explore.personalized.PersonalizedPage @@ -113,7 +112,7 @@ private fun TabText( @Composable fun ExplorePage() { val account = LocalAccount.current - val context = LocalContext.current + val navigator = LocalNavigator.current val loggedIn = remember(account) { account != null } @@ -156,7 +155,7 @@ fun ExplorePage() { icon = Icons.Rounded.Search, contentDescription = stringResource(id = R.string.title_search) ) { - context.goToActivity() + navigator.navigate(SearchPageDestination) } }, ) { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt index 84947ad8..c010d513 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt @@ -14,12 +14,11 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import com.huanchengfly.tieba.post.R -import com.huanchengfly.tieba.post.activities.NewSearchActivity -import com.huanchengfly.tieba.post.goToActivity import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme +import com.huanchengfly.tieba.post.ui.page.LocalNavigator +import com.huanchengfly.tieba.post.ui.page.destinations.SearchPageDestination import com.huanchengfly.tieba.post.ui.page.main.notifications.list.NotificationsListPage import com.huanchengfly.tieba.post.ui.page.main.notifications.list.NotificationsType import com.huanchengfly.tieba.post.ui.widgets.compose.ActionItem @@ -32,7 +31,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) @Composable fun NotificationsPage() { - val context = LocalContext.current + val navigator = LocalNavigator.current val pages = listOf Unit)>>( stringResource(id = R.string.title_reply_me) to @Composable { NotificationsListPage(type = NotificationsType.ReplyMe) @@ -54,7 +53,7 @@ fun NotificationsPage() { icon = Icons.Rounded.Search, contentDescription = stringResource(id = R.string.title_search) ) { - context.goToActivity() + navigator.navigate(SearchPageDestination) } }, ) { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/search/SearchPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/search/SearchPage.kt index 169d0323..fc68c1ab 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/search/SearchPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/search/SearchPage.kt @@ -555,7 +555,7 @@ private fun SearchTopBar( placeholder = { Text( text = stringResource(id = R.string.hint_search), - color = ExtendedTheme.colors.onTopBarSurface.copy(alpha = ContentAlpha.disabled) + color = ExtendedTheme.colors.onTopBarSurface.copy(alpha = ContentAlpha.medium) ) }, modifier = Modifier