From 6129bbc9ab9ac493a40e4b7f928f8271c191ae2d Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Sun, 26 Jun 2022 23:48:29 +0700
Subject: [PATCH] MangaInfoHeader tweaks (#7382)

* Changed cover alignment when title is longer
* Hide artist text if it's equal to author
* Set single line to status and source name
---
 .../manga/components/MangaInfoHeader.kt         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
index 053e0b240..e8b122ec4 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
@@ -64,6 +64,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -316,7 +317,7 @@ private fun MangaAndSourceTitlesLarge(
                 ),
             textAlign = TextAlign.Center,
         )
-        if (!artist.isNullOrBlank()) {
+        if (!artist.isNullOrBlank() && author != artist) {
             Text(
                 text = artist,
                 style = MaterialTheme.typography.titleSmall,
@@ -361,6 +362,8 @@ private fun MangaAndSourceTitlesLarge(
                         SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus)
                         else -> stringResource(R.string.unknown)
                     },
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 1,
                 )
                 DotSeparatorText()
                 if (isStubSource) {
@@ -376,6 +379,8 @@ private fun MangaAndSourceTitlesLarge(
                 Text(
                     text = sourceName,
                     modifier = Modifier.clickableNoIndication { doSearch(sourceName, false) },
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 1,
                 )
             }
         }
@@ -403,7 +408,9 @@ private fun MangaAndSourceTitlesSmall(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         MangaCover.Book(
-            modifier = Modifier.sizeIn(maxWidth = 100.dp),
+            modifier = Modifier
+                .sizeIn(maxWidth = 100.dp)
+                .align(Alignment.Top),
             data = coverDataProvider(),
             onClick = onCoverClick,
         )
@@ -439,7 +446,7 @@ private fun MangaAndSourceTitlesSmall(
                         onClick = { if (!author.isNullOrBlank()) doSearch(author, true) },
                     ),
             )
-            if (!artist.isNullOrBlank()) {
+            if (!artist.isNullOrBlank() && author != artist) {
                 Text(
                     text = artist,
                     style = MaterialTheme.typography.titleSmall,
@@ -483,6 +490,8 @@ private fun MangaAndSourceTitlesSmall(
                             SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus)
                             else -> stringResource(R.string.unknown)
                         },
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1,
                     )
                     DotSeparatorText()
                     if (isStubSource) {
@@ -503,6 +512,8 @@ private fun MangaAndSourceTitlesSmall(
                                 false,
                             )
                         },
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1,
                     )
                 }
             }