From fef8f9c2e9da90ba786d40adb411d6ed35b3b74b Mon Sep 17 00:00:00 2001 From: Incido Developer Date: Tue, 6 Oct 2026 12:15:15 +1300 Subject: [PATCH] =?UTF-8?q?feat(phase-1/m4.1):=20:composeApp=20in-place=20?= =?UTF-8?q?=E2=86=92=20Kotlin=20Multiplatform=20(androidTarget=20+=20jvm)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plan §6.1 step 1, the conservative shape: build converts, Android code moves UNMODIFIED (git shows pure renames; behaviour diff = zero), and commonMain starts with only the files that compile for both targets today — theme Color/Type, PasswordPolicy, ReleaseNotes, LinkedShare- Composer — behind two new expect/actual seams (justification per §9): * platformDynamicColorScheme — Android actual keeps the pre-M4 Build.VERSION + dynamicColorScheme branch verbatim; JVM actual returns null (desktop hides dynamic color, per M3's posture). * relativeTimestamp — Android actual is DateUtils verbatim; JVM actual is a java.time approximation of the same format (English- only until M4 follow-up; desktop has no locale switch yet). New friction found paying itself into §3/§2 (all fixed in-tree): * kotlinMultiplatform must be registered at the ROOT with apply false like the other Kotlin markers — sibling modules' markers put KGP on the buildscript classpath and the subproject request then dies with the kapt-style 'already on classpath with unknown version' (§2.5). * KMP source-set dependency handlers: platform(libs.x) returns raw notation, not a Dependency — use project.dependencies.platform(…); debugImplementation is not on the handler (moved to a project-level dependencies block); androidTestImplementation dropped (no tests). * ColorScheme is androidx.compose.material3.ColorScheme, NOT ui.graphics — desktop ships it inside material3-desktop, no extra artifact needed. * AGP 8.7.2 > KGP 2.0.21's tested max 8.5 — warning only, same as the kapt modules; assembleDebug green. Deliberate deferrals (documented in the build file): :core:domain is still kotlin("jvm") so commonMain can't see it — NoteColors moves when domain converts (M4.2, per the Phase-0 recommendation); screens, ViewModels and AppContainer move with the container seam (M4.3). Verified: ./gradlew :composeApp:compileKotlinJvm + assembleDebug + :core:data-jvm:smoke (M1a PASS) + :desktopApp:run --self-test (SELFTEST wrote note, clean exit) + git status clean over core/**/objectbox-models (ID model file unchanged, invariant 2). --- build.gradle.kts | 6 + composeApp/build.gradle.kts | 157 ++++++++++++------ .../{main => androidMain}/AndroidManifest.xml | 0 .../kotlin/org/incido/compose/App.kt | 0 .../org/incido/compose/IncidoApplication.kt | 0 .../compose/data/backup/BackupManager.kt | 0 .../compose/data/backup/CarnetImporter.kt | 0 .../data/backup/PassphraseGenerator.kt | 0 .../data/security/ObjectBoxKeyProvider.kt | 0 .../incido/compose/data/security/PinHasher.kt | 0 .../compose/data/security/SecurityManager.kt | 0 .../data/settings/AndroidSettingsStore.kt | 0 .../org/incido/compose/di/AppContainer.kt | 0 .../compose/share/SharedIntentBuffer.kt | 0 .../compose/ui/drawer/DrawerViewModel.kt | 0 .../incido/compose/ui/drawer/IncidoDrawer.kt | 0 .../compose/ui/editor/ImageViewerScreen.kt | 0 .../compose/ui/editor/NoteEditorScreen.kt | 0 .../compose/ui/editor/NoteEditorViewModel.kt | 0 .../compose/ui/editor/VoiceNoteSection.kt | 0 .../incido/compose/ui/editor/VoiceRecorder.kt | 0 .../compose/ui/notelist/NoteListScreen.kt | 0 .../compose/ui/notelist/NoteListViewModel.kt | 0 .../compose/ui/settings/PassphraseDialog.kt | 0 .../compose/ui/settings/ReleaseNotesDialog.kt | 0 .../compose/ui/settings/SettingsScreen.kt | 0 .../compose/ui/settings/SettingsViewModel.kt | 0 .../ui/settings/auth/PinChangeScreen.kt | 0 .../ui/settings/auth/PinEntryScreen.kt | 0 .../ui/settings/auth/PinSetupScreen.kt | 0 .../org/incido/compose/ui/theme/NoteColors.kt | 0 .../incido/compose/ui/theme/ThemeAndroid.kt | 18 ++ .../compose/util/RelativeTimeAndroid.kt | 13 ++ .../compose/data/settings/PasswordPolicy.kt | 0 .../compose/data/settings/ReleaseNotes.kt | 0 .../compose/share/LinkedShareComposer.kt | 0 .../org/incido/compose/ui/theme/Color.kt | 0 .../org/incido/compose/ui/theme/Theme.kt | 24 ++- .../org/incido/compose/ui/theme/Type.kt | 0 .../org/incido/compose/util/RelativeTime.kt | 22 +++ .../org/incido/compose/ui/theme/ThemeJvm.kt | 10 ++ .../incido/compose/util/RelativeTimeJvm.kt | 40 +++++ .../org/incido/compose/util/RelativeTime.kt | 22 --- 43 files changed, 229 insertions(+), 83 deletions(-) rename composeApp/src/{main => androidMain}/AndroidManifest.xml (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/App.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/IncidoApplication.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/backup/BackupManager.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/backup/CarnetImporter.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/backup/PassphraseGenerator.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/security/ObjectBoxKeyProvider.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/security/PinHasher.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/security/SecurityManager.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/data/settings/AndroidSettingsStore.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/di/AppContainer.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/share/SharedIntentBuffer.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/drawer/DrawerViewModel.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/editor/NoteEditorViewModel.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/editor/VoiceNoteSection.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/editor/VoiceRecorder.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/notelist/NoteListViewModel.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/PassphraseDialog.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/ReleaseNotesDialog.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/SettingsScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/auth/PinChangeScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/auth/PinEntryScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/settings/auth/PinSetupScreen.kt (100%) rename composeApp/src/{main => androidMain}/kotlin/org/incido/compose/ui/theme/NoteColors.kt (100%) create mode 100644 composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/ThemeAndroid.kt create mode 100644 composeApp/src/androidMain/kotlin/org/incido/compose/util/RelativeTimeAndroid.kt rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/data/settings/PasswordPolicy.kt (100%) rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt (100%) rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/share/LinkedShareComposer.kt (100%) rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/ui/theme/Color.kt (100%) rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/ui/theme/Theme.kt (62%) rename composeApp/src/{main => commonMain}/kotlin/org/incido/compose/ui/theme/Type.kt (100%) create mode 100644 composeApp/src/commonMain/kotlin/org/incido/compose/util/RelativeTime.kt create mode 100644 composeApp/src/jvmMain/kotlin/org/incido/compose/ui/theme/ThemeJvm.kt create mode 100644 composeApp/src/jvmMain/kotlin/org/incido/compose/util/RelativeTimeJvm.kt delete mode 100644 composeApp/src/main/kotlin/org/incido/compose/util/RelativeTime.kt diff --git a/build.gradle.kts b/build.gradle.kts index caa6b7f..a968b90 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,12 @@ plugins { alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.kotlinAndroid) apply false alias(libs.plugins.kotlinJvm) apply false + // Phase 1 (M4.1): must be registered here too — otherwise :composeApp's + // request for the multiplatform plugin collides with the KGP classes the + // other Kotlin plugin markers already put on the buildscript classpath + // ("already on classpath with unknown version" — same family as the + // kapt trap in tools/DESKTOP_PHASE_PLAN.md §2.5). + alias(libs.plugins.kotlinMultiplatform) apply false alias(libs.plugins.kotlinCompose) apply false alias(libs.plugins.ksp) apply false } diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 0167008..42aec89 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -1,16 +1,107 @@ -// composeApp — Android UI module hosting all screens, ViewModels, theme, -// navigation, and the manual DI container. Regular Android Compose (not -// Compose Multiplatform) is used in v0.1 to keep the build simple; the -// migration path to Multiplatform in v0.2 is a module-level refactor. +// composeApp — Incido's UI module: all screens, ViewModels, theme, +// navigation, and the manual DI container. +// +// Phase 1 (M4.1): converted in place from `kotlin("android")` to +// `kotlin("multiplatform")` with `androidTarget()` + `jvm()`, per the +// order of attack in tools/DESKTOP_PHASE_PLAN.md §6.1. The split is +// deliberately conservative — the goal of THIS step is the build shape: +// +// * commonMain — every file that compiles for both targets today +// (theme Color/Type, PasswordPolicy, ReleaseNotes, +// LinkedShareComposer) plus two expect/actual seams: +// `platformDynamicColorScheme` and `relativeTimestamp`. +// The Android actuals keep the pre-M4 code verbatim. +// * androidMain — everything still touching `android.*` (screens, +// ViewModels, AppContainer, security, backup IO, …), +// moved UNMODIFIED. Zero behaviour change; the seams +// for these move file-by-file in M4.2/M4.3. +// * jvmMain — the JVM actuals. Nothing else yet: :desktopApp keeps +// its own stand-in UI until M4.5 consumes this target. +// +// Note: :core:domain is still a plain kotlin("jvm") module, so +// commonMain cannot reference it yet — that is why NoteColors.kt stays +// in androidMain until :core:domain is converted in M4.2. plugins { alias(libs.plugins.androidLibrary) - alias(libs.plugins.kotlinAndroid) + alias(libs.plugins.kotlinMultiplatform) + // org.jetbrains.compose provides the `compose.*` dependency accessors + // that resolve to the right artifact per target (androidx.compose.* + // on androidTarget, *-desktop jars on jvm). + alias(libs.plugins.compose) alias(libs.plugins.kotlinCompose) - // v0.3.2.0 — Kotlin Serialization for the Backup JSON codec. + // v0.3.2.0 — Kotlin Serialization for the Backup JSON codec (used by + // CarnetImporter today; the plugin stays target-agnostic). alias(libs.plugins.kotlinSerialization) } +kotlin { + jvmToolchain(17) + + androidTarget() + jvm() + + sourceSets { + commonMain.dependencies { + implementation(compose.runtime) + implementation(compose.ui) + implementation(compose.foundation) + implementation(compose.material3) + implementation(libs.kotlinx.coroutines.core) + } + + androidMain.dependencies { + implementation(project(":core:domain")) + implementation(project(":core:data")) + // Phase 1 (M2 task 1): backup codecs + bridge now live here; the + // org.incido.compose.data.backup package name was kept, so no imports + // changed — only this dependency line. + implementation(project(":core:backup")) + // Phase 1 (M3 task 1): settings repository, same treatment — package + // kept, the Context-based construction moved to AndroidSettingsStore.kt. + implementation(project(":core:settings")) + + // Core / lifecycle + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.lifecycle.runtime) + implementation(libs.androidx.lifecycle.process) + implementation(libs.kotlinx.coroutines.android) + + // Compose BOM keeps all Compose artefact versions aligned. + // (Called inline — the KMP source-set dependency handler's + // platform() returns a raw notation, not a Dependency, so the + // old `val composeBom = platform(…)` idiom fails here.) + implementation(project.dependencies.platform(libs.composeBom)) + + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.navigation.compose) + + // Compose (same org.jetbrains.compose artifacts as before the + // M4.1 conversion — they resolve to the androidx variants on + // this target; version alignment unchanged). + implementation(libs.compose.ui) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.compose.foundation) + implementation(libs.compose.material3) + implementation(libs.compose.material.icons.extended) + + // v0.3.2.0 — Settings (DataStore Preferences), Security (Biometric), + // and Backup (Kotlin Serialization JSON) support. + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.biometric) + implementation(libs.kotlinx.serialization.json) + } + + jvmMain.dependencies { + // Nothing yet — the compose artifacts arrive via commonMain; + // :core:data-jvm / :core:settings wiring lands with M4.3's + // container seam when :desktopApp starts consuming this target. + } + } +} + android { namespace = "org.incido.compose" compileSdk = 35 @@ -19,20 +110,15 @@ android { minSdk = 26 } - buildFeatures { - compose = true - buildConfig = true - } + // M4.1: `buildFeatures.compose` is NOT set — the org.jetbrains.compose + // plugin owns Compose wiring on this target (setting it here alongside + // the KMP plugin is the classic double-wire; see §3 trap 6's sibling). compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlin { - jvmToolchain(17) - } - packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -40,44 +126,11 @@ android { } } +// AGP's debug-only configurations are project-level, so the Compose +// tooling dependency that was `debugImplementation` before the M4.1 +// conversion keeps that exact scope here (the KMP `sourceSets { … }` +// dependency handlers only expose implementation/api/compileOnly). dependencies { - implementation(project(":core:domain")) - implementation(project(":core:data")) - // Phase 1 (M2 task 1): backup codecs + bridge now live here; the - // org.incido.compose.data.backup package name was kept, so no imports - // changed — only this dependency line. - implementation(project(":core:backup")) - // Phase 1 (M3 task 1): settings repository, same treatment — package - // kept, the Context-based construction moved to AndroidSettingsStore.kt. - implementation(project(":core:settings")) - - // Core / lifecycle - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.androidx.lifecycle.viewmodel.compose) - implementation(libs.androidx.lifecycle.runtime) - implementation(libs.androidx.lifecycle.process) - implementation(libs.kotlinx.coroutines.android) - - // Compose BOM keeps all Compose artefact versions aligned - val composeBom = platform(libs.composeBom) - implementation(composeBom) - androidTestImplementation(composeBom) - - implementation(libs.androidx.activity.compose) - implementation(libs.androidx.navigation.compose) - - // Compose - implementation(libs.compose.ui) - implementation(libs.compose.ui.tooling.preview) - implementation(libs.compose.foundation) - implementation(libs.compose.material3) - implementation(libs.compose.material.icons.extended) debugImplementation(libs.compose.ui.tooling) - - // v0.3.2.0 — Settings (DataStore Preferences), Security (Biometric), - // and Backup (Kotlin Serialization JSON) support. - implementation(libs.androidx.datastore.preferences) - implementation(libs.androidx.biometric) - implementation(libs.kotlinx.serialization.json) } + diff --git a/composeApp/src/main/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml similarity index 100% rename from composeApp/src/main/AndroidManifest.xml rename to composeApp/src/androidMain/AndroidManifest.xml diff --git a/composeApp/src/main/kotlin/org/incido/compose/App.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/App.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/App.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/App.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/IncidoApplication.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/IncidoApplication.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/IncidoApplication.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/IncidoApplication.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/backup/BackupManager.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/BackupManager.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/backup/BackupManager.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/BackupManager.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/backup/CarnetImporter.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/CarnetImporter.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/backup/CarnetImporter.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/CarnetImporter.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/backup/PassphraseGenerator.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/PassphraseGenerator.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/backup/PassphraseGenerator.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/backup/PassphraseGenerator.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/security/ObjectBoxKeyProvider.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/security/ObjectBoxKeyProvider.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/security/ObjectBoxKeyProvider.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/security/ObjectBoxKeyProvider.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/security/PinHasher.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/security/PinHasher.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/security/PinHasher.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/security/PinHasher.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/security/SecurityManager.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/security/SecurityManager.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/security/SecurityManager.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/security/SecurityManager.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/settings/AndroidSettingsStore.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/data/settings/AndroidSettingsStore.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/settings/AndroidSettingsStore.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/data/settings/AndroidSettingsStore.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/di/AppContainer.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/di/AppContainer.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/di/AppContainer.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/di/AppContainer.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/share/SharedIntentBuffer.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/share/SharedIntentBuffer.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/share/SharedIntentBuffer.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/share/SharedIntentBuffer.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/DrawerViewModel.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/drawer/DrawerViewModel.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/drawer/DrawerViewModel.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/drawer/DrawerViewModel.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorViewModel.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/NoteEditorViewModel.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorViewModel.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/NoteEditorViewModel.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/VoiceNoteSection.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/VoiceNoteSection.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/editor/VoiceNoteSection.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/VoiceNoteSection.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/VoiceRecorder.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/VoiceRecorder.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/editor/VoiceRecorder.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/editor/VoiceRecorder.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListViewModel.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/notelist/NoteListViewModel.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListViewModel.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/notelist/NoteListViewModel.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/PassphraseDialog.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/PassphraseDialog.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/PassphraseDialog.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/PassphraseDialog.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/ReleaseNotesDialog.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/ReleaseNotesDialog.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/ReleaseNotesDialog.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/ReleaseNotesDialog.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/SettingsScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/SettingsScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinChangeScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinChangeScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinChangeScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinChangeScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinEntryScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinEntryScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinEntryScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinEntryScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinSetupScreen.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinSetupScreen.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/settings/auth/PinSetupScreen.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/settings/auth/PinSetupScreen.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/theme/NoteColors.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/theme/NoteColors.kt rename to composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt diff --git a/composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/ThemeAndroid.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/ThemeAndroid.kt new file mode 100644 index 0000000..5e76a50 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/ThemeAndroid.kt @@ -0,0 +1,18 @@ +package org.incido.compose.ui.theme + +import android.os.Build +import androidx.compose.material3.ColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +/** Android actual — the verbatim pre-M4 dynamic-colour branch: a real + * Material You scheme on API 31+ (S), null below that. */ +@Composable +actual fun platformDynamicColorScheme(darkTheme: Boolean): ColorScheme? { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return null + val context = LocalContext.current + return if (darkTheme) dynamicDarkColorScheme(context) + else dynamicLightColorScheme(context) +} diff --git a/composeApp/src/androidMain/kotlin/org/incido/compose/util/RelativeTimeAndroid.kt b/composeApp/src/androidMain/kotlin/org/incido/compose/util/RelativeTimeAndroid.kt new file mode 100644 index 0000000..9c06357 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/incido/compose/util/RelativeTimeAndroid.kt @@ -0,0 +1,13 @@ +package org.incido.compose.util + +import android.text.format.DateUtils + +/** Android actual — verbatim pre-M4 formatting: Android's own + * localised relative-time helper, unchanged. */ +actual fun relativeTimestamp(epochMillis: Long, nowMillis: Long): String = + DateUtils.getRelativeTimeSpanString( + epochMillis, + nowMillis, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE, + ).toString() diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/settings/PasswordPolicy.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/data/settings/PasswordPolicy.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/settings/PasswordPolicy.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/data/settings/PasswordPolicy.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/share/LinkedShareComposer.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/share/LinkedShareComposer.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/share/LinkedShareComposer.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/share/LinkedShareComposer.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/theme/Color.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Color.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/theme/Color.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Color.kt diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Theme.kt similarity index 62% rename from composeApp/src/main/kotlin/org/incido/compose/ui/theme/Theme.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Theme.kt index 635ed61..8e4d288 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Theme.kt @@ -1,14 +1,23 @@ package org.incido.compose.ui.theme -import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext + +/** + * Phase 1 (M4.1) platform seam for Material You dynamic color. + * + * Android returns a real scheme on API 31+ (the pre-M4 behaviour, kept + * verbatim in `androidMain`); every other platform returns null and the + * brand palette below applies. Desktop deliberately has no dynamic + * colour — same decision as M3 ("desktop hides the four Android-only + * security/appearance features"). + */ +@Composable +expect fun platformDynamicColorScheme(darkTheme: Boolean): ColorScheme? private val DarkColorScheme = darkColorScheme( primary = Purple80, @@ -34,11 +43,8 @@ fun IncidoTheme( content: @Composable () -> Unit, ) { val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) - else dynamicLightColorScheme(context) - } + dynamicColor -> platformDynamicColorScheme(darkTheme) + ?: if (darkTheme) DarkColorScheme else LightColorScheme darkTheme -> DarkColorScheme else -> LightColorScheme } diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/theme/Type.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Type.kt similarity index 100% rename from composeApp/src/main/kotlin/org/incido/compose/ui/theme/Type.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/Type.kt diff --git a/composeApp/src/commonMain/kotlin/org/incido/compose/util/RelativeTime.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/util/RelativeTime.kt new file mode 100644 index 0000000..cb61c18 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/incido/compose/util/RelativeTime.kt @@ -0,0 +1,22 @@ +package org.incido.compose.util + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember + +/** + * Returns a localised "X ago" style timestamp for the given epoch millis. + * + * Phase 1 (M4.1) platform seam: Android formats via + * [android.text.format.DateUtils.getRelativeTimeSpanString] (verbatim + * pre-M4 behaviour, kept in `androidMain`); the JVM target formats with + * `java.time` (see `RelativeTime.jvm.kt`). + */ +@Composable +fun rememberRelativeTimestamp(epochMillis: Long): String { + val now = remember { System.currentTimeMillis() } + return remember(epochMillis) { relativeTimestamp(epochMillis, now) } +} + +/** Formats [epochMillis] relative to [nowMillis] — "23 min. ago" / + * "Today" / "Yesterday" / "3 days ago" / absolute date beyond that. */ +expect fun relativeTimestamp(epochMillis: Long, nowMillis: Long): String diff --git a/composeApp/src/jvmMain/kotlin/org/incido/compose/ui/theme/ThemeJvm.kt b/composeApp/src/jvmMain/kotlin/org/incido/compose/ui/theme/ThemeJvm.kt new file mode 100644 index 0000000..a8c5f80 --- /dev/null +++ b/composeApp/src/jvmMain/kotlin/org/incido/compose/ui/theme/ThemeJvm.kt @@ -0,0 +1,10 @@ +package org.incido.compose.ui.theme + +import androidx.compose.runtime.Composable +import androidx.compose.material3.ColorScheme + +/** JVM actual — desktop has no Material You (hidden, not faked; same + * posture as M3's four hidden Android-only features). Always null, so + * [IncidoTheme] falls through to the brand palette. */ +@Composable +actual fun platformDynamicColorScheme(darkTheme: Boolean): ColorScheme? = null diff --git a/composeApp/src/jvmMain/kotlin/org/incido/compose/util/RelativeTimeJvm.kt b/composeApp/src/jvmMain/kotlin/org/incido/compose/util/RelativeTimeJvm.kt new file mode 100644 index 0000000..1a8f986 --- /dev/null +++ b/composeApp/src/jvmMain/kotlin/org/incido/compose/util/RelativeTimeJvm.kt @@ -0,0 +1,40 @@ +package org.incido.compose.util + +import java.time.Instant +import java.time.LocalDate +import java.time.ZoneId +import java.time.format.DateTimeFormatter +import java.time.temporal.ChronoUnit + +/** + * JVM actual — a `java.time` port of the Android `DateUtils` abbreviated + * relative format ("23 min. ago" / "Today" / "Yesterday" / "3 days + * ago" / absolute date beyond a week). + * + * English-only for now (desktop has no UI locale switch yet); matching + * Android's localisation exactly is M4 follow-up work — the Android + * actual above remains the reference behaviour. + */ +actual fun relativeTimestamp(epochMillis: Long, nowMillis: Long): String { + val zone = ZoneId.systemDefault() + val then = Instant.ofEpochMilli(epochMillis).atZone(zone).toLocalDate() + val now = Instant.ofEpochMilli(nowMillis).atZone(zone).toLocalDate() + val days = ChronoUnit.DAYS.between(then, now) + val deltaMillis = nowMillis - epochMillis + + // Same-day (and future / sub-minute) timestamps: relative clock time. + if (days <= 0L) { + if (deltaMillis < 60_000L) return "Just now" + val minutes = deltaMillis / 60_000L + if (minutes < 60L) return "$minutes min. ago" + val hours = minutes / 60L + return if (hours < 24L) "$hours hr. ago" else "Today" + } + if (days == 1L) return "Yesterday" + if (days < 7L) return "$days days ago" + + // Beyond a week: absolute date, year shown only when it differs — + // DateUtils' "Oct 5" / "Oct 5, 2025" shape. + val pattern = if (then.year == now.year) "MMM d" else "MMM d, yyyy" + return then.format(DateTimeFormatter.ofPattern(pattern)) +} diff --git a/composeApp/src/main/kotlin/org/incido/compose/util/RelativeTime.kt b/composeApp/src/main/kotlin/org/incido/compose/util/RelativeTime.kt deleted file mode 100644 index 56398bd..0000000 --- a/composeApp/src/main/kotlin/org/incido/compose/util/RelativeTime.kt +++ /dev/null @@ -1,22 +0,0 @@ -package org.incido.compose.util - -import android.text.format.DateUtils -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember - -/** - * Returns a localised "X ago" style timestamp for the given epoch millis. - * Uses Android's [DateUtils.getRelativeTimeSpanString] which handles all - * the edge cases (Today / Yesterday / N days ago / N weeks ago / …) and - * is automatically localised to the device language. - */ -@Composable -fun rememberRelativeTimestamp(epochMillis: Long): String { - val now = remember { System.currentTimeMillis() } - return DateUtils.getRelativeTimeSpanString( - epochMillis, - now, - DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE, - ).toString() -}