修改了HomePage的名字为SearchPage

open-ani · Sep 24, 2024 · ce57ce0 · ce57ce0
1 parent 29f5a0f
commit ce57ce0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...idMain/kotlin/ui/home/HomePage.android.kt → ...Main/kotlin/ui/home/SearchPage.android.kt b/...idMain/kotlin/ui/home/HomePage.android.kt → ...Main/kotlin/ui/home/SearchPage.android.kt
@@ -20,12 +20,12 @@ package me.him188.ani.app.ui.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
-import me.him188.ani.app.ui.foundation.ProvideCompositionLocalsForPreview
+import me.him188.ani.app.ui.foundation.ProvideFoundationCompositionLocalsForPreview
 
 @Composable
 @Preview(backgroundColor = 0xFF000000, showBackground = true)
 internal fun PreviewHomePagePortrait() {
- ProvideCompositionLocalsForPreview {
- HomePage()
+ ProvideFoundationCompositionLocalsForPreview {
+ SearchPage()
  }
 }
diff --git a/...src/commonMain/kotlin/ui/home/HomePage.kt → ...c/commonMain/kotlin/ui/home/SearchPage.kt b/...src/commonMain/kotlin/ui/home/HomePage.kt → ...c/commonMain/kotlin/ui/home/SearchPage.kt
@@ -60,14 +60,14 @@ import me.him188.ani.app.ui.home.search.SubjectPreviewColumn
 import me.him188.ani.app.ui.home.search.SubjectSearchBar
 
 @Composable
-fun HomePage(
+fun SearchPage(
  modifier: Modifier = Modifier,
  contentPadding: PaddingValues = PaddingValues(0.dp),
  searchBarFocusRequester: FocusRequester = remember { FocusRequester() },
  contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
 ) {
- val searchViewModel = viewModel { SearchViewModel() }
- val snackBarHostState = remember { SnackbarHostState() }
+ val searchViewModel = viewModel { SearchViewModel() } // 改成SubjectSearchState(无injection， 可以依赖于其他的state)
+ val snackBarHostState = remember { SnackbarHostState() } // 改成toaster
  val layoutDirection = LocalLayoutDirection.current
 
  val searchTag by searchViewModel.searchTags.collectAsStateWithLifecycle()

diff --git a/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt b/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt
@@ -78,7 +78,7 @@ import me.him188.ani.app.ui.foundation.layout.LocalPlatformWindow
 import me.him188.ani.app.ui.foundation.layout.isWidthAtLeastMedium
 import me.him188.ani.app.ui.foundation.layout.setRequestFullScreen
 import me.him188.ani.app.ui.foundation.theme.AniThemeDefaults
-import me.him188.ani.app.ui.home.HomePage
+import me.him188.ani.app.ui.home.SearchPage
 import me.him188.ani.app.ui.home.search.SearchViewModel
 import me.him188.ani.app.ui.profile.AccountViewModel
 import me.him188.ani.app.ui.profile.ProfilePage
@@ -259,7 +259,7 @@ private fun HomeSceneLandscape(
  VerticalPager(pagerState, userScrollEnabled = false) {
  when (it) {
  0 -> {
- HomePage(
+ SearchPage(
  Modifier.fillMaxSize(),
  searchBarFocusRequester = searchBarFocusRequester,
  contentWindowInsets = windowInsets,
@@ -400,7 +400,7 @@ private fun HomeScenePortrait(
  ) {
  HorizontalPager(pagerState, userScrollEnabled = false) {
  when (it) {
- 0 -> HomePage(
+ 0 -> SearchPage(
  contentPadding = contentPadding,
  searchBarFocusRequester = searchBarFocusRequester,
  )