From 7a071bcd2e4f2110a3e34a64e1ed55e6e78cb690 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 24 Sep 2024 18:11:58 +0100 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86HomePage=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=BASearchPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/home/{HomePage.android.kt => SearchPage.android.kt} | 2 +- .../kotlin/ui/home/{HomePage.kt => SearchPage.kt} | 2 +- app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename app/shared/src/androidMain/kotlin/ui/home/{HomePage.android.kt => SearchPage.android.kt} (98%) rename app/shared/src/commonMain/kotlin/ui/home/{HomePage.kt => SearchPage.kt} (99%) diff --git a/app/shared/src/androidMain/kotlin/ui/home/HomePage.android.kt b/app/shared/src/androidMain/kotlin/ui/home/SearchPage.android.kt similarity index 98% rename from app/shared/src/androidMain/kotlin/ui/home/HomePage.android.kt rename to app/shared/src/androidMain/kotlin/ui/home/SearchPage.android.kt index b775599b72..d58a059731 100644 --- a/app/shared/src/androidMain/kotlin/ui/home/HomePage.android.kt +++ b/app/shared/src/androidMain/kotlin/ui/home/SearchPage.android.kt @@ -26,6 +26,6 @@ import me.him188.ani.app.ui.foundation.ProvideCompositionLocalsForPreview @Preview(backgroundColor = 0xFF000000, showBackground = true) internal fun PreviewHomePagePortrait() { ProvideCompositionLocalsForPreview { - HomePage() + SearchPage() } } diff --git a/app/shared/src/commonMain/kotlin/ui/home/HomePage.kt b/app/shared/src/commonMain/kotlin/ui/home/SearchPage.kt similarity index 99% rename from app/shared/src/commonMain/kotlin/ui/home/HomePage.kt rename to app/shared/src/commonMain/kotlin/ui/home/SearchPage.kt index 3943718c05..2300df4a9b 100644 --- a/app/shared/src/commonMain/kotlin/ui/home/HomePage.kt +++ b/app/shared/src/commonMain/kotlin/ui/home/SearchPage.kt @@ -60,7 +60,7 @@ 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() }, diff --git a/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt b/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt index 53dfc9462e..03a81f922a 100644 --- 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, )