Merge release/v2.14.0 into chore/floret-implementation
Brings the 2.14.0 feature set (Month week numbers, .ics restore + per-calendar export picker, Day view on date-header tap, wrapped long titles, Simplified Chinese) onto the floret-kit migration without resurrecting the inline component copies the kit now owns. Conflict resolutions (both were import-block collisions where the migration repointed to de.jeanlucmakiola.floret.* while release kept the old app-local imports): - CalendarsScreen.kt: keep the kit imports (CollapsingScaffold, DialogAmountField/DialogUnitDropdown, collapseExit/expandEnter, predictiveBack) and repoint FullScreenPicker + positionOf to the kit (both moved out of ui.common). Keep the genuinely app-local LeadingAvatar/SourceLogo/curatedSourcePackage; drop the renamed calendarCollapseExit/calendarExpandEnter (0 uses). - ImportScreen.kt: keep the app-local CalendarPickerGroups, use the kit's predictiveBack, drop the now-unused OptionCard import. Semantic fixup: CalendarPickerGroups.kt (new in 2.14.0) relied on same-package resolution of GroupedRow/Position, which the migration moved to the kit — added the explicit floret.components imports. Verified: :app:compileDebugKotlin, ./gradlew test (app + kit), and scripts/check_translations.py all green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -28,8 +28,8 @@ android {
|
||||
// which builds this version and then creates the matching vX.Y.Z tag +
|
||||
// release itself (versionCode is pinned to MAJOR*10000 + MINOR*100 +
|
||||
// PATCH from versionName, e.g. 2.7.2 -> 20702). See docs/RELEASING.md.
|
||||
versionCode = 21301
|
||||
versionName = "2.13.1"
|
||||
versionCode = 21400
|
||||
versionName = "2.14.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user