From 88278625f12340fe7800bbf487135d83be289d94 Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 29 Dec 2021 22:30:49 +0100 Subject: [PATCH] Rename CAP -> CAPod --- README.md | 18 +++++++------- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 12 +++++----- .../cap/common/error/ErrorEventSource.kt | 7 ------ .../common/flow/DynamicStateFlowExtensions.kt | 3 --- .../eu/darken/cap/common/lists/ListItem.kt | 3 --- .../main/java/eu/darken/{cap => capod}/App.kt | 10 ++++---- .../{cap => capod}/common/BuildConfigWrap.kt | 4 ++-- .../darken/{cap => capod}/common/BuildWrap.kt | 2 +- .../common/ByteArrayExtensions.kt | 2 +- .../common/ContextExtensions.kt | 2 +- .../darken/{cap => capod}/common/InstallId.kt | 6 ++--- .../common/LiveDataExtensions.kt | 2 +- .../common/bluetooth/BleScanner.kt | 10 ++++---- .../common/bluetooth/BluetoothDevice2.kt | 2 +- .../bluetooth/BluetoothDeviceExtensions.kt | 2 +- .../common/bluetooth/BluetoothManager2.kt | 10 ++++---- .../common/bluetooth/BluetoothProfile2.kt | 2 +- .../common/collections/MapExtensions.kt | 2 +- .../common/compression/Zipper.kt | 8 +++---- .../common/coroutine/AppCoroutineScope.kt | 2 +- .../common/coroutine/CoroutineModule.kt | 2 +- .../coroutine/DefaultDispatcherProvider.kt | 2 +- .../common/coroutine/DispatcherProvider.kt | 2 +- .../common/dagger/AndroidModule.kt | 2 +- .../debug/bugreporting/BugReportSettings.kt | 4 ++-- .../common/debug/bugreporting/BugReporter.kt | 16 ++++++------- .../common/debug/bugreporting/Bugs.kt | 10 ++++---- .../debug/bugsnag/BugsnagErrorHandler.kt | 10 ++++---- .../common/debug/bugsnag/BugsnagLogger.kt | 6 ++--- .../debug/bugsnag/NOPBugsnagErrorHandler.kt | 8 +++---- .../common/debug/logging/FileLogger.kt | 2 +- .../common/debug/logging/LogCatLogger.kt | 2 +- .../common/debug/logging/LogExtensions.kt | 2 +- .../common/debug/logging/Logging.kt | 2 +- .../common/debug/recording/core/Recorder.kt | 12 +++++----- .../debug/recording/core/RecorderModule.kt | 20 ++++++++-------- .../debug/recording/core/RecorderService.kt | 18 +++++++------- .../debug/recording/ui/RecorderActivity.kt | 15 ++++++------ .../debug/recording/ui/RecorderActivityVM.kt | 24 +++++++++---------- .../common/error/ErrorDialog.kt | 2 +- .../capod/common/error/ErrorEventSource.kt | 7 ++++++ .../common/error/LocalizedError.kt | 4 ++-- .../common/error/ThrowableExtensions.kt | 2 +- .../common/flow/DynamicStateFlow.kt | 8 +++---- .../common/flow/DynamicStateFlowExtensions.kt | 3 +++ .../common/flow/FlowCombineExtensions.kt | 2 +- .../common/flow/FlowExtensions.kt | 12 +++++----- .../common/lists/BaseAdapter.kt | 4 ++-- .../{cap => capod}/common/lists/BindableVH.kt | 2 +- .../common/lists/DataAdapter.kt | 2 +- .../eu/darken/capod/common/lists/ListItem.kt | 3 +++ .../common/lists/RecyclerViewExtensions.kt | 2 +- .../common/lists/differ/AsyncDiffer.kt | 6 ++--- .../lists/differ/AsyncDifferExtensions.kt | 4 ++-- .../common/lists/differ/DifferItem.kt | 4 ++-- .../common/lists/differ/HasAsyncDiffer.kt | 2 +- .../common/lists/modular/ModularAdapter.kt | 4 ++-- .../common/lists/modular/mods/ClickMod.kt | 4 ++-- .../lists/modular/mods/DataBinderMod.kt | 6 ++--- .../lists/modular/mods/SimpleVHCreatorMod.kt | 4 ++-- .../common/lists/modular/mods/StableIdMod.kt | 6 ++--- .../lists/modular/mods/TypedVHCreatorMod.kt | 4 ++-- .../common/livedata/SingleLiveEvent.kt | 6 ++--- .../common/navigation/FragmentExtensions.kt | 8 +++---- .../common/navigation/NavArgsExtensions.kt | 2 +- .../navigation/NavControllerExtensions.kt | 2 +- .../navigation/NavDestinationExtensions.kt | 2 +- .../navigation/NavDirectionsExtensions.kt | 4 ++-- .../notifications/PendingIntentCompat.kt | 4 ++-- .../common/permissions/Permission.kt | 4 ++-- .../common/preferences/FlowPreference.kt | 6 ++--- .../preferences/SharedPreferenceExtensions.kt | 6 ++--- .../smart/Smart2BottomSheetDialogFragment.kt | 16 ++++++------- .../common/smart/Smart2Fragment.kt | 10 ++++---- .../{cap => capod}/common/smart/Smart2VM.kt | 16 ++++++------- .../common/smart/SmartActivity.kt | 8 +++---- .../common/smart/SmartFragment.kt | 8 +++---- .../common/smart/SmartService.kt | 6 ++--- .../{cap => capod}/common/smart/SmartVM.kt | 18 +++++++------- .../viewbinding/ViewBindingExtensions.kt | 6 ++--- .../common/viewmodel/SmartVM.kt | 6 ++--- .../{cap => capod}/common/viewmodel/VM.kt | 6 ++--- .../common/viewmodel/ViewModelLazyKeyed.kt | 2 +- .../common/worker/WorkerExtensions.kt | 2 +- .../{cap => capod}/main/ui/MainActivity.kt | 10 ++++---- .../{cap => capod}/main/ui/MainActivityVM.kt | 10 ++++---- .../{cap => capod}/main/ui/MainAdapter.kt | 22 ++++++++--------- .../{cap => capod}/main/ui/MainFragment.kt | 18 +++++++------- .../{cap => capod}/main/ui/MainFragmentVM.kt | 20 ++++++++-------- .../main/ui/cards/PermissionCardVH.kt | 10 ++++---- .../main/ui/cards/ToggleCardVH.kt | 8 +++---- .../monitor/core/MonitorComponent.kt | 2 +- .../monitor/core/MonitorCoroutineScope.kt | 2 +- .../monitor/core/MonitorModule.kt | 2 +- .../monitor/core/MonitorScope.kt | 2 +- .../{cap => capod}/monitor/core/PodMonitor.kt | 10 ++++---- .../core/receiver/BluetoothEventReceiver.kt | 16 ++++++------- .../monitor/core/worker/MonitorControl.kt | 12 +++++----- .../monitor/core/worker/MonitorWorker.kt | 22 ++++++++--------- .../core/worker/MonitorWorkerEntryPoint.kt | 8 +++---- .../monitor/ui/MonitorNotifications.kt | 22 +++++++++-------- .../{cap => capod}/pods/core/PodDevice.kt | 6 ++--- .../{cap => capod}/pods/core/PodFactory.kt | 12 +++++----- .../pods/core/airpods/AirPodsDevice.kt | 10 ++++---- .../pods/core/airpods/AirPodsFactory.kt | 24 +++++++++---------- .../pods/core/airpods/ApplePods.kt | 6 ++--- .../pods/core/airpods/ContinuityProtocol.kt | 8 +++---- .../pods/core/airpods/ProximityPairing.kt | 4 ++-- .../pods/core/airpods/models/AirPodsGen1.kt | 8 +++---- .../pods/core/airpods/models/AirPodsGen2.kt | 8 +++---- .../pods/core/airpods/models/AirPodsMax.kt | 6 ++--- .../pods/core/airpods/models/AirPodsPro.kt | 8 +++---- .../core/airpods/models/UnknownAppleDevice.kt | 6 ++--- .../res/layout/debug_recording_activity.xml | 2 +- app/src/main/res/layout/main_activity.xml | 2 +- app/src/main/res/navigation/nav_graph.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++- .../common/flow/DynamicStateFlowTest.kt | 4 ++-- .../pods/core/airpods/AirPodsFactoryTest.kt | 10 ++++---- .../pods/core/airpods/BaseAirPodsTest.kt | 4 ++-- .../core/airpods/models/AirPodsGen1Test.kt | 6 ++--- .../core/airpods/models/AirPodsGen2Test.kt | 6 ++--- .../core/airpods/models/AirPodsProTest.kt | 6 ++--- app/src/test/java/testhelper/BaseTest.kt | 6 ++--- .../coroutine/TestDispatcherProvider.kt | 2 +- .../testhelper/coroutine/TestExtensions.kt | 2 +- app/src/test/java/testhelper/flow/FlowTest.kt | 6 ++--- .../testhelpers/BaseTestInstrumentation.kt | 6 ++--- .../java/testhelpers/logging/JUnitLogger.kt | 2 +- .../preferences/MockFlowPreference.kt | 2 +- 131 files changed, 444 insertions(+), 444 deletions(-) delete mode 100644 app/src/main/java/eu/darken/cap/common/error/ErrorEventSource.kt delete mode 100644 app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlowExtensions.kt delete mode 100644 app/src/main/java/eu/darken/cap/common/lists/ListItem.kt rename app/src/main/java/eu/darken/{cap => capod}/App.kt (84%) rename app/src/main/java/eu/darken/{cap => capod}/common/BuildConfigWrap.kt (88%) rename app/src/main/java/eu/darken/{cap => capod}/common/BuildWrap.kt (91%) rename app/src/main/java/eu/darken/{cap => capod}/common/ByteArrayExtensions.kt (94%) rename app/src/main/java/eu/darken/{cap => capod}/common/ContextExtensions.kt (97%) rename app/src/main/java/eu/darken/{cap => capod}/common/InstallId.kt (90%) rename app/src/main/java/eu/darken/{cap => capod}/common/LiveDataExtensions.kt (95%) rename app/src/main/java/eu/darken/{cap => capod}/common/bluetooth/BleScanner.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/common/bluetooth/BluetoothDevice2.kt (88%) rename app/src/main/java/eu/darken/{cap => capod}/common/bluetooth/BluetoothDeviceExtensions.kt (81%) rename app/src/main/java/eu/darken/{cap => capod}/common/bluetooth/BluetoothManager2.kt (95%) rename app/src/main/java/eu/darken/{cap => capod}/common/bluetooth/BluetoothProfile2.kt (93%) rename app/src/main/java/eu/darken/{cap => capod}/common/collections/MapExtensions.kt (75%) rename app/src/main/java/eu/darken/{cap => capod}/common/compression/Zipper.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/common/coroutine/AppCoroutineScope.kt (92%) rename app/src/main/java/eu/darken/{cap => capod}/common/coroutine/CoroutineModule.kt (91%) rename app/src/main/java/eu/darken/{cap => capod}/common/coroutine/DefaultDispatcherProvider.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/common/coroutine/DispatcherProvider.kt (94%) rename app/src/main/java/eu/darken/{cap => capod}/common/dagger/AndroidModule.kt (96%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugreporting/BugReportSettings.kt (80%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugreporting/BugReporter.kt (80%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugreporting/Bugs.kt (56%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugsnag/BugsnagErrorHandler.kt (86%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugsnag/BugsnagLogger.kt (90%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/bugsnag/NOPBugsnagErrorHandler.kt (65%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/logging/FileLogger.kt (98%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/logging/LogCatLogger.kt (97%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/logging/LogExtensions.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/logging/Logging.kt (98%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/recording/core/Recorder.kt (75%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/recording/core/RecorderModule.kt (87%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/recording/core/RecorderService.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/recording/ui/RecorderActivity.kt (78%) rename app/src/main/java/eu/darken/{cap => capod}/common/debug/recording/ui/RecorderActivityVM.kt (85%) rename app/src/main/java/eu/darken/{cap => capod}/common/error/ErrorDialog.kt (92%) create mode 100644 app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt rename app/src/main/java/eu/darken/{cap => capod}/common/error/LocalizedError.kt (94%) rename app/src/main/java/eu/darken/{cap => capod}/common/error/ThrowableExtensions.kt (96%) rename app/src/main/java/eu/darken/{cap => capod}/common/flow/DynamicStateFlow.kt (96%) create mode 100644 app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt rename app/src/main/java/eu/darken/{cap => capod}/common/flow/FlowCombineExtensions.kt (99%) rename app/src/main/java/eu/darken/{cap => capod}/common/flow/FlowExtensions.kt (88%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/BaseAdapter.kt (96%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/BindableVH.kt (90%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/DataAdapter.kt (89%) create mode 100644 app/src/main/java/eu/darken/capod/common/lists/ListItem.kt rename app/src/main/java/eu/darken/{cap => capod}/common/lists/RecyclerViewExtensions.kt (93%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/differ/AsyncDiffer.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/differ/AsyncDifferExtensions.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/differ/DifferItem.kt (62%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/differ/HasAsyncDiffer.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/ModularAdapter.kt (97%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/mods/ClickMod.kt (75%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/mods/DataBinderMod.kt (79%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/mods/SimpleVHCreatorMod.kt (80%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/mods/StableIdMod.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/common/lists/modular/mods/TypedVHCreatorMod.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/common/livedata/SingleLiveEvent.kt (93%) rename app/src/main/java/eu/darken/{cap => capod}/common/navigation/FragmentExtensions.kt (86%) rename app/src/main/java/eu/darken/{cap => capod}/common/navigation/NavArgsExtensions.kt (93%) rename app/src/main/java/eu/darken/{cap => capod}/common/navigation/NavControllerExtensions.kt (92%) rename app/src/main/java/eu/darken/{cap => capod}/common/navigation/NavDestinationExtensions.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/common/navigation/NavDirectionsExtensions.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/common/notifications/PendingIntentCompat.kt (67%) rename app/src/main/java/eu/darken/{cap => capod}/common/permissions/Permission.kt (93%) rename app/src/main/java/eu/darken/{cap => capod}/common/preferences/FlowPreference.kt (94%) rename app/src/main/java/eu/darken/{cap => capod}/common/preferences/SharedPreferenceExtensions.kt (71%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/Smart2BottomSheetDialogFragment.kt (87%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/Smart2Fragment.kt (84%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/Smart2VM.kt (65%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/SmartActivity.kt (85%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/SmartFragment.kt (92%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/SmartService.kt (91%) rename app/src/main/java/eu/darken/{cap => capod}/common/smart/SmartVM.kt (78%) rename app/src/main/java/eu/darken/{cap => capod}/common/viewbinding/ViewBindingExtensions.kt (95%) rename app/src/main/java/eu/darken/{cap => capod}/common/viewmodel/SmartVM.kt (63%) rename app/src/main/java/eu/darken/{cap => capod}/common/viewmodel/VM.kt (70%) rename app/src/main/java/eu/darken/{cap => capod}/common/viewmodel/ViewModelLazyKeyed.kt (99%) rename app/src/main/java/eu/darken/{cap => capod}/common/worker/WorkerExtensions.kt (95%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/MainActivity.kt (71%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/MainActivityVM.kt (57%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/MainAdapter.kt (59%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/MainFragment.kt (81%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/MainFragmentVM.kt (78%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/cards/PermissionCardVH.kt (79%) rename app/src/main/java/eu/darken/{cap => capod}/main/ui/cards/ToggleCardVH.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/MonitorComponent.kt (91%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/MonitorCoroutineScope.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/MonitorModule.kt (89%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/MonitorScope.kt (77%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/PodMonitor.kt (74%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/receiver/BluetoothEventReceiver.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/worker/MonitorControl.kt (80%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/worker/MonitorWorker.kt (85%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/core/worker/MonitorWorkerEntryPoint.kt (52%) rename app/src/main/java/eu/darken/{cap => capod}/monitor/ui/MonitorNotifications.kt (82%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/PodDevice.kt (61%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/PodFactory.kt (69%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/AirPodsDevice.kt (96%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/AirPodsFactory.kt (84%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/ApplePods.kt (55%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/ContinuityProtocol.kt (90%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/ProximityPairing.kt (95%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsGen1.kt (54%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsGen2.kt (54%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsMax.kt (54%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsPro.kt (54%) rename app/src/main/java/eu/darken/{cap => capod}/pods/core/airpods/models/UnknownAppleDevice.kt (55%) rename app/src/test/java/eu/darken/{cap => capod}/common/flow/DynamicStateFlowTest.kt (99%) rename app/src/test/java/eu/darken/{cap => capod}/pods/core/airpods/AirPodsFactoryTest.kt (97%) rename app/src/test/java/eu/darken/{cap => capod}/pods/core/airpods/BaseAirPodsTest.kt (95%) rename app/src/test/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsGen1Test.kt (89%) rename app/src/test/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsGen2Test.kt (89%) rename app/src/test/java/eu/darken/{cap => capod}/pods/core/airpods/models/AirPodsProTest.kt (97%) diff --git a/README.md b/README.md index 3b0614cb..ae8e1b26 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Companion App for AirPods (CAP) +# Companion App for AirPods (CAPod) A companion app that adds support for AirPod specific features to Android. @@ -10,16 +10,16 @@ Supported models: ## Support the project -* Buy the CAP Pro In-App purchase on [Google Play](https://play.google.com/store/apps/details?id=eu.darken.cap) +* Buy the CAPod Pro In-App purchase on [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) * [Buy me a coffee](https://www.buymeacoffee.com/tydarken) -* Help translate CAP [on Crowdin](https://crowdin.com/project/airpod-companion) +* Help translate CAPod [on Crowdin](https://crowdin.com/project/airpod-companion) ## Download -* [Google Play](https://play.google.com/store/apps/details?id=eu.darken.cap) +* [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) * [GitHub](https://github.com/d4rken/android-airpods-companion/releases/latest) -## Use CAP as a library +## Use CAPod as a library AirPods use Apple's Continuity Protocol to communicate, specifically the Proximity Pairing Message type. If you want to build your own app based on this, you can include it like this: @@ -37,10 +37,10 @@ build your own app based on this, you can include it like this: ## License -CAP's code is available under a GPL v3 license, this excludes: +CAPod's code is available under a GPL v3 license, this excludes: -* CAP icons, logos, mascots and marketing materials. -* CAP animations and videos. -* CAP documentation. +* CAPod icons, logos, mascots and marketing materials. +* CAPod animations and videos. +* CAPod documentation. * Google Play store screenshots. * Google Play store texts & descriptions. \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 79da4c20..9014adf4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { versionCode buildConfig.version.code versionName buildConfig.version.name - testInstrumentationRunner "eu.darken.cap.HiltTestRunner" + testInstrumentationRunner "eu.darken.capod.HiltTestRunner" buildConfigField "String", "GITSHA", "\"${gitSha}\"" buildConfigField "String", "BUILDTIME", "\"${buildTime}\"" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9bf7ea9b..a6b2b9a0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="eu.darken.capod"> @@ -11,7 +11,7 @@ @@ -31,7 +31,7 @@ @@ -55,10 +55,10 @@ - + -} \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlowExtensions.kt b/app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlowExtensions.kt deleted file mode 100644 index 709f859e..00000000 --- a/app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlowExtensions.kt +++ /dev/null @@ -1,3 +0,0 @@ -package eu.darken.cap.common.flow - - diff --git a/app/src/main/java/eu/darken/cap/common/lists/ListItem.kt b/app/src/main/java/eu/darken/cap/common/lists/ListItem.kt deleted file mode 100644 index efcd56d0..00000000 --- a/app/src/main/java/eu/darken/cap/common/lists/ListItem.kt +++ /dev/null @@ -1,3 +0,0 @@ -package eu.darken.cap.common.lists - -interface ListItem \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/App.kt b/app/src/main/java/eu/darken/capod/App.kt similarity index 84% rename from app/src/main/java/eu/darken/cap/App.kt rename to app/src/main/java/eu/darken/capod/App.kt index 67b7981b..5d11498f 100644 --- a/app/src/main/java/eu/darken/cap/App.kt +++ b/app/src/main/java/eu/darken/capod/App.kt @@ -1,14 +1,14 @@ -package eu.darken.cap +package eu.darken.capod import android.app.Application import androidx.hilt.work.HiltWorkerFactory import androidx.work.Configuration import com.getkeepsafe.relinker.ReLinker import dagger.hilt.android.HiltAndroidApp -import eu.darken.cap.common.coroutine.AppScope -import eu.darken.cap.common.debug.bugreporting.BugReporter -import eu.darken.cap.common.debug.logging.* -import eu.darken.cap.monitor.core.worker.MonitorControl +import eu.darken.capod.common.coroutine.AppScope +import eu.darken.capod.common.debug.bugreporting.BugReporter +import eu.darken.capod.common.debug.logging.* +import eu.darken.capod.monitor.core.worker.MonitorControl import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/cap/common/BuildConfigWrap.kt b/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt similarity index 88% rename from app/src/main/java/eu/darken/cap/common/BuildConfigWrap.kt rename to app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt index a52421fd..55a4e323 100644 --- a/app/src/main/java/eu/darken/cap/common/BuildConfigWrap.kt +++ b/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt @@ -1,6 +1,6 @@ -package eu.darken.cap.common +package eu.darken.capod.common -import eu.darken.cap.BuildConfig +import eu.darken.capod.BuildConfig // Can't be const because that prevents them from being mocked in tests diff --git a/app/src/main/java/eu/darken/cap/common/BuildWrap.kt b/app/src/main/java/eu/darken/capod/common/BuildWrap.kt similarity index 91% rename from app/src/main/java/eu/darken/cap/common/BuildWrap.kt rename to app/src/main/java/eu/darken/capod/common/BuildWrap.kt index f0051a7a..47fcf195 100644 --- a/app/src/main/java/eu/darken/cap/common/BuildWrap.kt +++ b/app/src/main/java/eu/darken/capod/common/BuildWrap.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common +package eu.darken.capod.common import android.os.Build diff --git a/app/src/main/java/eu/darken/cap/common/ByteArrayExtensions.kt b/app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt similarity index 94% rename from app/src/main/java/eu/darken/cap/common/ByteArrayExtensions.kt rename to app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt index bce75756..6e64ab87 100644 --- a/app/src/main/java/eu/darken/cap/common/ByteArrayExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common +package eu.darken.capod.common import java.util.* diff --git a/app/src/main/java/eu/darken/cap/common/ContextExtensions.kt b/app/src/main/java/eu/darken/capod/common/ContextExtensions.kt similarity index 97% rename from app/src/main/java/eu/darken/cap/common/ContextExtensions.kt rename to app/src/main/java/eu/darken/capod/common/ContextExtensions.kt index 6c045ed8..f1d51970 100644 --- a/app/src/main/java/eu/darken/cap/common/ContextExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/ContextExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common +package eu.darken.capod.common import android.annotation.SuppressLint import android.content.ComponentName diff --git a/app/src/main/java/eu/darken/cap/common/InstallId.kt b/app/src/main/java/eu/darken/capod/common/InstallId.kt similarity index 90% rename from app/src/main/java/eu/darken/cap/common/InstallId.kt rename to app/src/main/java/eu/darken/capod/common/InstallId.kt index 90796ccf..f07c9082 100644 --- a/app/src/main/java/eu/darken/cap/common/InstallId.kt +++ b/app/src/main/java/eu/darken/capod/common/InstallId.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.common +package eu.darken.capod.common import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import java.io.File import java.util.* import java.util.regex.Pattern diff --git a/app/src/main/java/eu/darken/cap/common/LiveDataExtensions.kt b/app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt similarity index 95% rename from app/src/main/java/eu/darken/cap/common/LiveDataExtensions.kt rename to app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt index 7d4aa746..670b0d3f 100644 --- a/app/src/main/java/eu/darken/cap/common/LiveDataExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common +package eu.darken.capod.common import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment diff --git a/app/src/main/java/eu/darken/cap/common/bluetooth/BleScanner.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/common/bluetooth/BleScanner.kt rename to app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt index e6a9e650..b554cc94 100644 --- a/app/src/main/java/eu/darken/cap/common/bluetooth/BleScanner.kt +++ b/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.bluetooth +package eu.darken.capod.common.bluetooth import android.bluetooth.BluetoothManager import android.bluetooth.le.ScanCallback @@ -7,10 +7,10 @@ import android.bluetooth.le.ScanResult import android.bluetooth.le.ScanSettings import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.debug.logging.Logging.Priority.* -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.airpods.ProximityPairing import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDevice2.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDevice2.kt similarity index 88% rename from app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDevice2.kt rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDevice2.kt index 2714742b..9f06c576 100644 --- a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDevice2.kt +++ b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDevice2.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.bluetooth +package eu.darken.capod.common.bluetooth import android.bluetooth.BluetoothDevice import android.os.ParcelUuid diff --git a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDeviceExtensions.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDeviceExtensions.kt similarity index 81% rename from app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDeviceExtensions.kt rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDeviceExtensions.kt index fbb772e8..1bb382b7 100644 --- a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothDeviceExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDeviceExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.bluetooth +package eu.darken.capod.common.bluetooth import android.bluetooth.BluetoothDevice import android.os.ParcelUuid diff --git a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothManager2.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt similarity index 95% rename from app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothManager2.kt rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt index 036c1ddd..613e9899 100644 --- a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothManager2.kt +++ b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.bluetooth +package eu.darken.capod.common.bluetooth import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothDevice @@ -11,10 +11,10 @@ import android.content.IntentFilter import android.os.Handler import android.os.HandlerThread import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.Logging.Priority.* -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothProfile2.kt b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt similarity index 93% rename from app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothProfile2.kt rename to app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt index 7e9af879..63d539fa 100644 --- a/app/src/main/java/eu/darken/cap/common/bluetooth/BluetoothProfile2.kt +++ b/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.bluetooth +package eu.darken.capod.common.bluetooth import android.bluetooth.BluetoothProfile import java.util.concurrent.atomic.AtomicBoolean diff --git a/app/src/main/java/eu/darken/cap/common/collections/MapExtensions.kt b/app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt similarity index 75% rename from app/src/main/java/eu/darken/cap/common/collections/MapExtensions.kt rename to app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt index 0cd0f1c6..378deb66 100644 --- a/app/src/main/java/eu/darken/cap/common/collections/MapExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.collections +package eu.darken.capod.common.collections inline fun Map.mutate(block: MutableMap.() -> Unit): Map { return toMutableMap().apply(block).toMap() diff --git a/app/src/main/java/eu/darken/cap/common/compression/Zipper.kt b/app/src/main/java/eu/darken/capod/common/compression/Zipper.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/common/compression/Zipper.kt rename to app/src/main/java/eu/darken/capod/common/compression/Zipper.kt index 795aa16d..210ceb71 100644 --- a/app/src/main/java/eu/darken/cap/common/compression/Zipper.kt +++ b/app/src/main/java/eu/darken/capod/common/compression/Zipper.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.compression +package eu.darken.capod.common.compression -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.io.FileInputStream diff --git a/app/src/main/java/eu/darken/cap/common/coroutine/AppCoroutineScope.kt b/app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt similarity index 92% rename from app/src/main/java/eu/darken/cap/common/coroutine/AppCoroutineScope.kt rename to app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt index 19a818a3..2a7ff30e 100644 --- a/app/src/main/java/eu/darken/cap/common/coroutine/AppCoroutineScope.kt +++ b/app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.coroutine +package eu.darken.capod.common.coroutine import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/eu/darken/cap/common/coroutine/CoroutineModule.kt b/app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt similarity index 91% rename from app/src/main/java/eu/darken/cap/common/coroutine/CoroutineModule.kt rename to app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt index e33b54db..09920cb7 100644 --- a/app/src/main/java/eu/darken/cap/common/coroutine/CoroutineModule.kt +++ b/app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.coroutine +package eu.darken.capod.common.coroutine import dagger.Binds import dagger.Module diff --git a/app/src/main/java/eu/darken/cap/common/coroutine/DefaultDispatcherProvider.kt b/app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/common/coroutine/DefaultDispatcherProvider.kt rename to app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt index 48f0a068..a057e33e 100644 --- a/app/src/main/java/eu/darken/cap/common/coroutine/DefaultDispatcherProvider.kt +++ b/app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.coroutine +package eu.darken.capod.common.coroutine import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/common/coroutine/DispatcherProvider.kt b/app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt similarity index 94% rename from app/src/main/java/eu/darken/cap/common/coroutine/DispatcherProvider.kt rename to app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt index 6c0c4884..6f938114 100644 --- a/app/src/main/java/eu/darken/cap/common/coroutine/DispatcherProvider.kt +++ b/app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.coroutine +package eu.darken.capod.common.coroutine import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/eu/darken/cap/common/dagger/AndroidModule.kt b/app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt similarity index 96% rename from app/src/main/java/eu/darken/cap/common/dagger/AndroidModule.kt rename to app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt index f85cc164..5ade1bf9 100644 --- a/app/src/main/java/eu/darken/cap/common/dagger/AndroidModule.kt +++ b/app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.dagger +package eu.darken.capod.common.dagger import android.app.Application import android.app.NotificationManager diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReportSettings.kt b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReportSettings.kt similarity index 80% rename from app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReportSettings.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReportSettings.kt index cb665c53..c6aac9df 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReportSettings.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReportSettings.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.debug.bugreporting +package eu.darken.capod.common.debug.bugreporting import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.preferences.createFlowPreference +import eu.darken.capod.common.preferences.createFlowPreference import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReporter.kt b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReporter.kt similarity index 80% rename from app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReporter.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReporter.kt index ee476f8d..35c6b20c 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/BugReporter.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/BugReporter.kt @@ -1,16 +1,16 @@ -package eu.darken.cap.common.debug.bugreporting +package eu.darken.capod.common.debug.bugreporting import android.content.Context import com.bugsnag.android.Bugsnag import com.bugsnag.android.Configuration import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.InstallId -import eu.darken.cap.common.debug.bugsnag.BugsnagErrorHandler -import eu.darken.cap.common.debug.bugsnag.BugsnagLogger -import eu.darken.cap.common.debug.bugsnag.NOPBugsnagErrorHandler -import eu.darken.cap.common.debug.logging.Logging -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.InstallId +import eu.darken.capod.common.debug.bugsnag.BugsnagErrorHandler +import eu.darken.capod.common.debug.bugsnag.BugsnagLogger +import eu.darken.capod.common.debug.bugsnag.NOPBugsnagErrorHandler +import eu.darken.capod.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import javax.inject.Inject import javax.inject.Provider import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/Bugs.kt b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/Bugs.kt similarity index 56% rename from app/src/main/java/eu/darken/cap/common/debug/bugreporting/Bugs.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugreporting/Bugs.kt index f0e589a6..508b0ca3 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugreporting/Bugs.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugreporting/Bugs.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.debug.bugreporting +package eu.darken.capod.common.debug.bugreporting import com.bugsnag.android.Bugsnag -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag object Bugs { var ready = false diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagErrorHandler.kt b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagErrorHandler.kt similarity index 86% rename from app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagErrorHandler.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagErrorHandler.kt index 66f6996a..3e29bf6d 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagErrorHandler.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagErrorHandler.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.bugsnag +package eu.darken.capod.common.debug.bugsnag import android.annotation.SuppressLint import android.content.Context @@ -6,10 +6,10 @@ import android.content.pm.PackageManager import com.bugsnag.android.Event import com.bugsnag.android.OnErrorCallback import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.BuildConfig -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.BuildConfig +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagLogger.kt similarity index 90% rename from app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagLogger.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagLogger.kt index 4a36e4d1..b77489b6 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/BugsnagLogger.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/BugsnagLogger.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.debug.bugsnag +package eu.darken.capod.common.debug.bugsnag import com.bugsnag.android.Event -import eu.darken.cap.common.debug.logging.Logging -import eu.darken.cap.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.asLog import java.lang.String.format import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/NOPBugsnagErrorHandler.kt b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/NOPBugsnagErrorHandler.kt similarity index 65% rename from app/src/main/java/eu/darken/cap/common/debug/bugsnag/NOPBugsnagErrorHandler.kt rename to app/src/main/java/eu/darken/capod/common/debug/bugsnag/NOPBugsnagErrorHandler.kt index 5366b43d..d61d3114 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/bugsnag/NOPBugsnagErrorHandler.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/bugsnag/NOPBugsnagErrorHandler.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.debug.bugsnag +package eu.darken.capod.common.debug.bugsnag import com.bugsnag.android.Event import com.bugsnag.android.OnErrorCallback -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/common/debug/logging/FileLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt similarity index 98% rename from app/src/main/java/eu/darken/cap/common/debug/logging/FileLogger.kt rename to app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt index c1fa858e..b9a408e8 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/logging/FileLogger.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.logging +package eu.darken.capod.common.debug.logging import android.annotation.SuppressLint import android.util.Log diff --git a/app/src/main/java/eu/darken/cap/common/debug/logging/LogCatLogger.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt similarity index 97% rename from app/src/main/java/eu/darken/cap/common/debug/logging/LogCatLogger.kt rename to app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt index 696a1f27..bd911f99 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/logging/LogCatLogger.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.logging +package eu.darken.capod.common.debug.logging import android.os.Build import android.util.Log diff --git a/app/src/main/java/eu/darken/cap/common/debug/logging/LogExtensions.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/common/debug/logging/LogExtensions.kt rename to app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt index cf594547..dea642fb 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/logging/LogExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.logging +package eu.darken.capod.common.debug.logging fun logTag(vararg tags: String): String { val sb = StringBuilder("CAP:") diff --git a/app/src/main/java/eu/darken/cap/common/debug/logging/Logging.kt b/app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt similarity index 98% rename from app/src/main/java/eu/darken/cap/common/debug/logging/Logging.kt rename to app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt index e861ea42..673f54d7 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/logging/Logging.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.logging +package eu.darken.capod.common.debug.logging import java.io.PrintWriter import java.io.StringWriter diff --git a/app/src/main/java/eu/darken/cap/common/debug/recording/core/Recorder.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt similarity index 75% rename from app/src/main/java/eu/darken/cap/common/debug/recording/core/Recorder.kt rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt index bd33345e..b056be60 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/recording/core/Recorder.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.debug.recording.core +package eu.darken.capod.common.debug.recording.core -import eu.darken.cap.common.debug.logging.FileLogger -import eu.darken.cap.common.debug.logging.Logging -import eu.darken.cap.common.debug.logging.Logging.Priority.INFO -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.FileLogger +import eu.darken.capod.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.Logging.Priority.INFO +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import java.io.File diff --git a/app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderModule.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt similarity index 87% rename from app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderModule.kt rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt index de99e666..6363db3b 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderModule.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt @@ -1,18 +1,18 @@ -package eu.darken.cap.common.debug.recording.core +package eu.darken.capod.common.debug.recording.core import android.content.Context import android.content.Intent import android.os.Environment import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.BuildConfigWrap -import eu.darken.cap.common.coroutine.AppScope -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.Logging.Priority.ERROR -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.debug.recording.ui.RecorderActivity -import eu.darken.cap.common.flow.DynamicStateFlow -import eu.darken.cap.common.startServiceCompat +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.coroutine.AppScope +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.debug.recording.ui.RecorderActivity +import eu.darken.capod.common.flow.DynamicStateFlow +import eu.darken.capod.common.startServiceCompat import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.* import kotlinx.coroutines.plus diff --git a/app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderService.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderService.kt rename to app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt index 35b69f19..3fe3a120 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/recording/core/RecorderService.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.recording.core +package eu.darken.capod.common.debug.recording.core import android.app.NotificationChannel import android.app.NotificationManager @@ -8,14 +8,14 @@ import android.os.Build import android.os.IBinder import androidx.core.app.NotificationCompat import dagger.hilt.android.AndroidEntryPoint -import eu.darken.cap.R -import eu.darken.cap.common.BuildConfigWrap -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.notifications.PendingIntentCompat -import eu.darken.cap.common.smart.SmartService -import eu.darken.cap.main.ui.MainActivity +import eu.darken.capod.R +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.notifications.PendingIntentCompat +import eu.darken.capod.common.smart.SmartService +import eu.darken.capod.main.ui.MainActivity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel diff --git a/app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivity.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt similarity index 78% rename from app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivity.kt rename to app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt index 622ca2b6..3955a38b 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivity.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt @@ -1,26 +1,27 @@ -package eu.darken.cap.common.debug.recording.ui +package eu.darken.capod.common.debug.recording.ui import android.content.Context import android.content.Intent import android.os.Bundle import android.text.format.Formatter import androidx.activity.viewModels +import androidx.core.view.isInvisible import dagger.hilt.android.AndroidEntryPoint -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.error.asErrorDialogBuilder -import eu.darken.cap.common.smart.SmartActivity -import eu.darken.cap.databinding.CoreDebugRecordingActivityBinding +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.error.asErrorDialogBuilder +import eu.darken.capod.common.smart.SmartActivity +import eu.darken.capod.databinding.DebugRecordingActivityBinding @AndroidEntryPoint class RecorderActivity : SmartActivity() { - private lateinit var ui: CoreDebugRecordingActivityBinding + private lateinit var ui: DebugRecordingActivityBinding private val vm: RecorderActivityVM by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - ui = CoreDebugRecordingActivityBinding.inflate(layoutInflater) + ui = DebugRecordingActivityBinding.inflate(layoutInflater) setContentView(ui.root) vm.state.observe2 { state -> diff --git a/app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivityVM.kt b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt similarity index 85% rename from app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivityVM.kt rename to app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt index 2c9b9cb2..9148da89 100644 --- a/app/src/main/java/eu/darken/cap/common/debug/recording/ui/RecorderActivityVM.kt +++ b/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.debug.recording.ui +package eu.darken.capod.common.debug.recording.ui import android.content.Context @@ -7,16 +7,16 @@ import androidx.core.content.FileProvider import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.R -import eu.darken.cap.common.BuildConfigWrap -import eu.darken.cap.common.compression.Zipper -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.flow.DynamicStateFlow -import eu.darken.cap.common.flow.onError -import eu.darken.cap.common.flow.replayingShare -import eu.darken.cap.common.livedata.SingleLiveEvent -import eu.darken.cap.common.smart.Smart2VM +import eu.darken.capod.R +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.compression.Zipper +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.flow.DynamicStateFlow +import eu.darken.capod.common.flow.onError +import eu.darken.capod.common.flow.replayingShare +import eu.darken.capod.common.livedata.SingleLiveEvent +import eu.darken.capod.common.smart.Smart2VM import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map @@ -95,7 +95,7 @@ class RecorderActivityVM @Inject constructor( } - val chooserIntent = Intent.createChooser(intent, context.getString(R.string.debug_log_file_label)) + val chooserIntent = Intent.createChooser(intent, context.getString(R.string.debug_debuglog_file_label)) shareEvent.postValue(chooserIntent) } diff --git a/app/src/main/java/eu/darken/cap/common/error/ErrorDialog.kt b/app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt similarity index 92% rename from app/src/main/java/eu/darken/cap/common/error/ErrorDialog.kt rename to app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt index 0301aae3..ec40fbcb 100644 --- a/app/src/main/java/eu/darken/cap/common/error/ErrorDialog.kt +++ b/app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.error +package eu.darken.capod.common.error import android.content.Context import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt b/app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt new file mode 100644 index 00000000..3b990797 --- /dev/null +++ b/app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt @@ -0,0 +1,7 @@ +package eu.darken.capod.common.error + +import eu.darken.capod.common.livedata.SingleLiveEvent + +interface ErrorEventSource { + val errorEvents: SingleLiveEvent +} \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/common/error/LocalizedError.kt b/app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt similarity index 94% rename from app/src/main/java/eu/darken/cap/common/error/LocalizedError.kt rename to app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt index 2b66ef82..66dbb752 100644 --- a/app/src/main/java/eu/darken/cap/common/error/LocalizedError.kt +++ b/app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.common.error +package eu.darken.capod.common.error import android.content.Context -import eu.darken.cap.R +import eu.darken.capod.R interface HasLocalizedError { fun getLocalizedError(context: Context): LocalizedError diff --git a/app/src/main/java/eu/darken/cap/common/error/ThrowableExtensions.kt b/app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt similarity index 96% rename from app/src/main/java/eu/darken/cap/common/error/ThrowableExtensions.kt rename to app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt index 21f9662a..eeacd0f6 100644 --- a/app/src/main/java/eu/darken/cap/common/error/ThrowableExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.error +package eu.darken.capod.common.error import java.io.PrintWriter import java.io.StringWriter diff --git a/app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlow.kt b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt similarity index 96% rename from app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlow.kt rename to app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt index 80e98d5b..74228899 100644 --- a/app/src/main/java/eu/darken/cap/common/flow/DynamicStateFlow.kt +++ b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.flow +package eu.darken.capod.common.flow -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.BufferOverflow diff --git a/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt new file mode 100644 index 00000000..fc9cc6c1 --- /dev/null +++ b/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt @@ -0,0 +1,3 @@ +package eu.darken.capod.common.flow + + diff --git a/app/src/main/java/eu/darken/cap/common/flow/FlowCombineExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt similarity index 99% rename from app/src/main/java/eu/darken/cap/common/flow/FlowCombineExtensions.kt rename to app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt index bab5566e..59745f9b 100644 --- a/app/src/main/java/eu/darken/cap/common/flow/FlowCombineExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.flow +package eu.darken.capod.common.flow import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/eu/darken/cap/common/flow/FlowExtensions.kt b/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt similarity index 88% rename from app/src/main/java/eu/darken/cap/common/flow/FlowExtensions.kt rename to app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt index 4e450890..c6a1ff25 100644 --- a/app/src/main/java/eu/darken/cap/common/flow/FlowExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.flow +package eu.darken.capod.common.flow -import eu.darken.cap.common.debug.logging.Logging.Priority.ERROR -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.error.hasCause +import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.error.hasCause import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.* diff --git a/app/src/main/java/eu/darken/cap/common/lists/BaseAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt similarity index 96% rename from app/src/main/java/eu/darken/cap/common/lists/BaseAdapter.kt rename to app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt index fc50dd0e..928ac944 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/BaseAdapter.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.lists +package eu.darken.capod.common.lists import android.content.Context import android.content.res.Resources @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.annotation.* import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import eu.darken.cap.common.getColorForAttr +import eu.darken.capod.common.getColorForAttr abstract class BaseAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/eu/darken/cap/common/lists/BindableVH.kt b/app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt similarity index 90% rename from app/src/main/java/eu/darken/cap/common/lists/BindableVH.kt rename to app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt index b5c64f20..54af2a23 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/BindableVH.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.lists +package eu.darken.capod.common.lists import androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/eu/darken/cap/common/lists/DataAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/common/lists/DataAdapter.kt rename to app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt index 57f66a5b..36c2e691 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/DataAdapter.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.lists +package eu.darken.capod.common.lists import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/eu/darken/capod/common/lists/ListItem.kt b/app/src/main/java/eu/darken/capod/common/lists/ListItem.kt new file mode 100644 index 00000000..5a342a9a --- /dev/null +++ b/app/src/main/java/eu/darken/capod/common/lists/ListItem.kt @@ -0,0 +1,3 @@ +package eu.darken.capod.common.lists + +interface ListItem \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/common/lists/RecyclerViewExtensions.kt b/app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt similarity index 93% rename from app/src/main/java/eu/darken/cap/common/lists/RecyclerViewExtensions.kt rename to app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt index 16bd5cd3..def70ba1 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/RecyclerViewExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.lists +package eu.darken.capod.common.lists import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.DividerItemDecoration diff --git a/app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDiffer.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDiffer.kt rename to app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt index 79d660dd..a6f2b31e 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDiffer.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.common.lists.differ +package eu.darken.capod.common.lists.differ import androidx.recyclerview.widget.AsyncListDiffer import androidx.recyclerview.widget.DiffUtil -import eu.darken.cap.common.lists.modular.ModularAdapter -import eu.darken.cap.common.lists.modular.mods.StableIdMod +import eu.darken.capod.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.mods.StableIdMod class AsyncDiffer internal constructor( adapter: A, diff --git a/app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDifferExtensions.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDifferExtensions.kt rename to app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt index ee6f714c..edd8c39f 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/differ/AsyncDifferExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.common.lists.differ +package eu.darken.capod.common.lists.differ import androidx.recyclerview.widget.RecyclerView -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.ModularAdapter fun X.update(newData: List?) diff --git a/app/src/main/java/eu/darken/cap/common/lists/differ/DifferItem.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt similarity index 62% rename from app/src/main/java/eu/darken/cap/common/lists/differ/DifferItem.kt rename to app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt index db01100a..1d78df6e 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/differ/DifferItem.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt @@ -1,6 +1,6 @@ -package eu.darken.cap.common.lists.differ +package eu.darken.capod.common.lists.differ -import eu.darken.cap.common.lists.ListItem +import eu.darken.capod.common.lists.ListItem interface DifferItem : ListItem { val stableId: Long diff --git a/app/src/main/java/eu/darken/cap/common/lists/differ/HasAsyncDiffer.kt b/app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/common/lists/differ/HasAsyncDiffer.kt rename to app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt index 24d56919..9b50a8c3 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/differ/HasAsyncDiffer.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.lists.differ +package eu.darken.capod.common.lists.differ interface HasAsyncDiffer { diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/ModularAdapter.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt similarity index 97% rename from app/src/main/java/eu/darken/cap/common/lists/modular/ModularAdapter.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt index 83d8769c..6d905792 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/ModularAdapter.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.lists.modular +package eu.darken.capod.common.lists.modular import android.view.ViewGroup import androidx.annotation.CallSuper import androidx.annotation.LayoutRes import androidx.recyclerview.widget.RecyclerView -import eu.darken.cap.common.lists.BaseAdapter +import eu.darken.capod.common.lists.BaseAdapter abstract class ModularAdapter : BaseAdapter() { val modules = mutableListOf() diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/ClickMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt similarity index 75% rename from app/src/main/java/eu/darken/cap/common/lists/modular/mods/ClickMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt index 301347a4..5e74a560 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/ClickMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt @@ -1,6 +1,6 @@ -package eu.darken.cap.common.lists.modular.mods +package eu.darken.capod.common.lists.modular.mods -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.ModularAdapter class ClickMod constructor( private val listener: (VHT, Int) -> Unit diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/DataBinderMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt similarity index 79% rename from app/src/main/java/eu/darken/cap/common/lists/modular/mods/DataBinderMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt index 947c8f59..a344698c 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/DataBinderMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.lists.modular.mods +package eu.darken.capod.common.lists.modular.mods import androidx.viewbinding.ViewBinding -import eu.darken.cap.common.lists.BindableVH -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.BindableVH +import eu.darken.capod.common.lists.modular.ModularAdapter class DataBinderMod constructor( private val data: List, diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/SimpleVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt similarity index 80% rename from app/src/main/java/eu/darken/cap/common/lists/modular/mods/SimpleVHCreatorMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt index 1c814c8a..8f90427b 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/SimpleVHCreatorMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.common.lists.modular.mods +package eu.darken.capod.common.lists.modular.mods import android.view.ViewGroup -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.ModularAdapter class SimpleVHCreatorMod constructor( private val viewType: Int = 0, diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/StableIdMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/common/lists/modular/mods/StableIdMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt index 8017b157..db4f15bf 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/StableIdMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.lists.modular.mods +package eu.darken.capod.common.lists.modular.mods import androidx.recyclerview.widget.RecyclerView -import eu.darken.cap.common.lists.differ.DifferItem -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.differ.DifferItem +import eu.darken.capod.common.lists.modular.ModularAdapter class StableIdMod constructor( private val data: List, diff --git a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/TypedVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/common/lists/modular/mods/TypedVHCreatorMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt index 5f0cf16c..1e4a934a 100644 --- a/app/src/main/java/eu/darken/cap/common/lists/modular/mods/TypedVHCreatorMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.common.lists.modular.mods +package eu.darken.capod.common.lists.modular.mods import android.view.ViewGroup -import eu.darken.cap.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.ModularAdapter class TypedVHCreatorMod constructor( private val typeResolver: (Int) -> Boolean, diff --git a/app/src/main/java/eu/darken/cap/common/livedata/SingleLiveEvent.kt b/app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt similarity index 93% rename from app/src/main/java/eu/darken/cap/common/livedata/SingleLiveEvent.kt rename to app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt index 2fb97195..5d837703 100644 --- a/app/src/main/java/eu/darken/cap/common/livedata/SingleLiveEvent.kt +++ b/app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.livedata +package eu.darken.capod.common.livedata /* * Copyright 2017 Google Inc. @@ -22,8 +22,8 @@ import androidx.annotation.Nullable import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.log import java.util.concurrent.atomic.AtomicBoolean /** diff --git a/app/src/main/java/eu/darken/cap/common/navigation/FragmentExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt similarity index 86% rename from app/src/main/java/eu/darken/cap/common/navigation/FragmentExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt index d8f26f89..9f2bc230 100644 --- a/app/src/main/java/eu/darken/cap/common/navigation/FragmentExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.navigation +package eu.darken.capod.common.navigation import android.app.Activity import androidx.annotation.IdRes @@ -9,9 +9,9 @@ import androidx.navigation.NavController import androidx.navigation.NavDirections import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log fun Fragment.doNavigate(direction: NavDirections) = findNavController().doNavigate(direction) diff --git a/app/src/main/java/eu/darken/cap/common/navigation/NavArgsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt similarity index 93% rename from app/src/main/java/eu/darken/cap/common/navigation/NavArgsExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt index 9f568dc6..694548e6 100644 --- a/app/src/main/java/eu/darken/cap/common/navigation/NavArgsExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.navigation +package eu.darken.capod.common.navigation import android.os.Bundle import android.os.Parcelable diff --git a/app/src/main/java/eu/darken/cap/common/navigation/NavControllerExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt similarity index 92% rename from app/src/main/java/eu/darken/cap/common/navigation/NavControllerExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt index b676a9bd..a3b5a9d0 100644 --- a/app/src/main/java/eu/darken/cap/common/navigation/NavControllerExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.navigation +package eu.darken.capod.common.navigation import android.os.Bundle import androidx.annotation.IdRes diff --git a/app/src/main/java/eu/darken/cap/common/navigation/NavDestinationExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/common/navigation/NavDestinationExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt index 7384a568..bd3a4d65 100644 --- a/app/src/main/java/eu/darken/cap/common/navigation/NavDestinationExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.navigation +package eu.darken.capod.common.navigation import androidx.annotation.IdRes import androidx.navigation.NavDestination diff --git a/app/src/main/java/eu/darken/cap/common/navigation/NavDirectionsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/common/navigation/NavDirectionsExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt index d7d32c56..6ecd3d5a 100644 --- a/app/src/main/java/eu/darken/cap/common/navigation/NavDirectionsExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.navigation +package eu.darken.capod.common.navigation import androidx.lifecycle.MutableLiveData import androidx.navigation.NavDirections -import eu.darken.cap.common.livedata.SingleLiveEvent +import eu.darken.capod.common.livedata.SingleLiveEvent fun NavDirections.navVia(pub: MutableLiveData) = pub.postValue(this) diff --git a/app/src/main/java/eu/darken/cap/common/notifications/PendingIntentCompat.kt b/app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt similarity index 67% rename from app/src/main/java/eu/darken/cap/common/notifications/PendingIntentCompat.kt rename to app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt index 4caf63d6..773f5de4 100644 --- a/app/src/main/java/eu/darken/cap/common/notifications/PendingIntentCompat.kt +++ b/app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.common.notifications +package eu.darken.capod.common.notifications import android.app.PendingIntent -import eu.darken.cap.common.hasApiLevel +import eu.darken.capod.common.hasApiLevel object PendingIntentCompat { val FLAG_IMMUTABLE: Int = if (hasApiLevel(31)) { diff --git a/app/src/main/java/eu/darken/cap/common/permissions/Permission.kt b/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt similarity index 93% rename from app/src/main/java/eu/darken/cap/common/permissions/Permission.kt rename to app/src/main/java/eu/darken/capod/common/permissions/Permission.kt index 5665af56..7b315c85 100644 --- a/app/src/main/java/eu/darken/cap/common/permissions/Permission.kt +++ b/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt @@ -1,11 +1,11 @@ -package eu.darken.cap.common.permissions +package eu.darken.capod.common.permissions import android.content.Context import android.content.pm.PackageManager import android.os.Build import androidx.annotation.StringRes import androidx.core.content.ContextCompat -import eu.darken.cap.R +import eu.darken.capod.R enum class Permission( val minApiLevel: Int, diff --git a/app/src/main/java/eu/darken/cap/common/preferences/FlowPreference.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt similarity index 94% rename from app/src/main/java/eu/darken/cap/common/preferences/FlowPreference.kt rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt index bd5cc641..23c32b43 100644 --- a/app/src/main/java/eu/darken/cap/common/preferences/FlowPreference.kt +++ b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.common.preferences +package eu.darken.capod.common.preferences import android.content.SharedPreferences import androidx.core.content.edit -import eu.darken.cap.common.debug.logging.Logging.Priority.* -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/eu/darken/cap/common/preferences/SharedPreferenceExtensions.kt b/app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt similarity index 71% rename from app/src/main/java/eu/darken/cap/common/preferences/SharedPreferenceExtensions.kt rename to app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt index 8e580e20..1e263be0 100644 --- a/app/src/main/java/eu/darken/cap/common/preferences/SharedPreferenceExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.common.preferences +package eu.darken.capod.common.preferences import android.content.SharedPreferences import androidx.core.content.edit -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log fun SharedPreferences.clearAndNotify() { val currentKeys = this.all.keys.toSet() diff --git a/app/src/main/java/eu/darken/cap/common/smart/Smart2BottomSheetDialogFragment.kt b/app/src/main/java/eu/darken/capod/common/smart/Smart2BottomSheetDialogFragment.kt similarity index 87% rename from app/src/main/java/eu/darken/cap/common/smart/Smart2BottomSheetDialogFragment.kt rename to app/src/main/java/eu/darken/capod/common/smart/Smart2BottomSheetDialogFragment.kt index 0f209156..340d106e 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/Smart2BottomSheetDialogFragment.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/Smart2BottomSheetDialogFragment.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import android.content.Context import android.content.Intent @@ -9,13 +9,13 @@ import android.view.ViewGroup import androidx.lifecycle.LiveData import androidx.viewbinding.ViewBinding import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.error.asErrorDialogBuilder -import eu.darken.cap.common.navigation.doNavigate -import eu.darken.cap.common.navigation.popBackStack -import eu.darken.cap.common.observe2 +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.error.asErrorDialogBuilder +import eu.darken.capod.common.navigation.doNavigate +import eu.darken.capod.common.navigation.popBackStack +import eu.darken.capod.common.observe2 abstract class Smart2BottomSheetDialogFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/eu/darken/cap/common/smart/Smart2Fragment.kt b/app/src/main/java/eu/darken/capod/common/smart/Smart2Fragment.kt similarity index 84% rename from app/src/main/java/eu/darken/cap/common/smart/Smart2Fragment.kt rename to app/src/main/java/eu/darken/capod/common/smart/Smart2Fragment.kt index 4cd94e9b..459c387f 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/Smart2Fragment.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/Smart2Fragment.kt @@ -1,14 +1,14 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import android.os.Bundle import android.view.View import androidx.annotation.LayoutRes import androidx.lifecycle.LiveData import androidx.viewbinding.ViewBinding -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.error.asErrorDialogBuilder -import eu.darken.cap.common.navigation.doNavigate -import eu.darken.cap.common.navigation.popBackStack +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.error.asErrorDialogBuilder +import eu.darken.capod.common.navigation.doNavigate +import eu.darken.capod.common.navigation.popBackStack abstract class Smart2Fragment(@LayoutRes layoutRes: Int?) : SmartFragment(layoutRes) { diff --git a/app/src/main/java/eu/darken/cap/common/smart/Smart2VM.kt b/app/src/main/java/eu/darken/capod/common/smart/Smart2VM.kt similarity index 65% rename from app/src/main/java/eu/darken/cap/common/smart/Smart2VM.kt rename to app/src/main/java/eu/darken/capod/common/smart/Smart2VM.kt index abad88d8..10948a89 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/Smart2VM.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/Smart2VM.kt @@ -1,13 +1,13 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import androidx.navigation.NavDirections -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.error.ErrorEventSource -import eu.darken.cap.common.flow.setupCommonEventHandlers -import eu.darken.cap.common.livedata.SingleLiveEvent -import eu.darken.cap.common.navigation.NavEventSource +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.error.ErrorEventSource +import eu.darken.capod.common.flow.setupCommonEventHandlers +import eu.darken.capod.common.livedata.SingleLiveEvent +import eu.darken.capod.common.navigation.NavEventSource import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/eu/darken/cap/common/smart/SmartActivity.kt b/app/src/main/java/eu/darken/capod/common/smart/SmartActivity.kt similarity index 85% rename from app/src/main/java/eu/darken/cap/common/smart/SmartActivity.kt rename to app/src/main/java/eu/darken/capod/common/smart/SmartActivity.kt index 1daf1c51..a3eee077 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/SmartActivity.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/SmartActivity.kt @@ -1,12 +1,12 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag abstract class SmartActivity : AppCompatActivity() { internal val tag: String = diff --git a/app/src/main/java/eu/darken/cap/common/smart/SmartFragment.kt b/app/src/main/java/eu/darken/capod/common/smart/SmartFragment.kt similarity index 92% rename from app/src/main/java/eu/darken/cap/common/smart/SmartFragment.kt rename to app/src/main/java/eu/darken/capod/common/smart/SmartFragment.kt index b63d979b..40a4b9d3 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/SmartFragment.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/SmartFragment.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import android.content.Context import android.content.Intent @@ -8,9 +8,9 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.LayoutRes import androidx.fragment.app.Fragment -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag abstract class SmartFragment(@LayoutRes val layoutRes: Int?) : Fragment(layoutRes ?: 0) { diff --git a/app/src/main/java/eu/darken/cap/common/smart/SmartService.kt b/app/src/main/java/eu/darken/capod/common/smart/SmartService.kt similarity index 91% rename from app/src/main/java/eu/darken/cap/common/smart/SmartService.kt rename to app/src/main/java/eu/darken/capod/common/smart/SmartService.kt index a8645012..49a0b4d8 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/SmartService.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/SmartService.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import android.app.Service import android.content.Intent import android.content.res.Configuration -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag abstract class SmartService : Service() { private val tag: String = diff --git a/app/src/main/java/eu/darken/cap/common/smart/SmartVM.kt b/app/src/main/java/eu/darken/capod/common/smart/SmartVM.kt similarity index 78% rename from app/src/main/java/eu/darken/cap/common/smart/SmartVM.kt rename to app/src/main/java/eu/darken/capod/common/smart/SmartVM.kt index 2f8afeb0..8e956dc4 100644 --- a/app/src/main/java/eu/darken/cap/common/smart/SmartVM.kt +++ b/app/src/main/java/eu/darken/capod/common/smart/SmartVM.kt @@ -1,15 +1,15 @@ -package eu.darken.cap.common.smart +package eu.darken.capod.common.smart import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope -import eu.darken.cap.common.coroutine.DefaultDispatcherProvider -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.error.ErrorEventSource -import eu.darken.cap.common.flow.DynamicStateFlow -import eu.darken.cap.common.viewmodel.VM +import eu.darken.capod.common.coroutine.DefaultDispatcherProvider +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.error.ErrorEventSource +import eu.darken.capod.common.flow.DynamicStateFlow +import eu.darken.capod.common.viewmodel.VM import kotlinx.coroutines.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/eu/darken/cap/common/viewbinding/ViewBindingExtensions.kt b/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt similarity index 95% rename from app/src/main/java/eu/darken/cap/common/viewbinding/ViewBindingExtensions.kt rename to app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt index a2ace067..8327ffe7 100644 --- a/app/src/main/java/eu/darken/cap/common/viewbinding/ViewBindingExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.viewbinding +package eu.darken.capod.common.viewbinding import android.os.Handler import android.os.Looper @@ -8,8 +8,8 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.viewbinding.ViewBinding -import eu.darken.cap.common.debug.logging.Logging.Priority.* -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.log import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/eu/darken/cap/common/viewmodel/SmartVM.kt b/app/src/main/java/eu/darken/capod/common/viewmodel/SmartVM.kt similarity index 63% rename from app/src/main/java/eu/darken/cap/common/viewmodel/SmartVM.kt rename to app/src/main/java/eu/darken/capod/common/viewmodel/SmartVM.kt index 2fc1154a..84474dbd 100644 --- a/app/src/main/java/eu/darken/cap/common/viewmodel/SmartVM.kt +++ b/app/src/main/java/eu/darken/capod/common/viewmodel/SmartVM.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.common.viewmodel +package eu.darken.capod.common.viewmodel import androidx.lifecycle.asLiveData -import eu.darken.cap.common.coroutine.DefaultDispatcherProvider -import eu.darken.cap.common.coroutine.DispatcherProvider +import eu.darken.capod.common.coroutine.DefaultDispatcherProvider +import eu.darken.capod.common.coroutine.DispatcherProvider import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/eu/darken/cap/common/viewmodel/VM.kt b/app/src/main/java/eu/darken/capod/common/viewmodel/VM.kt similarity index 70% rename from app/src/main/java/eu/darken/cap/common/viewmodel/VM.kt rename to app/src/main/java/eu/darken/capod/common/viewmodel/VM.kt index 542a73f0..2314a75b 100644 --- a/app/src/main/java/eu/darken/cap/common/viewmodel/VM.kt +++ b/app/src/main/java/eu/darken/capod/common/viewmodel/VM.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.common.viewmodel +package eu.darken.capod.common.viewmodel import androidx.annotation.CallSuper import androidx.lifecycle.ViewModel -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag abstract class VM : ViewModel() { val TAG: String = logTag("VM", javaClass.simpleName) diff --git a/app/src/main/java/eu/darken/cap/common/viewmodel/ViewModelLazyKeyed.kt b/app/src/main/java/eu/darken/capod/common/viewmodel/ViewModelLazyKeyed.kt similarity index 99% rename from app/src/main/java/eu/darken/cap/common/viewmodel/ViewModelLazyKeyed.kt rename to app/src/main/java/eu/darken/capod/common/viewmodel/ViewModelLazyKeyed.kt index bf9cd15e..9524550e 100644 --- a/app/src/main/java/eu/darken/cap/common/viewmodel/ViewModelLazyKeyed.kt +++ b/app/src/main/java/eu/darken/capod/common/viewmodel/ViewModelLazyKeyed.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.viewmodel +package eu.darken.capod.common.viewmodel /* * Copyright 2018 The Android Open Source Project diff --git a/app/src/main/java/eu/darken/cap/common/worker/WorkerExtensions.kt b/app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt similarity index 95% rename from app/src/main/java/eu/darken/cap/common/worker/WorkerExtensions.kt rename to app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt index b9c3d7bb..19f6127f 100644 --- a/app/src/main/java/eu/darken/cap/common/worker/WorkerExtensions.kt +++ b/app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.common.worker +package eu.darken.capod.common.worker import android.os.Parcel import android.os.Parcelable diff --git a/app/src/main/java/eu/darken/cap/main/ui/MainActivity.kt b/app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt similarity index 71% rename from app/src/main/java/eu/darken/cap/main/ui/MainActivity.kt rename to app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt index 343f3c9e..5106322f 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/MainActivity.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt @@ -1,12 +1,12 @@ -package eu.darken.cap.main.ui +package eu.darken.capod.main.ui import android.os.Bundle import androidx.activity.viewModels import dagger.hilt.android.AndroidEntryPoint -import eu.darken.cap.R -import eu.darken.cap.common.navigation.findNavController -import eu.darken.cap.common.smart.SmartActivity -import eu.darken.cap.databinding.MainActivityBinding +import eu.darken.capod.R +import eu.darken.capod.common.navigation.findNavController +import eu.darken.capod.common.smart.SmartActivity +import eu.darken.capod.databinding.MainActivityBinding @AndroidEntryPoint class MainActivity : SmartActivity() { diff --git a/app/src/main/java/eu/darken/cap/main/ui/MainActivityVM.kt b/app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt similarity index 57% rename from app/src/main/java/eu/darken/cap/main/ui/MainActivityVM.kt rename to app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt index c0e53dab..0ac0a182 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/MainActivityVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.main.ui +package eu.darken.capod.main.ui import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.viewmodel.SmartVM +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.viewmodel.SmartVM import javax.inject.Inject @@ -11,6 +11,4 @@ import javax.inject.Inject class MainActivityVM @Inject constructor( handle: SavedStateHandle, dispatcherProvider: DispatcherProvider, -) : SmartVM(dispatcherProvider = dispatcherProvider) { - -} \ No newline at end of file +) : SmartVM(dispatcherProvider = dispatcherProvider) \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/main/ui/MainAdapter.kt b/app/src/main/java/eu/darken/capod/main/ui/MainAdapter.kt similarity index 59% rename from app/src/main/java/eu/darken/cap/main/ui/MainAdapter.kt rename to app/src/main/java/eu/darken/capod/main/ui/MainAdapter.kt index 4dba51bb..36d83ac8 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/MainAdapter.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/MainAdapter.kt @@ -1,18 +1,18 @@ -package eu.darken.cap.main.ui +package eu.darken.capod.main.ui import android.view.ViewGroup import androidx.annotation.LayoutRes import androidx.viewbinding.ViewBinding -import eu.darken.cap.common.lists.BindableVH -import eu.darken.cap.common.lists.differ.AsyncDiffer -import eu.darken.cap.common.lists.differ.DifferItem -import eu.darken.cap.common.lists.differ.HasAsyncDiffer -import eu.darken.cap.common.lists.differ.setupDiffer -import eu.darken.cap.common.lists.modular.ModularAdapter -import eu.darken.cap.common.lists.modular.mods.DataBinderMod -import eu.darken.cap.common.lists.modular.mods.TypedVHCreatorMod -import eu.darken.cap.main.ui.cards.PermissionCardVH -import eu.darken.cap.main.ui.cards.ToggleCardVH +import eu.darken.capod.common.lists.BindableVH +import eu.darken.capod.common.lists.differ.AsyncDiffer +import eu.darken.capod.common.lists.differ.DifferItem +import eu.darken.capod.common.lists.differ.HasAsyncDiffer +import eu.darken.capod.common.lists.differ.setupDiffer +import eu.darken.capod.common.lists.modular.ModularAdapter +import eu.darken.capod.common.lists.modular.mods.DataBinderMod +import eu.darken.capod.common.lists.modular.mods.TypedVHCreatorMod +import eu.darken.capod.main.ui.cards.PermissionCardVH +import eu.darken.capod.main.ui.cards.ToggleCardVH import javax.inject.Inject class MainAdapter @Inject constructor() : diff --git a/app/src/main/java/eu/darken/cap/main/ui/MainFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/MainFragment.kt similarity index 81% rename from app/src/main/java/eu/darken/cap/main/ui/MainFragment.kt rename to app/src/main/java/eu/darken/capod/main/ui/MainFragment.kt index 1afe297f..c47837ea 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/MainFragment.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/MainFragment.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.main.ui +package eu.darken.capod.main.ui import android.os.Bundle import android.view.View @@ -6,14 +6,14 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.viewModels import dagger.hilt.android.AndroidEntryPoint -import eu.darken.cap.R -import eu.darken.cap.common.BuildConfigWrap -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.lists.differ.update -import eu.darken.cap.common.lists.setupDefaults -import eu.darken.cap.common.smart.Smart2Fragment -import eu.darken.cap.common.viewbinding.viewBinding -import eu.darken.cap.databinding.MainFragmentBinding +import eu.darken.capod.R +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.lists.differ.update +import eu.darken.capod.common.lists.setupDefaults +import eu.darken.capod.common.smart.Smart2Fragment +import eu.darken.capod.common.viewbinding.viewBinding +import eu.darken.capod.databinding.MainFragmentBinding import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/eu/darken/cap/main/ui/MainFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/MainFragmentVM.kt similarity index 78% rename from app/src/main/java/eu/darken/cap/main/ui/MainFragmentVM.kt rename to app/src/main/java/eu/darken/capod/main/ui/MainFragmentVM.kt index eb654fc9..40170d77 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/MainFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/MainFragmentVM.kt @@ -1,19 +1,19 @@ -package eu.darken.cap.main.ui +package eu.darken.capod.main.ui import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.recording.core.RecorderModule -import eu.darken.cap.common.hasApiLevel -import eu.darken.cap.common.livedata.SingleLiveEvent -import eu.darken.cap.common.permissions.Permission -import eu.darken.cap.common.permissions.isGranted -import eu.darken.cap.common.smart.Smart2VM -import eu.darken.cap.main.ui.cards.PermissionCardVH -import eu.darken.cap.main.ui.cards.ToggleCardVH +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.recording.core.RecorderModule +import eu.darken.capod.common.hasApiLevel +import eu.darken.capod.common.livedata.SingleLiveEvent +import eu.darken.capod.common.permissions.Permission +import eu.darken.capod.common.permissions.isGranted +import eu.darken.capod.common.smart.Smart2VM +import eu.darken.capod.main.ui.cards.PermissionCardVH +import eu.darken.capod.main.ui.cards.ToggleCardVH import kotlinx.coroutines.flow.* import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/cap/main/ui/cards/PermissionCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/cards/PermissionCardVH.kt similarity index 79% rename from app/src/main/java/eu/darken/cap/main/ui/cards/PermissionCardVH.kt rename to app/src/main/java/eu/darken/capod/main/ui/cards/PermissionCardVH.kt index 3c6bc9d2..f47fac9d 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/cards/PermissionCardVH.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/cards/PermissionCardVH.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.main.ui.cards +package eu.darken.capod.main.ui.cards import android.view.ViewGroup -import eu.darken.cap.R -import eu.darken.cap.common.permissions.Permission -import eu.darken.cap.databinding.MainPermissionItemBinding -import eu.darken.cap.main.ui.MainAdapter +import eu.darken.capod.R +import eu.darken.capod.common.permissions.Permission +import eu.darken.capod.databinding.MainPermissionItemBinding +import eu.darken.capod.main.ui.MainAdapter class PermissionCardVH(parent: ViewGroup) : MainAdapter.BaseVH( diff --git a/app/src/main/java/eu/darken/cap/main/ui/cards/ToggleCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/cards/ToggleCardVH.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/main/ui/cards/ToggleCardVH.kt rename to app/src/main/java/eu/darken/capod/main/ui/cards/ToggleCardVH.kt index 66113277..90d2fc84 100644 --- a/app/src/main/java/eu/darken/cap/main/ui/cards/ToggleCardVH.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/cards/ToggleCardVH.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.main.ui.cards +package eu.darken.capod.main.ui.cards import android.view.ViewGroup -import eu.darken.cap.R -import eu.darken.cap.databinding.MainToggleItemBinding -import eu.darken.cap.main.ui.MainAdapter +import eu.darken.capod.R +import eu.darken.capod.databinding.MainToggleItemBinding +import eu.darken.capod.main.ui.MainAdapter class ToggleCardVH(parent: ViewGroup) : MainAdapter.BaseVH( diff --git a/app/src/main/java/eu/darken/cap/monitor/core/MonitorComponent.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt similarity index 91% rename from app/src/main/java/eu/darken/cap/monitor/core/MonitorComponent.kt rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt index 506e9716..70214807 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/MonitorComponent.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core +package eu.darken.capod.monitor.core import dagger.BindsInstance import dagger.hilt.DefineComponent diff --git a/app/src/main/java/eu/darken/cap/monitor/core/MonitorCoroutineScope.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/monitor/core/MonitorCoroutineScope.kt rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt index f69445b5..77f0f71f 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/MonitorCoroutineScope.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core +package eu.darken.capod.monitor.core import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/eu/darken/cap/monitor/core/MonitorModule.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt similarity index 89% rename from app/src/main/java/eu/darken/cap/monitor/core/MonitorModule.kt rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt index 282904f2..67e1926b 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/MonitorModule.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core +package eu.darken.capod.monitor.core import dagger.Binds import dagger.Module diff --git a/app/src/main/java/eu/darken/cap/monitor/core/MonitorScope.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt similarity index 77% rename from app/src/main/java/eu/darken/cap/monitor/core/MonitorScope.kt rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt index f7043450..f17af6a7 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/MonitorScope.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core +package eu.darken.capod.monitor.core import javax.inject.Qualifier diff --git a/app/src/main/java/eu/darken/cap/monitor/core/PodMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt similarity index 74% rename from app/src/main/java/eu/darken/cap/monitor/core/PodMonitor.kt rename to app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt index 286c38e6..393da8ec 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/PodMonitor.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.monitor.core +package eu.darken.capod.monitor.core -import eu.darken.cap.common.bluetooth.BleScanner -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.PodDevice -import eu.darken.cap.pods.core.PodFactory +import eu.darken.capod.common.bluetooth.BleScanner +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.PodDevice +import eu.darken.capod.pods.core.PodFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart diff --git a/app/src/main/java/eu/darken/cap/monitor/core/receiver/BluetoothEventReceiver.kt b/app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/monitor/core/receiver/BluetoothEventReceiver.kt rename to app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt index 8762eb34..2b041e7d 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/receiver/BluetoothEventReceiver.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core.receiver +package eu.darken.capod.monitor.core.receiver import android.bluetooth.BluetoothA2dp import android.bluetooth.BluetoothDevice @@ -7,13 +7,13 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint -import eu.darken.cap.common.bluetooth.hasFeature -import eu.darken.cap.common.coroutine.AppScope -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.monitor.core.worker.MonitorControl -import eu.darken.cap.pods.core.airpods.ContinuityProtocol +import eu.darken.capod.common.bluetooth.hasFeature +import eu.darken.capod.common.coroutine.AppScope +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.monitor.core.worker.MonitorControl +import eu.darken.capod.pods.core.airpods.ContinuityProtocol import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorControl.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt similarity index 80% rename from app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorControl.kt rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt index 12fc13a4..d243c096 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorControl.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt @@ -1,15 +1,15 @@ -package eu.darken.cap.monitor.core.worker +package eu.darken.capod.monitor.core.worker import android.bluetooth.BluetoothDevice import androidx.work.Data import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager -import eu.darken.cap.common.BuildConfigWrap -import eu.darken.cap.common.coroutine.DispatcherProvider -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import kotlinx.coroutines.withContext import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorker.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt similarity index 85% rename from app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorker.kt rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt index 52fb0cd2..e8e8c6ff 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorker.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.core.worker +package eu.darken.capod.monitor.core.worker import android.app.NotificationManager import android.content.Context @@ -8,16 +8,16 @@ import androidx.work.WorkerParameters import dagger.assisted.Assisted import dagger.assisted.AssistedInject import dagger.hilt.EntryPoints -import eu.darken.cap.common.debug.logging.Logging.Priority.ERROR -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.flow.setupCommonEventHandlers -import eu.darken.cap.monitor.core.MonitorComponent -import eu.darken.cap.monitor.core.MonitorCoroutineScope -import eu.darken.cap.monitor.ui.MonitorNotifications -import eu.darken.cap.pods.core.airpods.ContinuityProtocol +import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.flow.setupCommonEventHandlers +import eu.darken.capod.monitor.core.MonitorComponent +import eu.darken.capod.monitor.core.MonitorCoroutineScope +import eu.darken.capod.monitor.ui.MonitorNotifications +import eu.darken.capod.pods.core.airpods.ContinuityProtocol import kotlinx.coroutines.cancel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.* diff --git a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorkerEntryPoint.kt b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt similarity index 52% rename from app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorkerEntryPoint.kt rename to app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt index 1343e89c..3cf13d07 100644 --- a/app/src/main/java/eu/darken/cap/monitor/core/worker/MonitorWorkerEntryPoint.kt +++ b/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt @@ -1,10 +1,10 @@ -package eu.darken.cap.monitor.core.worker +package eu.darken.capod.monitor.core.worker import dagger.hilt.EntryPoint import dagger.hilt.InstallIn -import eu.darken.cap.common.bluetooth.BluetoothManager2 -import eu.darken.cap.monitor.core.MonitorComponent -import eu.darken.cap.monitor.core.PodMonitor +import eu.darken.capod.common.bluetooth.BluetoothManager2 +import eu.darken.capod.monitor.core.MonitorComponent +import eu.darken.capod.monitor.core.PodMonitor @InstallIn(MonitorComponent::class) @EntryPoint diff --git a/app/src/main/java/eu/darken/cap/monitor/ui/MonitorNotifications.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt similarity index 82% rename from app/src/main/java/eu/darken/cap/monitor/ui/MonitorNotifications.kt rename to app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt index a8bd4b6a..f1fe3907 100644 --- a/app/src/main/java/eu/darken/cap/monitor/ui/MonitorNotifications.kt +++ b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.monitor.ui +package eu.darken.capod.monitor.ui import android.annotation.SuppressLint import android.app.Notification @@ -11,14 +11,15 @@ import android.content.pm.ServiceInfo import androidx.core.app.NotificationCompat import androidx.work.ForegroundInfo import dagger.hilt.android.qualifiers.ApplicationContext -import eu.darken.cap.R -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.common.hasApiLevel -import eu.darken.cap.common.notifications.PendingIntentCompat -import eu.darken.cap.main.ui.MainActivity -import eu.darken.cap.pods.core.PodDevice +import eu.darken.capod.R +import eu.darken.capod.common.BuildConfigWrap +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.common.hasApiLevel +import eu.darken.capod.common.notifications.PendingIntentCompat +import eu.darken.capod.main.ui.MainActivity +import eu.darken.capod.pods.core.PodDevice import javax.inject.Inject @@ -84,7 +85,8 @@ class MonitorNotifications @Inject constructor( companion object { val TAG = logTag("Monitor", "Notifications") - private const val NOTIFICATION_CHANNEL_ID = "eu.darken.cap.notification.channel.device.status" + private val NOTIFICATION_CHANNEL_ID = + "${BuildConfigWrap.APPLICATION_ID}.notification.channel.device.status" internal const val NOTIFICATION_ID = 1 } } diff --git a/app/src/main/java/eu/darken/cap/pods/core/PodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt similarity index 61% rename from app/src/main/java/eu/darken/cap/pods/core/PodDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt index 930b16ff..5af6663f 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/PodDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt @@ -1,4 +1,4 @@ -package eu.darken.cap.pods.core +package eu.darken.capod.pods.core import android.bluetooth.le.ScanResult @@ -6,7 +6,5 @@ interface PodDevice { val scanResult: ScanResult - interface Status { - - } + interface Status } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/cap/pods/core/PodFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt similarity index 69% rename from app/src/main/java/eu/darken/cap/pods/core/PodFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt index 3f4914a4..1af684c4 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/PodFactory.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt @@ -1,12 +1,12 @@ -package eu.darken.cap.pods.core +package eu.darken.capod.pods.core import android.bluetooth.le.ScanResult import dagger.Reusable -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.airpods.AirPodsFactory +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.airpods.AirPodsFactory import javax.inject.Inject @Reusable diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsDevice.kt similarity index 96% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsDevice.kt index 4dde577b..68c0785f 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsDevice.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.isBitSet -import eu.darken.cap.common.lowerNibble -import eu.darken.cap.common.upperNibble +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.isBitSet +import eu.darken.capod.common.lowerNibble +import eu.darken.capod.common.upperNibble interface AirPodsDevice : ApplePods { diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsFactory.kt similarity index 84% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsFactory.kt index 77e626cf..4d2e5113 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/AirPodsFactory.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/AirPodsFactory.kt @@ -1,18 +1,18 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods import android.bluetooth.le.ScanResult import dagger.Reusable -import eu.darken.cap.common.debug.bugreporting.Bugs -import eu.darken.cap.common.debug.logging.Logging.Priority.INFO -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.PodDevice -import eu.darken.cap.pods.core.airpods.models.AirPodsGen1 -import eu.darken.cap.pods.core.airpods.models.AirPodsGen2 -import eu.darken.cap.pods.core.airpods.models.AirPodsPro -import eu.darken.cap.pods.core.airpods.models.UnknownAppleDevice +import eu.darken.capod.common.debug.bugreporting.Bugs +import eu.darken.capod.common.debug.logging.Logging.Priority.INFO +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.PodDevice +import eu.darken.capod.pods.core.airpods.models.AirPodsGen1 +import eu.darken.capod.pods.core.airpods.models.AirPodsGen2 +import eu.darken.capod.pods.core.airpods.models.AirPodsPro +import eu.darken.capod.pods.core.airpods.models.UnknownAppleDevice import javax.inject.Inject @Reusable diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/ApplePods.kt similarity index 55% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/ApplePods.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/ApplePods.kt index 735eb69d..347a6fbc 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/ApplePods.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/ApplePods.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.PodDevice +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.PodDevice interface ApplePods : PodDevice { diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/ContinuityProtocol.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/ContinuityProtocol.kt similarity index 90% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/ContinuityProtocol.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/ContinuityProtocol.kt index d20c42f9..a3151aec 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/ContinuityProtocol.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/ContinuityProtocol.kt @@ -1,11 +1,11 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods import android.bluetooth.le.ScanResult import android.os.ParcelUuid import dagger.Reusable -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.log -import eu.darken.cap.common.debug.logging.logTag +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.log +import eu.darken.capod.common.debug.logging.logTag import javax.inject.Inject object ContinuityProtocol { diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/ProximityPairing.kt similarity index 95% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/ProximityPairing.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/ProximityPairing.kt index 68645427..c944f055 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/ProximityPairing.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/ProximityPairing.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods import android.bluetooth.le.ScanFilter import dagger.Reusable -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.log import javax.inject.Inject diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1.kt similarity index 54% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1.kt index 559c641a..504ebfec 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models import android.bluetooth.le.ScanResult -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.ProximityPairing data class AirPodsGen1 constructor( override val scanResult: ScanResult, diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2.kt similarity index 54% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2.kt index 1437b770..a2a487fa 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models import android.bluetooth.le.ScanResult -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.ProximityPairing data class AirPodsGen2 constructor( override val scanResult: ScanResult, diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsMax.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsMax.kt similarity index 54% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsMax.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsMax.kt index d5acd2eb..409609af 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsMax.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsMax.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models import android.bluetooth.le.ScanResult -import eu.darken.cap.pods.core.airpods.ApplePods -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.pods.core.airpods.ApplePods +import eu.darken.capod.pods.core.airpods.ProximityPairing data class AirPodsMax constructor( override val scanResult: ScanResult, diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsPro.kt similarity index 54% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsPro.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsPro.kt index 040555f6..46e5b6c0 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/AirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/AirPodsPro.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models import android.bluetooth.le.ScanResult -import eu.darken.cap.common.debug.logging.logTag -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.common.debug.logging.logTag +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.ProximityPairing data class AirPodsPro constructor( override val scanResult: ScanResult, diff --git a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/UnknownAppleDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/UnknownAppleDevice.kt similarity index 55% rename from app/src/main/java/eu/darken/cap/pods/core/airpods/models/UnknownAppleDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/airpods/models/UnknownAppleDevice.kt index 84c0ccbc..06cc3f11 100644 --- a/app/src/main/java/eu/darken/cap/pods/core/airpods/models/UnknownAppleDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/airpods/models/UnknownAppleDevice.kt @@ -1,8 +1,8 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models import android.bluetooth.le.ScanResult -import eu.darken.cap.pods.core.airpods.ApplePods -import eu.darken.cap.pods.core.airpods.ProximityPairing +import eu.darken.capod.pods.core.airpods.ApplePods +import eu.darken.capod.pods.core.airpods.ProximityPairing data class UnknownAppleDevice constructor( override val scanResult: ScanResult, diff --git a/app/src/main/res/layout/debug_recording_activity.xml b/app/src/main/res/layout/debug_recording_activity.xml index 1a11811c..12fec71b 100644 --- a/app/src/main/res/layout/debug_recording_activity.xml +++ b/app/src/main/res/layout/debug_recording_activity.xml @@ -40,7 +40,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/label_path" - tools:text="/storage/emulated/0/Android/data/eu.darken.cap/cache/log_files/some_log_file_123124.log" /> + tools:text="/storage/emulated/0/Android/data/eu.darken.capod/cache/log_files/some_log_file_123124.log" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 04b05e46..225b8535 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ - Companion App for AirPods + CAPod + CAPod Pro Error BLUETOOTH CONNECT Required to be able to connect to paired Bluetooth devices. diff --git a/app/src/test/java/eu/darken/cap/common/flow/DynamicStateFlowTest.kt b/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt similarity index 99% rename from app/src/test/java/eu/darken/cap/common/flow/DynamicStateFlowTest.kt rename to app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt index 1a54e5d2..1885b051 100644 --- a/app/src/test/java/eu/darken/cap/common/flow/DynamicStateFlowTest.kt +++ b/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt @@ -1,6 +1,6 @@ -package eu.darken.cap.common.flow +package eu.darken.capod.common.flow -import eu.darken.cap.common.collections.mutate +import eu.darken.capod.common.collections.mutate import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe import io.kotest.matchers.types.instanceOf diff --git a/app/src/test/java/eu/darken/cap/pods/core/airpods/AirPodsFactoryTest.kt b/app/src/test/java/eu/darken/capod/pods/core/airpods/AirPodsFactoryTest.kt similarity index 97% rename from app/src/test/java/eu/darken/cap/pods/core/airpods/AirPodsFactoryTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/airpods/AirPodsFactoryTest.kt index 9141452e..43917c79 100644 --- a/app/src/test/java/eu/darken/cap/pods/core/airpods/AirPodsFactoryTest.kt +++ b/app/src/test/java/eu/darken/capod/pods/core/airpods/AirPodsFactoryTest.kt @@ -1,12 +1,12 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods import android.bluetooth.BluetoothDevice import android.bluetooth.le.ScanRecord import android.bluetooth.le.ScanResult -import eu.darken.cap.pods.core.PodDevice -import eu.darken.cap.pods.core.airpods.models.AirPodsGen1 -import eu.darken.cap.pods.core.airpods.models.AirPodsPro -import eu.darken.cap.pods.core.airpods.models.UnknownAppleDevice +import eu.darken.capod.pods.core.PodDevice +import eu.darken.capod.pods.core.airpods.models.AirPodsGen1 +import eu.darken.capod.pods.core.airpods.models.AirPodsPro +import eu.darken.capod.pods.core.airpods.models.UnknownAppleDevice import io.kotest.matchers.shouldBe import io.kotest.matchers.types.instanceOf import io.mockk.MockKAnnotations diff --git a/app/src/test/java/eu/darken/cap/pods/core/airpods/BaseAirPodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/airpods/BaseAirPodsTest.kt similarity index 95% rename from app/src/test/java/eu/darken/cap/pods/core/airpods/BaseAirPodsTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/airpods/BaseAirPodsTest.kt index 4358e547..88cecc78 100644 --- a/app/src/test/java/eu/darken/cap/pods/core/airpods/BaseAirPodsTest.kt +++ b/app/src/test/java/eu/darken/capod/pods/core/airpods/BaseAirPodsTest.kt @@ -1,9 +1,9 @@ -package eu.darken.cap.pods.core.airpods +package eu.darken.capod.pods.core.airpods import android.bluetooth.BluetoothDevice import android.bluetooth.le.ScanRecord import android.bluetooth.le.ScanResult -import eu.darken.cap.pods.core.PodDevice +import eu.darken.capod.pods.core.PodDevice import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1Test.kt b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1Test.kt similarity index 89% rename from app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1Test.kt index 512ad1fb..b8e1f98e 100644 --- a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen1Test.kt +++ b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen1Test.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.BaseAirPodsTest +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.BaseAirPodsTest import io.kotest.matchers.shouldBe import kotlinx.coroutines.test.runBlockingTest import org.junit.jupiter.api.Test diff --git a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2Test.kt similarity index 89% rename from app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2Test.kt index 8f732edc..e632db4d 100644 --- a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsGen2Test.kt +++ b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsGen2Test.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.BaseAirPodsTest +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.BaseAirPodsTest import io.kotest.matchers.shouldBe import kotlinx.coroutines.test.runBlockingTest import org.junit.jupiter.api.Test diff --git a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsProTest.kt similarity index 97% rename from app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsProTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsProTest.kt index 10da59ca..735b8ed5 100644 --- a/app/src/test/java/eu/darken/cap/pods/core/airpods/models/AirPodsProTest.kt +++ b/app/src/test/java/eu/darken/capod/pods/core/airpods/models/AirPodsProTest.kt @@ -1,7 +1,7 @@ -package eu.darken.cap.pods.core.airpods.models +package eu.darken.capod.pods.core.airpods.models -import eu.darken.cap.pods.core.airpods.AirPodsDevice -import eu.darken.cap.pods.core.airpods.BaseAirPodsTest +import eu.darken.capod.pods.core.airpods.AirPodsDevice +import eu.darken.capod.pods.core.airpods.BaseAirPodsTest import io.kotest.matchers.shouldBe import kotlinx.coroutines.test.runBlockingTest import org.junit.jupiter.api.Test diff --git a/app/src/test/java/testhelper/BaseTest.kt b/app/src/test/java/testhelper/BaseTest.kt index 46b3b362..5d845ecc 100644 --- a/app/src/test/java/testhelper/BaseTest.kt +++ b/app/src/test/java/testhelper/BaseTest.kt @@ -1,8 +1,8 @@ package testhelper -import eu.darken.cap.common.debug.logging.Logging -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log import io.mockk.unmockkAll import org.junit.jupiter.api.AfterAll import testhelpers.logging.JUnitLogger diff --git a/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt b/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt index de0e17cd..18f7cfd8 100644 --- a/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt +++ b/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt @@ -1,6 +1,6 @@ package testhelper.coroutine -import eu.darken.cap.common.coroutine.DispatcherProvider +import eu.darken.capod.common.coroutine.DispatcherProvider import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/app/src/test/java/testhelper/coroutine/TestExtensions.kt b/app/src/test/java/testhelper/coroutine/TestExtensions.kt index 624ff6f7..72a00a8e 100644 --- a/app/src/test/java/testhelper/coroutine/TestExtensions.kt +++ b/app/src/test/java/testhelper/coroutine/TestExtensions.kt @@ -1,6 +1,6 @@ package testhelper.coroutine -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.TestCoroutineScope diff --git a/app/src/test/java/testhelper/flow/FlowTest.kt b/app/src/test/java/testhelper/flow/FlowTest.kt index cdd9c494..46191a3c 100644 --- a/app/src/test/java/testhelper/flow/FlowTest.kt +++ b/app/src/test/java/testhelper/flow/FlowTest.kt @@ -1,8 +1,8 @@ package testhelper.flow -import eu.darken.cap.common.debug.logging.Logging.Priority.WARN -import eu.darken.cap.common.debug.logging.asLog -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN +import eu.darken.capod.common.debug.logging.asLog +import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.* import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.* diff --git a/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt b/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt index 8f9a7776..82dd848a 100644 --- a/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt +++ b/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt @@ -1,8 +1,8 @@ package testhelpers -import eu.darken.cap.common.debug.logging.Logging -import eu.darken.cap.common.debug.logging.Logging.Priority.VERBOSE -import eu.darken.cap.common.debug.logging.log +import eu.darken.capod.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.log import io.mockk.unmockkAll import org.junit.AfterClass import testhelpers.logging.JUnitLogger diff --git a/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt b/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt index d3983964..98ec94ca 100644 --- a/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt +++ b/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt @@ -1,6 +1,6 @@ package testhelpers.logging -import eu.darken.cap.common.debug.logging.Logging +import eu.darken.capod.common.debug.logging.Logging class JUnitLogger(private val minLogLevel: Logging.Priority = Logging.Priority.VERBOSE) : Logging.Logger { diff --git a/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt b/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt index 1e908c1b..8e8d133e 100644 --- a/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt +++ b/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt @@ -1,6 +1,6 @@ package testhelpers.preferences -import eu.darken.cap.common.preferences.FlowPreference +import eu.darken.capod.common.preferences.FlowPreference import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.MutableStateFlow