From 85c911cf3517b8730c3e96137c3976bfe88d824c Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 6 Aug 2023 21:35:32 +0800
Subject: [PATCH] Tweak GalleryDetailScene button layout

---
 .../ehviewer/ui/scene/GalleryDetailScene.kt   | 99 +++++++++----------
 app/src/main/res/values-de/strings.xml        |  3 +
 app/src/main/res/values-es/strings.xml        |  3 +
 app/src/main/res/values-fr/strings.xml        |  3 +
 app/src/main/res/values-ja/strings.xml        |  3 +
 app/src/main/res/values-ko/strings.xml        |  3 +
 app/src/main/res/values-nb-rNO/strings.xml    |  2 +
 app/src/main/res/values-th/strings.xml        |  3 +
 app/src/main/res/values-zh-rCN/strings.xml    |  3 +
 app/src/main/res/values-zh-rHK/strings.xml    |  3 +
 app/src/main/res/values-zh-rTW/strings.xml    |  3 +
 app/src/main/res/values/strings.xml           |  3 +
 12 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
index a59015a15..57f4942ba 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
@@ -35,10 +35,10 @@ import android.widget.ArrayAdapter
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -53,13 +53,14 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.CloudDone
-import androidx.compose.material.icons.filled.Difference
+import androidx.compose.material.icons.filled.FolderZip
 import androidx.compose.material.icons.filled.ImageSearch
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.filled.SwapVerticalCircle
 import androidx.compose.material3.Button
@@ -69,6 +70,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.FilledTonalButton
 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
@@ -93,6 +95,7 @@ import androidx.compose.ui.layout.LocalPinnableContainer
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
@@ -156,7 +159,6 @@ import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.ui.tools.CrystalCard
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.ui.tools.FilledTertiaryIconButton
-import com.hippo.ehviewer.ui.tools.FilledTertiaryIconToggleButton
 import com.hippo.ehviewer.ui.tools.GalleryDetailRating
 import com.hippo.ehviewer.util.AppHelper
 import com.hippo.ehviewer.util.ExceptionUtils
@@ -191,7 +193,6 @@ class GalleryDetailScene : BaseScene() {
     private var downloadButtonText by mutableStateOf("")
     private var ratingText by mutableStateOf("")
     private var torrentText by mutableStateOf("")
-    private var favButtonText by mutableStateOf("")
     private var getDetailError by mutableStateOf("")
 
     private var mTorrentList: TorrentResult? = null
@@ -412,6 +413,7 @@ class GalleryDetailScene : BaseScene() {
                                     Text(
                                         text = EhUtils.getSuitableTitle(it),
                                         maxLines = 2,
+                                        overflow = TextOverflow.Ellipsis,
                                     )
                                 }
                             },
@@ -427,6 +429,27 @@ 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 = ::doShareGallery) {
+                                    Icon(
+                                        imageVector = Icons.Default.Share,
+                                        contentDescription = null,
+                                    )
+                                }
                                 var dropdown by remember { mutableStateOf(false) }
                                 IconButton(onClick = { dropdown = !dropdown }) {
                                     Icon(
@@ -660,12 +683,16 @@ class GalleryDetailScene : BaseScene() {
         @Composable
         fun EhIconButton(
             icon: ImageVector,
+            text: String,
             onClick: () -> Unit,
-        ) = FilledTertiaryIconButton(onClick = onClick) {
-            Icon(
-                imageVector = icon,
-                contentDescription = null,
-            )
+        ) = Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            FilledTertiaryIconButton(onClick = onClick) {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = null,
+                )
+            }
+            Text(text = text)
         }
         Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin)))
         if (galleryDetail.newerVersions.isNotEmpty()) {
@@ -680,41 +707,28 @@ class GalleryDetailScene : BaseScene() {
             }
             Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin)))
         }
-        FlowRow(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.Center,
+        Row(
+            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 }
-            }
-            FilledTertiaryIconToggleButton(
-                checked = favored,
-                onCheckedChange = { modifyFavourite() },
-            ) {
-                Icon(
-                    imageVector = getFavoriteIcon(favored),
-                    contentDescription = null,
-                )
-            }
             EhIconButton(
-                icon = Icons.Default.Difference,
+                icon = Icons.Default.Search,
+                text = stringResource(id = R.string.similar_gallery),
                 onClick = ::showSimilarGalleryList,
             )
             EhIconButton(
                 icon = Icons.Default.ImageSearch,
+                text = stringResource(id = R.string.search_cover),
                 onClick = ::showCoverGalleryList,
             )
