diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt index 9e5723f..4f6e859 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/ViewsSettings.kt @@ -176,9 +176,14 @@ internal fun ViewsScreen( ) GroupedRow( title = stringResource(R.string.settings_timeline_scale), - summary = stringResource(state.timelineScale.labelRes), + summary = if (hours.enabled) { + stringResource(R.string.settings_timeline_scale_by_visible_hours) + } else { + stringResource(state.timelineScale.labelRes) + }, position = Position.Middle, - onClick = { showTimelineScale = true }, + dimmed = hours.enabled, + onClick = if (hours.enabled) null else ({ showTimelineScale = true }), ) GroupedRow( title = stringResource(R.string.settings_visible_hours), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87ead00..82e8ca8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -478,6 +478,7 @@ Multi-day view How many days the multi-day view shows side by side. Today opens in the first column. Hour height + Set by Visible hours How much vertical space one hour takes in week and day view. Both views share this setting. You can also pinch the timeline with two fingers to set any height in between. Fit whole day All 24 hours on one screen, no scrolling