release: cut v2.2.0 — tap-to-create + local calendar management
All checks were successful
CI / ci (push) Successful in 8m53s
Release — F-Droid repo + Gitea release / ci (push) Successful in 1m59s
Release — F-Droid repo + Gitea release / build-and-deploy (push) Successful in 8m57s
Release — F-Droid repo + Gitea release / gitea-release (push) Successful in 8s

Day/week: tap an empty slot to open the create form prefilled with that
day and the tapped hour (snapped to the hour, 1 h long). Threaded a start
time through CalendarHost → EventEditScreen → openNew; the FAB keeps its
default.

Local calendars: a full-screen editor from Settings → Calendars to
create/rename/recolor/delete device-only calendars (ACCOUNT_TYPE_LOCAL,
sync-adapter insert) with name, pastel-previewed colour, and a description
(stored in CAL_SYNC1). Synced calendars are listed read-only grouped by
account, each with a "manage in source app" deep-link resolved from the
account's own authenticator (DAVx5/ICSx5/…), plus an add-account shortcut;
a <queries> block makes the source apps launchable. Extracted a shared
InlineTextField into ui.common so the event form and calendar editor share
one borderless input style.

Tests: repository delegation + write-failure, mapper isLocal/description,
fake data source extended. Version bumped to 2.2.0 / 20200.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-16 09:49:14 +02:00
parent 15fb76005c
commit e194da3766
26 changed files with 1459 additions and 100 deletions

View File

@@ -14,6 +14,7 @@ class CalendarMapperTest {
color: Int = 0,
visible: Int = 1,
accessLevel: Int = CalendarContract.Calendars.CAL_ACCESS_OWNER,
description: String? = null,
): MapColumnReader = MapColumnReader(
CalendarProjection.IDX_ID to id,
CalendarProjection.IDX_DISPLAY_NAME to displayName,
@@ -22,6 +23,7 @@ class CalendarMapperTest {
CalendarProjection.IDX_COLOR to color,
CalendarProjection.IDX_VISIBLE to visible,
CalendarProjection.IDX_ACCESS_LEVEL to accessLevel,
CalendarProjection.IDX_DESCRIPTION to description,
)
@Test
@@ -90,4 +92,35 @@ class CalendarMapperTest {
val src = reader(accessLevel = CalendarContract.Calendars.CAL_ACCESS_NONE)
assertThat(src.toCalendarSource().canModifyContents).isFalse()
}
@Test
fun `local account type marks the calendar as app-owned`() {
val src = reader(accountType = CalendarContract.ACCOUNT_TYPE_LOCAL).toCalendarSource()
assertThat(src.isLocal).isTrue()
}
@Test
fun `synced account type is not local`() {
val src = reader(accountType = "com.google").toCalendarSource()
assertThat(src.isLocal).isFalse()
}
@Test
fun `local calendar exposes its CAL_SYNC1 description`() {
val src = reader(
accountType = CalendarContract.ACCOUNT_TYPE_LOCAL,
description = "House stuff",
).toCalendarSource()
assertThat(src.description).isEqualTo("House stuff")
}
@Test
fun `synced calendar never exposes CAL_SYNC1 as a description`() {
// CAL_SYNC1 holds the sync token for synced rows — it must not leak as a note.
val src = reader(
accountType = "com.google",
description = """{"type":"SYNC_TOKEN","value":"…"}""",
).toCalendarSource()
assertThat(src.description).isNull()
}
}

View File

@@ -327,6 +327,65 @@ class CalendarRepositoryImplTest {
}
}
@Test
fun `createLocalCalendar delegates and returns the new id`(@TempDir tempDir: Path) = runTest {
val fake = FakeCalendarDataSource().apply { nextCalendarId = 501L }
val repo = CalendarRepositoryImpl(fake, newPrefs(tempDir), Dispatchers.Unconfined)
val id = repo.createLocalCalendar(
displayName = "Home",
color = 0xFF33B679.toInt(),
description = "House stuff",
)
assertThat(id).isEqualTo(501L)
assertThat(fake.createdCalendars).containsExactly(
FakeCalendarDataSource.CreatedCalendar("Home", 0xFF33B679.toInt(), "House stuff"),
)
}
@Test
fun `updateCalendar forwards id, name, color and description`(@TempDir tempDir: Path) = runTest {
val fake = FakeCalendarDataSource()
val repo = CalendarRepositoryImpl(fake, newPrefs(tempDir), Dispatchers.Unconfined)
repo.updateCalendar(
id = 5L,
displayName = "Renamed",
color = 0xFF039BE5.toInt(),
description = null,
)
assertThat(fake.updatedCalendars).containsExactly(
FakeCalendarDataSource.UpdatedCalendar(5L, "Renamed", 0xFF039BE5.toInt(), null),
)
}
@Test
fun `deleteCalendar delegates to the data source`(@TempDir tempDir: Path) = runTest {
val fake = FakeCalendarDataSource()
val repo = CalendarRepositoryImpl(fake, newPrefs(tempDir), Dispatchers.Unconfined)
repo.deleteCalendar(id = 7L)
assertThat(fake.deletedCalendarIds).containsExactly(7L)
}
@Test
fun `createLocalCalendar propagates write failures`(@TempDir tempDir: Path) = runTest {
val fake = FakeCalendarDataSource().apply {
writeError = WriteFailedException("create local calendar 'Home'")
}
val repo = CalendarRepositoryImpl(fake, newPrefs(tempDir), Dispatchers.Unconfined)
try {
repo.createLocalCalendar(displayName = "Home", color = 0, description = null)
error("Expected WriteFailedException")
} catch (expected: WriteFailedException) {
assertThat(expected.message).contains("Home")
}
}
@Test
fun `eventDetail throws NoSuchEventException when data source returns null`(@TempDir tempDir: Path) = runTest {
val fake = FakeCalendarDataSource().apply {

View File

@@ -26,6 +26,18 @@ internal class FakeCalendarDataSource : CalendarDataSource {
val deletedEventIds = mutableListOf<Long>()
val deletedOccurrences = mutableListOf<Pair<Long, Long>>()
val deletedFromOccurrences = mutableListOf<Pair<Long, Long>>()
/** Id returned by the next [createLocalCalendar]. */
var nextCalendarId: Long = 500L
data class CreatedCalendar(val displayName: String, val color: Int, val description: String?)
data class UpdatedCalendar(
val id: Long,
val displayName: String,
val color: Int,
val description: String?,
)
val createdCalendars = mutableListOf<CreatedCalendar>()
val updatedCalendars = mutableListOf<UpdatedCalendar>()
val deletedCalendarIds = mutableListOf<Long>()
private val listeners = mutableListOf<() -> Unit>()
@@ -34,6 +46,22 @@ internal class FakeCalendarDataSource : CalendarDataSource {
instancesResult(beginMillis, endMillis)
override fun eventDetail(eventId: Long): EventDetail? = eventDetailResult(eventId)
override fun createLocalCalendar(displayName: String, color: Int, description: String?): Long {
writeError?.let { throw it }
createdCalendars += CreatedCalendar(displayName, color, description)
return nextCalendarId
}
override fun updateCalendar(id: Long, displayName: String, color: Int, description: String?) {
writeError?.let { throw it }
updatedCalendars += UpdatedCalendar(id, displayName, color, description)
}
override fun deleteCalendar(id: Long) {
writeError?.let { throw it }
deletedCalendarIds += id
}
override fun insertEvent(form: EventForm): Long {
writeError?.let { throw it }
insertedForms += form