-            EhIconButton(
-                icon = Icons.Default.Share,
-                onClick = ::doShareGallery,
-            )
             EhIconButton(
                 icon = Icons.Default.SwapVerticalCircle,
+                text = torrentText,
                 onClick = ::showTorrentDialog,
             )
             EhIconButton(
-                icon = Icons.Default.CloudDone,
+                icon = Icons.Default.FolderZip,
+                text = stringResource(id = R.string.archive),
                 onClick = ::showArchiveDialog,
             )
         }
@@ -861,13 +875,6 @@ class GalleryDetailScene : BaseScene() {
         galleryDetailUrl?.let { AppHelper.share(requireActivity(), it) }
     }
 
-    private fun updateFavoriteDrawable() {
-        val gd = composeBindingGD ?: return
-        lifecycleScope.launchIO {
-            favButtonText = gd.favoriteName ?: getString(R.string.local_favorites)
-        }
-    }
-
     private fun modifyFavourite() {
         val galleryDetail = composeBindingGD ?: return
         lifecycleScope.launchIO {
@@ -880,9 +887,6 @@ class GalleryDetailScene : BaseScene() {
                     } else {
                         showTip(R.string.add_to_favorite_success, LENGTH_SHORT)
                     }
-                    withUIContext {
-                        onModifyFavoritesSuccess()
-                    }
                 }.onFailure {
                     if (it !is CancellationException) {
                         if (remove) {
@@ -892,10 +896,6 @@ class GalleryDetailScene : BaseScene() {
                         }
                     }
                 }
-                withUIContext {
-                    // Update UI
-                    updateFavoriteDrawable()
-                }
             }
         }
     }
@@ -953,7 +953,6 @@ class GalleryDetailScene : BaseScene() {
         composeBindingGI = gd.galleryInfo
         composeBindingGD = gd
         updateDownloadText()
-        updateFavoriteDrawable()
         ratingText = getAllRatingText(gd.rating, gd.ratingCount)
         torrentText = resources.getString(R.string.torrent_count, gd.torrentCount)
     }
@@ -1249,12 +1248,6 @@ class GalleryDetailScene : BaseScene() {
         updateDownloadText()
     }
 
