Skip to content

Commit 45b0c76

Browse files
authored
Merge pull request #1151 from DimensionDev/bugfix/mixed_timeline
disable mixed timeline when only one tab
2 parents a774351 + ee7fd1c commit 45b0c76

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

app/src/main/java/dev/dimension/flare/ui/screen/home/HomeTimelineScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ private fun timelinePresenter(
382382
)
383383
} else {
384384
listOfNotNull(
385-
if (settings.enableMixedTimeline) {
385+
if (settings.enableMixedTimeline && settings.mainTabs.size > 1) {
386386
MixedTimelineTabItem(
387387
subTimelineTabItem = settings.mainTabs,
388388
)

app/src/main/java/dev/dimension/flare/ui/screen/home/TabSettingScreen.kt

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -135,29 +135,32 @@ internal fun TabSettingScreen(
135135
verticalArrangement = Arrangement.spacedBy(2.dp),
136136
) {
137137
state.enableMixedTimeline.onSuccess { enabled ->
138-
item("header") {
139-
ListItem(
140-
headlineContent = {
141-
Text(stringResource(R.string.tab_settings_mixed_timeline))
142-
},
143-
trailingContent = {
144-
Switch(
145-
checked = enabled,
146-
onCheckedChange = {
147-
state.setEnableMixedTimeline(it)
148-
},
149-
)
150-
},
151-
supportingContent = {
152-
Text(stringResource(R.string.tab_settings_mixed_timeline_desc))
153-
},
154-
modifier =
155-
Modifier
156-
.listCard()
157-
.clickable {
158-
state.setEnableMixedTimeline(!enabled)
159-
},
160-
)
138+
if (state.currentTabs.size > 1) {
139+
item("header") {
140+
ListItem(
141+
headlineContent = {
142+
Text(stringResource(R.string.tab_settings_mixed_timeline))
143+
},
144+
trailingContent = {
145+
Switch(
146+
checked = enabled,
147+
onCheckedChange = {
148+
state.setEnableMixedTimeline(it)
149+
},
150+
)
151+
},
152+
supportingContent = {
153+
Text(stringResource(R.string.tab_settings_mixed_timeline_desc))
154+
},
155+
modifier =
156+
Modifier
157+
.animateItem()
158+
.listCard()
159+
.clickable {
160+
state.setEnableMixedTimeline(!enabled)
161+
},
162+
)
163+
}
161164
}
162165
}
163166
item {

0 commit comments

Comments
 (0)