From 6ee79f14cbfaa095c4febfedbeccf8ef4afa453a Mon Sep 17 00:00:00 2001 From: beyond Date: Wed, 26 Aug 2026 19:59:01 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/myapplication/MainApp.kt | 2 +- .../myapplication/screens/LibraryScreen.kt | 23 +++---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/com/example/myapplication/MainApp.kt b/app/src/main/kotlin/com/example/myapplication/MainApp.kt index 0d7b2d1..eba750a 100644 --- a/app/src/main/kotlin/com/example/myapplication/MainApp.kt +++ b/app/src/main/kotlin/com/example/myapplication/MainApp.kt @@ -79,7 +79,7 @@ fun MainApp() { var recordsSegment by remember { mutableIntStateOf(1) } var searchQuery by remember { mutableStateOf("") } var showLibraryAddDialog by remember { mutableStateOf(false) } - var libraryIsGrid by remember { mutableStateOf(false) } + var libraryIsGrid by remember { mutableStateOf(true) } var showIconLibraryManager by remember { mutableStateOf(false) } var showCacheDetail by remember { mutableStateOf(false) } var homeDetailVisible by remember { mutableStateOf(false) } diff --git a/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt b/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt index 4db43d7..dc041a3 100644 --- a/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt +++ b/app/src/main/kotlin/com/example/myapplication/screens/LibraryScreen.kt @@ -188,7 +188,6 @@ private fun ServerCard(server: EmbyServer, tint: Color, onClick: () -> Unit, onC } } - /* ------------------------------------------------------------------ */ /* Icon Library Section */ /* ------------------------------------------------------------------ */ @@ -243,7 +242,7 @@ private fun ServerGridCard(server: EmbyServer, tint: Color, onClick: () -> Unit, GlassPopup(expanded = showPopup, onDismissRequest = { showPopup = false }) { GlassPopupItem(text = "\u7F16\u8F91", icon = Icons.Outlined.Edit, onClick = { showPopup = false; onEdit() }); GlassPopupItem(text = "\u66F4\u6362\u56FE\u6807", icon = Icons.Outlined.Image, onClick = { showPopup = false; onChangeIcon() }); GlassPopupItem(text = "\u5220\u9664", icon = Icons.Outlined.Delete, tint = offlineRed, onClick = { showPopup = false; onDelete() }) } } } - if (server.note.isNotBlank()) { + Box(Modifier.height(22.dp)) { Text( text = server.note, color = GlassTokens.subtext, @@ -257,7 +256,6 @@ private fun ServerGridCard(server: EmbyServer, tint: Color, onClick: () -> Unit, } } - /* ------------------------------------------------------------------ */ /* Icon Library Section */ /* ------------------------------------------------------------------ */ @@ -338,8 +336,8 @@ fun LibraryScreen( } else { LazyVerticalGrid( columns = if (isGrid) GridCells.Fixed(2) else GridCells.Fixed(1), - modifier = Modifier.fillMaxSize().padding(horizontal = if (isGrid) 16.dp else 0.dp), - contentPadding = PaddingValues(top = 16.dp, bottom = bottomBarContentPadding(86.dp).calculateBottomPadding()), + modifier = Modifier.fillMaxSize().statusBarsPadding().padding(horizontal = if (isGrid) 16.dp else 0.dp, vertical = 0.dp).padding(top = 78.dp), + contentPadding = PaddingValues(bottom = bottomBarContentPadding(86.dp).calculateBottomPadding()), verticalArrangement = Arrangement.spacedBy(if (isGrid) 12.dp else 10.dp), horizontalArrangement = Arrangement.spacedBy(if (isGrid) 12.dp else 0.dp), ) { @@ -379,7 +377,6 @@ fun LibraryScreen( } } - /* ------------------------------------------------------------------ */ /* Icon Library Section */ /* ------------------------------------------------------------------ */ @@ -397,7 +394,6 @@ fun IconLibraryManagerScreen( var showAddDialog by remember { mutableStateOf(false) } var editingLibraryId by remember { mutableStateOf(null) } - val editingLibrary = editingLibraryId?.let { id -> libraries.find { it.id == id } } Column(modifier.fillMaxSize() @@ -1192,7 +1188,6 @@ private fun AddIconLibraryDialog( } } - /* ------------------------------------------------------------------ */ /* Icon Library Section */ /* ------------------------------------------------------------------ */ @@ -1410,7 +1405,6 @@ private fun IconPickerDialog(server: EmbyServer, onDismiss: () -> Unit, onPick: } } - /* ------------------------------------------------------------------ */ /* Icon Library Section */ /* ------------------------------------------------------------------ */ @@ -1556,14 +1550,3 @@ private fun AddServerDialog(initial: EmbyServer? = null, onDismiss: () -> Unit, } } - - - - - - - - - - -