更新布局

aaa1115910 · Oct 2, 2024 · ec1a642 · ec1a642
1 parent ef2aeb7
commit ec1a642
Show file tree

Hide file tree

Showing 23 changed files with 1,193 additions and 728 deletions.
diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/activities/MainActivity.kt b/app/src/main/kotlin/dev/aaa1115910/bv/activities/MainActivity.kt
@@ -12,7 +12,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import dev.aaa1115910.bv.repository.UserRepository
-import dev.aaa1115910.bv.screen.HomeScreen
+import dev.aaa1115910.bv.screen.MainScreen
 import dev.aaa1115910.bv.screen.RegionBlockScreen
 import dev.aaa1115910.bv.screen.user.lock.UnlockUserScreen
 import dev.aaa1115910.bv.ui.theme.BVTheme
@@ -67,7 +67,7 @@ class MainActivity : ComponentActivity() {
                 } else {
                     //HomeScreen()
                     if (!userLockLocked) {
-                        HomeScreen()
+                        MainScreen()
                     } else {
                         UnlockUserScreen(
                             onUnlockSuccess = { user ->

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/activities/anime/AnimeIndexActivity.kt b/app/src/main/kotlin/dev/aaa1115910/bv/activities/anime/AnimeIndexActivity.kt
@@ -3,7 +3,7 @@ package dev.aaa1115910.bv.activities.anime
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import dev.aaa1115910.bv.screen.home.anime.AnimeIndexScreen
+import dev.aaa1115910.bv.screen.main.pgc.anime.AnimeIndexScreen
 import dev.aaa1115910.bv.ui.theme.BVTheme
 
 class AnimeIndexActivity : ComponentActivity() {

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/activities/anime/AnimeTimelineActivity.kt b/app/src/main/kotlin/dev/aaa1115910/bv/activities/anime/AnimeTimelineActivity.kt
@@ -3,7 +3,7 @@ package dev.aaa1115910.bv.activities.anime
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import dev.aaa1115910.bv.screen.home.anime.AnimeTimelineScreen
+import dev.aaa1115910.bv.screen.main.pgc.anime.AnimeTimelineScreen
 import dev.aaa1115910.bv.ui.theme.BVTheme
 
 class AnimeTimelineActivity : ComponentActivity() {

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/activities/search/SearchInputActivity.kt b/app/src/main/kotlin/dev/aaa1115910/bv/activities/search/SearchInputActivity.kt
@@ -3,15 +3,18 @@ package dev.aaa1115910.bv.activities.search
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.runtime.remember
+import androidx.compose.ui.focus.FocusRequester
 import dev.aaa1115910.bv.screen.search.SearchInputScreen
 import dev.aaa1115910.bv.ui.theme.BVTheme
 
 class SearchInputActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
+            val defaultFocusRequester = remember { FocusRequester() }
             BVTheme {
-                SearchInputScreen()
+                SearchInputScreen(defaultFocusRequester = defaultFocusRequester)
             }
         }
     }

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/component/DevelopingTip.kt b/app/src/main/kotlin/dev/aaa1115910/bv/component/DevelopingTip.kt
@@ -0,0 +1,59 @@
+package dev.aaa1115910.bv.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import dev.aaa1115910.bv.ui.theme.BVTheme
+
+@Composable
+fun DevelopingTip(modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(20.dp)
+    ) {
+        Text(
+            text = "\uD83D\uDEA7",
+            style = MaterialTheme.typography.displayLarge
+        )
+        Text(
+            text = "前方施工 请绕行",
+            style = MaterialTheme.typography.titleLarge
+        )
+    }
+}
+
+@Composable
+fun DevelopingTipContent(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        DevelopingTip()
+    }
+}
+
+@Preview
+@Composable
+private fun DevelopingTipPreview() {
+    BVTheme {
+        DevelopingTip()
+    }
+}
+
+@Preview(device = "id:tv_1080p")
+@Composable
+private fun DevelopingTipContentPreview() {
+    BVTheme {
+        DevelopingTipContent()
+    }
+}