From 0c66fc60108f1f6f0d977d82d5c55f7e689fcea6 Mon Sep 17 00:00:00 2001 From: Brummel Date: Sat, 2 May 2026 11:55:38 +0200 Subject: [PATCH] refactor: rename to common/, clients/desktop, clients/wearos Move three directories into their target topology: - doctate-common/ -> common/ - client-desktop/ -> clients/desktop/ - watch/wearos/ -> clients/wearos/ Update doctate-common path-dependency in 3 Cargo.toml files (server, clients/desktop, experiments) and the workspace members list in the root Cargo.toml. Crate names unchanged (doctate-server, doctate-common, doctate-desktop). Workspace still in single-Cargo.lock form; isolation into standalone workspaces follows in stage 3. All 508 tests pass, experiments standalone-workspace also resolves the new path. --- Cargo.toml | 2 +- {client-desktop => clients/desktop}/Cargo.toml | 2 +- {client-desktop => clients/desktop}/src/app.rs | 0 .../desktop}/src/case_store.rs | 0 .../desktop}/src/case_update.rs | 0 {client-desktop => clients/desktop}/src/config.rs | 0 .../desktop}/src/config_path.rs | 0 .../desktop}/src/footer_status.rs | 0 {client-desktop => clients/desktop}/src/lib.rs | 0 .../desktop}/src/magic_link.rs | 0 {client-desktop => clients/desktop}/src/main.rs | 0 {client-desktop => clients/desktop}/src/paths.rs | 0 .../desktop}/src/pending_cleanup.rs | 0 {client-desktop => clients/desktop}/src/recorder.rs | 0 .../desktop}/src/server_sync.rs | 0 .../desktop}/src/snapshot_cache.rs | 0 {client-desktop => clients/desktop}/src/startup.rs | 0 {client-desktop => clients/desktop}/src/state.rs | 0 {client-desktop => clients/desktop}/src/upload.rs | 0 .../desktop}/tests/single_instance_lock_test.rs | 0 {watch => clients}/wearos/.gitignore | 0 {watch => clients}/wearos/app/.gitignore | 0 {watch => clients}/wearos/app/build.gradle.kts | 0 {watch => clients}/wearos/app/lint.xml | 0 {watch => clients}/wearos/app/proguard-rules.pro | 0 .../wearos/app/src/androidTest/assets/sample.m4a | Bin .../java/com/doctate/watch/net/UploadClientTest.kt | 0 .../wearos/app/src/main/AndroidManifest.xml | 0 .../src/main/java/com/doctate/watch/DoctateApp.kt | 0 .../java/com/doctate/watch/audio/AudioRecorder.kt | 0 .../java/com/doctate/watch/audio/PendingCleanup.kt | 0 .../java/com/doctate/watch/audio/PendingStore.kt | 0 .../java/com/doctate/watch/audio/PendingUpload.kt | 0 .../complication/DoctateComplicationService.kt | 0 .../main/java/com/doctate/watch/domain/CaseEntry.kt | 0 .../main/java/com/doctate/watch/domain/CaseId.kt | 0 .../java/com/doctate/watch/domain/CaseMarker.kt | 0 .../main/java/com/doctate/watch/domain/CaseStore.kt | 0 .../java/com/doctate/watch/domain/DiskCaseStore.kt | 0 .../java/com/doctate/watch/domain/OnelinerState.kt | 0 .../com/doctate/watch/domain/OnelinerStateExt.kt | 0 .../java/com/doctate/watch/domain/OnelinersJson.kt | 0 .../java/com/doctate/watch/domain/OnelinersWire.kt | 0 .../java/com/doctate/watch/domain/StartupCleanup.kt | 0 .../com/doctate/watch/net/HttpClientProvider.kt | 0 .../com/doctate/watch/net/OnelinerOverrideClient.kt | 0 .../java/com/doctate/watch/net/OnelinersClient.kt | 0 .../main/java/com/doctate/watch/net/PollOutcome.kt | 0 .../java/com/doctate/watch/net/SnapshotCache.kt | 0 .../main/java/com/doctate/watch/net/UploadClient.kt | 0 .../main/java/com/doctate/watch/net/UploadResult.kt | 0 .../java/com/doctate/watch/presentation/AppNav.kt | 0 .../doctate/watch/presentation/CaseDetailScreen.kt | 0 .../doctate/watch/presentation/CaseListScreen.kt | 0 .../com/doctate/watch/presentation/MainActivity.kt | 0 .../com/doctate/watch/presentation/NavCommand.kt | 0 .../doctate/watch/presentation/RecordingScreen.kt | 0 .../watch/presentation/RecordingViewModel.kt | 0 .../com/doctate/watch/presentation/TimeFormat.kt | 0 .../java/com/doctate/watch/presentation/UiState.kt | 0 .../com/doctate/watch/presentation/theme/Theme.kt | 0 .../java/com/doctate/watch/settings/Settings.kt | 0 .../main/java/com/doctate/watch/sync/SyncService.kt | 0 .../com/doctate/watch/sync/SyncServiceLauncher.kt | 0 .../main/java/com/doctate/watch/sync/SyncState.kt | 0 .../com/doctate/watch/sync/SyncStateProvider.kt | 0 .../main/java/com/doctate/watch/sync/SyncTrigger.kt | 0 .../java/com/doctate/watch/sync/SyncWorkerLoop.kt | 0 .../com/doctate/watch/tile/DoctateTileService.kt | 0 .../main/java/com/doctate/watch/tile/TileLayouts.kt | 0 .../app/src/main/res/drawable/ic_complication.xml | 0 .../main/res/drawable/ic_launcher_background.xml | 0 .../main/res/drawable/ic_launcher_foreground.xml | 0 .../app/src/main/res/drawable/splash_icon.xml | 0 .../app/src/main/res/drawable/tile_preview.xml | 0 .../app/src/main/res/mipmap-anydpi/ic_launcher.xml | 0 .../main/res/mipmap-anydpi/ic_launcher_round.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.webp | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.webp | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../wearos/app/src/main/res/values/strings.xml | 0 .../wearos/app/src/main/res/values/styles.xml | 0 .../src/main/res/xml/network_security_config.xml | 0 .../com/doctate/watch/audio/PendingCleanupTest.kt | 0 .../com/doctate/watch/audio/PendingStoreTest.kt | 0 .../java/com/doctate/watch/domain/CaseIdTest.kt | 0 .../com/doctate/watch/domain/DiskCaseStoreTest.kt | 0 .../doctate/watch/domain/OnelinerStateExtTest.kt | 0 .../com/doctate/watch/domain/OnelinersJsonTest.kt | 0 .../com/doctate/watch/domain/StartupCleanupTest.kt | 0 .../doctate/watch/net/OnelinerOverrideClientTest.kt | 0 .../com/doctate/watch/net/OnelinersClientTest.kt | 0 .../java/com/doctate/watch/net/SnapshotCacheTest.kt | 0 .../watch/presentation/UiStateReducerTest.kt | 0 .../com/doctate/watch/sync/SyncWorkerLoopTest.kt | 0 .../doctate/watch/testfixtures/InMemoryCaseStore.kt | 0 {watch => clients}/wearos/build.gradle.kts | 0 {watch => clients}/wearos/gradle.properties | 0 .../wearos/gradle/gradle-daemon-jvm.properties | 0 {watch => clients}/wearos/gradle/libs.versions.toml | 0 .../wearos/gradle/wrapper/gradle-wrapper.jar | Bin .../wearos/gradle/wrapper/gradle-wrapper.properties | 0 {watch => clients}/wearos/gradlew | 0 {watch => clients}/wearos/gradlew.bat | 0 {watch => clients}/wearos/run.sh | 0 {watch => clients}/wearos/settings.gradle.kts | 0 {doctate-common => common}/Cargo.toml | 0 {doctate-common => common}/src/ack.rs | 0 {doctate-common => common}/src/bulk.rs | 0 {doctate-common => common}/src/constants.rs | 0 {doctate-common => common}/src/lib.rs | 0 {doctate-common => common}/src/oneliners.rs | 0 {doctate-common => common}/src/recordings.rs | 0 {doctate-common => common}/src/timestamp.rs | 0 {doctate-common => common}/src/url.rs | 0 experiments/Cargo.toml | 2 +- server/Cargo.toml | 2 +- 124 files changed, 4 insertions(+), 4 deletions(-) rename {client-desktop => clients/desktop}/Cargo.toml (94%) rename {client-desktop => clients/desktop}/src/app.rs (100%) rename {client-desktop => clients/desktop}/src/case_store.rs (100%) rename {client-desktop => clients/desktop}/src/case_update.rs (100%) rename {client-desktop => clients/desktop}/src/config.rs (100%) rename {client-desktop => clients/desktop}/src/config_path.rs (100%) rename {client-desktop => clients/desktop}/src/footer_status.rs (100%) rename {client-desktop => clients/desktop}/src/lib.rs (100%) rename {client-desktop => clients/desktop}/src/magic_link.rs (100%) rename {client-desktop => clients/desktop}/src/main.rs (100%) rename {client-desktop => clients/desktop}/src/paths.rs (100%) rename {client-desktop => clients/desktop}/src/pending_cleanup.rs (100%) rename {client-desktop => clients/desktop}/src/recorder.rs (100%) rename {client-desktop => clients/desktop}/src/server_sync.rs (100%) rename {client-desktop => clients/desktop}/src/snapshot_cache.rs (100%) rename {client-desktop => clients/desktop}/src/startup.rs (100%) rename {client-desktop => clients/desktop}/src/state.rs (100%) rename {client-desktop => clients/desktop}/src/upload.rs (100%) rename {client-desktop => clients/desktop}/tests/single_instance_lock_test.rs (100%) rename {watch => clients}/wearos/.gitignore (100%) rename {watch => clients}/wearos/app/.gitignore (100%) rename {watch => clients}/wearos/app/build.gradle.kts (100%) rename {watch => clients}/wearos/app/lint.xml (100%) rename {watch => clients}/wearos/app/proguard-rules.pro (100%) rename {watch => clients}/wearos/app/src/androidTest/assets/sample.m4a (100%) rename {watch => clients}/wearos/app/src/androidTest/java/com/doctate/watch/net/UploadClientTest.kt (100%) rename {watch => clients}/wearos/app/src/main/AndroidManifest.xml (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/DoctateApp.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/audio/AudioRecorder.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/audio/PendingCleanup.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/audio/PendingStore.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/audio/PendingUpload.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/complication/DoctateComplicationService.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/CaseEntry.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/CaseId.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/CaseMarker.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/CaseStore.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/DiskCaseStore.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerState.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerStateExt.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersJson.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersWire.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/domain/StartupCleanup.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/HttpClientProvider.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/OnelinerOverrideClient.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/OnelinersClient.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/PollOutcome.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/SnapshotCache.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/UploadClient.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/net/UploadResult.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/AppNav.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/CaseDetailScreen.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/CaseListScreen.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/MainActivity.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/NavCommand.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingScreen.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingViewModel.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/TimeFormat.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/UiState.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/presentation/theme/Theme.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/settings/Settings.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncService.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncServiceLauncher.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncState.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncStateProvider.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncTrigger.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/sync/SyncWorkerLoop.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/tile/DoctateTileService.kt (100%) rename {watch => clients}/wearos/app/src/main/java/com/doctate/watch/tile/TileLayouts.kt (100%) rename {watch => clients}/wearos/app/src/main/res/drawable/ic_complication.xml (100%) rename {watch => clients}/wearos/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename {watch => clients}/wearos/app/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {watch => clients}/wearos/app/src/main/res/drawable/splash_icon.xml (100%) rename {watch => clients}/wearos/app/src/main/res/drawable/tile_preview.xml (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-anydpi/ic_launcher.xml (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {watch => clients}/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {watch => clients}/wearos/app/src/main/res/values/strings.xml (100%) rename {watch => clients}/wearos/app/src/main/res/values/styles.xml (100%) rename {watch => clients}/wearos/app/src/main/res/xml/network_security_config.xml (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/audio/PendingCleanupTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/audio/PendingStoreTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/domain/CaseIdTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/domain/DiskCaseStoreTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/domain/OnelinerStateExtTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/domain/OnelinersJsonTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/domain/StartupCleanupTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/net/OnelinerOverrideClientTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/net/OnelinersClientTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/net/SnapshotCacheTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/presentation/UiStateReducerTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/sync/SyncWorkerLoopTest.kt (100%) rename {watch => clients}/wearos/app/src/test/java/com/doctate/watch/testfixtures/InMemoryCaseStore.kt (100%) rename {watch => clients}/wearos/build.gradle.kts (100%) rename {watch => clients}/wearos/gradle.properties (100%) rename {watch => clients}/wearos/gradle/gradle-daemon-jvm.properties (100%) rename {watch => clients}/wearos/gradle/libs.versions.toml (100%) rename {watch => clients}/wearos/gradle/wrapper/gradle-wrapper.jar (100%) rename {watch => clients}/wearos/gradle/wrapper/gradle-wrapper.properties (100%) rename {watch => clients}/wearos/gradlew (100%) rename {watch => clients}/wearos/gradlew.bat (100%) rename {watch => clients}/wearos/run.sh (100%) rename {watch => clients}/wearos/settings.gradle.kts (100%) rename {doctate-common => common}/Cargo.toml (100%) rename {doctate-common => common}/src/ack.rs (100%) rename {doctate-common => common}/src/bulk.rs (100%) rename {doctate-common => common}/src/constants.rs (100%) rename {doctate-common => common}/src/lib.rs (100%) rename {doctate-common => common}/src/oneliners.rs (100%) rename {doctate-common => common}/src/recordings.rs (100%) rename {doctate-common => common}/src/timestamp.rs (100%) rename {doctate-common => common}/src/url.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 6c69e94..486a6e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["server", "doctate-common", "client-desktop"] +members = ["server", "common", "clients/desktop"] resolver = "3" [workspace.package] diff --git a/client-desktop/Cargo.toml b/clients/desktop/Cargo.toml similarity index 94% rename from client-desktop/Cargo.toml rename to clients/desktop/Cargo.toml index 1cf9ea8..153ede0 100644 --- a/client-desktop/Cargo.toml +++ b/clients/desktop/Cargo.toml @@ -9,7 +9,7 @@ name = "doctate" path = "src/main.rs" [dependencies] -doctate-common = { path = "../doctate-common" } +doctate-common = { path = "../../common" } eframe = "0.28" reqwest = { workspace = true } serde = { workspace = true } diff --git a/client-desktop/src/app.rs b/clients/desktop/src/app.rs similarity index 100% rename from client-desktop/src/app.rs rename to clients/desktop/src/app.rs diff --git a/client-desktop/src/case_store.rs b/clients/desktop/src/case_store.rs similarity index 100% rename from client-desktop/src/case_store.rs rename to clients/desktop/src/case_store.rs diff --git a/client-desktop/src/case_update.rs b/clients/desktop/src/case_update.rs similarity index 100% rename from client-desktop/src/case_update.rs rename to clients/desktop/src/case_update.rs diff --git a/client-desktop/src/config.rs b/clients/desktop/src/config.rs similarity index 100% rename from client-desktop/src/config.rs rename to clients/desktop/src/config.rs diff --git a/client-desktop/src/config_path.rs b/clients/desktop/src/config_path.rs similarity index 100% rename from client-desktop/src/config_path.rs rename to clients/desktop/src/config_path.rs diff --git a/client-desktop/src/footer_status.rs b/clients/desktop/src/footer_status.rs similarity index 100% rename from client-desktop/src/footer_status.rs rename to clients/desktop/src/footer_status.rs diff --git a/client-desktop/src/lib.rs b/clients/desktop/src/lib.rs similarity index 100% rename from client-desktop/src/lib.rs rename to clients/desktop/src/lib.rs diff --git a/client-desktop/src/magic_link.rs b/clients/desktop/src/magic_link.rs similarity index 100% rename from client-desktop/src/magic_link.rs rename to clients/desktop/src/magic_link.rs diff --git a/client-desktop/src/main.rs b/clients/desktop/src/main.rs similarity index 100% rename from client-desktop/src/main.rs rename to clients/desktop/src/main.rs diff --git a/client-desktop/src/paths.rs b/clients/desktop/src/paths.rs similarity index 100% rename from client-desktop/src/paths.rs rename to clients/desktop/src/paths.rs diff --git a/client-desktop/src/pending_cleanup.rs b/clients/desktop/src/pending_cleanup.rs similarity index 100% rename from client-desktop/src/pending_cleanup.rs rename to clients/desktop/src/pending_cleanup.rs diff --git a/client-desktop/src/recorder.rs b/clients/desktop/src/recorder.rs similarity index 100% rename from client-desktop/src/recorder.rs rename to clients/desktop/src/recorder.rs diff --git a/client-desktop/src/server_sync.rs b/clients/desktop/src/server_sync.rs similarity index 100% rename from client-desktop/src/server_sync.rs rename to clients/desktop/src/server_sync.rs diff --git a/client-desktop/src/snapshot_cache.rs b/clients/desktop/src/snapshot_cache.rs similarity index 100% rename from client-desktop/src/snapshot_cache.rs rename to clients/desktop/src/snapshot_cache.rs diff --git a/client-desktop/src/startup.rs b/clients/desktop/src/startup.rs similarity index 100% rename from client-desktop/src/startup.rs rename to clients/desktop/src/startup.rs diff --git a/client-desktop/src/state.rs b/clients/desktop/src/state.rs similarity index 100% rename from client-desktop/src/state.rs rename to clients/desktop/src/state.rs diff --git a/client-desktop/src/upload.rs b/clients/desktop/src/upload.rs similarity index 100% rename from client-desktop/src/upload.rs rename to clients/desktop/src/upload.rs diff --git a/client-desktop/tests/single_instance_lock_test.rs b/clients/desktop/tests/single_instance_lock_test.rs similarity index 100% rename from client-desktop/tests/single_instance_lock_test.rs rename to clients/desktop/tests/single_instance_lock_test.rs diff --git a/watch/wearos/.gitignore b/clients/wearos/.gitignore similarity index 100% rename from watch/wearos/.gitignore rename to clients/wearos/.gitignore diff --git a/watch/wearos/app/.gitignore b/clients/wearos/app/.gitignore similarity index 100% rename from watch/wearos/app/.gitignore rename to clients/wearos/app/.gitignore diff --git a/watch/wearos/app/build.gradle.kts b/clients/wearos/app/build.gradle.kts similarity index 100% rename from watch/wearos/app/build.gradle.kts rename to clients/wearos/app/build.gradle.kts diff --git a/watch/wearos/app/lint.xml b/clients/wearos/app/lint.xml similarity index 100% rename from watch/wearos/app/lint.xml rename to clients/wearos/app/lint.xml diff --git a/watch/wearos/app/proguard-rules.pro b/clients/wearos/app/proguard-rules.pro similarity index 100% rename from watch/wearos/app/proguard-rules.pro rename to clients/wearos/app/proguard-rules.pro diff --git a/watch/wearos/app/src/androidTest/assets/sample.m4a b/clients/wearos/app/src/androidTest/assets/sample.m4a similarity index 100% rename from watch/wearos/app/src/androidTest/assets/sample.m4a rename to clients/wearos/app/src/androidTest/assets/sample.m4a diff --git a/watch/wearos/app/src/androidTest/java/com/doctate/watch/net/UploadClientTest.kt b/clients/wearos/app/src/androidTest/java/com/doctate/watch/net/UploadClientTest.kt similarity index 100% rename from watch/wearos/app/src/androidTest/java/com/doctate/watch/net/UploadClientTest.kt rename to clients/wearos/app/src/androidTest/java/com/doctate/watch/net/UploadClientTest.kt diff --git a/watch/wearos/app/src/main/AndroidManifest.xml b/clients/wearos/app/src/main/AndroidManifest.xml similarity index 100% rename from watch/wearos/app/src/main/AndroidManifest.xml rename to clients/wearos/app/src/main/AndroidManifest.xml diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/DoctateApp.kt b/clients/wearos/app/src/main/java/com/doctate/watch/DoctateApp.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/DoctateApp.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/DoctateApp.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/audio/AudioRecorder.kt b/clients/wearos/app/src/main/java/com/doctate/watch/audio/AudioRecorder.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/audio/AudioRecorder.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/audio/AudioRecorder.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingCleanup.kt b/clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingCleanup.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingCleanup.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingCleanup.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingStore.kt b/clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingStore.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingStore.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingStore.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingUpload.kt b/clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingUpload.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/audio/PendingUpload.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/audio/PendingUpload.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/complication/DoctateComplicationService.kt b/clients/wearos/app/src/main/java/com/doctate/watch/complication/DoctateComplicationService.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/complication/DoctateComplicationService.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/complication/DoctateComplicationService.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseEntry.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseEntry.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseEntry.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseEntry.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseId.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseId.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseId.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseId.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseMarker.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseMarker.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseMarker.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseMarker.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseStore.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseStore.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/CaseStore.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/CaseStore.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/DiskCaseStore.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/DiskCaseStore.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/DiskCaseStore.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/DiskCaseStore.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerState.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerState.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerState.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerState.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerStateExt.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerStateExt.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerStateExt.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinerStateExt.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersJson.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersJson.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersJson.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersJson.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersWire.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersWire.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersWire.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/OnelinersWire.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/domain/StartupCleanup.kt b/clients/wearos/app/src/main/java/com/doctate/watch/domain/StartupCleanup.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/domain/StartupCleanup.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/domain/StartupCleanup.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/HttpClientProvider.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/HttpClientProvider.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/HttpClientProvider.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/HttpClientProvider.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/OnelinerOverrideClient.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/OnelinerOverrideClient.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/OnelinerOverrideClient.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/OnelinerOverrideClient.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/OnelinersClient.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/OnelinersClient.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/OnelinersClient.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/OnelinersClient.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/PollOutcome.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/PollOutcome.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/PollOutcome.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/PollOutcome.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/SnapshotCache.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/SnapshotCache.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/SnapshotCache.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/SnapshotCache.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/UploadClient.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/UploadClient.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/UploadClient.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/UploadClient.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/net/UploadResult.kt b/clients/wearos/app/src/main/java/com/doctate/watch/net/UploadResult.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/net/UploadResult.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/net/UploadResult.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/AppNav.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/AppNav.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/AppNav.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/AppNav.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/CaseDetailScreen.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/CaseDetailScreen.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/CaseDetailScreen.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/CaseDetailScreen.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/CaseListScreen.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/CaseListScreen.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/CaseListScreen.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/CaseListScreen.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/MainActivity.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/MainActivity.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/MainActivity.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/MainActivity.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/NavCommand.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/NavCommand.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/NavCommand.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/NavCommand.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingScreen.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingScreen.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingScreen.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingScreen.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingViewModel.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingViewModel.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingViewModel.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/RecordingViewModel.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/TimeFormat.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/TimeFormat.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/TimeFormat.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/TimeFormat.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/UiState.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/UiState.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/UiState.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/UiState.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/presentation/theme/Theme.kt b/clients/wearos/app/src/main/java/com/doctate/watch/presentation/theme/Theme.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/presentation/theme/Theme.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/presentation/theme/Theme.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/settings/Settings.kt b/clients/wearos/app/src/main/java/com/doctate/watch/settings/Settings.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/settings/Settings.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/settings/Settings.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncService.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncService.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncService.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncService.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncServiceLauncher.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncServiceLauncher.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncServiceLauncher.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncServiceLauncher.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncState.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncState.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncState.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncState.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncStateProvider.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncStateProvider.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncStateProvider.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncStateProvider.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncTrigger.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncTrigger.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncTrigger.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncTrigger.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncWorkerLoop.kt b/clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncWorkerLoop.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/sync/SyncWorkerLoop.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/sync/SyncWorkerLoop.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/tile/DoctateTileService.kt b/clients/wearos/app/src/main/java/com/doctate/watch/tile/DoctateTileService.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/tile/DoctateTileService.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/tile/DoctateTileService.kt diff --git a/watch/wearos/app/src/main/java/com/doctate/watch/tile/TileLayouts.kt b/clients/wearos/app/src/main/java/com/doctate/watch/tile/TileLayouts.kt similarity index 100% rename from watch/wearos/app/src/main/java/com/doctate/watch/tile/TileLayouts.kt rename to clients/wearos/app/src/main/java/com/doctate/watch/tile/TileLayouts.kt diff --git a/watch/wearos/app/src/main/res/drawable/ic_complication.xml b/clients/wearos/app/src/main/res/drawable/ic_complication.xml similarity index 100% rename from watch/wearos/app/src/main/res/drawable/ic_complication.xml rename to clients/wearos/app/src/main/res/drawable/ic_complication.xml diff --git a/watch/wearos/app/src/main/res/drawable/ic_launcher_background.xml b/clients/wearos/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from watch/wearos/app/src/main/res/drawable/ic_launcher_background.xml rename to clients/wearos/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/watch/wearos/app/src/main/res/drawable/ic_launcher_foreground.xml b/clients/wearos/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from watch/wearos/app/src/main/res/drawable/ic_launcher_foreground.xml rename to clients/wearos/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/watch/wearos/app/src/main/res/drawable/splash_icon.xml b/clients/wearos/app/src/main/res/drawable/splash_icon.xml similarity index 100% rename from watch/wearos/app/src/main/res/drawable/splash_icon.xml rename to clients/wearos/app/src/main/res/drawable/splash_icon.xml diff --git a/watch/wearos/app/src/main/res/drawable/tile_preview.xml b/clients/wearos/app/src/main/res/drawable/tile_preview.xml similarity index 100% rename from watch/wearos/app/src/main/res/drawable/tile_preview.xml rename to clients/wearos/app/src/main/res/drawable/tile_preview.xml diff --git a/watch/wearos/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/clients/wearos/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-anydpi/ic_launcher.xml rename to clients/wearos/app/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/watch/wearos/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/clients/wearos/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to clients/wearos/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/watch/wearos/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/clients/wearos/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to clients/wearos/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/watch/wearos/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/clients/wearos/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to clients/wearos/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/watch/wearos/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/clients/wearos/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to clients/wearos/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/watch/wearos/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/clients/wearos/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to clients/wearos/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/clients/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to clients/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/clients/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to clients/wearos/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/clients/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to clients/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/clients/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to clients/wearos/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/clients/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to clients/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/watch/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/clients/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from watch/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to clients/wearos/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/watch/wearos/app/src/main/res/values/strings.xml b/clients/wearos/app/src/main/res/values/strings.xml similarity index 100% rename from watch/wearos/app/src/main/res/values/strings.xml rename to clients/wearos/app/src/main/res/values/strings.xml diff --git a/watch/wearos/app/src/main/res/values/styles.xml b/clients/wearos/app/src/main/res/values/styles.xml similarity index 100% rename from watch/wearos/app/src/main/res/values/styles.xml rename to clients/wearos/app/src/main/res/values/styles.xml diff --git a/watch/wearos/app/src/main/res/xml/network_security_config.xml b/clients/wearos/app/src/main/res/xml/network_security_config.xml similarity index 100% rename from watch/wearos/app/src/main/res/xml/network_security_config.xml rename to clients/wearos/app/src/main/res/xml/network_security_config.xml diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/audio/PendingCleanupTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/audio/PendingCleanupTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/audio/PendingCleanupTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/audio/PendingCleanupTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/audio/PendingStoreTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/audio/PendingStoreTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/audio/PendingStoreTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/audio/PendingStoreTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/domain/CaseIdTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/domain/CaseIdTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/domain/CaseIdTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/domain/CaseIdTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/domain/DiskCaseStoreTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/domain/DiskCaseStoreTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/domain/DiskCaseStoreTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/domain/DiskCaseStoreTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/domain/OnelinerStateExtTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/domain/OnelinerStateExtTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/domain/OnelinerStateExtTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/domain/OnelinerStateExtTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/domain/OnelinersJsonTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/domain/OnelinersJsonTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/domain/OnelinersJsonTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/domain/OnelinersJsonTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/domain/StartupCleanupTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/domain/StartupCleanupTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/domain/StartupCleanupTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/domain/StartupCleanupTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/net/OnelinerOverrideClientTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/net/OnelinerOverrideClientTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/net/OnelinerOverrideClientTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/net/OnelinerOverrideClientTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/net/OnelinersClientTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/net/OnelinersClientTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/net/OnelinersClientTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/net/OnelinersClientTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/net/SnapshotCacheTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/net/SnapshotCacheTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/net/SnapshotCacheTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/net/SnapshotCacheTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/presentation/UiStateReducerTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/presentation/UiStateReducerTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/presentation/UiStateReducerTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/presentation/UiStateReducerTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/sync/SyncWorkerLoopTest.kt b/clients/wearos/app/src/test/java/com/doctate/watch/sync/SyncWorkerLoopTest.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/sync/SyncWorkerLoopTest.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/sync/SyncWorkerLoopTest.kt diff --git a/watch/wearos/app/src/test/java/com/doctate/watch/testfixtures/InMemoryCaseStore.kt b/clients/wearos/app/src/test/java/com/doctate/watch/testfixtures/InMemoryCaseStore.kt similarity index 100% rename from watch/wearos/app/src/test/java/com/doctate/watch/testfixtures/InMemoryCaseStore.kt rename to clients/wearos/app/src/test/java/com/doctate/watch/testfixtures/InMemoryCaseStore.kt diff --git a/watch/wearos/build.gradle.kts b/clients/wearos/build.gradle.kts similarity index 100% rename from watch/wearos/build.gradle.kts rename to clients/wearos/build.gradle.kts diff --git a/watch/wearos/gradle.properties b/clients/wearos/gradle.properties similarity index 100% rename from watch/wearos/gradle.properties rename to clients/wearos/gradle.properties diff --git a/watch/wearos/gradle/gradle-daemon-jvm.properties b/clients/wearos/gradle/gradle-daemon-jvm.properties similarity index 100% rename from watch/wearos/gradle/gradle-daemon-jvm.properties rename to clients/wearos/gradle/gradle-daemon-jvm.properties diff --git a/watch/wearos/gradle/libs.versions.toml b/clients/wearos/gradle/libs.versions.toml similarity index 100% rename from watch/wearos/gradle/libs.versions.toml rename to clients/wearos/gradle/libs.versions.toml diff --git a/watch/wearos/gradle/wrapper/gradle-wrapper.jar b/clients/wearos/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from watch/wearos/gradle/wrapper/gradle-wrapper.jar rename to clients/wearos/gradle/wrapper/gradle-wrapper.jar diff --git a/watch/wearos/gradle/wrapper/gradle-wrapper.properties b/clients/wearos/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from watch/wearos/gradle/wrapper/gradle-wrapper.properties rename to clients/wearos/gradle/wrapper/gradle-wrapper.properties diff --git a/watch/wearos/gradlew b/clients/wearos/gradlew similarity index 100% rename from watch/wearos/gradlew rename to clients/wearos/gradlew diff --git a/watch/wearos/gradlew.bat b/clients/wearos/gradlew.bat similarity index 100% rename from watch/wearos/gradlew.bat rename to clients/wearos/gradlew.bat diff --git a/watch/wearos/run.sh b/clients/wearos/run.sh similarity index 100% rename from watch/wearos/run.sh rename to clients/wearos/run.sh diff --git a/watch/wearos/settings.gradle.kts b/clients/wearos/settings.gradle.kts similarity index 100% rename from watch/wearos/settings.gradle.kts rename to clients/wearos/settings.gradle.kts diff --git a/doctate-common/Cargo.toml b/common/Cargo.toml similarity index 100% rename from doctate-common/Cargo.toml rename to common/Cargo.toml diff --git a/doctate-common/src/ack.rs b/common/src/ack.rs similarity index 100% rename from doctate-common/src/ack.rs rename to common/src/ack.rs diff --git a/doctate-common/src/bulk.rs b/common/src/bulk.rs similarity index 100% rename from doctate-common/src/bulk.rs rename to common/src/bulk.rs diff --git a/doctate-common/src/constants.rs b/common/src/constants.rs similarity index 100% rename from doctate-common/src/constants.rs rename to common/src/constants.rs diff --git a/doctate-common/src/lib.rs b/common/src/lib.rs similarity index 100% rename from doctate-common/src/lib.rs rename to common/src/lib.rs diff --git a/doctate-common/src/oneliners.rs b/common/src/oneliners.rs similarity index 100% rename from doctate-common/src/oneliners.rs rename to common/src/oneliners.rs diff --git a/doctate-common/src/recordings.rs b/common/src/recordings.rs similarity index 100% rename from doctate-common/src/recordings.rs rename to common/src/recordings.rs diff --git a/doctate-common/src/timestamp.rs b/common/src/timestamp.rs similarity index 100% rename from doctate-common/src/timestamp.rs rename to common/src/timestamp.rs diff --git a/doctate-common/src/url.rs b/common/src/url.rs similarity index 100% rename from doctate-common/src/url.rs rename to common/src/url.rs diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 95299cb..5ed4dea 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -8,7 +8,7 @@ edition = "2024" [dependencies] doctate-server = { path = "../server" } -doctate-common = { path = "../doctate-common" } +doctate-common = { path = "../common" } tokio = { version = "1", features = ["full"] } reqwest = { version = "0.12", default-features = false, features = ["json", "multipart", "rustls-tls"] } serde = { version = "1", features = ["derive"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index 522bb16..69a1f36 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true default-run = "doctate-server" [dependencies] -doctate-common = { path = "../doctate-common" } +doctate-common = { path = "../common" } axum = { version = "0.8", features = ["multipart"] } tokio.workspace = true reqwest.workspace = true