-    private fun onModifyFavoritesSuccess() {
-        if (composeBindingGD != null) {
-            updateFavoriteDrawable()
-        }
-    }
-
     private inner class DeleteDialogHelper(
         private val mGalleryInfo: GalleryInfo,
         private val mBuilder: CheckBoxDialogBuilder,
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9fd5067a9..1d0d48e70 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -105,6 +105,8 @@
     <string name="read">Lesen</string>
     <string name="share">Teilen</string>
     <string name="rate">Bewerten</string>
+    <string name="similar_gallery">Ähnlich</string>
+    <string name="search_cover">Nach dem Umschlag suchen</string>
     <string name="no_tags">Kein Etikett</string>
     <string name="no_comments">Kein Kommentar</string>
     <string name="no_more_comments">Keine weiteren Kommentare</string>
@@ -309,6 +311,7 @@
     <string name="no_archives">Keine Archivdatei</string>
     <string name="download_archive_started">Archivdatei wird heruntergeladen</string>
     <string name="download_archive_failure">Fehler beim Herunterladen der Archivdatei</string>
+    <string name="archive">Archivdateien</string>
     <string name="download_archive_failure_no_hath">H@H-Klient ist für das Herunterladen der Archivdateien erforderlich</string>
     <string name="settings_privacy">Datenschutzoptionen</string>
     <string name="settings_privacy_secure">Screenshot verhindern</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1e77ef9b0..d7cb655e2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -138,6 +138,8 @@
     <string name="torrent_count">Torrent (%d)</string>
     <string name="share">Compartir</string>
     <string name="rate">Valorar</string>
+    <string name="similar_gallery">Similar</string>
+    <string name="search_cover">Buscar portada</string>
     <string name="no_tags">Sin etiquetas</string>
     <string name="no_comments">Sin comentarios</string>
     <string name="no_more_comments">No hay más comentarios</string>
@@ -408,6 +410,7 @@
     <string name="cancel_vote_down">Cancelar voto negativo</string>
     <string name="clear_all">Limpiar todo</string>
     <string name="comment_failed">Comentario fallido</string>
+    <string name="archive">Archivo</string>
     <string name="delete">Eliminar</string>
     <string name="download_state_failed">Descarga fallida</string>
     <string name="download_state_none">Descarga en pausa</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0cb10c2af..1287e2d7e 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -147,6 +147,8 @@
     <string name="torrent_count">Torrent (%d)</string>
     <string name="share">Partager</string>
     <string name="rate">Noter</string>
+    <string name="similar_gallery">Similaire(s)</string>
+    <string name="search_cover">Chercher le couverture</string>
     <string name="no_tags">Aucun tag</string>
     <string name="no_comments">Aucun commentaire</string>
     <string name="no_more_comments">Pas d\'autres commentaires</string>
@@ -442,6 +444,7 @@
     <string name="no_archives">Aucun fiche archives</string>
     <string name="download_archive_started">Téléchargement du fiche archives a commencé</string>
     <string name="download_archive_failure">Téléchargement du fiche archives a échoué</string>
+    <string name="archive">Fiches archives</string>
     <string name="download_archive_failure_no_hath">Client H@H est nécessaire pour le téléchargement de fiches archives</string>
     <string name="settings_privacy">Confidentialité</string>
     <string name="settings_privacy_secure">Empêcher les captures d\'ecran</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fab8a68f4..da7c6a9af 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -146,6 +146,8 @@
     <string name="torrent_count">トレント (%d)</string>
     <string name="share">共有</string>
     <string name="rate">評価</string>
+    <string name="similar_gallery">類似のギャラリー</string>
+    <string name="search_cover">カバーを検索</string>
     <string name="no_tags">タグなし</string>
     <string name="no_comments">コメントなし</string>
     <string name="no_more_comments">コメントはこれ以上ありません</string>
@@ -433,6 +435,7 @@
     <string name="no_archives">圧縮パッケージなし</string>
     <string name="download_archive_started">圧縮パッケージのダウンロードを開始しました</string>
     <string name="download_archive_failure">圧縮パッケージをダウンロードできませんでした</string>
+    <string name="archive">圧縮パッケージ</string>
     <string name="download_archive_failure_no_hath">圧縮パッケージのダウンロードにはH@Hクライアントが必要です</string>
     <string name="settings_privacy">プライバシー</string>
     <string name="settings_privacy_secure">スクリーンキャプチャを防ぐ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c7b2c40f6..81d8740fe 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -137,6 +137,8 @@
     <string name="torrent_count">토렌트 (%d)</string>
     <string name="share">공유</string>
     <string name="rate">평가</string>
+    <string name="similar_gallery">유사</string>
+    <string name="search_cover">커버 검색</string>
     <string name="no_tags">태그 없음</string>
     <string name="no_comments">코멘트 없음</string>
     <string name="no_more_comments">코멘트가 더 없음</string>
@@ -406,6 +408,7 @@
     <string name="no_archives">아카이브 없음</string>
     <string name="download_archive_started">아카이브 다운로드가 시작되었습니다.</string>
     <string name="download_archive_failure">아카이브 다운로드에 실패했습니다.</string>
+    <string name="archive">아카이브</string>
     <string name="download_archive_failure_no_hath">아카이브를 다운로드하려면 H@H 클라이언트가 필요합니다.</string>
     <string name="settings_privacy">개인 정보</string>
     <string name="settings_privacy_secure">화면 캡처 허용 안 함</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index e59e93901..711fb4d3b 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -13,6 +13,7 @@
     <string name="downloads">Nedlastninger</string>
     <string name="register">Registrering</string>
     <string name="error_invalid_number">Ugyldig nummer</string>
+    <string name="similar_gallery">Lignende</string>
     <string name="homepage">Hjemmeside</string>
     <string name="history">Historikk</string>
     <string name="subscription">Abonnement</string>
@@ -44,6 +45,7 @@
     <string name="search">Søk</string>
     <string name="image_search">Bildesøk</string>
     <string name="search_normal">Normalt søk</string>
+    <string name="search_cover">Søk i omslag</string>
     <string name="search_image">Bildesøk</string>
     <string name="search_specify_uploader">Angi opplaster</string>
     <string name="search_specify_tag">Angi etikett</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 69d6d4855..28e41826e 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -139,6 +139,8 @@
     <string name="torrent_count">Torrent (%d)</string>
     <string name="share">แชร์</string>
     <string name="rate">คะแนน</string>
+    <string name="similar_gallery">เหมือน</string>
+    <string name="search_cover">ค้นหาปก</string>
     <string name="no_tags">ไม่มีแท็ก</string>
     <string name="no_comments">ไม่มีความคิดเห็น</string>
     <string name="no_more_comments">ไม่มีความเห็นเพิ่มเติมแล้ว</string>
@@ -421,6 +423,7 @@
     <string name="no_archives">ยังไม่มีไฟล์บีบอัด</string>
     <string name="download_archive_started">เริ่มการดาวน์โหลดบีบอัด</string>
     <string name="download_archive_failure">การดาวน์โหลดไฟล์บีบอัดล้มเหลว</string>
+    <string name="archive">การบีบอัด</string>
     <string name="download_archive_failure_no_hath">ต้องการ H@H client เพื่อโหลดไฟล์บีบอัด</string>
     <string name="settings_privacy">ความเป็นส่วนตัว</string>
     <string name="settings_privacy_secure">ป้องกันการบันทึกภาพหน้าจอ</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 605503cc1..75e39c913 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -137,6 +137,8 @@
     <string name="torrent_count">种子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">评分</string>
+    <string name="similar_gallery">相似画廊</string>
+    <string name="search_cover">搜索封面</string>
     <string name="no_tags">暂无标签</string>
     <string name="no_comments">暂无评论</string>
     <string name="no_more_comments">已显示所有评论</string>
@@ -450,6 +452,7 @@
     <string name="no_archives">没有压缩包</string>
     <string name="download_archive_started">开始下载压缩包</string>
     <string name="download_archive_failure">无法下载压缩包</string>
+    <string name="archive">压缩包</string>
     <string name="archive_free">免费</string>
     <string name="archive_original">原始档案</string>
     <string name="archive_resample">重采样档案</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a730abebb..48bd4a79d 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -155,6 +155,8 @@
     <string name="torrent_count">種子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">評分</string>
+    <string name="similar_gallery">相似畫廊</string>
+    <string name="search_cover">搜索封面</string>
     <string name="no_tags">暫無標籤</string>
     <string name="no_comments">暫無評論</string>
     <string name="no_more_comments">已顯示所有評論</string>
@@ -462,6 +464,7 @@
     <string name="no_archives">沒有壓縮包</string>
     <string name="download_archive_started">開始下載壓縮包</string>
     <string name="download_archive_failure">無法下載壓縮包</string>
+    <string name="archive">壓縮包</string>
     <string name="download_archive_failure_no_hath">下載壓縮包需要 H@H 客户端</string>
     <string name="settings_privacy">隱私</string>
     <string name="settings_privacy_secure">不允許荧幕抓取</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d0817b85d..81b886197 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -134,6 +134,8 @@
     <string name="torrent_count">種子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">評分</string>
+    <string name="similar_gallery">類似的圖庫</string>
+    <string name="search_cover">以封面搜尋</string>
     <string name="no_tags">還沒有標籤</string>
     <string name="no_comments">沒有留言</string>
     <string name="no_more_comments">已顯示所有的留言了</string>
@@ -439,6 +441,7 @@
     <string name="no_archives">沒有壓縮檔</string>
     <string name="download_archive_started">開始下載壓縮檔</string>
     <string name="download_archive_failure">下載失敗</string>
+    <string name="archive">壓縮檔</string>
     <string name="archive_free">免費</string>
     <string name="archive_original">原始檔案</string>
     <string name="archive_resample">重新採樣檔案</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b16486fd..0f92c2f44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,6 +179,8 @@
     <string name="torrent_count">Torrent (%d)</string>
     <string name="share">Share</string>
     <string name="rate">Rate</string>
+    <string name="similar_gallery">Similar</string>
+    <string name="search_cover">Search Cover</string>
     <string name="no_tags">No tags</string>
     <string name="no_comments">No comments</string>
     <string name="no_more_comments">No more comments</string>
@@ -515,6 +517,7 @@
     <string name="no_archives">No Archives</string>
     <string name="download_archive_started">Archive download started</string>
     <string name="download_archive_failure">Failed to download archive</string>
+    <string name="archive">Archive</string>
     <string name="archive_free">Free</string>
     <string name="archive_original">Original archive</string>
     <string name="archive_resample">Resample archive</string>