Move favorite button below header

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt

@@ -68,9 +68,9 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.FilledTonalIconToggleButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.IconToggleButton
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
@@ -429,20 +429,11 @@ class GalleryDetailScene : BaseScene() {
                             },
                             scrollBehavior = scrollBehavior,
                             actions = {
-                                composeBindingGD?.let { galleryDetail ->
-                                    val favored by produceState(initialValue = false) {
-                                        value = galleryDetail.favoriteSlot != NOT_FAVORITED
-                                        FavouriteStatusRouter.stateFlow(galleryDetail.gid).collect { value = it != NOT_FAVORITED }
-                                    }
-                                    IconToggleButton(
-                                        checked = favored,
-                                        onCheckedChange = { modifyFavourite() },
-                                    ) {
-                                        Icon(
-                                            imageVector = getFavoriteIcon(favored),
-                                            contentDescription = null,
-                                        )
-                                    }
+                                IconButton(onClick = ::showArchiveDialog) {
+                                    Icon(
+                                        imageVector = Icons.Default.FolderZip,
+                                        contentDescription = null,
+                                    )
                                 }
                                 IconButton(onClick = ::doShareGallery) {
                                     Icon(
@@ -711,6 +702,27 @@ class GalleryDetailScene : BaseScene() {
             modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()),
             horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterHorizontally),
         ) {
+            val favored by produceState(initialValue = false) {
+                value = galleryDetail.favoriteSlot != NOT_FAVORITED
+                FavouriteStatusRouter.stateFlow(galleryDetail.gid).collect { value = it != NOT_FAVORITED }
+            }
+            val favButtonText = if (favored) {
+                galleryDetail.favoriteName ?: stringResource(id = R.string.local_favorites)
+            } else {
+                stringResource(id = R.string.not_favorited)
+            }
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                FilledTonalIconToggleButton(
+                    checked = favored,
+                    onCheckedChange = { modifyFavourite() },
+                ) {
+                    Icon(
+                        imageVector = getFavoriteIcon(favored),
+                        contentDescription = null,
+                    )
+                }
+                Text(text = favButtonText)
+            }
             EhIconButton(
                 icon = Icons.Default.Search,
                 text = stringResource(id = R.string.similar_gallery),
@@ -726,11 +738,6 @@ class GalleryDetailScene : BaseScene() {
                 text = torrentText,
                 onClick = ::showTorrentDialog,
             )
-            EhIconButton(
-                icon = Icons.Default.FolderZip,
-                text = stringResource(id = R.string.archive),
-                onClick = ::showArchiveDialog,
-            )
         }
         Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin)))
         CrystalCard(

app/src/main/res/values-de/strings.xml

@@ -120,6 +120,7 @@
     <string name="rate_failed">Bewertung fehlgeschlagen</string>
     <string name="no_torrents">Keine Torrentdatei</string>
     <string name="torrents">Torrentdateien</string>
+    <string name="not_favorited">Nicht zu Favoriten hinzugefügt</string>
     <string name="add_favorites_dialog_title">Zu Favoriten hinzufügen</string>
     <string name="add_to_favorite_success">Zu Favoriten hinzugefügt</string>
     <string name="remove_from_favorite_success">Aus Favoriten entfernt</string>

app/src/main/res/values-es/strings.xml

@@ -153,6 +153,7 @@
     <string name="rate_failed">Valoración fallida</string>
     <string name="no_torrents">Sin torrents</string>
     <string name="torrents">Torrents</string>
+    <string name="not_favorited">No en favoritos</string>
     <string name="add_favorites_dialog_title">Añadir a favoritos - Elige categoría</string>
     <string name="remove_from_favorite_success">Eliminado de favoritos</string>
     <string name="add_to_favorite_failure">No se ha podido agregar a favoritos</string>

app/src/main/res/values-fr/strings.xml

@@ -162,6 +162,7 @@
     <string name="rate_failed">Échec de notation</string>
     <string name="no_torrents">Aucun fiche torrent</string>
     <string name="torrents">Fiches torrent</string>
+    <string name="not_favorited">Non ajoutée à favoris</string>
     <string name="add_favorites_dialog_title">Ajouter à favoris</string>
     <string name="add_to_favorite_success">Ajouté à favoris</string>
     <string name="remove_from_favorite_success">Retirer de favoris</string>

app/src/main/res/values-ja/strings.xml

@@ -161,6 +161,7 @@
     <string name="rate_failed">評価できませんでした</string>
     <string name="no_torrents">トレントなし</string>
     <string name="torrents">トレント</string>
+    <string name="not_favorited">未追加</string>
     <string name="add_favorites_dialog_title">お気に入りに追加</string>
     <string name="add_to_favorite_success">お気に入りに追加しました。</string>
     <string name="remove_from_favorite_success">お気に入りから削除しました。</string>

app/src/main/res/values-ko/strings.xml

@@ -152,6 +152,7 @@
     <string name="rate_failed">평가에 실패했습니다.</string>
     <string name="no_torrents">토렌트 없음</string>
     <string name="torrents">토렌트</string>
+    <string name="not_favorited">즐겨찾기에 없음</string>
     <string name="add_favorites_dialog_title">즐겨찾기에 추가</string>
     <string name="add_to_favorite_success">즐겨찾기에 추가했습니다.</string>
     <string name="remove_from_favorite_success">즐겨찾기에서 제거했습니다.</string>

app/src/main/res/values-th/strings.xml

@@ -154,6 +154,7 @@
     <string name="rate_failed">การให้คะแนนล้มเหลว</string>
     <string name="no_torrents">ไม่มีไฟล์ torrents</string>
     <string name="torrents">Torrents</string>
+    <string name="not_favorited">ยังไม่เพิ่มรายการโปรด</string>
     <string name="add_favorites_dialog_title">เพิ่มเข้ารายการโปรด</string>
     <string name="add_to_favorite_success">เพิ่มเข้าในรายการโปรดแล้ว</string>
     <string name="remove_from_favorite_success">ลบออกจากรายการโปรดแล้ว</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -155,6 +155,7 @@
     <string name="download_torrent_started">开始下载种子</string>
     <string name="download_torrent_failure">无法下载种子</string>
     <string name="torrents">种子</string>
+    <string name="not_favorited">未收藏</string>
     <string name="add_favorites_dialog_title">添加收藏</string>
     <string name="add_to_favorite_success">已添加至收藏</string>
     <string name="remove_from_favorite_success">移除收藏</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -170,6 +170,7 @@
     <string name="rate_failed">評分失敗</string>
     <string name="no_torrents">沒有種子</string>
     <string name="torrents">種子</string>
+    <string name="not_favorited">未收藏</string>
     <string name="add_favorites_dialog_title">添加收藏</string>
     <string name="add_to_favorite_success">已添加至收藏</string>
     <string name="remove_from_favorite_success">移除收藏</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -151,6 +151,7 @@
     <string name="download_torrent_started">開始下載種子</string>
     <string name="download_torrent_failure">無法下載種子</string>
     <string name="torrents">種子</string>
+    <string name="not_favorited">未收藏</string>
     <string name="add_favorites_dialog_title">新增到收藏裡</string>
     <string name="add_to_favorite_success">已新增至收藏中</string>
     <string name="remove_from_favorite_success">從收藏中移除</string>

app/src/main/res/values/strings.xml

@@ -197,6 +197,7 @@
     <string name="download_torrent_started">Torrent download started</string>
     <string name="download_torrent_failure">Failed to download torrent</string>
     <string name="torrents">Torrents</string>
+    <string name="not_favorited">Not favorited</string>
     <string name="add_favorites_dialog_title">Add to favorites</string>
     <string name="add_to_favorite_success">Added to favorites</string>
     <string name="remove_from_favorite_success">Removed from favorites</string>