HapeLee 6 месяцев назад
Родитель
Сommit
12b20ce5d8
1 измененных файлов с 35 добавлено и 31 удалено
  1. 35 31
      app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt

+ 35 - 31
app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt

@@ -730,7 +730,7 @@ private fun BookshelfManageScreen(
                             ) {
                             ) {
                                 Column(
                                 Column(
                                     modifier = Modifier.weight(1f),
                                     modifier = Modifier.weight(1f),
-                                    verticalArrangement = Arrangement.spacedBy(4.dp)
+                                    verticalArrangement = Arrangement.spacedBy(2.dp)
                                 ) {
                                 ) {
                                     AppText(
                                     AppText(
                                         text = book.name,
                                         text = book.name,
@@ -762,7 +762,9 @@ private fun BookshelfManageScreen(
                                 )
                                 )
                             }
                             }
                             Row(
                             Row(
-                                modifier = Modifier.fillMaxWidth(),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(top = 4.dp),
                                 horizontalArrangement = Arrangement.spacedBy(8.dp),
                                 horizontalArrangement = Arrangement.spacedBy(8.dp),
                                 verticalAlignment = Alignment.CenterVertically
                                 verticalAlignment = Alignment.CenterVertically
                             ) {
                             ) {
@@ -777,35 +779,9 @@ private fun BookshelfManageScreen(
                                 } else {
                                 } else {
                                     Spacer(modifier = Modifier.weight(1f))
                                     Spacer(modifier = Modifier.weight(1f))
                                 }
                                 }
-                                Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-                                    SmallTonalIconButton(
-                                        onClick = {
-                                            if (!book.isLocal) {
-                                                viewModel.dispatch(BookshelfManageScreenIntent.ToggleBookDownload(book))
-                                            }
-                                        },
-                                        imageVector = if (isDownloading) Icons.Default.Stop else Icons.Default.Download,
-                                        contentDescription = "download"
-                                    )
-                                    SmallTonalIconButton(
-                                        onClick = { exportBook(book) },
-                                        imageVector = Icons.Default.Upload,
-                                        contentDescription = "upload"
-                                    )
-                                    SmallTonalIconButton(
-                                        onClick = {
-                                            pendingMoveGroupBookUrl = book.bookUrl
-                                            groupPickerCurrentGroupId = book.group.coerceAtLeast(0L)
-                                            showGroupSelectSheet = true
-                                        },
-                                        imageVector = Icons.Default.Bookmarks,
-                                        contentDescription = "group"
-                                    )
-                                    SmallTonalIconButton(
-                                        onClick = { moreMenuBookUrl = book.bookUrl },
-                                        imageVector = Icons.Default.MoreVert,
-                                        contentDescription = "more"
-                                    )
+                                Row(
+                                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                                ) {
                                     RoundDropdownMenu(
                                     RoundDropdownMenu(
                                         expanded = moreMenuBookUrl == book.bookUrl,
                                         expanded = moreMenuBookUrl == book.bookUrl,
                                         onDismissRequest = { moreMenuBookUrl = null }
                                         onDismissRequest = { moreMenuBookUrl = null }
@@ -838,6 +814,34 @@ private fun BookshelfManageScreen(
                                             }
                                             }
                                         )
                                         )
                                     }
                                     }
+                                    SmallTonalIconButton(
+                                        onClick = {
+                                            if (!book.isLocal) {
+                                                viewModel.dispatch(BookshelfManageScreenIntent.ToggleBookDownload(book))
+                                            }
+                                        },
+                                        imageVector = if (isDownloading) Icons.Default.Stop else Icons.Default.Download,
+                                        contentDescription = "download"
+                                    )
+                                    SmallTonalIconButton(
+                                        onClick = { exportBook(book) },
+                                        imageVector = Icons.Default.Upload,
+                                        contentDescription = "upload"
+                                    )
+                                    SmallTonalIconButton(
+                                        onClick = {
+                                            pendingMoveGroupBookUrl = book.bookUrl
+                                            groupPickerCurrentGroupId = book.group.coerceAtLeast(0L)
+                                            showGroupSelectSheet = true
+                                        },
+                                        imageVector = Icons.Default.Bookmarks,
+                                        contentDescription = "group"
+                                    )
+                                    SmallTonalIconButton(
+                                        onClick = { moreMenuBookUrl = book.bookUrl },
+                                        imageVector = Icons.Default.MoreVert,
+                                        contentDescription = "more"
+                                    )
                                 }
                                 }
                             }
                             }
                         }
                         }