mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-26 11:07:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust tab indicator visual (#9219)

Browse Source 
Now behaves like the non-compose indicator by showing the swipe progress too
This commit is contained in:
Ivan Iskandar
2023-03-17 09:20:25 +07:00
committed by GitHub
parent 4d3e13b0d1
commit 18e55aa25f
6 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
View File

@ -56,7 +56,7 @@ fun TabbedDialog(
TabRow(
modifier = Modifier.weight(1f),
selectedTabIndex = pagerState.currentPage,
indicator = { TabIndicator(it[pagerState.currentPage]) },
indicator = { TabIndicator(it[pagerState.currentPage], pagerState.currentPageOffsetFraction) },
divider = {},
) {
tabTitles.fastForEachIndexed { i, tab ->

2
app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
View File

@ -69,7 +69,7 @@ fun TabbedScreen(
) {
TabRow(
selectedTabIndex = state.currentPage,
indicator = { TabIndicator(it[state.currentPage]) },
indicator = { TabIndicator(it[state.currentPage], state.currentPageOffsetFraction) },
) {
tabs.forEachIndexed { index, tab ->
Tab(

2
app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
View File

@ -65,7 +65,7 @@ fun LibraryContent(
}
LibraryTabs(
categories = categories,
currentPageIndex = pagerState.currentPage,
pagerState = pagerState,
getNumberOfMangaForCategory = getNumberOfMangaForCategory,
) { scope.launch { pagerState.animateScrollToPage(it) } }
}

9
app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
View File

@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.unit.dp
import eu.kanade.presentation.category.visualName
import tachiyomi.domain.category.model.Category
import tachiyomi.presentation.core.components.PagerState
import tachiyomi.presentation.core.components.material.Divider
import tachiyomi.presentation.core.components.material.TabIndicator
import tachiyomi.presentation.core.components.material.TabText
@ -15,22 +16,22 @@ import tachiyomi.presentation.core.components.material.TabText
@Composable
internal fun LibraryTabs(
categories: List<Category>,
currentPageIndex: Int,
pagerState: PagerState,
getNumberOfMangaForCategory: (Category) -> Int?,
onTabItemClick: (Int) -> Unit,
) {
Column {
ScrollableTabRow(
selectedTabIndex = currentPageIndex,
selectedTabIndex = pagerState.currentPage,
edgePadding = 0.dp,
indicator = { TabIndicator(it[currentPageIndex]) },
indicator = { TabIndicator(it[pagerState.currentPage], pagerState.currentPageOffsetFraction) },
// TODO: use default when width is fixed upstream
// https://issuetracker.google.com/issues/242879624
divider = {},
) {
categories.forEachIndexed { index, category ->
Tab(
selected = currentPageIndex == index,
selected = pagerState.currentPage == index,
onClick = { onTabItemClick(index) },
text = {
TabText(