makiolaj/calendula
1
0
Fork 1
Code Issues Pull Requests 6 Actions Releases 24 Activity

release: v2.11.0 #48

Merged
makiolaj merged 35 commits from release/v2.11.0 into main 2026-06-27 21:49:33 +00:00
Conversation 0 Commits 35 Files Changed 43 +3 -7
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b2bfdc0f42 - Show all commits

10
app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt
View File

@@ -470,7 +470,7 @@ private fun AppearanceScreen(
Spacer(Modifier.height(16.dp)) Spacer(Modifier.height(16.dp))
// Calendar layout // Calendar — view, week, and timeline formatting
GroupedRow( GroupedRow(
title = stringResource(R.string.settings_default_view), title = stringResource(R.string.settings_default_view),
summary = stringResource(state.defaultView.labelRes), summary = stringResource(state.defaultView.labelRes),
@@ -480,17 +480,13 @@ private fun AppearanceScreen(
GroupedRow( GroupedRow(
title = stringResource(R.string.settings_week_start), title = stringResource(R.string.settings_week_start),
summary = weekStartLabel(state.weekStart), summary = weekStartLabel(state.weekStart),
position = Position.Bottom, position = Position.Middle,
onClick = { showWeekStart = true }, onClick = { showWeekStart = true },
) )
Spacer(Modifier.height(16.dp))
// Timeline display
GroupedRow( GroupedRow(
title = stringResource(R.string.settings_time_format), title = stringResource(R.string.settings_time_format),
summary = timeFormatLabel(state.timeFormat), summary = timeFormatLabel(state.timeFormat),
position = Position.Top, position = Position.Middle,
onClick = { showTimeFormat = true }, onClick = { showTimeFormat = true },
) )
GroupedRow( GroupedRow(