Skip to content

feat: diary entry import functionality#34

Merged
SmilingPixel merged 8 commits into
mainfrom
feat/file_import_0705
Jul 16, 2026
Merged

feat: diary entry import functionality#34
SmilingPixel merged 8 commits into
mainfrom
feat/file_import_0705

Conversation

@SmilingPixel

Copy link
Copy Markdown
Owner

This pull request introduces a comprehensive diary entry import and export feature, allowing users to back up and restore their entries using local text files. The main changes include new import/export UI in the settings, core import/export logic, and platform-specific support detection.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds a diary entry import/export feature to MarkDay, enabling users to back up entries as sync-compatible text files and restore them later via the Settings diagnostics UI, with platform-specific availability gating.

Changes:

  • Added core import preview/apply logic for sync-compatible diary entry files, including conflict/duplicate handling.
  • Integrated an “Import Diary Entries” flow into Settings > Diagnostics, including a conflict resolution dialog and import result messaging.
  • Added platform-specific import availability (expect/actual) and documented the feature in the README, plus common tests for import behavior.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
README.md Documents the new import/export feature, UX location, and file naming convention.
composeApp/src/commonMain/kotlin/io/github/smiling_pixel/sync/DiaryEntryImportAvailability.kt Introduces expect API for platform availability checks.
composeApp/src/androidMain/kotlin/io/github/smiling_pixel/sync/DiaryEntryImportAvailability.android.kt Enables import availability on Android.
composeApp/src/jvmMain/kotlin/io/github/smiling_pixel/sync/DiaryEntryImportAvailability.jvm.kt Enables import availability on Desktop (JVM).
composeApp/src/wasmJsMain/kotlin/io/github/smiling_pixel/sync/DiaryEntryImportAvailability.wasmJs.kt Disables import availability on Web (Wasm).
composeApp/src/commonMain/kotlin/io/github/smiling_pixel/sync/DiaryEntryImport.kt Implements import file model + preview/apply import logic (new entries, conflicts, invalids, duplicates).
composeApp/src/commonMain/kotlin/io/github/smiling_pixel/screens/SettingsScreen.kt Adds import UI wiring (file picker, preview, conflict dialog, diagnostics messaging).
composeApp/src/commonTest/kotlin/io/github/smiling_pixel/sync/DiaryEntryImportTest.kt Adds tests covering preview/apply behavior (invalid files, conflicts, duplicates, mixed batches).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@SmilingPixel
SmilingPixel merged commit 6465728 into main Jul 16, 2026
3 checks passed
@SmilingPixel
SmilingPixel deleted the feat/file_import_0705 branch July 16, 2026 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants