From be8f4919c8e5ebcb100543ef7b156cd93e348e5e Mon Sep 17 00:00:00 2001 From: darken Date: Thu, 4 Sep 2025 11:57:53 +0200 Subject: [PATCH] Merge main and common module to simplify. --- app-common/build.gradle.kts | 22 ----------- app-common/src/foss/AndroidManifest.xml | 4 -- app-common/src/gplay/AndroidManifest.xml | 8 ---- app-common/src/main/AndroidManifest.xml | 35 ------------------ app/build.gradle.kts | 7 ++-- .../common/upgrade/core/UpgradeControlFoss.kt | 2 +- .../debug/autoreport/AutoReportingModule.kt | 1 - .../debug/autoreport/FossAutoReporting.kt | 0 .../common/upgrade/core/UpgradeRepoGplay.kt | 2 +- .../debug/autoreport/AutoReportingModule.kt | 0 .../debug/autoreport/GplayAutoReporting.kt | 0 app/src/main/AndroidManifest.xml | 30 +++++++++++++++ .../common/BroadcastReceiverExtensions.kt | 0 .../eu/darken/capod/common/BuildConfigWrap.kt | 0 .../java/eu/darken/capod/common/BuildWrap.kt | 0 .../capod/common/ByteArrayExtensions.kt | 0 .../eu/darken/capod/common/ClipboardHelper.kt | 2 +- .../eu/darken/capod/common/ColorExtensions.kt | 0 .../darken/capod/common/ContextExtensions.kt | 0 .../java/eu/darken/capod/common/InstallId.kt | 2 +- .../eu/darken/capod/common/MediaControl.kt | 0 .../eu/darken/capod/common/PrivacyPolicy.kt | 0 .../eu/darken/capod/common/SystemClockWrap.kt | 0 .../eu/darken/capod/common/UIConverter.kt | 0 .../eu/darken/capod/common/WebpageTool.kt | 0 .../capod/common/bluetooth/BleScanResult.kt | 0 .../bluetooth/BleScanResultForwarder.kt | 0 .../common/bluetooth/BleScanResultReceiver.kt | 0 .../capod/common/bluetooth/BleScanner.kt | 0 .../common/bluetooth/BluetoothAddress.kt | 0 .../common/bluetooth/BluetoothDevice2.kt | 0 .../common/bluetooth/BluetoothExtensions.kt | 0 .../common/bluetooth/BluetoothManager2.kt | 0 .../common/bluetooth/BluetoothProfile2.kt | 0 .../capod/common/bluetooth/FakeBleData.kt | 0 .../capod/common/bluetooth/ScannerMode.kt | 0 .../collections/CollectionExtensions.kt | 0 .../capod/common/collections/MapExtensions.kt | 0 .../common/coroutine/AppCoroutineScope.kt | 0 .../capod/common/coroutine/CoroutineModule.kt | 0 .../coroutine/DefaultDispatcherProvider.kt | 0 .../common/coroutine/DispatcherProvider.kt | 0 .../capod/common/dagger/AndroidModule.kt | 0 .../java/eu/darken/capod/common/debug/Bugs.kt | 4 +- .../capod/common/debug/DebugSettings.kt | 0 .../debug/autoreport/AutomaticBugReporter.kt | 0 .../capod/common/debug/logging/FileLogger.kt | 0 .../common/debug/logging/LogCatLogger.kt | 0 .../common/debug/logging/LogExtensions.kt | 0 .../capod/common/debug/logging/Logging.kt | 0 .../darken/capod/common/error/ErrorDialog.kt | 0 .../capod/common/error/ErrorEventSource.kt | 0 .../capod/common/error/LocalizedError.kt | 0 .../capod/common/error/ThrowableExtensions.kt | 0 .../capod/common/flow/DynamicStateFlow.kt | 11 +++++- .../common/flow/DynamicStateFlowExtensions.kt | 0 .../common/flow/FlowCombineExtensions.kt | 0 .../capod/common/flow/FlowExtensions.kt | 17 ++++++++- .../darken/capod/common/lists/BaseAdapter.kt | 7 +++- .../darken/capod/common/lists/BindableVH.kt | 0 .../darken/capod/common/lists/DataAdapter.kt | 0 .../eu/darken/capod/common/lists/ListItem.kt | 0 .../common/lists/RecyclerViewExtensions.kt | 0 .../capod/common/lists/differ/AsyncDiffer.kt | 0 .../lists/differ/AsyncDifferExtensions.kt | 0 .../capod/common/lists/differ/DifferItem.kt | 0 .../common/lists/differ/HasAsyncDiffer.kt | 0 .../common/lists/modular/ModularAdapter.kt | 0 .../common/lists/modular/mods/ClickMod.kt | 2 +- .../lists/modular/mods/DataBinderMod.kt | 2 +- .../lists/modular/mods/SimpleVHCreatorMod.kt | 2 +- .../common/lists/modular/mods/StableIdMod.kt | 2 +- .../lists/modular/mods/TypedVHCreatorMod.kt | 4 +- .../capod/common/livedata/SingleLiveEvent.kt | 0 .../common/navigation/FragmentExtensions.kt | 0 .../common/navigation/NavArgsExtensions.kt | 0 .../navigation/NavControllerExtensions.kt | 0 .../navigation/NavDestinationExtensions.kt | 0 .../navigation/NavDirectionsExtensions.kt | 0 .../notifications/PendingIntentCompat.kt | 0 .../capod/common/permissions/Permission.kt | 4 +- .../common/preferences/FlowPreference.kt | 2 +- .../preferences/FlowPreferenceExtension.kt | 0 .../FlowPreferenceMoshiExtension.kt | 0 .../preferences/MaterialSwitchPreference.kt | 3 +- .../preferences/PreferenceStoreMapper.kt | 0 .../capod/common/preferences/Settings.kt | 0 .../preferences/SharedPreferenceExtensions.kt | 0 .../common/serialization/ByteArrayAdapter.kt | 0 .../serialization/JavaInstantAdapter.kt | 0 .../serialization/SerializationModule.kt | 0 .../eu/darken/capod/common/uix/Activity2.kt | 0 .../eu/darken/capod/common/uix/Fragment2.kt | 0 .../eu/darken/capod/common/uix/Fragment3.kt | 0 .../eu/darken/capod/common/uix/ViewModel1.kt | 0 .../eu/darken/capod/common/uix/ViewModel2.kt | 6 ++- .../eu/darken/capod/common/uix/ViewModel3.kt | 0 .../capod/common/uix/ViewModelLazyKeyed.kt | 7 +++- .../capod/common/upgrade/UpgradeRepo.kt | 0 .../common/upgrade/UpgradeRepoExtensions.kt | 0 .../viewbinding/ViewBindingExtensions.kt | 0 .../capod/devices/core/DeviceProfile.kt | 0 .../capod/devices/core/DeviceProfilesRepo.kt | 2 +- .../darken/capod/main/core/GeneralSettings.kt | 0 .../eu/darken/capod/main/core/MonitorMode.kt | 2 +- .../darken/capod/main/core/PermissionTool.kt | 2 +- .../ui/onboarding/OnboardingFragmentVM.kt | 1 - .../monitor/core/MonitorCoroutineScope.kt | 0 .../capod/monitor/core/PodDeviceCache.kt | 0 .../darken/capod/monitor/core/PodMonitor.kt | 0 .../eu/darken/capod/monitor/core/PodSorter.kt | 0 .../capod/monitor/ui/MonitorNotifications.kt | 4 +- .../darken/capod/pods/core/DualPodDevice.kt | 2 +- .../java/eu/darken/capod/pods/core/HasCase.kt | 2 +- .../capod/pods/core/HasChargeDetection.kt | 0 .../capod/pods/core/HasChargeDetectionDual.kt | 0 .../capod/pods/core/HasDualMicrophone.kt | 0 .../darken/capod/pods/core/HasEarDetection.kt | 0 .../capod/pods/core/HasEarDetectionDual.kt | 0 .../eu/darken/capod/pods/core/HasPodStyle.kt | 0 .../capod/pods/core/HasStateDetection.kt | 0 .../eu/darken/capod/pods/core/PodDevice.kt | 2 +- .../capod/pods/core/PodDeviceExtensions.kt | 10 ++--- .../eu/darken/capod/pods/core/PodFactory.kt | 0 .../darken/capod/pods/core/SinglePodDevice.kt | 0 .../capod/pods/core/apple/AppleFactory.kt | 0 .../pods/core/apple/AppleFactoryModule.kt | 0 .../darken/capod/pods/core/apple/ApplePods.kt | 0 .../capod/pods/core/apple/ApplePodsFactory.kt | 0 .../capod/pods/core/apple/DualApplePods.kt | 0 .../capod/pods/core/apple/HasAppleColor.kt | 0 .../capod/pods/core/apple/SingleApplePods.kt | 0 .../pods/core/apple/airpods/AirPodsGen1.kt | 0 .../pods/core/apple/airpods/AirPodsGen2.kt | 0 .../pods/core/apple/airpods/AirPodsGen3.kt | 0 .../pods/core/apple/airpods/AirPodsGen4.kt | 0 .../pods/core/apple/airpods/AirPodsGen4Anc.kt | 0 .../pods/core/apple/airpods/AirPodsMax.kt | 0 .../pods/core/apple/airpods/AirPodsMaxUsbc.kt | 0 .../pods/core/apple/airpods/AirPodsPro.kt | 2 +- .../pods/core/apple/airpods/AirPodsPro2.kt | 2 +- .../core/apple/airpods/AirPodsPro2Usbc.kt | 2 +- .../pods/core/apple/airpods/AirPodsPro3.kt | 0 .../apple/airpods/HasStateDetectionAirPods.kt | 0 .../pods/core/apple/beats/BeatsFitPro.kt | 0 .../capod/pods/core/apple/beats/BeatsFlex.kt | 0 .../capod/pods/core/apple/beats/BeatsSolo3.kt | 0 .../pods/core/apple/beats/BeatsStudio3.kt | 0 .../capod/pods/core/apple/beats/BeatsX.kt | 0 .../pods/core/apple/beats/PowerBeats3.kt | 0 .../pods/core/apple/beats/PowerBeats4.kt | 0 .../pods/core/apple/beats/PowerBeatsPro.kt | 0 .../pods/core/apple/beats/PowerBeatsPro2.kt | 0 .../pods/core/apple/history/KnownDevice.kt | 0 .../pods/core/apple/history/PodHistoryRepo.kt | 0 .../pods/core/apple/misc/FakeAirPodsGen1.kt | 0 .../pods/core/apple/misc/FakeAirPodsGen2.kt | 0 .../pods/core/apple/misc/FakeAirPodsGen3.kt | 0 .../pods/core/apple/misc/FakeAirPodsPro.kt | 2 +- .../pods/core/apple/misc/FakeAirPodsPro2.kt | 2 +- .../core/apple/misc/UnknownAppleDevice.kt | 0 .../core/apple/protocol/ContinuityProtocol.kt | 0 .../apple/protocol/IdentityResolvingKey.kt | 0 .../apple/protocol/ProximityEncryptionKey.kt | 0 .../core/apple/protocol/ProximityMessage.kt | 0 .../core/apple/protocol/ProximityPairing.kt | 0 .../core/apple/protocol/ProximityPayload.kt | 0 .../pods/core/apple/protocol/RPAChecker.kt | 0 .../capod/pods/core/unknown/UnknownDevice.kt | 0 .../pods/core/unknown/UnknownDeviceFactory.kt | 0 .../darken/capod/reaction/core/ReactionHub.kt | 1 - .../capod/reaction/core/ReactionSettings.kt | 0 .../reaction/core/autoconnect/AutoConnect.kt | 10 ++++- .../core/autoconnect/AutoConnectCondition.kt | 0 .../reaction/core/playpause/PlayPause.kt | 7 +++- .../reaction/core/popup/PopUpReaction.kt | 0 .../drawable-hdpi/devic_airpods_pro2_both.png | Bin .../drawable-hdpi/devic_airpods_pro2_case.png | Bin .../drawable-hdpi/devic_airpods_pro2_left.png | Bin .../devic_airpods_pro2_right.png | Bin .../drawable-mdpi/devic_airpods_pro2_both.png | Bin .../drawable-mdpi/devic_airpods_pro2_case.png | Bin .../drawable-mdpi/devic_airpods_pro2_left.png | Bin .../devic_airpods_pro2_right.png | Bin .../devic_airpods_pro2_both.png | Bin .../devic_airpods_pro2_case.png | Bin .../devic_airpods_pro2_left.png | Bin .../devic_airpods_pro2_right.png | Bin .../devic_airpods_pro2_both.png | Bin .../devic_airpods_pro2_case.png | Bin .../devic_airpods_pro2_left.png | Bin .../devic_airpods_pro2_right.png | Bin .../devic_airpods_pro2_both.png | Bin .../devic_airpods_pro2_case.png | Bin .../devic_airpods_pro2_left.png | Bin .../devic_airpods_pro2_right.png | Bin .../res/drawable/devic_airpods_gen1_both.xml | 0 .../res/drawable/devic_airpods_gen1_case.xml | 0 .../res/drawable/devic_airpods_gen1_left.xml | 0 .../res/drawable/devic_airpods_gen1_right.xml | 0 .../res/drawable/devic_airpods_gen2_both.xml | 0 .../drawable/devic_earbuds_generic_both.xml | 0 .../res/drawable/devic_headphones_generic.xml | 0 .../drawable/ic_baseline_battery_0_bar_24.xml | 0 .../drawable/ic_baseline_battery_1_bar_24.xml | 0 .../drawable/ic_baseline_battery_2_bar_24.xml | 0 .../drawable/ic_baseline_battery_3_bar_24.xml | 0 .../drawable/ic_baseline_battery_4_bar_24.xml | 0 .../drawable/ic_baseline_battery_5_bar_24.xml | 0 .../drawable/ic_baseline_battery_6_bar_24.xml | 0 .../ic_baseline_battery_charging_full_24.xml | 0 .../drawable/ic_baseline_battery_full_24.xml | 0 .../ic_baseline_battery_unknown_24.xml | 0 .../drawable/ic_baseline_devices_other_24.xml | 0 .../ic_baseline_disabled_visible_24.xml | 0 .../res/drawable/ic_baseline_grid_view_24.xml | 0 .../res/drawable/ic_baseline_hearing_24.xml | 0 .../ic_baseline_hearing_disabled_24.xml | 0 .../ic_baseline_keyboard_voice_24.xml | 0 .../res/drawable/ic_baseline_power_24.xml | 0 .../res/drawable/ic_baseline_settings_24.xml | 0 .../ic_baseline_settings_bluetooth_24.xml | 0 .../ic_baseline_settings_input_antenna_24.xml | 0 .../drawable/ic_baseline_watch_later_12.xml | 0 .../drawable/ic_baseline_watch_later_24.xml | 0 .../drawable/ic_checkbox_blank_badge_24.xml | 0 .../src/main/res/drawable/ic_chip_24.xml | 0 .../res/drawable/ic_filter_cog_outline_24.xml | 0 .../res/drawable/ic_format_list_group_24.xml | 0 .../src/main/res/drawable/ic_heart.xml | 0 .../src/main/res/drawable/ic_strategy_24.xml | 0 .../res/layout/preference_material_switch.xml | 0 .../capod/common/ByteArrayExtensionsTest.kt | 0 .../capod/common/flow/DynamicStateFlowTest.kt | 0 .../preferences/FlowPreferenceMoshiTest.kt | 0 .../common/preferences/FlowPreferenceTest.kt | 0 .../capod/monitor/core/RPACheckerTest.kt | 0 .../pods/core/apple/AirPodsFactoryTest.kt | 0 .../capod/pods/core/apple/BaseAirPodsTest.kt | 0 .../core/apple/BasicSingleApplePodsTest.kt | 0 .../pods/core/apple/DualApplePodsTest.kt | 0 .../pods/core/apple/SingleApplePodsTest.kt | 0 .../core/apple/airpods/AirPodsGen1Test.kt | 0 .../core/apple/airpods/AirPodsGen2Test.kt | 0 .../core/apple/airpods/AirPodsGen3Test.kt | 0 .../core/apple/airpods/AirPodsGen4AncTest.kt | 0 .../core/apple/airpods/AirPodsGen4Test.kt | 0 .../pods/core/apple/airpods/AirPodsMaxTest.kt | 0 .../core/apple/airpods/AirPodsMaxUsbcTest.kt | 0 .../core/apple/airpods/AirPodsPro2Test.kt | 0 .../core/apple/airpods/AirPodsPro2UsbcTest.kt | 0 .../core/apple/airpods/AirPodsPro3Test.kt | 0 .../pods/core/apple/airpods/AirPodsProTest.kt | 0 .../pods/core/apple/beats/BeatsFitProTest.kt | 0 .../pods/core/apple/beats/BeatsFlexText.kt | 0 .../pods/core/apple/beats/BeatsSolo3Test.kt | 0 .../pods/core/apple/beats/BeatsStudio3Test.kt | 0 .../capod/pods/core/apple/beats/BeatsXTest.kt | 0 .../pods/core/apple/beats/PowerBeats3Test.kt | 0 .../pods/core/apple/beats/PowerBeats4Test.kt | 0 .../core/apple/beats/PowerBeatsPro2Test.kt | 0 .../core/apple/beats/PowerBeatsProTest.kt | 0 .../core/apple/misc/FakeAirPodsGen1Test.kt | 0 .../core/apple/misc/FakeAirPodsGen2Test.kt | 0 .../core/apple/misc/FakeAirPodsGen3Test.kt | 0 .../core/apple/misc/FakeAirPodsPro2Test.kt | 0 .../core/apple/misc/FakeAirPodsProTest.kt | 0 .../src/test/java/testhelpers/BaseTest.kt | 0 .../src/test/java/testhelpers/IsAUnitTest.kt | 0 .../coroutine/TestDispatcherProvider.kt | 0 .../testhelpers/coroutine/TestExtensions.kt | 0 .../test/java/testhelpers/flow/FlowTest.kt | 16 +++++++- .../java/testhelpers/json/JsonExtensions.kt | 0 .../livedata/InstantExecutorExtension.kt | 0 .../java/testhelpers/logging/JUnitLogger.kt | 0 .../preferences/MockFlowPreference.kt | 0 .../preferences/MockSharedPreferences.kt | 0 .../preferences/MockSharedPreferencesTest.kt | 0 278 files changed, 142 insertions(+), 117 deletions(-) delete mode 100644 app-common/src/foss/AndroidManifest.xml delete mode 100644 app-common/src/gplay/AndroidManifest.xml delete mode 100644 app-common/src/main/AndroidManifest.xml rename {app-common => app}/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt (88%) rename {app-common => app}/src/foss/java/eu/darken/capod/debug/autoreport/FossAutoReporting.kt (100%) rename {app-common => app}/src/gplay/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt (100%) rename {app-common => app}/src/gplay/java/eu/darken/capod/debug/autoreport/GplayAutoReporting.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/BroadcastReceiverExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/BuildWrap.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/ColorExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/ContextExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/InstallId.kt (98%) rename {app-common => app}/src/main/java/eu/darken/capod/common/MediaControl.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/SystemClockWrap.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/UIConverter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/WebpageTool.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BleScanResultForwarder.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BleScanResultReceiver.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BluetoothAddress.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BluetoothDevice2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/bluetooth/ScannerMode.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/collections/CollectionExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/Bugs.kt (77%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/DebugSettings.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/autoreport/AutomaticBugReporter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/error/LocalizedError.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt (93%) rename {app-common => app}/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt (81%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt (90%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/BindableVH.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/ListItem.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt (87%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt (93%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt (91%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt (93%) rename {app-common => app}/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt (86%) rename {app-common => app}/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/permissions/Permission.kt (97%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt (98%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt (78%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/Settings.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/Activity2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/Fragment2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/Fragment3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt (91%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt (96%) rename {app-common => app}/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt (97%) rename {app-common => app}/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/main/core/MonitorMode.kt (93%) rename {app-common => app}/src/main/java/eu/darken/capod/main/core/PermissionTool.kt (98%) rename {app-common => app}/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt (93%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasCase.kt (89%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/PodDevice.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt (85%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/PodFactory.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt (99%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt (98%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt (91%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt (100%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt (94%) rename {app-common => app}/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt (100%) rename {app-common => app}/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png (100%) rename {app-common => app}/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png (100%) rename {app-common => app}/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png (100%) rename {app-common => app}/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png (100%) rename {app-common => app}/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png (100%) rename {app-common => app}/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png (100%) rename {app-common => app}/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png (100%) rename {app-common => app}/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png (100%) rename {app-common => app}/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png (100%) rename {app-common => app}/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png (100%) rename {app-common => app}/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png (100%) rename {app-common => app}/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png (100%) rename {app-common => app}/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png (100%) rename {app-common => app}/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png (100%) rename {app-common => app}/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png (100%) rename {app-common => app}/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png (100%) rename {app-common => app}/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png (100%) rename {app-common => app}/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png (100%) rename {app-common => app}/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png (100%) rename {app-common => app}/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png (100%) rename {app-common => app}/src/main/res/drawable/devic_airpods_gen1_both.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_airpods_gen1_case.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_airpods_gen1_left.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_airpods_gen1_right.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_airpods_gen2_both.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_earbuds_generic_both.xml (100%) rename {app-common => app}/src/main/res/drawable/devic_headphones_generic.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_full_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_battery_unknown_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_devices_other_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_disabled_visible_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_grid_view_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_hearing_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_power_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_settings_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_watch_later_12.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_baseline_watch_later_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_checkbox_blank_badge_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_chip_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_filter_cog_outline_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_format_list_group_24.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_heart.xml (100%) rename {app-common => app}/src/main/res/drawable/ic_strategy_24.xml (100%) rename {app-common => app}/src/main/res/layout/preference_material_switch.xml (100%) rename {app-common => app}/src/test/java/eu/darken/capod/common/ByteArrayExtensionsTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/monitor/core/RPACheckerTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4AncTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbcTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2UsbcTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFitProTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2Test.kt (100%) rename {app-common => app}/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsProTest.kt (100%) rename {app-common => app}/src/test/java/testhelpers/BaseTest.kt (100%) rename {app-common => app}/src/test/java/testhelpers/IsAUnitTest.kt (100%) rename {app-common => app}/src/test/java/testhelpers/coroutine/TestDispatcherProvider.kt (100%) rename {app-common => app}/src/test/java/testhelpers/coroutine/TestExtensions.kt (100%) rename {app-common => app}/src/test/java/testhelpers/flow/FlowTest.kt (83%) rename {app-common => app}/src/test/java/testhelpers/json/JsonExtensions.kt (100%) rename {app-common => app}/src/test/java/testhelpers/livedata/InstantExecutorExtension.kt (100%) rename {app-common => app}/src/test/java/testhelpers/logging/JUnitLogger.kt (100%) rename {app-common => app}/src/test/java/testhelpers/preferences/MockFlowPreference.kt (100%) rename {app-common => app}/src/test/java/testhelpers/preferences/MockSharedPreferences.kt (100%) rename {app-common => app}/src/test/java/testhelpers/preferences/MockSharedPreferencesTest.kt (100%) diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts index 1bc68e61..349ef940 100644 --- a/app-common/build.gradle.kts +++ b/app-common/build.gradle.kts @@ -5,7 +5,6 @@ plugins { id("kotlin-kapt") id("kotlin-parcelize") } -apply(plugin = "dagger.hilt.android.plugin") android { compileSdk = ProjectConfig.compileSdk @@ -28,7 +27,6 @@ android { } compileOptions { - isCoreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } @@ -72,28 +70,8 @@ android { } } - testOptions { - unitTests { - isIncludeAndroidResources = true - } - //noinspection WrongGradleMethod - tasks.withType { - useJUnitPlatform() - } - } } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") - - addBaseAndroid() - addBaseAndroidUi() - addBaseKotlin() - addDagger() - addMoshi() - addBaseWorkManager() - addNavigation() - - addTesting() } \ No newline at end of file diff --git a/app-common/src/foss/AndroidManifest.xml b/app-common/src/foss/AndroidManifest.xml deleted file mode 100644 index 44008a43..00000000 --- a/app-common/src/foss/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app-common/src/gplay/AndroidManifest.xml b/app-common/src/gplay/AndroidManifest.xml deleted file mode 100644 index 1fb42b0a..00000000 --- a/app-common/src/gplay/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml deleted file mode 100644 index beda55e9..00000000 --- a/app-common/src/main/AndroidManifest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0567d1ed..74f4fdd8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -122,9 +122,10 @@ android { unitTests { isIncludeAndroidResources = true } - } - tasks.withType { - useJUnitPlatform() + //noinspection WrongGradleMethod + tasks.withType { + useJUnitPlatform() + } } } diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt b/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt index 4edac72e..d73063fa 100644 --- a/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt +++ b/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt @@ -32,7 +32,7 @@ class UpgradeControlFoss @Inject constructor( override fun launchBillingFlow(activity: Activity) { MaterialAlertDialogBuilder(activity).apply { - setIcon(eu.darken.capod.common.R.drawable.ic_heart) + setIcon(R.drawable.ic_heart) setTitle(R.string.upgrade_capod_label) setMessage(R.string.upgrade_capod_description) setPositiveButton(R.string.foss_upgrade_donate_label) { _, _ -> diff --git a/app-common/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt b/app/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt similarity index 88% rename from app-common/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt rename to app/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt index 9d5f695c..c35e4a71 100644 --- a/app-common/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt +++ b/app/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt @@ -5,7 +5,6 @@ import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter -import eu.darken.capod.debug.autoreport.FossAutoReporting import javax.inject.Singleton @InstallIn(SingletonComponent::class) diff --git a/app-common/src/foss/java/eu/darken/capod/debug/autoreport/FossAutoReporting.kt b/app/src/foss/java/eu/darken/capod/debug/autoreport/FossAutoReporting.kt similarity index 100% rename from app-common/src/foss/java/eu/darken/capod/debug/autoreport/FossAutoReporting.kt rename to app/src/foss/java/eu/darken/capod/debug/autoreport/FossAutoReporting.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt index d9fa9f37..9561916d 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt +++ b/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt @@ -78,7 +78,7 @@ class UpgradeRepoGplay @Inject constructor( override fun launchBillingFlow(activity: Activity) { MaterialAlertDialogBuilder(activity).apply { - setIcon(eu.darken.capod.common.R.drawable.ic_heart) + setIcon(R.drawable.ic_heart) setTitle(R.string.upgrade_capod_label) setMessage(R.string.upgrade_capod_description) setPositiveButton(R.string.general_upgrade_action) { _, _ -> diff --git a/app-common/src/gplay/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt b/app/src/gplay/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt similarity index 100% rename from app-common/src/gplay/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt rename to app/src/gplay/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt diff --git a/app-common/src/gplay/java/eu/darken/capod/debug/autoreport/GplayAutoReporting.kt b/app/src/gplay/java/eu/darken/capod/debug/autoreport/GplayAutoReporting.kt similarity index 100% rename from app-common/src/gplay/java/eu/darken/capod/debug/autoreport/GplayAutoReporting.kt rename to app/src/gplay/java/eu/darken/capod/debug/autoreport/GplayAutoReporting.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e23d932..958c9b09 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,28 @@ + + + + + + + + + + + + @@ -35,6 +57,14 @@ + + + + + + constructor( +class ClickMod( private val listener: (VHT, Int) -> Unit ) : ModularAdapter.Module.Binder { diff --git a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt similarity index 93% rename from app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt index a344698c..ae6a4179 100644 --- a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt @@ -4,7 +4,7 @@ import androidx.viewbinding.ViewBinding import eu.darken.capod.common.lists.BindableVH import eu.darken.capod.common.lists.modular.ModularAdapter -class DataBinderMod constructor( +class DataBinderMod( private val data: List, private val customBinder: ( (adapter: ModularAdapter, vh: HolderT, pos: Int, payload: MutableList) -> Unit diff --git a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt similarity index 91% rename from app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt index 8f90427b..d9893e9a 100644 --- a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt @@ -3,7 +3,7 @@ package eu.darken.capod.common.lists.modular.mods import android.view.ViewGroup import eu.darken.capod.common.lists.modular.ModularAdapter -class SimpleVHCreatorMod constructor( +class SimpleVHCreatorMod( private val viewType: Int = 0, private val factory: (ViewGroup) -> HolderT ) : ModularAdapter.Module.Creator where HolderT : ModularAdapter.VH { diff --git a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt similarity index 93% rename from app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt index db4f15bf..5da6a003 100644 --- a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt @@ -4,7 +4,7 @@ import androidx.recyclerview.widget.RecyclerView import eu.darken.capod.common.lists.differ.DifferItem import eu.darken.capod.common.lists.modular.ModularAdapter -class StableIdMod constructor( +class StableIdMod( private val data: List, private val customResolver: (position: Int) -> Long = { (data[it] as? DifferItem)?.stableId ?: RecyclerView.NO_ID diff --git a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt similarity index 86% rename from app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt rename to app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt index 1e4a934a..2df2f78a 100644 --- a/app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt +++ b/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt @@ -3,14 +3,14 @@ package eu.darken.capod.common.lists.modular.mods import android.view.ViewGroup import eu.darken.capod.common.lists.modular.ModularAdapter -class TypedVHCreatorMod constructor( +class TypedVHCreatorMod( private val typeResolver: (Int) -> Boolean, private val factory: (ViewGroup) -> HolderT ) : ModularAdapter.Module.Typing, ModularAdapter.Module.Creator where HolderT : ModularAdapter.VH { private fun ModularAdapter<*>.determineOurViewType(): Int { - val typingModules = modules.filterIsInstance(ModularAdapter.Module.Typing::class.java) + val typingModules = modules.filterIsInstance() return typingModules.indexOf(this@TypedVHCreatorMod) } diff --git a/app-common/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt b/app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt rename to app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt b/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt rename to app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt b/app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt rename to app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt b/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt similarity index 97% rename from app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt rename to app/src/main/java/eu/darken/capod/common/permissions/Permission.kt index 2d0dcd27..124fbd92 100644 --- a/app-common/src/main/java/eu/darken/capod/common/permissions/Permission.kt +++ b/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt @@ -13,8 +13,8 @@ import eu.darken.capod.common.withinApiLevel enum class Permission( val minApiLevel: Int, val maxApiLevel: Int = Int.MAX_VALUE, - @StringRes val labelRes: Int, - @StringRes val descriptionRes: Int, + @param:StringRes val labelRes: Int, + @param:StringRes val descriptionRes: Int, val permissionId: String, val isGranted: (Context) -> Boolean = { ContextCompat.checkSelfPermission(it, permissionId) == PackageManager.PERMISSION_GRANTED diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt similarity index 98% rename from app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt index e042b761..bd246315 100644 --- a/app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt +++ b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt @@ -7,7 +7,7 @@ import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow -class FlowPreference constructor( +class FlowPreference( private val preferences: SharedPreferences, val key: String, val rawReader: (Any?) -> T, diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt b/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt rename to app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt b/app/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt similarity index 78% rename from app-common/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt rename to app/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt index 7f8d1e07..e6368fa6 100644 --- a/app-common/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt +++ b/app/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt @@ -3,12 +3,13 @@ package eu.darken.capod.common.preferences import android.content.Context import android.util.AttributeSet import androidx.preference.SwitchPreferenceCompat +import eu.darken.capod.R class MaterialSwitchPreference(context: Context, attrs: AttributeSet?) : SwitchPreferenceCompat(context, attrs) { init { // Use material switch - widgetLayoutResource = eu.darken.capod.common.R.layout.preference_material_switch + widgetLayoutResource = R.layout.preference_material_switch } } \ No newline at end of file diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt b/app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt rename to app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/Settings.kt b/app/src/main/java/eu/darken/capod/common/preferences/Settings.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/preferences/Settings.kt rename to app/src/main/java/eu/darken/capod/common/preferences/Settings.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt b/app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt rename to app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt b/app/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt rename to app/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt b/app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt rename to app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt b/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt rename to app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/Activity2.kt b/app/src/main/java/eu/darken/capod/common/uix/Activity2.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/uix/Activity2.kt rename to app/src/main/java/eu/darken/capod/common/uix/Activity2.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/Fragment2.kt b/app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/uix/Fragment2.kt rename to app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/Fragment3.kt b/app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/uix/Fragment3.kt rename to app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt similarity index 91% rename from app-common/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt index fbba0765..2e469cd3 100644 --- a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt +++ b/app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt @@ -9,9 +9,13 @@ 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 kotlinx.coroutines.* +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.launch +import kotlinx.coroutines.plus import kotlin.coroutines.CoroutineContext diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt rename to app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt b/app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt similarity index 96% rename from app-common/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt rename to app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt index 370846e0..1a143a91 100644 --- a/app-common/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt +++ b/app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt @@ -20,7 +20,12 @@ package eu.darken.capod.common.uix import androidx.activity.ComponentActivity import androidx.annotation.MainThread import androidx.fragment.app.Fragment -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelLazy +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelStore +import androidx.lifecycle.ViewModelStoreOwner +import androidx.lifecycle.get import kotlin.reflect.KClass /** diff --git a/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt b/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt rename to app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt b/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt rename to app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt b/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt rename to app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt diff --git a/app-common/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt b/app/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt rename to app/src/main/java/eu/darken/capod/devices/core/DeviceProfile.kt diff --git a/app-common/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt b/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt similarity index 97% rename from app-common/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt rename to app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt index 1f51943d..a219f506 100644 --- a/app-common/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt +++ b/app/src/main/java/eu/darken/capod/devices/core/DeviceProfilesRepo.kt @@ -15,7 +15,7 @@ import javax.inject.Singleton @Singleton class DeviceProfilesRepo @Inject constructor( - @ApplicationContext private val context: Context, + @param:ApplicationContext private val context: Context, private val moshi: Moshi, ) { diff --git a/app-common/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt b/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt rename to app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt diff --git a/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt b/app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt similarity index 93% rename from app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt rename to app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt index 01cf8d31..2deeb555 100644 --- a/app-common/src/main/java/eu/darken/capod/main/core/MonitorMode.kt +++ b/app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt @@ -7,7 +7,7 @@ import eu.darken.capod.common.R @JsonClass(generateAdapter = false) enum class MonitorMode( - @StringRes val labelRes: Int + @param:StringRes val labelRes: Int ) { @Json(name = "monitor.mode.manual") MANUAL( R.string.settings_monitor_mode_manual_label diff --git a/app-common/src/main/java/eu/darken/capod/main/core/PermissionTool.kt b/app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt similarity index 98% rename from app-common/src/main/java/eu/darken/capod/main/core/PermissionTool.kt rename to app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt index cc02d256..2575f529 100644 --- a/app-common/src/main/java/eu/darken/capod/main/core/PermissionTool.kt +++ b/app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onEach -import java.util.* +import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/capod/main/ui/onboarding/OnboardingFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/onboarding/OnboardingFragmentVM.kt index ee7ded2d..b6eedaf8 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/onboarding/OnboardingFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/onboarding/OnboardingFragmentVM.kt @@ -6,7 +6,6 @@ import eu.darken.capod.common.coroutine.DispatcherProvider import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.uix.ViewModel3 import eu.darken.capod.main.core.GeneralSettings -import kotlinx.coroutines.flow.* import javax.inject.Inject @HiltViewModel diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt b/app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt rename to app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt rename to app/src/main/java/eu/darken/capod/monitor/core/PodDeviceCache.kt diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt rename to app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt diff --git a/app-common/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt b/app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt rename to app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt index b373e7be..a8f3cbb9 100644 --- a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt +++ b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt @@ -66,7 +66,7 @@ class MonitorNotifications @Inject constructor( builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID).apply { setContentIntent(openPi) priority = NotificationCompat.PRIORITY_LOW - setSmallIcon(eu.darken.capod.common.R.drawable.devic_earbuds_generic_both) + setSmallIcon(R.drawable.devic_earbuds_generic_both) setOngoing(true) setContentTitle(context.getString(eu.darken.capod.common.R.string.app_name)) } @@ -79,7 +79,7 @@ class MonitorNotifications @Inject constructor( setStyle(NotificationCompat.BigTextStyle()) setContentTitle(context.getString(eu.darken.capod.common.R.string.pods_none_label_short)) setSubText(context.getString(eu.darken.capod.common.R.string.app_name)) - setSmallIcon(eu.darken.capod.common.R.drawable.devic_earbuds_generic_both) + setSmallIcon(R.drawable.devic_earbuds_generic_both) } } diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt similarity index 93% rename from app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt index 4e9bb87f..172f16db 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R interface DualPodDevice : PodDevice { diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt b/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt similarity index 89% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasCase.kt index 7efcdb55..118fc237 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R interface HasCase { diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt b/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt b/app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt b/app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt b/app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt b/app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt rename to app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt index 0cd7faba..e9125c7f 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.annotation.DrawableRes import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.bluetooth.BluetoothAddress import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt similarity index 85% rename from app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt rename to app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt index c4671476..6d038b73 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt @@ -3,26 +3,26 @@ package eu.darken.capod.pods.core import android.content.Context import android.icu.text.RelativeDateTimeFormatter import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import java.time.Duration import java.time.Instant import kotlin.math.roundToInt fun DualPodDevice.getBatteryLevelLeftPod(context: Context): String = batteryLeftPodPercent?.let { "${(it * 100).roundToInt()}%" } - ?: context.getString(R.string.general_value_not_available_label) + ?: context.getString(eu.darken.capod.common.R.string.general_value_not_available_label) fun DualPodDevice.getBatteryLevelRightPod(context: Context): String = batteryRightPodPercent?.let { "${(it * 100).roundToInt()}%" } - ?: context.getString(R.string.general_value_not_available_label) + ?: context.getString(eu.darken.capod.common.R.string.general_value_not_available_label) fun HasCase.getBatteryLevelCase(context: Context): String = batteryCasePercent?.let { "${(it * 100).roundToInt()}%" } - ?: context.getString(R.string.general_value_not_available_label) + ?: context.getString(eu.darken.capod.common.R.string.general_value_not_available_label) fun SinglePodDevice.getBatteryLevelHeadset(context: Context): String = batteryHeadsetPercent?.let { "${(it * 100).roundToInt()}%" } - ?: context.getString(R.string.general_value_not_available_label) + ?: context.getString(eu.darken.capod.common.R.string.general_value_not_available_label) fun PodDevice.getSignalQuality(context: Context): String { val multiplier = 100 * signalQuality diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/PodFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePods.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbc.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt index cdb2f3d5..c0b7d160 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt index 4d33be90..d4d067aa 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt index 910373ae..1e6208d4 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/airpods/HasStateDetectionAirPods.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/history/KnownDevice.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/history/PodHistoryRepo.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt index 4fbf8d55..295e1d18 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core.apple.misc import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.HasCase diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt similarity index 99% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt index e229eff0..56831bd1 100644 --- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt @@ -1,7 +1,7 @@ package eu.darken.capod.pods.core.apple.misc import androidx.annotation.DrawableRes -import eu.darken.capod.common.R +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.DualPodDevice diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/IdentityResolvingKey.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityEncryptionKey.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityMessage.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPayload.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt rename to app/src/main/java/eu/darken/capod/pods/core/apple/protocol/RPAChecker.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt rename to app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt b/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt rename to app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt b/app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt similarity index 98% rename from app-common/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt rename to app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt index eecd1893..4026907a 100644 --- a/app-common/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt +++ b/app/src/main/java/eu/darken/capod/reaction/core/ReactionHub.kt @@ -22,7 +22,6 @@ class ReactionHub @Inject constructor( autoConnect.monitor(), popUpReaction.monitor() ) { _, _, _ -> - Unit } .setupCommonEventHandlers(TAG) { "monitor" } diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt b/app/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt rename to app/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt b/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt similarity index 91% rename from app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt rename to app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt index 5df1994a..a62de2ae 100644 --- a/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt +++ b/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt @@ -12,7 +12,15 @@ import eu.darken.capod.pods.core.HasEarDetection import eu.darken.capod.pods.core.HasEarDetectionDual import eu.darken.capod.pods.core.apple.DualApplePods import eu.darken.capod.reaction.core.ReactionSettings -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.distinctUntilChangedBy +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.map import javax.inject.Inject import javax.inject.Singleton diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt b/app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt rename to app/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnectCondition.kt diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt b/app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt similarity index 94% rename from app-common/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt rename to app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt index ff79a318..521bfc66 100644 --- a/app-common/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt +++ b/app/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt @@ -12,7 +12,12 @@ import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.pods.core.HasEarDetection import eu.darken.capod.pods.core.HasEarDetectionDual import eu.darken.capod.reaction.core.ReactionSettings -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.onEach import javax.inject.Inject import javax.inject.Singleton diff --git a/app-common/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt b/app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt similarity index 100% rename from app-common/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt rename to app/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png similarity index 100% rename from app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png similarity index 100% rename from app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png similarity index 100% rename from app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png similarity index 100% rename from app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png similarity index 100% rename from app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png similarity index 100% rename from app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png similarity index 100% rename from app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png similarity index 100% rename from app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png similarity index 100% rename from app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png similarity index 100% rename from app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png similarity index 100% rename from app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png similarity index 100% rename from app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png similarity index 100% rename from app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png similarity index 100% rename from app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png similarity index 100% rename from app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png similarity index 100% rename from app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png similarity index 100% rename from app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png similarity index 100% rename from app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png similarity index 100% rename from app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png similarity index 100% rename from app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png diff --git a/app-common/src/main/res/drawable/devic_airpods_gen1_both.xml b/app/src/main/res/drawable/devic_airpods_gen1_both.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_airpods_gen1_both.xml rename to app/src/main/res/drawable/devic_airpods_gen1_both.xml diff --git a/app-common/src/main/res/drawable/devic_airpods_gen1_case.xml b/app/src/main/res/drawable/devic_airpods_gen1_case.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_airpods_gen1_case.xml rename to app/src/main/res/drawable/devic_airpods_gen1_case.xml diff --git a/app-common/src/main/res/drawable/devic_airpods_gen1_left.xml b/app/src/main/res/drawable/devic_airpods_gen1_left.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_airpods_gen1_left.xml rename to app/src/main/res/drawable/devic_airpods_gen1_left.xml diff --git a/app-common/src/main/res/drawable/devic_airpods_gen1_right.xml b/app/src/main/res/drawable/devic_airpods_gen1_right.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_airpods_gen1_right.xml rename to app/src/main/res/drawable/devic_airpods_gen1_right.xml diff --git a/app-common/src/main/res/drawable/devic_airpods_gen2_both.xml b/app/src/main/res/drawable/devic_airpods_gen2_both.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_airpods_gen2_both.xml rename to app/src/main/res/drawable/devic_airpods_gen2_both.xml diff --git a/app-common/src/main/res/drawable/devic_earbuds_generic_both.xml b/app/src/main/res/drawable/devic_earbuds_generic_both.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_earbuds_generic_both.xml rename to app/src/main/res/drawable/devic_earbuds_generic_both.xml diff --git a/app-common/src/main/res/drawable/devic_headphones_generic.xml b/app/src/main/res/drawable/devic_headphones_generic.xml similarity index 100% rename from app-common/src/main/res/drawable/devic_headphones_generic.xml rename to app/src/main/res/drawable/devic_headphones_generic.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml b/app/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml b/app/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_full_24.xml b/app/src/main/res/drawable/ic_baseline_battery_full_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_full_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_full_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_battery_unknown_24.xml b/app/src/main/res/drawable/ic_baseline_battery_unknown_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_battery_unknown_24.xml rename to app/src/main/res/drawable/ic_baseline_battery_unknown_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_devices_other_24.xml b/app/src/main/res/drawable/ic_baseline_devices_other_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_devices_other_24.xml rename to app/src/main/res/drawable/ic_baseline_devices_other_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_disabled_visible_24.xml b/app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_disabled_visible_24.xml rename to app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_grid_view_24.xml b/app/src/main/res/drawable/ic_baseline_grid_view_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_grid_view_24.xml rename to app/src/main/res/drawable/ic_baseline_grid_view_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_hearing_24.xml b/app/src/main/res/drawable/ic_baseline_hearing_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_hearing_24.xml rename to app/src/main/res/drawable/ic_baseline_hearing_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml b/app/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml rename to app/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml rename to app/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_power_24.xml b/app/src/main/res/drawable/ic_baseline_power_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_power_24.xml rename to app/src/main/res/drawable/ic_baseline_power_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_settings_24.xml rename to app/src/main/res/drawable/ic_baseline_settings_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml rename to app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml b/app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml rename to app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_watch_later_12.xml b/app/src/main/res/drawable/ic_baseline_watch_later_12.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_watch_later_12.xml rename to app/src/main/res/drawable/ic_baseline_watch_later_12.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_watch_later_24.xml b/app/src/main/res/drawable/ic_baseline_watch_later_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_baseline_watch_later_24.xml rename to app/src/main/res/drawable/ic_baseline_watch_later_24.xml diff --git a/app-common/src/main/res/drawable/ic_checkbox_blank_badge_24.xml b/app/src/main/res/drawable/ic_checkbox_blank_badge_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_checkbox_blank_badge_24.xml rename to app/src/main/res/drawable/ic_checkbox_blank_badge_24.xml diff --git a/app-common/src/main/res/drawable/ic_chip_24.xml b/app/src/main/res/drawable/ic_chip_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_chip_24.xml rename to app/src/main/res/drawable/ic_chip_24.xml diff --git a/app-common/src/main/res/drawable/ic_filter_cog_outline_24.xml b/app/src/main/res/drawable/ic_filter_cog_outline_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_filter_cog_outline_24.xml rename to app/src/main/res/drawable/ic_filter_cog_outline_24.xml diff --git a/app-common/src/main/res/drawable/ic_format_list_group_24.xml b/app/src/main/res/drawable/ic_format_list_group_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_format_list_group_24.xml rename to app/src/main/res/drawable/ic_format_list_group_24.xml diff --git a/app-common/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_heart.xml rename to app/src/main/res/drawable/ic_heart.xml diff --git a/app-common/src/main/res/drawable/ic_strategy_24.xml b/app/src/main/res/drawable/ic_strategy_24.xml similarity index 100% rename from app-common/src/main/res/drawable/ic_strategy_24.xml rename to app/src/main/res/drawable/ic_strategy_24.xml diff --git a/app-common/src/main/res/layout/preference_material_switch.xml b/app/src/main/res/layout/preference_material_switch.xml similarity index 100% rename from app-common/src/main/res/layout/preference_material_switch.xml rename to app/src/main/res/layout/preference_material_switch.xml diff --git a/app-common/src/test/java/eu/darken/capod/common/ByteArrayExtensionsTest.kt b/app/src/test/java/eu/darken/capod/common/ByteArrayExtensionsTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/common/ByteArrayExtensionsTest.kt rename to app/src/test/java/eu/darken/capod/common/ByteArrayExtensionsTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt b/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt rename to app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt b/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt rename to app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt b/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt rename to app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/monitor/core/RPACheckerTest.kt b/app/src/test/java/eu/darken/capod/monitor/core/RPACheckerTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/monitor/core/RPACheckerTest.kt rename to app/src/test/java/eu/darken/capod/monitor/core/RPACheckerTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4AncTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4AncTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4AncTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4AncTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbcTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbcTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbcTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxUsbcTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2UsbcTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2UsbcTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2UsbcTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2UsbcTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFitProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFitProTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFitProTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFitProTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats4Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2Test.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2Test.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2Test.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2Test.kt diff --git a/app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsProTest.kt b/app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsProTest.kt similarity index 100% rename from app-common/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsProTest.kt rename to app/src/test/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsProTest.kt diff --git a/app-common/src/test/java/testhelpers/BaseTest.kt b/app/src/test/java/testhelpers/BaseTest.kt similarity index 100% rename from app-common/src/test/java/testhelpers/BaseTest.kt rename to app/src/test/java/testhelpers/BaseTest.kt diff --git a/app-common/src/test/java/testhelpers/IsAUnitTest.kt b/app/src/test/java/testhelpers/IsAUnitTest.kt similarity index 100% rename from app-common/src/test/java/testhelpers/IsAUnitTest.kt rename to app/src/test/java/testhelpers/IsAUnitTest.kt diff --git a/app-common/src/test/java/testhelpers/coroutine/TestDispatcherProvider.kt b/app/src/test/java/testhelpers/coroutine/TestDispatcherProvider.kt similarity index 100% rename from app-common/src/test/java/testhelpers/coroutine/TestDispatcherProvider.kt rename to app/src/test/java/testhelpers/coroutine/TestDispatcherProvider.kt diff --git a/app-common/src/test/java/testhelpers/coroutine/TestExtensions.kt b/app/src/test/java/testhelpers/coroutine/TestExtensions.kt similarity index 100% rename from app-common/src/test/java/testhelpers/coroutine/TestExtensions.kt rename to app/src/test/java/testhelpers/coroutine/TestExtensions.kt diff --git a/app-common/src/test/java/testhelpers/flow/FlowTest.kt b/app/src/test/java/testhelpers/flow/FlowTest.kt similarity index 83% rename from app-common/src/test/java/testhelpers/flow/FlowTest.kt rename to app/src/test/java/testhelpers/flow/FlowTest.kt index 8a1f899f..b205c567 100644 --- a/app-common/src/test/java/testhelpers/flow/FlowTest.kt +++ b/app/src/test/java/testhelpers/flow/FlowTest.kt @@ -3,11 +3,23 @@ package testhelpers.flow 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.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.cancelAndJoin import kotlinx.coroutines.channels.BufferOverflow -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.buffer +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onCompletion +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock +import kotlinx.coroutines.withTimeout fun Flow.test( tag: String? = null, diff --git a/app-common/src/test/java/testhelpers/json/JsonExtensions.kt b/app/src/test/java/testhelpers/json/JsonExtensions.kt similarity index 100% rename from app-common/src/test/java/testhelpers/json/JsonExtensions.kt rename to app/src/test/java/testhelpers/json/JsonExtensions.kt diff --git a/app-common/src/test/java/testhelpers/livedata/InstantExecutorExtension.kt b/app/src/test/java/testhelpers/livedata/InstantExecutorExtension.kt similarity index 100% rename from app-common/src/test/java/testhelpers/livedata/InstantExecutorExtension.kt rename to app/src/test/java/testhelpers/livedata/InstantExecutorExtension.kt diff --git a/app-common/src/test/java/testhelpers/logging/JUnitLogger.kt b/app/src/test/java/testhelpers/logging/JUnitLogger.kt similarity index 100% rename from app-common/src/test/java/testhelpers/logging/JUnitLogger.kt rename to app/src/test/java/testhelpers/logging/JUnitLogger.kt diff --git a/app-common/src/test/java/testhelpers/preferences/MockFlowPreference.kt b/app/src/test/java/testhelpers/preferences/MockFlowPreference.kt similarity index 100% rename from app-common/src/test/java/testhelpers/preferences/MockFlowPreference.kt rename to app/src/test/java/testhelpers/preferences/MockFlowPreference.kt diff --git a/app-common/src/test/java/testhelpers/preferences/MockSharedPreferences.kt b/app/src/test/java/testhelpers/preferences/MockSharedPreferences.kt similarity index 100% rename from app-common/src/test/java/testhelpers/preferences/MockSharedPreferences.kt rename to app/src/test/java/testhelpers/preferences/MockSharedPreferences.kt diff --git a/app-common/src/test/java/testhelpers/preferences/MockSharedPreferencesTest.kt b/app/src/test/java/testhelpers/preferences/MockSharedPreferencesTest.kt similarity index 100% rename from app-common/src/test/java/testhelpers/preferences/MockSharedPreferencesTest.kt rename to app/src/test/java/testhelpers/preferences/MockSharedPreferencesTest.kt