From aa2afd1402044b4f3e6343d3fb63bdac16bd703c Mon Sep 17 00:00:00 2001
From: Eshlender <35057681+e-shl@users.noreply.github.com>
Date: Thu, 2 Nov 2023 07:17:17 +0500
Subject: [PATCH] Text on tabs Overflow Ellipsis (#10095)

* Update TabbedDialog to TabbedScreen

* clean

(cherry picked from commit b3d7c9247530c0522033b4a9130d252bcbf50163)

# Conflicts:
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
---
 .../presentation/components/TabbedDialog.kt   | 21 ++++++-------------
 .../core/components/material/Tabs.kt          |  2 --
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
index 675f35360..20e3640c9 100644
--- a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
@@ -16,7 +16,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -32,6 +31,7 @@ import eu.kanade.tachiyomi.R
 import kotlinx.coroutines.launch
 import tachiyomi.presentation.core.components.HorizontalPager
 import tachiyomi.presentation.core.components.material.TabIndicator
+import tachiyomi.presentation.core.components.material.TabText
 
 object TabbedDialogPaddings {
     val Horizontal = 24.dp
@@ -61,21 +61,12 @@ fun TabbedDialog(
                     indicator = { TabIndicator(it[pagerState.currentPage], pagerState.currentPageOffsetFraction) },
                     divider = {},
                 ) {
-                    tabTitles.fastForEachIndexed { i, tab ->
-                        val selected = pagerState.currentPage == i
+                    tabTitles.fastForEachIndexed { index, tab ->
                         Tab(
-                            selected = selected,
-                            onClick = { scope.launch { pagerState.animateScrollToPage(i) } },
-                            text = {
-                                Text(
-                                    text = tab,
-                                    color = if (selected) {
-                                        MaterialTheme.colorScheme.primary
-                                    } else {
-                                        MaterialTheme.colorScheme.onSurfaceVariant
-                                    },
-                                )
-                            },
+                            selected = pagerState.currentPage == index,
+                            onClick = { scope.launch { pagerState.animateScrollToPage(index) } },
+                            text = { TabText(text = tab) },
+                            unselectedContentColor = MaterialTheme.colorScheme.onSurface,
                         )
                     }
                 }
diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
index 178033cfd..0770d577a 100644
--- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
+++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
@@ -65,10 +65,8 @@ fun TabText(text: String, badgeCount: Int? = null) {
     ) {
         Text(
             text = text,
-            // SY -->
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            // SY <--
         )
         if (badgeCount != null) {
             Pill(