diff --git a/app/.gitignore b/app-common/.gitignore similarity index 100% rename from app/.gitignore rename to app-common/.gitignore diff --git a/app-common/build.gradle b/app-common/build.gradle new file mode 100644 index 00000000..76ac35db --- /dev/null +++ b/app-common/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-kapt' + id 'kotlin-parcelize' + id 'androidx.navigation.safeargs.kotlin' + id 'com.bugsnag.android.gradle' + id 'dagger.hilt.android.plugin' +} + +android { + compileSdkVersion buildConfig.compileSdk + + defaultConfig { + + minSdkVersion buildConfig.minSdk + targetSdkVersion buildConfig.targetSdk + + versionCode buildConfig.version.code + versionName buildConfig.version.name + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + buildFeatures { + viewBinding true + } + + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = "1.8" + + freeCompilerArgs += [ + "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-Xuse-experimental=kotlinx.coroutines.FlowPreview", + "-Xuse-experimental=kotlin.time.ExperimentalTime", + "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", + "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", + "-Xopt-in=kotlin.RequiresOptIn" + ] + } + } +} + +dependencies { + // DI + implementation "com.google.dagger:dagger:${versions.dagger.core}" + implementation "com.google.dagger:dagger-android:${versions.dagger.core}" + + kapt "com.google.dagger:dagger-compiler:${versions.dagger.core}" + kapt "com.google.dagger:dagger-android-processor:${versions.dagger.core}" + + implementation "com.google.dagger:hilt-android:${versions.dagger.core}" + kapt "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + testImplementation "com.google.dagger:hilt-android-testing:${versions.dagger.core}" + kaptTest "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + androidTestImplementation "com.google.dagger:hilt-android-testing:${versions.dagger.core}" + kaptAndroidTest "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + kapt "androidx.hilt:hilt-compiler:1.0.0" + implementation 'androidx.hilt:hilt-common:1.0.0' + kaptTest "androidx.hilt:hilt-compiler:1.0.0" + testImplementation 'androidx.hilt:hilt-common:1.0.0' +} \ No newline at end of file diff --git a/app-common/consumer-rules.pro b/app-common/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/app-common/proguard-rules.pro b/app-common/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/app-common/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app-common/src/androidTest/java/eu/darken/capod/ExampleInstrumentedTest.kt b/app-common/src/androidTest/java/eu/darken/capod/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..076bf6df --- /dev/null +++ b/app-common/src/androidTest/java/eu/darken/capod/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package eu.darken.capod + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("eu.darken.capod.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml new file mode 100644 index 00000000..6fee1ef2 --- /dev/null +++ b/app-common/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_airpod_both_24.xml b/app-common/src/main/res/drawable/ic_airpod_both_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_airpod_both_24.xml rename to app-common/src/main/res/drawable/ic_airpod_both_24.xml diff --git a/app/src/main/res/drawable/ic_airpod_case_24.xml b/app-common/src/main/res/drawable/ic_airpod_case_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_airpod_case_24.xml rename to app-common/src/main/res/drawable/ic_airpod_case_24.xml diff --git a/app/src/main/res/drawable/ic_airpod_left_24.xml b/app-common/src/main/res/drawable/ic_airpod_left_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_airpod_left_24.xml rename to app-common/src/main/res/drawable/ic_airpod_left_24.xml diff --git a/app/src/main/res/drawable/ic_airpod_right_24.xml b/app-common/src/main/res/drawable/ic_airpod_right_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_airpod_right_24.xml rename to app-common/src/main/res/drawable/ic_airpod_right_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_0_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_1_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_2_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_3_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_4_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_5_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_6_bar_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_charging_full_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_full_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_full_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_full_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_full_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_battery_unknown_24.xml b/app-common/src/main/res/drawable/ic_baseline_battery_unknown_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_battery_unknown_24.xml rename to app-common/src/main/res/drawable/ic_baseline_battery_unknown_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_devices_other_24.xml b/app-common/src/main/res/drawable/ic_baseline_devices_other_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_devices_other_24.xml rename to app-common/src/main/res/drawable/ic_baseline_devices_other_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml b/app-common/src/main/res/drawable/ic_baseline_disabled_visible_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml rename to app-common/src/main/res/drawable/ic_baseline_disabled_visible_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_hearing_24.xml b/app-common/src/main/res/drawable/ic_baseline_hearing_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_hearing_24.xml rename to app-common/src/main/res/drawable/ic_baseline_hearing_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml b/app-common/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml rename to app-common/src/main/res/drawable/ic_baseline_hearing_disabled_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml b/app-common/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml rename to app-common/src/main/res/drawable/ic_baseline_keyboard_voice_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_power_24.xml b/app-common/src/main/res/drawable/ic_baseline_power_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_power_24.xml rename to app-common/src/main/res/drawable/ic_baseline_power_24.xml diff --git a/app-common/src/main/res/drawable/ic_baseline_watch_later_12.xml b/app-common/src/main/res/drawable/ic_baseline_watch_later_12.xml new file mode 100644 index 00000000..fe849c66 --- /dev/null +++ b/app-common/src/main/res/drawable/ic_baseline_watch_later_12.xml @@ -0,0 +1,10 @@ + + + diff --git a/app-common/src/main/res/drawable/ic_baseline_watch_later_24.xml b/app-common/src/main/res/drawable/ic_baseline_watch_later_24.xml new file mode 100644 index 00000000..9b57bedb --- /dev/null +++ b/app-common/src/main/res/drawable/ic_baseline_watch_later_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_device_airpods_gen1.xml b/app-common/src/main/res/drawable/ic_device_airpods_gen1.xml similarity index 100% rename from app/src/main/res/drawable/ic_device_airpods_gen1.xml rename to app-common/src/main/res/drawable/ic_device_airpods_gen1.xml diff --git a/app/src/main/res/drawable/ic_device_airpods_gen2.xml b/app-common/src/main/res/drawable/ic_device_airpods_gen2.xml similarity index 100% rename from app/src/main/res/drawable/ic_device_airpods_gen2.xml rename to app-common/src/main/res/drawable/ic_device_airpods_gen2.xml diff --git a/app/src/main/res/drawable/ic_device_generic_earbuds.xml b/app-common/src/main/res/drawable/ic_device_generic_earbuds.xml similarity index 100% rename from app/src/main/res/drawable/ic_device_generic_earbuds.xml rename to app-common/src/main/res/drawable/ic_device_generic_earbuds.xml diff --git a/app/src/main/res/drawable/ic_device_generic_headphones.xml b/app-common/src/main/res/drawable/ic_device_generic_headphones.xml similarity index 100% rename from app/src/main/res/drawable/ic_device_generic_headphones.xml rename to app-common/src/main/res/drawable/ic_device_generic_headphones.xml diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml new file mode 100644 index 00000000..5edb55d2 --- /dev/null +++ b/app-common/src/main/res/values/strings.xml @@ -0,0 +1,152 @@ + + CAPod + CAPod Pro + CAPod FOSS + + Device status + + Error + Share + Done + Copy + Thank you + N/A + Grant permission + Upgrade + Check + Close + + Size + Compressed size + Debug notifications + Recorded log file + Record debug log + + Bluetooth connect + This app requires the \"Bluetooth connect\" permission to interact with paired devices and initiate connections. + Bluetooth scanning + The \"Bluetooth scanning\" permission allows this app to discover and receive Bluetooth data from nearby devices such as your AirPods. + Bluetooth + This app requires the \"Bluetooth\" permission to connect to paired bluetooth devices. + Access fine location + CAPod uses the \"fine location\" permission to receive Bluetooth Low Energy data. Your headphones use Bluetooth Low Energy technology to broadcast their status. This app will NOT use Bluetooth data to determine your location. + Background location access + CAPod uses \"background location access\" to enable features like \"Show popup\" and \"AutoConnect\" while the app is closed. Background location access allows the app to receive Bluetooth Low Energy data while it is in the background. This app will NOT use Bluetooth data to determine your location. + Disable battery optimizations + Battery optimizations prevent this app from reliably receiving Bluetooth data while the app is in the background. + + Left pod + Right pod + Case + Open + Closed + Not connected to a device + Connected to a device, but idle + In music mode + In call mode + Ringing + Hanging up + Unknown connection state + Raw data + Unknown device + This is an unknown device, but it is using similar message format. Let\'s add support for it, contact me :) + No device + Charging + In ear + Microphone + Yours + Being worn + Unknown state + + No primary device + All detected devices are unlikely to be yours. Power on and connect your device or adjust the settings. + + Settings + Privacy policy + Handling data responsibly. + Licenses + Other + Settings + General tweaks that affect the whole app. + Acknowledgements + + Changelog + Email developer + + Install ID + Automatic error reports are anonymous. Share your install ID if the developer needs to find your error reports. + Support + If you need some help. + Issue tracker + A public issue tracker for bug reports and feature requests (english only). + Discord + A place to hang out in and ask questions. + Note that I can only respond in german or english. + Automatic bug reports + Automatically reports issues, e.g. details on an app crash so I can figure out how to fix it. + Debug mode + Show additional information to troubleshoot issues. + Monitor mode + Under which circumstances this app monitors Bluetooth data. + Scanner mode + Should the Bluetooth Low Energy data scanner prioritize performance or conserve energy? + When app is open + When device is connected + Always + Low power + Balanced + Low latency + Auto pause + Pause audio when removing the device from your ear. + Show all devices + Show other people\'s devices that are near you. + Auto play + Start audio playback when device is worn. + Fake data + Show fake data, i.e., simulate devices that don\’t exist. + Debug settings + Additional settings to help troubleshoot issues with the app. + Minimum signal quality + The minimum signal quality that a device needs to have to be considered yours. + Auto connect + If Android does not automatically connect, we can ask it too. This will set the monitor mode setting to \'Always\'. + Auto connect condition + When should we try to connect to your device? + Reactions + React to events and behaviors. + Your device + Your device address + The address of your paired device. The app uses this to determine when it is connected to your phone. + None + Your device model + The model of your main device. This helps the app recognize your device when it is not connected to your phone. + + When seen + Case is open + In ear + + Upgrade CAPod + Get additional features and support the developer. + Show popup + Show a popup when the device case is opened (experimental). + Bluetooth is disabled + Bluetooth is disabled, enable it ;) + Translation + Help translate this app into your favorite language. + One pod mode + Wearing both pods is not required, wearing a single pod is sufficient to trigger reactions. + System Alert Window + Allow CAPod to draw over other apps to make the feature \"Show PopUp\" possible. + Last seen: %s + First seen: %s + Unfiltered BLE data + Remove any filters from the BLE scanner to show all broadcasted BLE data. Useful to add support for new headphone types. + The following permission is required: + Compatibility mode + Disable optimizations to improve compatibility. Try this if you are not seeing any data. + Translators + darken + + CAPod for WearOS + View details about your AirPood devices on your WearOS device. + \ No newline at end of file diff --git a/app-common/src/test/java/eu/darken/capod/ExampleUnitTest.kt b/app-common/src/test/java/eu/darken/capod/ExampleUnitTest.kt new file mode 100644 index 00000000..a05083ee --- /dev/null +++ b/app-common/src/test/java/eu/darken/capod/ExampleUnitTest.kt @@ -0,0 +1,16 @@ +package eu.darken.capod + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/app-phone/.gitignore b/app-phone/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/app-phone/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app-phone/build.gradle b/app-phone/build.gradle new file mode 100644 index 00000000..22a3de6f --- /dev/null +++ b/app-phone/build.gradle @@ -0,0 +1,296 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-kapt' + id 'kotlin-parcelize' + id 'androidx.navigation.safeargs.kotlin' + id 'com.bugsnag.android.gradle' + id 'dagger.hilt.android.plugin' +} + +def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim() +def buildTime = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("GMT+1")) + +android { + def packageName = "eu.darken.capod" + + compileSdkVersion buildConfig.compileSdk + + defaultConfig { + applicationId "${packageName}" + + minSdkVersion buildConfig.minSdk + targetSdkVersion buildConfig.targetSdk + + versionCode buildConfig.version.code + versionName buildConfig.version.name + + testInstrumentationRunner "eu.darken.capod.HiltTestRunner" + + buildConfigField "String", "GITSHA", "\"${gitSha}\"" + buildConfigField "String", "BUILDTIME", "\"${buildTime}\"" + + manifestPlaceholders = [bugsnagApiKey: "fake"] + } + + signingConfigs { + releaseFoss {} + releaseGplay {} + } + + signingConfigs { + releaseFoss { + def signingFossPropFile = new File(System.properties['user.home'], ".appconfig/${packageName}/signing-foss.properties") + Properties signingPropsFoss = new Properties() + if (signingFossPropFile.canRead()) signingPropsFoss.load(new FileInputStream(signingFossPropFile)) + String keyStorePathFoss = System.getenv("STORE_PATH") ?: signingPropsFoss["release.storePath"] + File keyStoreFoss = keyStorePathFoss ? new File(keyStorePathFoss) : null + if (keyStoreFoss?.canRead()) { + storeFile keyStoreFoss + storePassword System.getenv("STORE_PASSWORD") ?: signingPropsFoss['release.storePassword'] + keyAlias System.getenv("KEY_ALIAS") ?: signingPropsFoss['release.keyAlias'] + keyPassword System.getenv("KEY_PASSWORD") ?: signingPropsFoss['release.keyPassword'] + } + } + + releaseGplay { + def signingGplayPropFile = new File(System.properties['user.home'], ".appconfig/${packageName}/signing-gplay.properties") + Properties signingPropsGplay = new Properties() + if (signingGplayPropFile.canRead()) signingPropsGplay.load(new FileInputStream(signingGplayPropFile)) + String keyStorePathGplay = System.getenv("STORE_PATH") ?: signingPropsGplay["release.storePath"] + File keyStoreGplay = keyStorePathGplay ? new File(keyStorePathGplay) : null + if (keyStoreGplay?.canRead()) { + storeFile keyStoreGplay + storePassword System.getenv("STORE_PASSWORD") ?: signingPropsGplay['release.storePassword'] + keyAlias System.getenv("KEY_ALIAS") ?: signingPropsGplay['release.keyAlias'] + keyPassword System.getenv("KEY_PASSWORD") ?: signingPropsGplay['release.keyPassword'] + } + } + } + + flavorDimensions "version" + productFlavors { + foss { + signingConfig signingConfigs.releaseFoss + } + gplay { + signingConfig signingConfigs.releaseGplay + } + } + + Properties bugsnagProps = new Properties() + def bugsnagPropsFile = new File(System.properties['user.home'], ".appconfig/${packageName}/bugsnag.properties") + if (bugsnagPropsFile.canRead()) bugsnagProps.load(new FileInputStream(bugsnagPropsFile)) + String bugSnagApiKey = System.getenv("BUGSNAG_API_KEY") ?: bugsnagProps.getProperty("bugsnag.apikey", "") + + buildTypes { + def proguardRulesRelease = fileTree(dir: "../proguard", include: ["*.pro"]).asList().toArray() + debug { + minifyEnabled false + shrinkResources false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles proguardRulesRelease + proguardFiles 'proguard-rules-debug.pro' + manifestPlaceholders = [bugsnagApiKey: bugSnagApiKey] + } + beta { + lintOptions { + abortOnError true + fatal 'StopShip' + } + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles proguardRulesRelease + manifestPlaceholders = [bugsnagApiKey: bugSnagApiKey] + } + release { + lintOptions { + abortOnError true + fatal 'StopShip' + } + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') + proguardFiles proguardRulesRelease + manifestPlaceholders = [bugsnagApiKey: bugSnagApiKey] + } + } + + applicationVariants.all { variant -> + def flavor = variant.productFlavors[0].name.toUpperCase() + def buildType = variant.buildType.name.toUpperCase() + def versionCode = defaultConfig.versionCode + def versionName = defaultConfig.versionName + + if (variant.buildType.name == "debug") { + variant.mergedFlavor.resourceConfigurations.clear() + variant.mergedFlavor.resourceConfigurations.add("en") + variant.mergedFlavor.resourceConfigurations.add("de") + } else if (variant.buildType.name != "debug") { + variant.outputs.each { output -> + output.outputFileName = "${packageName}-v${versionName}(${versionCode})-${gitSha}-${flavor}-${buildType}.apk" + } + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + buildFeatures { + viewBinding true + } + + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = "1.8" + + freeCompilerArgs += [ + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-Xopt-in=kotlinx.coroutines.FlowPreview", + "-Xopt-in=kotlin.time.ExperimentalTime", + "-Xopt-in=kotlin.ExperimentalUnsignedTypes", + "-Xopt-in=kotlin.contracts.ExperimentalContracts", + "-Xopt-in=kotlin.RequiresOptIn" + ] + } + } + + testOptions { + unitTests.all { + useJUnitPlatform() + } + unitTests { + includeAndroidResources = true + } + } + + sourceSets { + test { + java.srcDirs += "$projectDir/src/testShared/java" + } + androidTest { + java.srcDirs += "$projectDir/src/testShared/java" + androidTest.assets.srcDirs += files("$projectDir/schemas".toString()) + } + } +} + +dependencies { + implementation(project(":app-common")) + // Kotlin + implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin.core}" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlin.coroutines}" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlin.coroutines}" + + testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin.core}" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.kotlin.coroutines}" + androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.kotlin.coroutines}") { + // conflicts with mockito due to direct inclusion of byte buddy + exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" + } + + // Debugging + implementation('com.bugsnag:bugsnag-android:5.9.2') + implementation 'com.getkeepsafe.relinker:relinker:1.4.3' + + implementation("com.squareup.moshi:moshi:1.13.0") + kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0") + + // DI + implementation "com.google.dagger:dagger:${versions.dagger.core}" + implementation "com.google.dagger:dagger-android:${versions.dagger.core}" + + kapt "com.google.dagger:dagger-compiler:${versions.dagger.core}" + kapt "com.google.dagger:dagger-android-processor:${versions.dagger.core}" + + implementation "com.google.dagger:hilt-android:${versions.dagger.core}" + kapt "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + testImplementation "com.google.dagger:hilt-android-testing:${versions.dagger.core}" + kaptTest "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + androidTestImplementation "com.google.dagger:hilt-android-testing:${versions.dagger.core}" + kaptAndroidTest "com.google.dagger:hilt-android-compiler:${versions.dagger.core}" + + kapt "androidx.hilt:hilt-compiler:1.0.0" + implementation 'androidx.hilt:hilt-common:1.0.0' + kaptTest "androidx.hilt:hilt-compiler:1.0.0" + testImplementation 'androidx.hilt:hilt-common:1.0.0' + + // Support libs + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.annotation:annotation:1.3.0' + + implementation 'androidx.activity:activity-ktx:1.5.1' + implementation 'androidx.fragment:fragment-ktx:1.5.2' + + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0' + implementation 'androidx.lifecycle:lifecycle-process:2.4.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0' + + implementation "androidx.navigation:navigation-fragment-ktx:2.5.1" + implementation "androidx.navigation:navigation-ui-ktx:2.5.1" + + implementation 'androidx.preference:preference-ktx:1.1.1' + + implementation 'androidx.core:core-splashscreen:1.0.0' + + + def work_version = "2.7.1" + implementation "androidx.work:work-runtime:${work_version}" + testImplementation "androidx.work:work-testing:${work_version}" + implementation "androidx.work:work-runtime-ktx:${work_version}" + implementation 'androidx.hilt:hilt-work:1.0.0' + + // IAP + gplayImplementation 'com.android.billingclient:billing:4.0.0' + + // UI + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'com.google.android.material:material:1.6.0-alpha01' + + // Testing + testImplementation 'junit:junit:4.13.2' + testImplementation "org.junit.vintage:junit-vintage-engine:5.7.1" + testImplementation "androidx.test:core-ktx:1.4.0" + + testImplementation "io.mockk:mockk:1.12.1" + androidTestImplementation "io.mockk:mockk-android:1.11.0" + + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1" + + androidTestImplementation "androidx.navigation:navigation-testing:2.3.5" + + testImplementation "io.kotest:kotest-runner-junit5:4.6.2" + testImplementation "io.kotest:kotest-assertions-core-jvm:4.6.2" + testImplementation "io.kotest:kotest-property-jvm:4.6.2" + androidTestImplementation "io.kotest:kotest-assertions-core-jvm:4.6.2" + androidTestImplementation "io.kotest:kotest-property-jvm:4.6.2" + + testImplementation 'android.arch.core:core-testing:1.1.1' + androidTestImplementation 'android.arch.core:core-testing:1.1.1' + debugImplementation 'androidx.test:core-ktx:1.4.0' + + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' + androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.4.0' +} \ No newline at end of file diff --git a/app/proguard-rules-debug.pro b/app-phone/proguard-rules-debug.pro similarity index 100% rename from app/proguard-rules-debug.pro rename to app-phone/proguard-rules-debug.pro diff --git a/app/proguard/proguard-moshi.pro b/app-phone/proguard/proguard-moshi.pro similarity index 100% rename from app/proguard/proguard-moshi.pro rename to app-phone/proguard/proguard-moshi.pro diff --git a/app/proguard/proguard-rules.pro b/app-phone/proguard/proguard-rules.pro similarity index 100% rename from app/proguard/proguard-rules.pro rename to app-phone/proguard/proguard-rules.pro diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt b/app-phone/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt similarity index 100% rename from app/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt rename to app-phone/src/foss/java/eu/darken/capod/common/upgrade/UpgradeModule.kt diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt b/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt similarity index 100% rename from app/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt rename to app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossCache.kt diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt b/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt similarity index 100% rename from app/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt rename to app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/FossUpgrade.kt diff --git a/app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt b/app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt similarity index 100% rename from app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt rename to app-phone/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt diff --git a/app/src/foss/res/values-af-rZA/strings.xml b/app-phone/src/foss/res/values-af-rZA/strings.xml similarity index 100% rename from app/src/foss/res/values-af-rZA/strings.xml rename to app-phone/src/foss/res/values-af-rZA/strings.xml diff --git a/app/src/foss/res/values-am/strings.xml b/app-phone/src/foss/res/values-am/strings.xml similarity index 100% rename from app/src/foss/res/values-am/strings.xml rename to app-phone/src/foss/res/values-am/strings.xml diff --git a/app/src/foss/res/values-ar/strings.xml b/app-phone/src/foss/res/values-ar/strings.xml similarity index 100% rename from app/src/foss/res/values-ar/strings.xml rename to app-phone/src/foss/res/values-ar/strings.xml diff --git a/app/src/foss/res/values-az/strings.xml b/app-phone/src/foss/res/values-az/strings.xml similarity index 100% rename from app/src/foss/res/values-az/strings.xml rename to app-phone/src/foss/res/values-az/strings.xml diff --git a/app/src/foss/res/values-be/strings.xml b/app-phone/src/foss/res/values-be/strings.xml similarity index 100% rename from app/src/foss/res/values-be/strings.xml rename to app-phone/src/foss/res/values-be/strings.xml diff --git a/app/src/foss/res/values-bg/strings.xml b/app-phone/src/foss/res/values-bg/strings.xml similarity index 100% rename from app/src/foss/res/values-bg/strings.xml rename to app-phone/src/foss/res/values-bg/strings.xml diff --git a/app/src/foss/res/values-bn-rBD/strings.xml b/app-phone/src/foss/res/values-bn-rBD/strings.xml similarity index 100% rename from app/src/foss/res/values-bn-rBD/strings.xml rename to app-phone/src/foss/res/values-bn-rBD/strings.xml diff --git a/app/src/foss/res/values-ca/strings.xml b/app-phone/src/foss/res/values-ca/strings.xml similarity index 100% rename from app/src/foss/res/values-ca/strings.xml rename to app-phone/src/foss/res/values-ca/strings.xml diff --git a/app/src/foss/res/values-cs/strings.xml b/app-phone/src/foss/res/values-cs/strings.xml similarity index 100% rename from app/src/foss/res/values-cs/strings.xml rename to app-phone/src/foss/res/values-cs/strings.xml diff --git a/app/src/foss/res/values-da/strings.xml b/app-phone/src/foss/res/values-da/strings.xml similarity index 100% rename from app/src/foss/res/values-da/strings.xml rename to app-phone/src/foss/res/values-da/strings.xml diff --git a/app/src/foss/res/values-de/strings.xml b/app-phone/src/foss/res/values-de/strings.xml similarity index 100% rename from app/src/foss/res/values-de/strings.xml rename to app-phone/src/foss/res/values-de/strings.xml diff --git a/app/src/foss/res/values-el/strings.xml b/app-phone/src/foss/res/values-el/strings.xml similarity index 100% rename from app/src/foss/res/values-el/strings.xml rename to app-phone/src/foss/res/values-el/strings.xml diff --git a/app/src/foss/res/values-es-rAR/strings.xml b/app-phone/src/foss/res/values-es-rAR/strings.xml similarity index 100% rename from app/src/foss/res/values-es-rAR/strings.xml rename to app-phone/src/foss/res/values-es-rAR/strings.xml diff --git a/app/src/foss/res/values-es-rMX/strings.xml b/app-phone/src/foss/res/values-es-rMX/strings.xml similarity index 100% rename from app/src/foss/res/values-es-rMX/strings.xml rename to app-phone/src/foss/res/values-es-rMX/strings.xml diff --git a/app/src/foss/res/values-es/strings.xml b/app-phone/src/foss/res/values-es/strings.xml similarity index 100% rename from app/src/foss/res/values-es/strings.xml rename to app-phone/src/foss/res/values-es/strings.xml diff --git a/app/src/foss/res/values-et-rEE/strings.xml b/app-phone/src/foss/res/values-et-rEE/strings.xml similarity index 100% rename from app/src/foss/res/values-et-rEE/strings.xml rename to app-phone/src/foss/res/values-et-rEE/strings.xml diff --git a/app/src/foss/res/values-eu-rES/strings.xml b/app-phone/src/foss/res/values-eu-rES/strings.xml similarity index 100% rename from app/src/foss/res/values-eu-rES/strings.xml rename to app-phone/src/foss/res/values-eu-rES/strings.xml diff --git a/app/src/foss/res/values-fa/strings.xml b/app-phone/src/foss/res/values-fa/strings.xml similarity index 100% rename from app/src/foss/res/values-fa/strings.xml rename to app-phone/src/foss/res/values-fa/strings.xml diff --git a/app/src/foss/res/values-fi/strings.xml b/app-phone/src/foss/res/values-fi/strings.xml similarity index 100% rename from app/src/foss/res/values-fi/strings.xml rename to app-phone/src/foss/res/values-fi/strings.xml diff --git a/app/src/foss/res/values-fil/strings.xml b/app-phone/src/foss/res/values-fil/strings.xml similarity index 100% rename from app/src/foss/res/values-fil/strings.xml rename to app-phone/src/foss/res/values-fil/strings.xml diff --git a/app/src/foss/res/values-fr/strings.xml b/app-phone/src/foss/res/values-fr/strings.xml similarity index 100% rename from app/src/foss/res/values-fr/strings.xml rename to app-phone/src/foss/res/values-fr/strings.xml diff --git a/app/src/foss/res/values-gl-rES/strings.xml b/app-phone/src/foss/res/values-gl-rES/strings.xml similarity index 100% rename from app/src/foss/res/values-gl-rES/strings.xml rename to app-phone/src/foss/res/values-gl-rES/strings.xml diff --git a/app/src/foss/res/values-hi-rIN/strings.xml b/app-phone/src/foss/res/values-hi-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-hi-rIN/strings.xml rename to app-phone/src/foss/res/values-hi-rIN/strings.xml diff --git a/app/src/foss/res/values-hr/strings.xml b/app-phone/src/foss/res/values-hr/strings.xml similarity index 100% rename from app/src/foss/res/values-hr/strings.xml rename to app-phone/src/foss/res/values-hr/strings.xml diff --git a/app/src/foss/res/values-hu/strings.xml b/app-phone/src/foss/res/values-hu/strings.xml similarity index 100% rename from app/src/foss/res/values-hu/strings.xml rename to app-phone/src/foss/res/values-hu/strings.xml diff --git a/app/src/foss/res/values-hy-rAM/strings.xml b/app-phone/src/foss/res/values-hy-rAM/strings.xml similarity index 100% rename from app/src/foss/res/values-hy-rAM/strings.xml rename to app-phone/src/foss/res/values-hy-rAM/strings.xml diff --git a/app/src/foss/res/values-in/strings.xml b/app-phone/src/foss/res/values-in/strings.xml similarity index 100% rename from app/src/foss/res/values-in/strings.xml rename to app-phone/src/foss/res/values-in/strings.xml diff --git a/app/src/foss/res/values-is/strings.xml b/app-phone/src/foss/res/values-is/strings.xml similarity index 100% rename from app/src/foss/res/values-is/strings.xml rename to app-phone/src/foss/res/values-is/strings.xml diff --git a/app/src/foss/res/values-it/strings.xml b/app-phone/src/foss/res/values-it/strings.xml similarity index 100% rename from app/src/foss/res/values-it/strings.xml rename to app-phone/src/foss/res/values-it/strings.xml diff --git a/app/src/foss/res/values-iw/strings.xml b/app-phone/src/foss/res/values-iw/strings.xml similarity index 100% rename from app/src/foss/res/values-iw/strings.xml rename to app-phone/src/foss/res/values-iw/strings.xml diff --git a/app/src/foss/res/values-ja/strings.xml b/app-phone/src/foss/res/values-ja/strings.xml similarity index 100% rename from app/src/foss/res/values-ja/strings.xml rename to app-phone/src/foss/res/values-ja/strings.xml diff --git a/app/src/foss/res/values-ka-rGE/strings.xml b/app-phone/src/foss/res/values-ka-rGE/strings.xml similarity index 100% rename from app/src/foss/res/values-ka-rGE/strings.xml rename to app-phone/src/foss/res/values-ka-rGE/strings.xml diff --git a/app/src/foss/res/values-km-rKH/strings.xml b/app-phone/src/foss/res/values-km-rKH/strings.xml similarity index 100% rename from app/src/foss/res/values-km-rKH/strings.xml rename to app-phone/src/foss/res/values-km-rKH/strings.xml diff --git a/app/src/foss/res/values-kmr-rTR/strings.xml b/app-phone/src/foss/res/values-kmr-rTR/strings.xml similarity index 100% rename from app/src/foss/res/values-kmr-rTR/strings.xml rename to app-phone/src/foss/res/values-kmr-rTR/strings.xml diff --git a/app/src/foss/res/values-kn-rIN/strings.xml b/app-phone/src/foss/res/values-kn-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-kn-rIN/strings.xml rename to app-phone/src/foss/res/values-kn-rIN/strings.xml diff --git a/app/src/foss/res/values-ko/strings.xml b/app-phone/src/foss/res/values-ko/strings.xml similarity index 100% rename from app/src/foss/res/values-ko/strings.xml rename to app-phone/src/foss/res/values-ko/strings.xml diff --git a/app/src/foss/res/values-ky-rKG/strings.xml b/app-phone/src/foss/res/values-ky-rKG/strings.xml similarity index 100% rename from app/src/foss/res/values-ky-rKG/strings.xml rename to app-phone/src/foss/res/values-ky-rKG/strings.xml diff --git a/app/src/foss/res/values-lo-rLA/strings.xml b/app-phone/src/foss/res/values-lo-rLA/strings.xml similarity index 100% rename from app/src/foss/res/values-lo-rLA/strings.xml rename to app-phone/src/foss/res/values-lo-rLA/strings.xml diff --git a/app/src/foss/res/values-lt/strings.xml b/app-phone/src/foss/res/values-lt/strings.xml similarity index 100% rename from app/src/foss/res/values-lt/strings.xml rename to app-phone/src/foss/res/values-lt/strings.xml diff --git a/app/src/foss/res/values-lv/strings.xml b/app-phone/src/foss/res/values-lv/strings.xml similarity index 100% rename from app/src/foss/res/values-lv/strings.xml rename to app-phone/src/foss/res/values-lv/strings.xml diff --git a/app/src/foss/res/values-mk-rMK/strings.xml b/app-phone/src/foss/res/values-mk-rMK/strings.xml similarity index 100% rename from app/src/foss/res/values-mk-rMK/strings.xml rename to app-phone/src/foss/res/values-mk-rMK/strings.xml diff --git a/app/src/foss/res/values-ml-rIN/strings.xml b/app-phone/src/foss/res/values-ml-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-ml-rIN/strings.xml rename to app-phone/src/foss/res/values-ml-rIN/strings.xml diff --git a/app/src/foss/res/values-mn-rMN/strings.xml b/app-phone/src/foss/res/values-mn-rMN/strings.xml similarity index 100% rename from app/src/foss/res/values-mn-rMN/strings.xml rename to app-phone/src/foss/res/values-mn-rMN/strings.xml diff --git a/app/src/foss/res/values-mr-rIN/strings.xml b/app-phone/src/foss/res/values-mr-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-mr-rIN/strings.xml rename to app-phone/src/foss/res/values-mr-rIN/strings.xml diff --git a/app/src/foss/res/values-ms/strings.xml b/app-phone/src/foss/res/values-ms/strings.xml similarity index 100% rename from app/src/foss/res/values-ms/strings.xml rename to app-phone/src/foss/res/values-ms/strings.xml diff --git a/app/src/foss/res/values-my-rMM/strings.xml b/app-phone/src/foss/res/values-my-rMM/strings.xml similarity index 100% rename from app/src/foss/res/values-my-rMM/strings.xml rename to app-phone/src/foss/res/values-my-rMM/strings.xml diff --git a/app/src/foss/res/values-ne-rNP/strings.xml b/app-phone/src/foss/res/values-ne-rNP/strings.xml similarity index 100% rename from app/src/foss/res/values-ne-rNP/strings.xml rename to app-phone/src/foss/res/values-ne-rNP/strings.xml diff --git a/app/src/foss/res/values-nl/strings.xml b/app-phone/src/foss/res/values-nl/strings.xml similarity index 100% rename from app/src/foss/res/values-nl/strings.xml rename to app-phone/src/foss/res/values-nl/strings.xml diff --git a/app/src/foss/res/values-no/strings.xml b/app-phone/src/foss/res/values-no/strings.xml similarity index 100% rename from app/src/foss/res/values-no/strings.xml rename to app-phone/src/foss/res/values-no/strings.xml diff --git a/app/src/foss/res/values-pl/strings.xml b/app-phone/src/foss/res/values-pl/strings.xml similarity index 100% rename from app/src/foss/res/values-pl/strings.xml rename to app-phone/src/foss/res/values-pl/strings.xml diff --git a/app/src/foss/res/values-pt-rBR/strings.xml b/app-phone/src/foss/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/foss/res/values-pt-rBR/strings.xml rename to app-phone/src/foss/res/values-pt-rBR/strings.xml diff --git a/app/src/foss/res/values-pt/strings.xml b/app-phone/src/foss/res/values-pt/strings.xml similarity index 100% rename from app/src/foss/res/values-pt/strings.xml rename to app-phone/src/foss/res/values-pt/strings.xml diff --git a/app/src/foss/res/values-rm/strings.xml b/app-phone/src/foss/res/values-rm/strings.xml similarity index 100% rename from app/src/foss/res/values-rm/strings.xml rename to app-phone/src/foss/res/values-rm/strings.xml diff --git a/app/src/foss/res/values-ro/strings.xml b/app-phone/src/foss/res/values-ro/strings.xml similarity index 100% rename from app/src/foss/res/values-ro/strings.xml rename to app-phone/src/foss/res/values-ro/strings.xml diff --git a/app/src/foss/res/values-ru/strings.xml b/app-phone/src/foss/res/values-ru/strings.xml similarity index 100% rename from app/src/foss/res/values-ru/strings.xml rename to app-phone/src/foss/res/values-ru/strings.xml diff --git a/app/src/foss/res/values-sc-rIT/strings.xml b/app-phone/src/foss/res/values-sc-rIT/strings.xml similarity index 100% rename from app/src/foss/res/values-sc-rIT/strings.xml rename to app-phone/src/foss/res/values-sc-rIT/strings.xml diff --git a/app/src/foss/res/values-si-rLK/strings.xml b/app-phone/src/foss/res/values-si-rLK/strings.xml similarity index 100% rename from app/src/foss/res/values-si-rLK/strings.xml rename to app-phone/src/foss/res/values-si-rLK/strings.xml diff --git a/app/src/foss/res/values-sk/strings.xml b/app-phone/src/foss/res/values-sk/strings.xml similarity index 100% rename from app/src/foss/res/values-sk/strings.xml rename to app-phone/src/foss/res/values-sk/strings.xml diff --git a/app/src/foss/res/values-sl/strings.xml b/app-phone/src/foss/res/values-sl/strings.xml similarity index 100% rename from app/src/foss/res/values-sl/strings.xml rename to app-phone/src/foss/res/values-sl/strings.xml diff --git a/app/src/foss/res/values-sq-rAL/strings.xml b/app-phone/src/foss/res/values-sq-rAL/strings.xml similarity index 100% rename from app/src/foss/res/values-sq-rAL/strings.xml rename to app-phone/src/foss/res/values-sq-rAL/strings.xml diff --git a/app/src/foss/res/values-sr/strings.xml b/app-phone/src/foss/res/values-sr/strings.xml similarity index 100% rename from app/src/foss/res/values-sr/strings.xml rename to app-phone/src/foss/res/values-sr/strings.xml diff --git a/app/src/foss/res/values-sv/strings.xml b/app-phone/src/foss/res/values-sv/strings.xml similarity index 100% rename from app/src/foss/res/values-sv/strings.xml rename to app-phone/src/foss/res/values-sv/strings.xml diff --git a/app/src/foss/res/values-sw/strings.xml b/app-phone/src/foss/res/values-sw/strings.xml similarity index 100% rename from app/src/foss/res/values-sw/strings.xml rename to app-phone/src/foss/res/values-sw/strings.xml diff --git a/app/src/foss/res/values-ta-rIN/strings.xml b/app-phone/src/foss/res/values-ta-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-ta-rIN/strings.xml rename to app-phone/src/foss/res/values-ta-rIN/strings.xml diff --git a/app/src/foss/res/values-te-rIN/strings.xml b/app-phone/src/foss/res/values-te-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-te-rIN/strings.xml rename to app-phone/src/foss/res/values-te-rIN/strings.xml diff --git a/app/src/foss/res/values-th/strings.xml b/app-phone/src/foss/res/values-th/strings.xml similarity index 100% rename from app/src/foss/res/values-th/strings.xml rename to app-phone/src/foss/res/values-th/strings.xml diff --git a/app/src/foss/res/values-tr/strings.xml b/app-phone/src/foss/res/values-tr/strings.xml similarity index 100% rename from app/src/foss/res/values-tr/strings.xml rename to app-phone/src/foss/res/values-tr/strings.xml diff --git a/app/src/foss/res/values-uk/strings.xml b/app-phone/src/foss/res/values-uk/strings.xml similarity index 100% rename from app/src/foss/res/values-uk/strings.xml rename to app-phone/src/foss/res/values-uk/strings.xml diff --git a/app/src/foss/res/values-ur-rIN/strings.xml b/app-phone/src/foss/res/values-ur-rIN/strings.xml similarity index 100% rename from app/src/foss/res/values-ur-rIN/strings.xml rename to app-phone/src/foss/res/values-ur-rIN/strings.xml diff --git a/app/src/foss/res/values-uz/strings.xml b/app-phone/src/foss/res/values-uz/strings.xml similarity index 100% rename from app/src/foss/res/values-uz/strings.xml rename to app-phone/src/foss/res/values-uz/strings.xml diff --git a/app/src/foss/res/values-vi/strings.xml b/app-phone/src/foss/res/values-vi/strings.xml similarity index 100% rename from app/src/foss/res/values-vi/strings.xml rename to app-phone/src/foss/res/values-vi/strings.xml diff --git a/app/src/foss/res/values-zh-rCN/strings.xml b/app-phone/src/foss/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/foss/res/values-zh-rCN/strings.xml rename to app-phone/src/foss/res/values-zh-rCN/strings.xml diff --git a/app/src/foss/res/values-zh-rHK/strings.xml b/app-phone/src/foss/res/values-zh-rHK/strings.xml similarity index 100% rename from app/src/foss/res/values-zh-rHK/strings.xml rename to app-phone/src/foss/res/values-zh-rHK/strings.xml diff --git a/app/src/foss/res/values-zh-rTW/strings.xml b/app-phone/src/foss/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/foss/res/values-zh-rTW/strings.xml rename to app-phone/src/foss/res/values-zh-rTW/strings.xml diff --git a/app/src/foss/res/values-zu/strings.xml b/app-phone/src/foss/res/values-zu/strings.xml similarity index 100% rename from app/src/foss/res/values-zu/strings.xml rename to app-phone/src/foss/res/values-zu/strings.xml diff --git a/app/src/foss/res/values/strings.xml b/app-phone/src/foss/res/values/strings.xml similarity index 100% rename from app/src/foss/res/values/strings.xml rename to app-phone/src/foss/res/values/strings.xml diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/UpgradeModule.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingCache.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/BillingExtensions.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/CapodSku.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnection.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt similarity index 93% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt index b84fefdc..58de4a15 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt +++ b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientConnectionProvider.kt @@ -1,7 +1,8 @@ package eu.darken.capod.common.upgrade.core.client import android.content.Context -import com.android.billingclient.api.BillingClient.* +import com.android.billingclient.api.BillingClient.BillingResponseCode +import com.android.billingclient.api.BillingClient.newBuilder import com.android.billingclient.api.BillingClientStateListener import com.android.billingclient.api.BillingResult import com.android.billingclient.api.Purchase @@ -14,7 +15,10 @@ import eu.darken.capod.common.flow.setupCommonEventHandlers import kotlinx.coroutines.CancellationException import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.retryWhen import javax.inject.Inject import javax.inject.Singleton import kotlin.coroutines.resume diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientException.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/BillingClientExtensions.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/client/GplayServiceUnavailableException.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/AvailableSku.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingData.kt diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt similarity index 98% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt index 8e0bafed..093a09a8 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt +++ b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/BillingDataRepo.kt @@ -1,8 +1,7 @@ package eu.darken.capod.common.upgrade.core.data import android.app.Activity -import com.android.billingclient.api.* -import com.android.billingclient.api.BillingClient.* +import com.android.billingclient.api.BillingClient.BillingResponseCode import eu.darken.capod.common.coroutine.AppScope import eu.darken.capod.common.debug.Bugs import eu.darken.capod.common.debug.logging.Logging.Priority.* diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt similarity index 82% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt index cdb7a43b..9b8f4f14 100644 --- a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt +++ b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/PurchasedSku.kt @@ -1,7 +1,6 @@ package eu.darken.capod.common.upgrade.core.data import com.android.billingclient.api.Purchase -import eu.darken.capod.common.upgrade.core.data.Sku data class PurchasedSku(val sku: Sku, val purchase: Purchase) { override fun toString(): String = "IAP(sku=$sku, purchase=${purchase.skus})" diff --git a/app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt b/app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt similarity index 100% rename from app/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt rename to app-phone/src/gplay/java/eu/darken/capod/common/upgrade/core/data/Sku.kt diff --git a/app/src/gplay/res/values-af-rZA/strings.xml b/app-phone/src/gplay/res/values-af-rZA/strings.xml similarity index 100% rename from app/src/gplay/res/values-af-rZA/strings.xml rename to app-phone/src/gplay/res/values-af-rZA/strings.xml diff --git a/app/src/gplay/res/values-am/strings.xml b/app-phone/src/gplay/res/values-am/strings.xml similarity index 100% rename from app/src/gplay/res/values-am/strings.xml rename to app-phone/src/gplay/res/values-am/strings.xml diff --git a/app/src/gplay/res/values-ar/strings.xml b/app-phone/src/gplay/res/values-ar/strings.xml similarity index 100% rename from app/src/gplay/res/values-ar/strings.xml rename to app-phone/src/gplay/res/values-ar/strings.xml diff --git a/app/src/gplay/res/values-az/strings.xml b/app-phone/src/gplay/res/values-az/strings.xml similarity index 100% rename from app/src/gplay/res/values-az/strings.xml rename to app-phone/src/gplay/res/values-az/strings.xml diff --git a/app/src/gplay/res/values-be/strings.xml b/app-phone/src/gplay/res/values-be/strings.xml similarity index 100% rename from app/src/gplay/res/values-be/strings.xml rename to app-phone/src/gplay/res/values-be/strings.xml diff --git a/app/src/gplay/res/values-bg/strings.xml b/app-phone/src/gplay/res/values-bg/strings.xml similarity index 100% rename from app/src/gplay/res/values-bg/strings.xml rename to app-phone/src/gplay/res/values-bg/strings.xml diff --git a/app/src/gplay/res/values-bn-rBD/strings.xml b/app-phone/src/gplay/res/values-bn-rBD/strings.xml similarity index 100% rename from app/src/gplay/res/values-bn-rBD/strings.xml rename to app-phone/src/gplay/res/values-bn-rBD/strings.xml diff --git a/app/src/gplay/res/values-ca/strings.xml b/app-phone/src/gplay/res/values-ca/strings.xml similarity index 100% rename from app/src/gplay/res/values-ca/strings.xml rename to app-phone/src/gplay/res/values-ca/strings.xml diff --git a/app/src/gplay/res/values-cs/strings.xml b/app-phone/src/gplay/res/values-cs/strings.xml similarity index 100% rename from app/src/gplay/res/values-cs/strings.xml rename to app-phone/src/gplay/res/values-cs/strings.xml diff --git a/app/src/gplay/res/values-da/strings.xml b/app-phone/src/gplay/res/values-da/strings.xml similarity index 100% rename from app/src/gplay/res/values-da/strings.xml rename to app-phone/src/gplay/res/values-da/strings.xml diff --git a/app/src/gplay/res/values-de/strings.xml b/app-phone/src/gplay/res/values-de/strings.xml similarity index 100% rename from app/src/gplay/res/values-de/strings.xml rename to app-phone/src/gplay/res/values-de/strings.xml diff --git a/app/src/gplay/res/values-el/strings.xml b/app-phone/src/gplay/res/values-el/strings.xml similarity index 100% rename from app/src/gplay/res/values-el/strings.xml rename to app-phone/src/gplay/res/values-el/strings.xml diff --git a/app/src/gplay/res/values-es-rAR/strings.xml b/app-phone/src/gplay/res/values-es-rAR/strings.xml similarity index 100% rename from app/src/gplay/res/values-es-rAR/strings.xml rename to app-phone/src/gplay/res/values-es-rAR/strings.xml diff --git a/app/src/gplay/res/values-es-rMX/strings.xml b/app-phone/src/gplay/res/values-es-rMX/strings.xml similarity index 100% rename from app/src/gplay/res/values-es-rMX/strings.xml rename to app-phone/src/gplay/res/values-es-rMX/strings.xml diff --git a/app/src/gplay/res/values-es/strings.xml b/app-phone/src/gplay/res/values-es/strings.xml similarity index 100% rename from app/src/gplay/res/values-es/strings.xml rename to app-phone/src/gplay/res/values-es/strings.xml diff --git a/app/src/gplay/res/values-et-rEE/strings.xml b/app-phone/src/gplay/res/values-et-rEE/strings.xml similarity index 100% rename from app/src/gplay/res/values-et-rEE/strings.xml rename to app-phone/src/gplay/res/values-et-rEE/strings.xml diff --git a/app/src/gplay/res/values-eu-rES/strings.xml b/app-phone/src/gplay/res/values-eu-rES/strings.xml similarity index 100% rename from app/src/gplay/res/values-eu-rES/strings.xml rename to app-phone/src/gplay/res/values-eu-rES/strings.xml diff --git a/app/src/gplay/res/values-fa/strings.xml b/app-phone/src/gplay/res/values-fa/strings.xml similarity index 100% rename from app/src/gplay/res/values-fa/strings.xml rename to app-phone/src/gplay/res/values-fa/strings.xml diff --git a/app/src/gplay/res/values-fi/strings.xml b/app-phone/src/gplay/res/values-fi/strings.xml similarity index 100% rename from app/src/gplay/res/values-fi/strings.xml rename to app-phone/src/gplay/res/values-fi/strings.xml diff --git a/app/src/gplay/res/values-fil/strings.xml b/app-phone/src/gplay/res/values-fil/strings.xml similarity index 100% rename from app/src/gplay/res/values-fil/strings.xml rename to app-phone/src/gplay/res/values-fil/strings.xml diff --git a/app/src/gplay/res/values-fr/strings.xml b/app-phone/src/gplay/res/values-fr/strings.xml similarity index 100% rename from app/src/gplay/res/values-fr/strings.xml rename to app-phone/src/gplay/res/values-fr/strings.xml diff --git a/app/src/gplay/res/values-gl-rES/strings.xml b/app-phone/src/gplay/res/values-gl-rES/strings.xml similarity index 100% rename from app/src/gplay/res/values-gl-rES/strings.xml rename to app-phone/src/gplay/res/values-gl-rES/strings.xml diff --git a/app/src/gplay/res/values-hi-rIN/strings.xml b/app-phone/src/gplay/res/values-hi-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-hi-rIN/strings.xml rename to app-phone/src/gplay/res/values-hi-rIN/strings.xml diff --git a/app/src/gplay/res/values-hr/strings.xml b/app-phone/src/gplay/res/values-hr/strings.xml similarity index 100% rename from app/src/gplay/res/values-hr/strings.xml rename to app-phone/src/gplay/res/values-hr/strings.xml diff --git a/app/src/gplay/res/values-hu/strings.xml b/app-phone/src/gplay/res/values-hu/strings.xml similarity index 100% rename from app/src/gplay/res/values-hu/strings.xml rename to app-phone/src/gplay/res/values-hu/strings.xml diff --git a/app/src/gplay/res/values-hy-rAM/strings.xml b/app-phone/src/gplay/res/values-hy-rAM/strings.xml similarity index 100% rename from app/src/gplay/res/values-hy-rAM/strings.xml rename to app-phone/src/gplay/res/values-hy-rAM/strings.xml diff --git a/app/src/gplay/res/values-in/strings.xml b/app-phone/src/gplay/res/values-in/strings.xml similarity index 100% rename from app/src/gplay/res/values-in/strings.xml rename to app-phone/src/gplay/res/values-in/strings.xml diff --git a/app/src/gplay/res/values-is/strings.xml b/app-phone/src/gplay/res/values-is/strings.xml similarity index 100% rename from app/src/gplay/res/values-is/strings.xml rename to app-phone/src/gplay/res/values-is/strings.xml diff --git a/app/src/gplay/res/values-it/strings.xml b/app-phone/src/gplay/res/values-it/strings.xml similarity index 100% rename from app/src/gplay/res/values-it/strings.xml rename to app-phone/src/gplay/res/values-it/strings.xml diff --git a/app/src/gplay/res/values-iw/strings.xml b/app-phone/src/gplay/res/values-iw/strings.xml similarity index 100% rename from app/src/gplay/res/values-iw/strings.xml rename to app-phone/src/gplay/res/values-iw/strings.xml diff --git a/app/src/gplay/res/values-ja/strings.xml b/app-phone/src/gplay/res/values-ja/strings.xml similarity index 100% rename from app/src/gplay/res/values-ja/strings.xml rename to app-phone/src/gplay/res/values-ja/strings.xml diff --git a/app/src/gplay/res/values-ka-rGE/strings.xml b/app-phone/src/gplay/res/values-ka-rGE/strings.xml similarity index 100% rename from app/src/gplay/res/values-ka-rGE/strings.xml rename to app-phone/src/gplay/res/values-ka-rGE/strings.xml diff --git a/app/src/gplay/res/values-km-rKH/strings.xml b/app-phone/src/gplay/res/values-km-rKH/strings.xml similarity index 100% rename from app/src/gplay/res/values-km-rKH/strings.xml rename to app-phone/src/gplay/res/values-km-rKH/strings.xml diff --git a/app/src/gplay/res/values-kmr-rTR/strings.xml b/app-phone/src/gplay/res/values-kmr-rTR/strings.xml similarity index 100% rename from app/src/gplay/res/values-kmr-rTR/strings.xml rename to app-phone/src/gplay/res/values-kmr-rTR/strings.xml diff --git a/app/src/gplay/res/values-kn-rIN/strings.xml b/app-phone/src/gplay/res/values-kn-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-kn-rIN/strings.xml rename to app-phone/src/gplay/res/values-kn-rIN/strings.xml diff --git a/app/src/gplay/res/values-ko/strings.xml b/app-phone/src/gplay/res/values-ko/strings.xml similarity index 100% rename from app/src/gplay/res/values-ko/strings.xml rename to app-phone/src/gplay/res/values-ko/strings.xml diff --git a/app/src/gplay/res/values-ky-rKG/strings.xml b/app-phone/src/gplay/res/values-ky-rKG/strings.xml similarity index 100% rename from app/src/gplay/res/values-ky-rKG/strings.xml rename to app-phone/src/gplay/res/values-ky-rKG/strings.xml diff --git a/app/src/gplay/res/values-lo-rLA/strings.xml b/app-phone/src/gplay/res/values-lo-rLA/strings.xml similarity index 100% rename from app/src/gplay/res/values-lo-rLA/strings.xml rename to app-phone/src/gplay/res/values-lo-rLA/strings.xml diff --git a/app/src/gplay/res/values-lt/strings.xml b/app-phone/src/gplay/res/values-lt/strings.xml similarity index 100% rename from app/src/gplay/res/values-lt/strings.xml rename to app-phone/src/gplay/res/values-lt/strings.xml diff --git a/app/src/gplay/res/values-lv/strings.xml b/app-phone/src/gplay/res/values-lv/strings.xml similarity index 100% rename from app/src/gplay/res/values-lv/strings.xml rename to app-phone/src/gplay/res/values-lv/strings.xml diff --git a/app/src/gplay/res/values-mk-rMK/strings.xml b/app-phone/src/gplay/res/values-mk-rMK/strings.xml similarity index 100% rename from app/src/gplay/res/values-mk-rMK/strings.xml rename to app-phone/src/gplay/res/values-mk-rMK/strings.xml diff --git a/app/src/gplay/res/values-ml-rIN/strings.xml b/app-phone/src/gplay/res/values-ml-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-ml-rIN/strings.xml rename to app-phone/src/gplay/res/values-ml-rIN/strings.xml diff --git a/app/src/gplay/res/values-mn-rMN/strings.xml b/app-phone/src/gplay/res/values-mn-rMN/strings.xml similarity index 100% rename from app/src/gplay/res/values-mn-rMN/strings.xml rename to app-phone/src/gplay/res/values-mn-rMN/strings.xml diff --git a/app/src/gplay/res/values-mr-rIN/strings.xml b/app-phone/src/gplay/res/values-mr-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-mr-rIN/strings.xml rename to app-phone/src/gplay/res/values-mr-rIN/strings.xml diff --git a/app/src/gplay/res/values-ms/strings.xml b/app-phone/src/gplay/res/values-ms/strings.xml similarity index 100% rename from app/src/gplay/res/values-ms/strings.xml rename to app-phone/src/gplay/res/values-ms/strings.xml diff --git a/app/src/gplay/res/values-my-rMM/strings.xml b/app-phone/src/gplay/res/values-my-rMM/strings.xml similarity index 100% rename from app/src/gplay/res/values-my-rMM/strings.xml rename to app-phone/src/gplay/res/values-my-rMM/strings.xml diff --git a/app/src/gplay/res/values-ne-rNP/strings.xml b/app-phone/src/gplay/res/values-ne-rNP/strings.xml similarity index 100% rename from app/src/gplay/res/values-ne-rNP/strings.xml rename to app-phone/src/gplay/res/values-ne-rNP/strings.xml diff --git a/app/src/gplay/res/values-nl/strings.xml b/app-phone/src/gplay/res/values-nl/strings.xml similarity index 100% rename from app/src/gplay/res/values-nl/strings.xml rename to app-phone/src/gplay/res/values-nl/strings.xml diff --git a/app/src/gplay/res/values-no/strings.xml b/app-phone/src/gplay/res/values-no/strings.xml similarity index 100% rename from app/src/gplay/res/values-no/strings.xml rename to app-phone/src/gplay/res/values-no/strings.xml diff --git a/app/src/gplay/res/values-pl/strings.xml b/app-phone/src/gplay/res/values-pl/strings.xml similarity index 100% rename from app/src/gplay/res/values-pl/strings.xml rename to app-phone/src/gplay/res/values-pl/strings.xml diff --git a/app/src/gplay/res/values-pt-rBR/strings.xml b/app-phone/src/gplay/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/gplay/res/values-pt-rBR/strings.xml rename to app-phone/src/gplay/res/values-pt-rBR/strings.xml diff --git a/app/src/gplay/res/values-pt/strings.xml b/app-phone/src/gplay/res/values-pt/strings.xml similarity index 100% rename from app/src/gplay/res/values-pt/strings.xml rename to app-phone/src/gplay/res/values-pt/strings.xml diff --git a/app/src/gplay/res/values-rm/strings.xml b/app-phone/src/gplay/res/values-rm/strings.xml similarity index 100% rename from app/src/gplay/res/values-rm/strings.xml rename to app-phone/src/gplay/res/values-rm/strings.xml diff --git a/app/src/gplay/res/values-ro/strings.xml b/app-phone/src/gplay/res/values-ro/strings.xml similarity index 100% rename from app/src/gplay/res/values-ro/strings.xml rename to app-phone/src/gplay/res/values-ro/strings.xml diff --git a/app/src/gplay/res/values-ru/strings.xml b/app-phone/src/gplay/res/values-ru/strings.xml similarity index 100% rename from app/src/gplay/res/values-ru/strings.xml rename to app-phone/src/gplay/res/values-ru/strings.xml diff --git a/app/src/gplay/res/values-sc-rIT/strings.xml b/app-phone/src/gplay/res/values-sc-rIT/strings.xml similarity index 100% rename from app/src/gplay/res/values-sc-rIT/strings.xml rename to app-phone/src/gplay/res/values-sc-rIT/strings.xml diff --git a/app/src/gplay/res/values-si-rLK/strings.xml b/app-phone/src/gplay/res/values-si-rLK/strings.xml similarity index 100% rename from app/src/gplay/res/values-si-rLK/strings.xml rename to app-phone/src/gplay/res/values-si-rLK/strings.xml diff --git a/app/src/gplay/res/values-sk/strings.xml b/app-phone/src/gplay/res/values-sk/strings.xml similarity index 100% rename from app/src/gplay/res/values-sk/strings.xml rename to app-phone/src/gplay/res/values-sk/strings.xml diff --git a/app/src/gplay/res/values-sl/strings.xml b/app-phone/src/gplay/res/values-sl/strings.xml similarity index 100% rename from app/src/gplay/res/values-sl/strings.xml rename to app-phone/src/gplay/res/values-sl/strings.xml diff --git a/app/src/gplay/res/values-sq-rAL/strings.xml b/app-phone/src/gplay/res/values-sq-rAL/strings.xml similarity index 100% rename from app/src/gplay/res/values-sq-rAL/strings.xml rename to app-phone/src/gplay/res/values-sq-rAL/strings.xml diff --git a/app/src/gplay/res/values-sr/strings.xml b/app-phone/src/gplay/res/values-sr/strings.xml similarity index 100% rename from app/src/gplay/res/values-sr/strings.xml rename to app-phone/src/gplay/res/values-sr/strings.xml diff --git a/app/src/gplay/res/values-sv/strings.xml b/app-phone/src/gplay/res/values-sv/strings.xml similarity index 100% rename from app/src/gplay/res/values-sv/strings.xml rename to app-phone/src/gplay/res/values-sv/strings.xml diff --git a/app/src/gplay/res/values-sw/strings.xml b/app-phone/src/gplay/res/values-sw/strings.xml similarity index 100% rename from app/src/gplay/res/values-sw/strings.xml rename to app-phone/src/gplay/res/values-sw/strings.xml diff --git a/app/src/gplay/res/values-ta-rIN/strings.xml b/app-phone/src/gplay/res/values-ta-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-ta-rIN/strings.xml rename to app-phone/src/gplay/res/values-ta-rIN/strings.xml diff --git a/app/src/gplay/res/values-te-rIN/strings.xml b/app-phone/src/gplay/res/values-te-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-te-rIN/strings.xml rename to app-phone/src/gplay/res/values-te-rIN/strings.xml diff --git a/app/src/gplay/res/values-th/strings.xml b/app-phone/src/gplay/res/values-th/strings.xml similarity index 100% rename from app/src/gplay/res/values-th/strings.xml rename to app-phone/src/gplay/res/values-th/strings.xml diff --git a/app/src/gplay/res/values-tr/strings.xml b/app-phone/src/gplay/res/values-tr/strings.xml similarity index 100% rename from app/src/gplay/res/values-tr/strings.xml rename to app-phone/src/gplay/res/values-tr/strings.xml diff --git a/app/src/gplay/res/values-uk/strings.xml b/app-phone/src/gplay/res/values-uk/strings.xml similarity index 100% rename from app/src/gplay/res/values-uk/strings.xml rename to app-phone/src/gplay/res/values-uk/strings.xml diff --git a/app/src/gplay/res/values-ur-rIN/strings.xml b/app-phone/src/gplay/res/values-ur-rIN/strings.xml similarity index 100% rename from app/src/gplay/res/values-ur-rIN/strings.xml rename to app-phone/src/gplay/res/values-ur-rIN/strings.xml diff --git a/app/src/gplay/res/values-uz/strings.xml b/app-phone/src/gplay/res/values-uz/strings.xml similarity index 100% rename from app/src/gplay/res/values-uz/strings.xml rename to app-phone/src/gplay/res/values-uz/strings.xml diff --git a/app/src/gplay/res/values-vi/strings.xml b/app-phone/src/gplay/res/values-vi/strings.xml similarity index 100% rename from app/src/gplay/res/values-vi/strings.xml rename to app-phone/src/gplay/res/values-vi/strings.xml diff --git a/app/src/gplay/res/values-zh-rCN/strings.xml b/app-phone/src/gplay/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/gplay/res/values-zh-rCN/strings.xml rename to app-phone/src/gplay/res/values-zh-rCN/strings.xml diff --git a/app/src/gplay/res/values-zh-rHK/strings.xml b/app-phone/src/gplay/res/values-zh-rHK/strings.xml similarity index 100% rename from app/src/gplay/res/values-zh-rHK/strings.xml rename to app-phone/src/gplay/res/values-zh-rHK/strings.xml diff --git a/app/src/gplay/res/values-zh-rTW/strings.xml b/app-phone/src/gplay/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/gplay/res/values-zh-rTW/strings.xml rename to app-phone/src/gplay/res/values-zh-rTW/strings.xml diff --git a/app/src/gplay/res/values-zu/strings.xml b/app-phone/src/gplay/res/values-zu/strings.xml similarity index 100% rename from app/src/gplay/res/values-zu/strings.xml rename to app-phone/src/gplay/res/values-zu/strings.xml diff --git a/app/src/gplay/res/values/strings.xml b/app-phone/src/gplay/res/values/strings.xml similarity index 100% rename from app/src/gplay/res/values/strings.xml rename to app-phone/src/gplay/res/values/strings.xml diff --git a/app/src/main/AndroidManifest.xml b/app-phone/src/main/AndroidManifest.xml similarity index 97% rename from app/src/main/AndroidManifest.xml rename to app-phone/src/main/AndroidManifest.xml index 981a2252..7b5ec653 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app-phone/src/main/AndroidManifest.xml @@ -7,13 +7,13 @@ - + @@ -21,7 +21,6 @@ android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" /> - + android:theme="@style/AppTheme"> diff --git a/app/src/main/ic_launcher-playstore.png b/app-phone/src/main/ic_launcher-playstore.png similarity index 100% rename from app/src/main/ic_launcher-playstore.png rename to app-phone/src/main/ic_launcher-playstore.png diff --git a/app/src/main/java/eu/darken/capod/App.kt b/app-phone/src/main/java/eu/darken/capod/App.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/App.kt rename to app-phone/src/main/java/eu/darken/capod/App.kt diff --git a/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt b/app-phone/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt rename to app-phone/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt diff --git a/app/src/main/java/eu/darken/capod/common/BuildWrap.kt b/app-phone/src/main/java/eu/darken/capod/common/BuildWrap.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/BuildWrap.kt rename to app-phone/src/main/java/eu/darken/capod/common/BuildWrap.kt diff --git a/app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/ByteArrayExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/ClipboardHelper.kt b/app-phone/src/main/java/eu/darken/capod/common/ClipboardHelper.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/ClipboardHelper.kt rename to app-phone/src/main/java/eu/darken/capod/common/ClipboardHelper.kt diff --git a/app/src/main/java/eu/darken/capod/common/ColorExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/ColorExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/ColorExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/ColorExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/ContextExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/ContextExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/ContextExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/ContextExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/EmailTool.kt b/app-phone/src/main/java/eu/darken/capod/common/EmailTool.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/EmailTool.kt rename to app-phone/src/main/java/eu/darken/capod/common/EmailTool.kt diff --git a/app/src/main/java/eu/darken/capod/common/InstallId.kt b/app-phone/src/main/java/eu/darken/capod/common/InstallId.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/InstallId.kt rename to app-phone/src/main/java/eu/darken/capod/common/InstallId.kt diff --git a/app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/LiveDataExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/MediaControl.kt b/app-phone/src/main/java/eu/darken/capod/common/MediaControl.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/MediaControl.kt rename to app-phone/src/main/java/eu/darken/capod/common/MediaControl.kt diff --git a/app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt b/app-phone/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt rename to app-phone/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt diff --git a/app/src/main/java/eu/darken/capod/common/SystemClockWrap.kt b/app-phone/src/main/java/eu/darken/capod/common/SystemClockWrap.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/SystemClockWrap.kt rename to app-phone/src/main/java/eu/darken/capod/common/SystemClockWrap.kt diff --git a/app/src/main/java/eu/darken/capod/common/UIConverter.kt b/app-phone/src/main/java/eu/darken/capod/common/UIConverter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/UIConverter.kt rename to app-phone/src/main/java/eu/darken/capod/common/UIConverter.kt diff --git a/app/src/main/java/eu/darken/capod/common/WebpageTool.kt b/app-phone/src/main/java/eu/darken/capod/common/WebpageTool.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/WebpageTool.kt rename to app-phone/src/main/java/eu/darken/capod/common/WebpageTool.kt diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanResult.kt diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/BleScanner.kt diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt similarity index 99% rename from app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt index 164703ea..f6c3215b 100644 --- a/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt +++ b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt @@ -20,7 +20,6 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.io.IOException -import java.util.* import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/BluetoothProfile2.kt diff --git a/app/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt b/app-phone/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt rename to app-phone/src/main/java/eu/darken/capod/common/bluetooth/FakeBleData.kt diff --git a/app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/collections/MapExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/compression/Zipper.kt b/app-phone/src/main/java/eu/darken/capod/common/compression/Zipper.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/compression/Zipper.kt rename to app-phone/src/main/java/eu/darken/capod/common/compression/Zipper.kt diff --git a/app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt b/app-phone/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt rename to app-phone/src/main/java/eu/darken/capod/common/coroutine/AppCoroutineScope.kt diff --git a/app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt b/app-phone/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt rename to app-phone/src/main/java/eu/darken/capod/common/coroutine/CoroutineModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt b/app-phone/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt rename to app-phone/src/main/java/eu/darken/capod/common/coroutine/DefaultDispatcherProvider.kt diff --git a/app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt b/app-phone/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt rename to app-phone/src/main/java/eu/darken/capod/common/coroutine/DispatcherProvider.kt diff --git a/app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt b/app-phone/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt rename to app-phone/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/Bugs.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/Bugs.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/Bugs.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/Bugs.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/logging/FileLogger.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogCatLogger.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/logging/LogExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/logging/Logging.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/Recorder.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/recording/core/RecorderService.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivity.kt diff --git a/app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt b/app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt rename to app-phone/src/main/java/eu/darken/capod/common/debug/recording/ui/RecorderActivityVM.kt diff --git a/app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt b/app-phone/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt rename to app-phone/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt diff --git a/app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt b/app-phone/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt rename to app-phone/src/main/java/eu/darken/capod/common/error/ErrorEventSource.kt diff --git a/app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt b/app-phone/src/main/java/eu/darken/capod/common/error/LocalizedError.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/error/LocalizedError.kt rename to app-phone/src/main/java/eu/darken/capod/common/error/LocalizedError.kt diff --git a/app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/error/ThrowableExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt b/app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt rename to app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt diff --git a/app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/flow/DynamicStateFlowExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/BindableVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/BindableVH.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/BindableVH.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/ListItem.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/ListItem.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/ListItem.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/ListItem.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt diff --git a/app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt b/app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt rename to app-phone/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt diff --git a/app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt b/app-phone/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt rename to app-phone/src/main/java/eu/darken/capod/common/livedata/SingleLiveEvent.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt b/app-phone/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt rename to app-phone/src/main/java/eu/darken/capod/common/notifications/PendingIntentCompat.kt diff --git a/app/src/main/java/eu/darken/capod/common/permissions/Permission.kt b/app-phone/src/main/java/eu/darken/capod/common/permissions/Permission.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/permissions/Permission.kt rename to app-phone/src/main/java/eu/darken/capod/common/permissions/Permission.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt similarity index 96% rename from app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt index 2c5b80ab..e042b761 100644 --- a/app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt +++ b/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt @@ -2,7 +2,7 @@ package eu.darken.capod.common.preferences import android.content.SharedPreferences import androidx.core.content.edit -import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE import eu.darken.capod.common.debug.logging.log import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt similarity index 97% rename from app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt index 5e184470..96aead1b 100644 --- a/app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt +++ b/app-phone/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreferenceDialogFragment.kt @@ -3,7 +3,8 @@ package eu.darken.capod.common.preferences import android.os.Bundle import android.view.Gravity import android.widget.LinearLayout -import android.widget.LinearLayout.* +import android.widget.LinearLayout.LayoutParams +import android.widget.LinearLayout.VERTICAL import android.widget.SeekBar import android.widget.TextView import androidx.appcompat.app.AlertDialog diff --git a/app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/Settings.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/Settings.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/Settings.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/Settings.kt diff --git a/app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt b/app-phone/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt rename to app-phone/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt b/app-phone/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt rename to app-phone/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Activity2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/Activity2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Activity2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/Activity2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/BottomSheetDialogFragment2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/Fragment2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/Fragment2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/Fragment3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/Fragment3.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Service2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/Service2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Service2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/Service2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel1.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt b/app-phone/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt rename to app-phone/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt diff --git a/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt b/app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt rename to app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt diff --git a/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt similarity index 96% rename from app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt index 8327ffe7..587749a1 100644 --- a/app/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt +++ b/app-phone/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt @@ -8,7 +8,8 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.viewbinding.ViewBinding -import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN import eu.darken.capod.common.debug.logging.log import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt b/app-phone/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt b/app-phone/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt rename to app-phone/src/main/java/eu/darken/capod/main/core/GeneralSettings.kt diff --git a/app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt b/app-phone/src/main/java/eu/darken/capod/main/core/MonitorMode.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/core/MonitorMode.kt rename to app-phone/src/main/java/eu/darken/capod/main/core/MonitorMode.kt diff --git a/app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt b/app-phone/src/main/java/eu/darken/capod/main/core/PermissionTool.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/core/PermissionTool.kt rename to app-phone/src/main/java/eu/darken/capod/main/core/PermissionTool.kt diff --git a/app/src/main/java/eu/darken/capod/main/core/ScannerMode.kt b/app-phone/src/main/java/eu/darken/capod/main/core/ScannerMode.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/core/ScannerMode.kt rename to app-phone/src/main/java/eu/darken/capod/main/core/ScannerMode.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/MainActivity.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/MainActivity.kt index f04e1b58..9ba57750 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/MainActivity.kt +++ b/app-phone/src/main/java/eu/darken/capod/main/ui/MainActivity.kt @@ -17,10 +17,10 @@ class MainActivity : Activity2() { private val navController by lazy { supportFragmentManager.findNavController(R.id.nav_host) } override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - installSplashScreen() + super.onCreate(savedInstanceState) + ui = MainActivityBinding.inflate(layoutInflater) setContentView(ui.root) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/MainActivityVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/BluetoothDisabledVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/MissingMainDeviceVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/PermissionCardVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/PodDeviceVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/UnknownPodDeviceCardVH.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/ModelSelectionDialogFactory.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorComponent.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorCoroutineScope.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorModule.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/MonitorScope.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/PodSorter.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/receiver/BluetoothEventReceiver.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorControl.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt similarity index 95% rename from app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt index d1b1f49c..9113505b 100644 --- a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt +++ b/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt @@ -10,7 +10,8 @@ import dagger.assisted.AssistedInject import dagger.hilt.EntryPoints import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.debug.Bugs -import eu.darken.capod.common.debug.logging.Logging.Priority.* +import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE +import eu.darken.capod.common.debug.logging.Logging.Priority.WARN import eu.darken.capod.common.debug.logging.asLog import eu.darken.capod.common.debug.logging.log import eu.darken.capod.common.debug.logging.logTag @@ -18,7 +19,9 @@ import eu.darken.capod.common.flow.setupCommonEventHandlers import eu.darken.capod.main.core.GeneralSettings import eu.darken.capod.main.core.MonitorMode import eu.darken.capod.main.core.PermissionTool -import eu.darken.capod.monitor.core.* +import eu.darken.capod.monitor.core.MonitorComponent +import eu.darken.capod.monitor.core.MonitorCoroutineScope +import eu.darken.capod.monitor.core.PodMonitor import eu.darken.capod.monitor.ui.MonitorNotifications import eu.darken.capod.reaction.ReactionHub import kotlinx.coroutines.CancellationException diff --git a/app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt b/app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorkerEntryPoint.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt b/app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt b/app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt rename to app-phone/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasCase.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasCase.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasCase.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetection.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasChargeDetectionDual.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasDualMicrophone.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetection.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasEarDetectionDual.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasPodStyle.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/HasStateDetection.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/PodDevice.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/PodDevice.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/PodDeviceExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/PodFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/PodFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/PodFactory.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/SinglePodDevice.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualAirPods.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/HasAppleColor.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFlex.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsX.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/Twsi99999.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/UnknownAppleDevice.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsPro.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ContinuityProtocol.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/apple/protocol/ProximityPairing.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDevice.kt diff --git a/app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt b/app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt rename to app-phone/src/main/java/eu/darken/capod/pods/core/unknown/UnknownDeviceFactory.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt b/app-phone/src/main/java/eu/darken/capod/reaction/ReactionHub.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/ReactionHub.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/ReactionHub.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt b/app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnect.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt b/app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/autoconnect/AutoConnectCondition.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt b/app-phone/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/playpause/PlayPause.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt b/app-phone/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/popup/PopUpReaction.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt b/app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpPodViewFactory.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt b/app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt similarity index 98% rename from app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt index 2180e26e..fcc22bb0 100644 --- a/app/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt +++ b/app-phone/src/main/java/eu/darken/capod/reaction/popup/ui/PopUpWindow.kt @@ -27,7 +27,7 @@ class PopUpWindow @Inject constructor( private val context = ContextThemeWrapper(appContext, R.style.AppTheme) private val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - private val windowManager: WindowManager = context.getSystemService(WINDOW_SERVICE) as WindowManager + private val windowManager: WindowManager = context.getSystemService(WINDOW_SERVICE) private val layoutParams = WindowManager.LayoutParams( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT, // Display it on top of other application windows diff --git a/app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt b/app-phone/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/settings/ReactionSettings.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt b/app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragment.kt diff --git a/app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt b/app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt rename to app-phone/src/main/java/eu/darken/capod/reaction/settings/ui/ReactionSettingsFragmentVM.kt diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app-phone/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to app-phone/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app-phone/src/main/res/drawable/ic_baseline_add_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_add_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_add_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_apps_24.xml b/app-phone/src/main/res/drawable/ic_baseline_apps_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_apps_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_apps_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app-phone/src/main/res/drawable/ic_baseline_arrow_back_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_arrow_back_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_arrow_back_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml b/app-phone/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml b/app-phone/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_bluetooth_searching_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_book_24.xml b/app-phone/src/main/res/drawable/ic_baseline_book_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_book_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_book_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_bug_report_24.xml b/app-phone/src/main/res/drawable/ic_baseline_bug_report_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_bug_report_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_bug_report_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_chat_24.xml b/app-phone/src/main/res/drawable/ic_baseline_chat_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_chat_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_chat_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_close_24.xml b/app-phone/src/main/res/drawable/ic_baseline_close_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_close_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_close_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_data_array_24.xml b/app-phone/src/main/res/drawable/ic_baseline_data_array_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_data_array_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_data_array_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_ghost_24.xml b/app-phone/src/main/res/drawable/ic_baseline_ghost_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_ghost_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_ghost_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_grid_view_24.xml b/app-phone/src/main/res/drawable/ic_baseline_grid_view_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_grid_view_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_grid_view_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_heart_24.xml b/app-phone/src/main/res/drawable/ic_baseline_heart_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_heart_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_heart_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_looks_one_24.xml b/app-phone/src/main/res/drawable/ic_baseline_looks_one_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_looks_one_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_looks_one_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_monitor_24.xml b/app-phone/src/main/res/drawable/ic_baseline_monitor_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_monitor_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_monitor_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_pause_circle_24.xml b/app-phone/src/main/res/drawable/ic_baseline_pause_circle_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_pause_circle_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_pause_circle_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_play_circle_24.xml b/app-phone/src/main/res/drawable/ic_baseline_play_circle_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_play_circle_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_play_circle_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_question_mark_24.xml b/app-phone/src/main/res/drawable/ic_baseline_question_mark_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_question_mark_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_question_mark_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_refresh_24.xml b/app-phone/src/main/res/drawable/ic_baseline_refresh_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_refresh_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_refresh_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_settings_24.xml b/app-phone/src/main/res/drawable/ic_baseline_settings_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_settings_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_settings_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/app-phone/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml b/app-phone/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_settings_input_antenna_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml b/app-phone/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_signal_cellular_alt_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_stars_24.xml b/app-phone/src/main/res/drawable/ic_baseline_stars_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_stars_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_stars_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_support_agent_24.xml b/app-phone/src/main/res/drawable/ic_baseline_support_agent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_support_agent_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_support_agent_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_text_snippet_24.xml b/app-phone/src/main/res/drawable/ic_baseline_text_snippet_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_text_snippet_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_text_snippet_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/app-phone/src/main/res/drawable/ic_baseline_translate_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_translate_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_translate_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_widgets_24.xml b/app-phone/src/main/res/drawable/ic_baseline_widgets_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_widgets_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_widgets_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_workspaces_24.xml b/app-phone/src/main/res/drawable/ic_baseline_workspaces_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_workspaces_24.xml rename to app-phone/src/main/res/drawable/ic_baseline_workspaces_24.xml diff --git a/app/src/main/res/drawable/ic_card_text_onsurface.xml b/app-phone/src/main/res/drawable/ic_card_text_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_card_text_onsurface.xml rename to app-phone/src/main/res/drawable/ic_card_text_onsurface.xml diff --git a/app/src/main/res/drawable/ic_changelog_onsurface.xml b/app-phone/src/main/res/drawable/ic_changelog_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_changelog_onsurface.xml rename to app-phone/src/main/res/drawable/ic_changelog_onsurface.xml diff --git a/app/src/main/res/drawable/ic_discord_onsurface.xml b/app-phone/src/main/res/drawable/ic_discord_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_discord_onsurface.xml rename to app-phone/src/main/res/drawable/ic_discord_onsurface.xml diff --git a/app/src/main/res/drawable/ic_email_onsurface.xml b/app-phone/src/main/res/drawable/ic_email_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_email_onsurface.xml rename to app-phone/src/main/res/drawable/ic_email_onsurface.xml diff --git a/app/src/main/res/drawable/ic_github_onsurface.xml b/app-phone/src/main/res/drawable/ic_github_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_github_onsurface.xml rename to app-phone/src/main/res/drawable/ic_github_onsurface.xml diff --git a/app/src/main/res/drawable/ic_heart.xml b/app-phone/src/main/res/drawable/ic_heart.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart.xml rename to app-phone/src/main/res/drawable/ic_heart.xml diff --git a/app/src/main/res/drawable/ic_id_onsurface.xml b/app-phone/src/main/res/drawable/ic_id_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_id_onsurface.xml rename to app-phone/src/main/res/drawable/ic_id_onsurface.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app-phone/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_background.xml rename to app-phone/src/main/res/drawable/ic_launcher_background.xml diff --git a/app/src/main/res/drawable/ic_notification_device_status_icon.xml b/app-phone/src/main/res/drawable/ic_notification_device_status_icon.xml similarity index 100% rename from app/src/main/res/drawable/ic_notification_device_status_icon.xml rename to app-phone/src/main/res/drawable/ic_notification_device_status_icon.xml diff --git a/app/src/main/res/drawable/ic_octocat_onsurface.xml b/app-phone/src/main/res/drawable/ic_octocat_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_octocat_onsurface.xml rename to app-phone/src/main/res/drawable/ic_octocat_onsurface.xml diff --git a/app/src/main/res/drawable/ic_spider_thread_onsurface.xml b/app-phone/src/main/res/drawable/ic_spider_thread_onsurface.xml similarity index 100% rename from app/src/main/res/drawable/ic_spider_thread_onsurface.xml rename to app-phone/src/main/res/drawable/ic_spider_thread_onsurface.xml diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app-phone/src/main/res/drawable/ic_twitter.xml similarity index 100% rename from app/src/main/res/drawable/ic_twitter.xml rename to app-phone/src/main/res/drawable/ic_twitter.xml diff --git a/app/src/main/res/drawable/splash_graphic.xml b/app-phone/src/main/res/drawable/splash_graphic.xml similarity index 100% rename from app/src/main/res/drawable/splash_graphic.xml rename to app-phone/src/main/res/drawable/splash_graphic.xml diff --git a/app/src/main/res/drawable/splash_graphic2.xml b/app-phone/src/main/res/drawable/splash_graphic2.xml similarity index 100% rename from app/src/main/res/drawable/splash_graphic2.xml rename to app-phone/src/main/res/drawable/splash_graphic2.xml diff --git a/app/src/main/res/drawable/splash_screen.xml b/app-phone/src/main/res/drawable/splash_screen.xml similarity index 100% rename from app/src/main/res/drawable/splash_screen.xml rename to app-phone/src/main/res/drawable/splash_screen.xml diff --git a/app/src/main/res/layout/debug_recording_activity.xml b/app-phone/src/main/res/layout/debug_recording_activity.xml similarity index 100% rename from app/src/main/res/layout/debug_recording_activity.xml rename to app-phone/src/main/res/layout/debug_recording_activity.xml diff --git a/app/src/main/res/layout/main_activity.xml b/app-phone/src/main/res/layout/main_activity.xml similarity index 100% rename from app/src/main/res/layout/main_activity.xml rename to app-phone/src/main/res/layout/main_activity.xml diff --git a/app/src/main/res/layout/main_fragment.xml b/app-phone/src/main/res/layout/main_fragment.xml similarity index 100% rename from app/src/main/res/layout/main_fragment.xml rename to app-phone/src/main/res/layout/main_fragment.xml diff --git a/app/src/main/res/layout/monitor_notification_dual_pods_small.xml b/app-phone/src/main/res/layout/monitor_notification_dual_pods_small.xml similarity index 100% rename from app/src/main/res/layout/monitor_notification_dual_pods_small.xml rename to app-phone/src/main/res/layout/monitor_notification_dual_pods_small.xml diff --git a/app/src/main/res/layout/monitor_notification_single_pods_small.xml b/app-phone/src/main/res/layout/monitor_notification_single_pods_small.xml similarity index 100% rename from app/src/main/res/layout/monitor_notification_single_pods_small.xml rename to app-phone/src/main/res/layout/monitor_notification_single_pods_small.xml diff --git a/app/src/main/res/layout/monitor_notification_unknown_device_small.xml b/app-phone/src/main/res/layout/monitor_notification_unknown_device_small.xml similarity index 100% rename from app/src/main/res/layout/monitor_notification_unknown_device_small.xml rename to app-phone/src/main/res/layout/monitor_notification_unknown_device_small.xml diff --git a/app/src/main/res/layout/overview_bluetooth_disabled_item.xml b/app-phone/src/main/res/layout/overview_bluetooth_disabled_item.xml similarity index 100% rename from app/src/main/res/layout/overview_bluetooth_disabled_item.xml rename to app-phone/src/main/res/layout/overview_bluetooth_disabled_item.xml diff --git a/app/src/main/res/layout/overview_nomaindevice_item.xml b/app-phone/src/main/res/layout/overview_nomaindevice_item.xml similarity index 100% rename from app/src/main/res/layout/overview_nomaindevice_item.xml rename to app-phone/src/main/res/layout/overview_nomaindevice_item.xml diff --git a/app/src/main/res/layout/overview_permission_item.xml b/app-phone/src/main/res/layout/overview_permission_item.xml similarity index 100% rename from app/src/main/res/layout/overview_permission_item.xml rename to app-phone/src/main/res/layout/overview_permission_item.xml diff --git a/app/src/main/res/layout/overview_pods_dual_item.xml b/app-phone/src/main/res/layout/overview_pods_dual_item.xml similarity index 100% rename from app/src/main/res/layout/overview_pods_dual_item.xml rename to app-phone/src/main/res/layout/overview_pods_dual_item.xml diff --git a/app/src/main/res/layout/overview_pods_single_item.xml b/app-phone/src/main/res/layout/overview_pods_single_item.xml similarity index 100% rename from app/src/main/res/layout/overview_pods_single_item.xml rename to app-phone/src/main/res/layout/overview_pods_single_item.xml diff --git a/app/src/main/res/layout/overview_pods_unknown_item.xml b/app-phone/src/main/res/layout/overview_pods_unknown_item.xml similarity index 100% rename from app/src/main/res/layout/overview_pods_unknown_item.xml rename to app-phone/src/main/res/layout/overview_pods_unknown_item.xml diff --git a/app/src/main/res/layout/popup_notification_dual_pods.xml b/app-phone/src/main/res/layout/popup_notification_dual_pods.xml similarity index 100% rename from app/src/main/res/layout/popup_notification_dual_pods.xml rename to app-phone/src/main/res/layout/popup_notification_dual_pods.xml diff --git a/app/src/main/res/layout/popup_notification_single_pods.xml b/app-phone/src/main/res/layout/popup_notification_single_pods.xml similarity index 100% rename from app/src/main/res/layout/popup_notification_single_pods.xml rename to app-phone/src/main/res/layout/popup_notification_single_pods.xml diff --git a/app/src/main/res/layout/popup_window_container_layout.xml b/app-phone/src/main/res/layout/popup_window_container_layout.xml similarity index 100% rename from app/src/main/res/layout/popup_window_container_layout.xml rename to app-phone/src/main/res/layout/popup_window_container_layout.xml diff --git a/app/src/main/res/layout/settings_fragment.xml b/app-phone/src/main/res/layout/settings_fragment.xml similarity index 100% rename from app/src/main/res/layout/settings_fragment.xml rename to app-phone/src/main/res/layout/settings_fragment.xml diff --git a/app/src/main/res/menu/main.xml b/app-phone/src/main/res/menu/main.xml similarity index 100% rename from app/src/main/res/menu/main.xml rename to app-phone/src/main/res/menu/main.xml diff --git a/app/src/main/res/menu/menu_settings_index.xml b/app-phone/src/main/res/menu/menu_settings_index.xml similarity index 100% rename from app/src/main/res/menu/menu_settings_index.xml rename to app-phone/src/main/res/menu/menu_settings_index.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app-phone/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app-phone/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to app-phone/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-phone/src/main/res/mipmap-hdpi/ic_launcher_background.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_background.png rename to app-phone/src/main/res/mipmap-hdpi/ic_launcher_background.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-phone/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to app-phone/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app-phone/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to app-phone/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app-phone/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to app-phone/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-phone/src/main/res/mipmap-mdpi/ic_launcher_background.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_background.png rename to app-phone/src/main/res/mipmap-mdpi/ic_launcher_background.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-phone/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to app-phone/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app-phone/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to app-phone/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-phone/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app-phone/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_background.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_background.png rename to app-phone/src/main/res/mipmap-xhdpi/ic_launcher_background.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to app-phone/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app-phone/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to app-phone/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app-phone/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_background.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png rename to app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_background.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to app-phone/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png rename to app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app-phone/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/navigation/nav_graph.xml b/app-phone/src/main/res/navigation/nav_graph.xml similarity index 100% rename from app/src/main/res/navigation/nav_graph.xml rename to app-phone/src/main/res/navigation/nav_graph.xml diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app-phone/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from app/src/main/res/values-af-rZA/strings.xml rename to app-phone/src/main/res/values-af-rZA/strings.xml diff --git a/app/src/main/res/values-am/strings.xml b/app-phone/src/main/res/values-am/strings.xml similarity index 100% rename from app/src/main/res/values-am/strings.xml rename to app-phone/src/main/res/values-am/strings.xml diff --git a/app/src/main/res/values-ar/strings.xml b/app-phone/src/main/res/values-ar/strings.xml similarity index 100% rename from app/src/main/res/values-ar/strings.xml rename to app-phone/src/main/res/values-ar/strings.xml diff --git a/app/src/main/res/values-az/strings.xml b/app-phone/src/main/res/values-az/strings.xml similarity index 100% rename from app/src/main/res/values-az/strings.xml rename to app-phone/src/main/res/values-az/strings.xml diff --git a/app/src/main/res/values-be/strings.xml b/app-phone/src/main/res/values-be/strings.xml similarity index 100% rename from app/src/main/res/values-be/strings.xml rename to app-phone/src/main/res/values-be/strings.xml diff --git a/app/src/main/res/values-bg/strings.xml b/app-phone/src/main/res/values-bg/strings.xml similarity index 100% rename from app/src/main/res/values-bg/strings.xml rename to app-phone/src/main/res/values-bg/strings.xml diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app-phone/src/main/res/values-bn-rBD/strings.xml similarity index 100% rename from app/src/main/res/values-bn-rBD/strings.xml rename to app-phone/src/main/res/values-bn-rBD/strings.xml diff --git a/app/src/main/res/values-ca/strings.xml b/app-phone/src/main/res/values-ca/strings.xml similarity index 100% rename from app/src/main/res/values-ca/strings.xml rename to app-phone/src/main/res/values-ca/strings.xml diff --git a/app/src/main/res/values-cs/strings.xml b/app-phone/src/main/res/values-cs/strings.xml similarity index 100% rename from app/src/main/res/values-cs/strings.xml rename to app-phone/src/main/res/values-cs/strings.xml diff --git a/app/src/main/res/values-da/strings.xml b/app-phone/src/main/res/values-da/strings.xml similarity index 100% rename from app/src/main/res/values-da/strings.xml rename to app-phone/src/main/res/values-da/strings.xml diff --git a/app/src/main/res/values-de/strings.xml b/app-phone/src/main/res/values-de/strings.xml similarity index 100% rename from app/src/main/res/values-de/strings.xml rename to app-phone/src/main/res/values-de/strings.xml diff --git a/app/src/main/res/values-el/strings.xml b/app-phone/src/main/res/values-el/strings.xml similarity index 100% rename from app/src/main/res/values-el/strings.xml rename to app-phone/src/main/res/values-el/strings.xml diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app-phone/src/main/res/values-es-rAR/strings.xml similarity index 100% rename from app/src/main/res/values-es-rAR/strings.xml rename to app-phone/src/main/res/values-es-rAR/strings.xml diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app-phone/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from app/src/main/res/values-es-rMX/strings.xml rename to app-phone/src/main/res/values-es-rMX/strings.xml diff --git a/app/src/main/res/values-es/strings.xml b/app-phone/src/main/res/values-es/strings.xml similarity index 100% rename from app/src/main/res/values-es/strings.xml rename to app-phone/src/main/res/values-es/strings.xml diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app-phone/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from app/src/main/res/values-et-rEE/strings.xml rename to app-phone/src/main/res/values-et-rEE/strings.xml diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app-phone/src/main/res/values-eu-rES/strings.xml similarity index 100% rename from app/src/main/res/values-eu-rES/strings.xml rename to app-phone/src/main/res/values-eu-rES/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/app-phone/src/main/res/values-fa/strings.xml similarity index 100% rename from app/src/main/res/values-fa/strings.xml rename to app-phone/src/main/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fi/strings.xml b/app-phone/src/main/res/values-fi/strings.xml similarity index 100% rename from app/src/main/res/values-fi/strings.xml rename to app-phone/src/main/res/values-fi/strings.xml diff --git a/app/src/main/res/values-fil/strings.xml b/app-phone/src/main/res/values-fil/strings.xml similarity index 100% rename from app/src/main/res/values-fil/strings.xml rename to app-phone/src/main/res/values-fil/strings.xml diff --git a/app/src/main/res/values-fr/strings.xml b/app-phone/src/main/res/values-fr/strings.xml similarity index 100% rename from app/src/main/res/values-fr/strings.xml rename to app-phone/src/main/res/values-fr/strings.xml diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app-phone/src/main/res/values-gl-rES/strings.xml similarity index 100% rename from app/src/main/res/values-gl-rES/strings.xml rename to app-phone/src/main/res/values-gl-rES/strings.xml diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app-phone/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-hi-rIN/strings.xml rename to app-phone/src/main/res/values-hi-rIN/strings.xml diff --git a/app/src/main/res/values-hr/strings.xml b/app-phone/src/main/res/values-hr/strings.xml similarity index 100% rename from app/src/main/res/values-hr/strings.xml rename to app-phone/src/main/res/values-hr/strings.xml diff --git a/app/src/main/res/values-hu/strings.xml b/app-phone/src/main/res/values-hu/strings.xml similarity index 100% rename from app/src/main/res/values-hu/strings.xml rename to app-phone/src/main/res/values-hu/strings.xml diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app-phone/src/main/res/values-hy-rAM/strings.xml similarity index 100% rename from app/src/main/res/values-hy-rAM/strings.xml rename to app-phone/src/main/res/values-hy-rAM/strings.xml diff --git a/app/src/main/res/values-in/strings.xml b/app-phone/src/main/res/values-in/strings.xml similarity index 100% rename from app/src/main/res/values-in/strings.xml rename to app-phone/src/main/res/values-in/strings.xml diff --git a/app/src/main/res/values-is/strings.xml b/app-phone/src/main/res/values-is/strings.xml similarity index 100% rename from app/src/main/res/values-is/strings.xml rename to app-phone/src/main/res/values-is/strings.xml diff --git a/app/src/main/res/values-it/strings.xml b/app-phone/src/main/res/values-it/strings.xml similarity index 100% rename from app/src/main/res/values-it/strings.xml rename to app-phone/src/main/res/values-it/strings.xml diff --git a/app/src/main/res/values-iw/strings.xml b/app-phone/src/main/res/values-iw/strings.xml similarity index 100% rename from app/src/main/res/values-iw/strings.xml rename to app-phone/src/main/res/values-iw/strings.xml diff --git a/app/src/main/res/values-ja/strings.xml b/app-phone/src/main/res/values-ja/strings.xml similarity index 100% rename from app/src/main/res/values-ja/strings.xml rename to app-phone/src/main/res/values-ja/strings.xml diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app-phone/src/main/res/values-ka-rGE/strings.xml similarity index 100% rename from app/src/main/res/values-ka-rGE/strings.xml rename to app-phone/src/main/res/values-ka-rGE/strings.xml diff --git a/app/src/main/res/values-km-rKH/strings.xml b/app-phone/src/main/res/values-km-rKH/strings.xml similarity index 100% rename from app/src/main/res/values-km-rKH/strings.xml rename to app-phone/src/main/res/values-km-rKH/strings.xml diff --git a/app/src/main/res/values-kmr-rTR/strings.xml b/app-phone/src/main/res/values-kmr-rTR/strings.xml similarity index 100% rename from app/src/main/res/values-kmr-rTR/strings.xml rename to app-phone/src/main/res/values-kmr-rTR/strings.xml diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app-phone/src/main/res/values-kn-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-kn-rIN/strings.xml rename to app-phone/src/main/res/values-kn-rIN/strings.xml diff --git a/app/src/main/res/values-ko/strings.xml b/app-phone/src/main/res/values-ko/strings.xml similarity index 100% rename from app/src/main/res/values-ko/strings.xml rename to app-phone/src/main/res/values-ko/strings.xml diff --git a/app/src/main/res/values-ky-rKG/strings.xml b/app-phone/src/main/res/values-ky-rKG/strings.xml similarity index 100% rename from app/src/main/res/values-ky-rKG/strings.xml rename to app-phone/src/main/res/values-ky-rKG/strings.xml diff --git a/app/src/main/res/values-lo-rLA/strings.xml b/app-phone/src/main/res/values-lo-rLA/strings.xml similarity index 100% rename from app/src/main/res/values-lo-rLA/strings.xml rename to app-phone/src/main/res/values-lo-rLA/strings.xml diff --git a/app/src/main/res/values-lt/strings.xml b/app-phone/src/main/res/values-lt/strings.xml similarity index 100% rename from app/src/main/res/values-lt/strings.xml rename to app-phone/src/main/res/values-lt/strings.xml diff --git a/app/src/main/res/values-lv/strings.xml b/app-phone/src/main/res/values-lv/strings.xml similarity index 100% rename from app/src/main/res/values-lv/strings.xml rename to app-phone/src/main/res/values-lv/strings.xml diff --git a/app/src/main/res/values-mk-rMK/strings.xml b/app-phone/src/main/res/values-mk-rMK/strings.xml similarity index 100% rename from app/src/main/res/values-mk-rMK/strings.xml rename to app-phone/src/main/res/values-mk-rMK/strings.xml diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app-phone/src/main/res/values-ml-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-ml-rIN/strings.xml rename to app-phone/src/main/res/values-ml-rIN/strings.xml diff --git a/app/src/main/res/values-mn-rMN/strings.xml b/app-phone/src/main/res/values-mn-rMN/strings.xml similarity index 100% rename from app/src/main/res/values-mn-rMN/strings.xml rename to app-phone/src/main/res/values-mn-rMN/strings.xml diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app-phone/src/main/res/values-mr-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-mr-rIN/strings.xml rename to app-phone/src/main/res/values-mr-rIN/strings.xml diff --git a/app/src/main/res/values-ms/strings.xml b/app-phone/src/main/res/values-ms/strings.xml similarity index 100% rename from app/src/main/res/values-ms/strings.xml rename to app-phone/src/main/res/values-ms/strings.xml diff --git a/app/src/main/res/values-my-rMM/strings.xml b/app-phone/src/main/res/values-my-rMM/strings.xml similarity index 100% rename from app/src/main/res/values-my-rMM/strings.xml rename to app-phone/src/main/res/values-my-rMM/strings.xml diff --git a/app/src/main/res/values-ne-rNP/strings.xml b/app-phone/src/main/res/values-ne-rNP/strings.xml similarity index 100% rename from app/src/main/res/values-ne-rNP/strings.xml rename to app-phone/src/main/res/values-ne-rNP/strings.xml diff --git a/app/src/main/res/values-night/themes.xml b/app-phone/src/main/res/values-night/themes.xml similarity index 100% rename from app/src/main/res/values-night/themes.xml rename to app-phone/src/main/res/values-night/themes.xml diff --git a/app/src/main/res/values-nl/strings.xml b/app-phone/src/main/res/values-nl/strings.xml similarity index 100% rename from app/src/main/res/values-nl/strings.xml rename to app-phone/src/main/res/values-nl/strings.xml diff --git a/app/src/main/res/values-no/strings.xml b/app-phone/src/main/res/values-no/strings.xml similarity index 100% rename from app/src/main/res/values-no/strings.xml rename to app-phone/src/main/res/values-no/strings.xml diff --git a/app/src/main/res/values-pl/strings.xml b/app-phone/src/main/res/values-pl/strings.xml similarity index 100% rename from app/src/main/res/values-pl/strings.xml rename to app-phone/src/main/res/values-pl/strings.xml diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app-phone/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/strings.xml rename to app-phone/src/main/res/values-pt-rBR/strings.xml diff --git a/app/src/main/res/values-pt/strings.xml b/app-phone/src/main/res/values-pt/strings.xml similarity index 100% rename from app/src/main/res/values-pt/strings.xml rename to app-phone/src/main/res/values-pt/strings.xml diff --git a/app/src/main/res/values-rm/strings.xml b/app-phone/src/main/res/values-rm/strings.xml similarity index 100% rename from app/src/main/res/values-rm/strings.xml rename to app-phone/src/main/res/values-rm/strings.xml diff --git a/app/src/main/res/values-ro/strings.xml b/app-phone/src/main/res/values-ro/strings.xml similarity index 100% rename from app/src/main/res/values-ro/strings.xml rename to app-phone/src/main/res/values-ro/strings.xml diff --git a/app/src/main/res/values-ru/strings.xml b/app-phone/src/main/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/strings.xml rename to app-phone/src/main/res/values-ru/strings.xml diff --git a/app/src/main/res/values-sc-rIT/strings.xml b/app-phone/src/main/res/values-sc-rIT/strings.xml similarity index 100% rename from app/src/main/res/values-sc-rIT/strings.xml rename to app-phone/src/main/res/values-sc-rIT/strings.xml diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app-phone/src/main/res/values-si-rLK/strings.xml similarity index 100% rename from app/src/main/res/values-si-rLK/strings.xml rename to app-phone/src/main/res/values-si-rLK/strings.xml diff --git a/app/src/main/res/values-sk/strings.xml b/app-phone/src/main/res/values-sk/strings.xml similarity index 100% rename from app/src/main/res/values-sk/strings.xml rename to app-phone/src/main/res/values-sk/strings.xml diff --git a/app/src/main/res/values-sl/strings.xml b/app-phone/src/main/res/values-sl/strings.xml similarity index 100% rename from app/src/main/res/values-sl/strings.xml rename to app-phone/src/main/res/values-sl/strings.xml diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app-phone/src/main/res/values-sq-rAL/strings.xml similarity index 100% rename from app/src/main/res/values-sq-rAL/strings.xml rename to app-phone/src/main/res/values-sq-rAL/strings.xml diff --git a/app/src/main/res/values-sr/strings.xml b/app-phone/src/main/res/values-sr/strings.xml similarity index 100% rename from app/src/main/res/values-sr/strings.xml rename to app-phone/src/main/res/values-sr/strings.xml diff --git a/app/src/main/res/values-sv/strings.xml b/app-phone/src/main/res/values-sv/strings.xml similarity index 100% rename from app/src/main/res/values-sv/strings.xml rename to app-phone/src/main/res/values-sv/strings.xml diff --git a/app/src/main/res/values-sw/strings.xml b/app-phone/src/main/res/values-sw/strings.xml similarity index 100% rename from app/src/main/res/values-sw/strings.xml rename to app-phone/src/main/res/values-sw/strings.xml diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app-phone/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-ta-rIN/strings.xml rename to app-phone/src/main/res/values-ta-rIN/strings.xml diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app-phone/src/main/res/values-te-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-te-rIN/strings.xml rename to app-phone/src/main/res/values-te-rIN/strings.xml diff --git a/app/src/main/res/values-th/strings.xml b/app-phone/src/main/res/values-th/strings.xml similarity index 100% rename from app/src/main/res/values-th/strings.xml rename to app-phone/src/main/res/values-th/strings.xml diff --git a/app/src/main/res/values-tr/strings.xml b/app-phone/src/main/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/strings.xml rename to app-phone/src/main/res/values-tr/strings.xml diff --git a/app/src/main/res/values-uk/strings.xml b/app-phone/src/main/res/values-uk/strings.xml similarity index 100% rename from app/src/main/res/values-uk/strings.xml rename to app-phone/src/main/res/values-uk/strings.xml diff --git a/app/src/main/res/values-ur-rIN/strings.xml b/app-phone/src/main/res/values-ur-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-ur-rIN/strings.xml rename to app-phone/src/main/res/values-ur-rIN/strings.xml diff --git a/app/src/main/res/values-uz/strings.xml b/app-phone/src/main/res/values-uz/strings.xml similarity index 100% rename from app/src/main/res/values-uz/strings.xml rename to app-phone/src/main/res/values-uz/strings.xml diff --git a/app/src/main/res/values-vi/strings.xml b/app-phone/src/main/res/values-vi/strings.xml similarity index 100% rename from app/src/main/res/values-vi/strings.xml rename to app-phone/src/main/res/values-vi/strings.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app-phone/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to app-phone/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app-phone/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rHK/strings.xml rename to app-phone/src/main/res/values-zh-rHK/strings.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app-phone/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to app-phone/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values-zu/strings.xml b/app-phone/src/main/res/values-zu/strings.xml similarity index 100% rename from app/src/main/res/values-zu/strings.xml rename to app-phone/src/main/res/values-zu/strings.xml diff --git a/app/src/main/res/values/attrs.xml b/app-phone/src/main/res/values/attrs.xml similarity index 100% rename from app/src/main/res/values/attrs.xml rename to app-phone/src/main/res/values/attrs.xml diff --git a/app/src/main/res/values/colors.xml b/app-phone/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to app-phone/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/dimens.xml b/app-phone/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to app-phone/src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/strings.xml b/app-phone/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to app-phone/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/app-phone/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to app-phone/src/main/res/values/styles.xml diff --git a/app/src/main/res/values/themes.xml b/app-phone/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to app-phone/src/main/res/values/themes.xml diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app-phone/src/main/res/xml/file_provider_paths.xml similarity index 100% rename from app/src/main/res/xml/file_provider_paths.xml rename to app-phone/src/main/res/xml/file_provider_paths.xml diff --git a/app/src/main/res/xml/preferences_acknowledgements.xml b/app-phone/src/main/res/xml/preferences_acknowledgements.xml similarity index 100% rename from app/src/main/res/xml/preferences_acknowledgements.xml rename to app-phone/src/main/res/xml/preferences_acknowledgements.xml diff --git a/app/src/main/res/xml/preferences_debug.xml b/app-phone/src/main/res/xml/preferences_debug.xml similarity index 100% rename from app/src/main/res/xml/preferences_debug.xml rename to app-phone/src/main/res/xml/preferences_debug.xml diff --git a/app/src/main/res/xml/preferences_general.xml b/app-phone/src/main/res/xml/preferences_general.xml similarity index 100% rename from app/src/main/res/xml/preferences_general.xml rename to app-phone/src/main/res/xml/preferences_general.xml diff --git a/app/src/main/res/xml/preferences_index.xml b/app-phone/src/main/res/xml/preferences_index.xml similarity index 100% rename from app/src/main/res/xml/preferences_index.xml rename to app-phone/src/main/res/xml/preferences_index.xml diff --git a/app/src/main/res/xml/preferences_reactions.xml b/app-phone/src/main/res/xml/preferences_reactions.xml similarity index 100% rename from app/src/main/res/xml/preferences_reactions.xml rename to app-phone/src/main/res/xml/preferences_reactions.xml diff --git a/app/src/main/res/xml/preferences_support.xml b/app-phone/src/main/res/xml/preferences_support.xml similarity index 100% rename from app/src/main/res/xml/preferences_support.xml rename to app-phone/src/main/res/xml/preferences_support.xml diff --git a/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt b/app-phone/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt similarity index 86% rename from app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt rename to app-phone/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt index 1885b051..f2fc3f65 100644 --- a/app/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt +++ b/app-phone/src/test/java/eu/darken/capod/common/flow/DynamicStateFlowTest.kt @@ -11,7 +11,9 @@ import io.mockk.mockk import kotlinx.coroutines.* import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.firstOrNull -import kotlinx.coroutines.test.TestCoroutineScope +import kotlinx.coroutines.test.TestCoroutineDispatcher +import kotlinx.coroutines.test.TestCoroutineExceptionHandler +import kotlinx.coroutines.test.createTestCoroutineScope import org.junit.jupiter.api.Test import testhelper.BaseTest import testhelper.coroutine.runBlockingTest2 @@ -25,7 +27,8 @@ class DynamicStateFlowTest : BaseTest() { // Without an init value, there isn't a way to keep using the flow @Test fun `exceptions on initialization are rethrown`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", parentScope = testScope, @@ -46,7 +49,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `subscription doesn't end when no subscriber is collecting, mode Lazily`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val valueProvider = mockk String>() coEvery { valueProvider.invoke(any()) } returns "Test" @@ -68,7 +72,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `value updates`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val valueProvider = mockk Long>() coEvery { valueProvider.invoke(any()) } returns 1 @@ -107,7 +112,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `check multi threading value updates with more complex data`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val valueProvider = mockk Map>() coEvery { valueProvider.invoke(any()) } returns mapOf("data" to TestData()) @@ -144,7 +150,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `only emit new values if they actually changed updates`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", @@ -168,7 +175,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `multiple subscribers share the flow`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val valueProvider = mockk String>() coEvery { valueProvider.invoke(any()) } returns "Test" @@ -242,7 +250,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `blocking update is actually blocking`() = runBlocking { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", parentScope = testScope, @@ -272,7 +281,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `blocking update rethrows error`() = runBlocking { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", parentScope = testScope, @@ -302,7 +312,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `async updates error handler`() { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", @@ -324,7 +335,8 @@ class DynamicStateFlowTest : BaseTest() { @Test fun `async updates rethrow errors on HotDataFlow scope if no error handler is set`() = runBlocking { - val testScope = TestCoroutineScope() + val testScope = + createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) val hotData = DynamicStateFlow( loggingTag = "tag", diff --git a/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt b/app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt rename to app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiTest.kt diff --git a/app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt b/app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt rename to app-phone/src/test/java/eu/darken/capod/common/preferences/FlowPreferenceTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/AirPodsFactoryTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/BaseAirPodsTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/BasicSingleApplePodsTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/DualApplePodsTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen1Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen2Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsProTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsFlexText.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsSolo3Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsStudio3Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/BeatsXTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeats3Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsProTest.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/Twsi99999Test.kt diff --git a/app/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt b/app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt similarity index 100% rename from app/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt rename to app-phone/src/test/java/eu/darken/capod/pods/core/apple/misc/VarunrAirPodsProTest.kt diff --git a/app/src/test/java/testhelper/BaseTest.kt b/app-phone/src/test/java/testhelper/BaseTest.kt similarity index 100% rename from app/src/test/java/testhelper/BaseTest.kt rename to app-phone/src/test/java/testhelper/BaseTest.kt diff --git a/app/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt b/app-phone/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt similarity index 70% rename from app/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt rename to app-phone/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt index 900333f2..3364bbd9 100644 --- a/app/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt +++ b/app-phone/src/test/java/testhelper/coroutine/CoroutinesTestExtension.kt @@ -2,10 +2,7 @@ package testhelper.coroutine import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestCoroutineDispatcher -import kotlinx.coroutines.test.TestCoroutineScope -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.setMain +import kotlinx.coroutines.test.* import org.junit.jupiter.api.extension.AfterEachCallback import org.junit.jupiter.api.extension.BeforeEachCallback import org.junit.jupiter.api.extension.ExtensionContext @@ -13,7 +10,8 @@ import org.junit.jupiter.api.extension.ExtensionContext @ExperimentalCoroutinesApi class CoroutinesTestExtension( private val dispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher() -) : BeforeEachCallback, AfterEachCallback, TestCoroutineScope by TestCoroutineScope(dispatcher) { +) : BeforeEachCallback, AfterEachCallback, + TestCoroutineScope by createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + dispatcher) { override fun beforeEach(context: ExtensionContext?) { Dispatchers.setMain(dispatcher) diff --git a/app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt b/app-phone/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt similarity index 100% rename from app/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt rename to app-phone/src/test/java/testhelper/coroutine/TestDispatcherProvider.kt diff --git a/app/src/test/java/testhelper/coroutine/TestExtensions.kt b/app-phone/src/test/java/testhelper/coroutine/TestExtensions.kt similarity index 100% rename from app/src/test/java/testhelper/coroutine/TestExtensions.kt rename to app-phone/src/test/java/testhelper/coroutine/TestExtensions.kt diff --git a/app/src/test/java/testhelper/flow/FlowTest.kt b/app-phone/src/test/java/testhelper/flow/FlowTest.kt similarity index 89% rename from app/src/test/java/testhelper/flow/FlowTest.kt rename to app-phone/src/test/java/testhelper/flow/FlowTest.kt index 46191a3c..4730ae04 100644 --- a/app/src/test/java/testhelper/flow/FlowTest.kt +++ b/app-phone/src/test/java/testhelper/flow/FlowTest.kt @@ -8,11 +8,13 @@ import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.* import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import kotlinx.coroutines.test.TestCoroutineScope +import kotlinx.coroutines.test.TestCoroutineDispatcher +import kotlinx.coroutines.test.TestCoroutineExceptionHandler +import kotlinx.coroutines.test.createTestCoroutineScope fun Flow.test( tag: String? = null, - startOnScope: CoroutineScope = TestCoroutineScope() + startOnScope: CoroutineScope = createTestCoroutineScope(TestCoroutineDispatcher() + TestCoroutineExceptionHandler() + EmptyCoroutineContext) ): TestCollector = createTest(tag ?: "FlowTest").start(scope = startOnScope) fun Flow.createTest( diff --git a/app/src/test/java/testhelper/json/JsonExtensions.kt b/app-phone/src/test/java/testhelper/json/JsonExtensions.kt similarity index 100% rename from app/src/test/java/testhelper/json/JsonExtensions.kt rename to app-phone/src/test/java/testhelper/json/JsonExtensions.kt diff --git a/app/src/test/java/testhelper/livedata/InstantExecutorExtension.kt b/app-phone/src/test/java/testhelper/livedata/InstantExecutorExtension.kt similarity index 100% rename from app/src/test/java/testhelper/livedata/InstantExecutorExtension.kt rename to app-phone/src/test/java/testhelper/livedata/InstantExecutorExtension.kt diff --git a/app/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt b/app-phone/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt similarity index 100% rename from app/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt rename to app-phone/src/test/java/testhelper/preferences/MockSharedPreferencesTest.kt diff --git a/app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt b/app-phone/src/testShared/java/testhelpers/BaseTestInstrumentation.kt similarity index 100% rename from app/src/testShared/java/testhelpers/BaseTestInstrumentation.kt rename to app-phone/src/testShared/java/testhelpers/BaseTestInstrumentation.kt diff --git a/app/src/testShared/java/testhelpers/IsAUnitTest.kt b/app-phone/src/testShared/java/testhelpers/IsAUnitTest.kt similarity index 100% rename from app/src/testShared/java/testhelpers/IsAUnitTest.kt rename to app-phone/src/testShared/java/testhelpers/IsAUnitTest.kt diff --git a/app/src/testShared/java/testhelpers/logging/JUnitLogger.kt b/app-phone/src/testShared/java/testhelpers/logging/JUnitLogger.kt similarity index 100% rename from app/src/testShared/java/testhelpers/logging/JUnitLogger.kt rename to app-phone/src/testShared/java/testhelpers/logging/JUnitLogger.kt diff --git a/app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt b/app-phone/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt similarity index 100% rename from app/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt rename to app-phone/src/testShared/java/testhelpers/preferences/MockFlowPreference.kt diff --git a/app/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt b/app-phone/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt similarity index 100% rename from app/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt rename to app-phone/src/testShared/java/testhelpers/preferences/MockSharedPreferences.kt diff --git a/app-wearos/.gitignore b/app-wearos/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/app-wearos/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app-wearos/build.gradle similarity index 97% rename from app/build.gradle rename to app-wearos/build.gradle index b196b203..c981106c 100644 --- a/app/build.gradle +++ b/app-wearos/build.gradle @@ -183,6 +183,8 @@ android { } dependencies { + implementation(project(":app-common")) + // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin.core}" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlin.coroutines}" @@ -195,6 +197,11 @@ dependencies { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" } + implementation ("androidx.wear:wear:1.2.0") + implementation ("androidx.wear.tiles:tiles-material:1.1.0") + implementation ("com.google.android.horologist:horologist-tiles:0.1.5") + implementation 'com.google.android.gms:play-services-wearable:17.1.0' + // Debugging implementation('com.bugsnag:bugsnag-android:5.9.2') implementation 'com.getkeepsafe.relinker:relinker:1.4.3' @@ -259,6 +266,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation 'com.google.android.material:material:1.6.0-alpha01' + // Testing testImplementation 'junit:junit:4.13.2' testImplementation "org.junit.vintage:junit-vintage-engine:5.7.1" diff --git a/app-wearos/proguard-rules.pro b/app-wearos/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/app-wearos/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app-wearos/src/main/AndroidManifest.xml b/app-wearos/src/main/AndroidManifest.xml new file mode 100644 index 00000000..bc67a4b9 --- /dev/null +++ b/app-wearos/src/main/AndroidManifest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app-wearos/src/main/java/eu/darken/capod/wear/core/CAPodTileService.kt b/app-wearos/src/main/java/eu/darken/capod/wear/core/CAPodTileService.kt new file mode 100644 index 00000000..95460256 --- /dev/null +++ b/app-wearos/src/main/java/eu/darken/capod/wear/core/CAPodTileService.kt @@ -0,0 +1,53 @@ +package eu.darken.capod.wear.core + +import androidx.wear.tiles.* +import com.google.android.horologist.tiles.CoroutinesTileService +import eu.darken.capod.R + +private const val RESOURCES_VERSION = "0" + +class CAPodTileService : CoroutinesTileService() { + + override suspend fun resourcesRequest( + requestParams: RequestBuilders.ResourcesRequest + ): ResourceBuilders.Resources { + return ResourceBuilders.Resources.Builder() + .setVersion(RESOURCES_VERSION) + .build() + } + + override suspend fun tileRequest( + requestParams: RequestBuilders.TileRequest + ): TileBuilders.Tile { + val singleTileTimeline = TimelineBuilders.Timeline.Builder() + .addTimelineEntry( + TimelineBuilders.TimelineEntry.Builder() + .setLayout( + LayoutElementBuilders.Layout.Builder() + .setRoot(tileLayout()) + .build() + ) + .build() + ) + .build() + + return TileBuilders.Tile.Builder() + .setResourcesVersion(RESOURCES_VERSION) + .setTimeline(singleTileTimeline) + .build() + } + + private fun tileLayout(): LayoutElementBuilders.LayoutElement { + val text = getString(R.string.app_name) + return LayoutElementBuilders.Box.Builder() + .setVerticalAlignment(LayoutElementBuilders.VERTICAL_ALIGN_CENTER) + .setWidth(DimensionBuilders.expand()) + .setHeight(DimensionBuilders.expand()) + .addContent( + LayoutElementBuilders.Text.Builder() + .setText(text) + .build() + ) + .build() + } +} \ No newline at end of file diff --git a/app-wearos/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt b/app-wearos/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt new file mode 100644 index 00000000..4047e97b --- /dev/null +++ b/app-wearos/src/main/java/eu/darken/capod/wear/ui/MainActivity.kt @@ -0,0 +1,18 @@ +package eu.darken.capod.wear.ui + +import android.app.Activity +import android.os.Bundle +import eu.darken.capod.databinding.ActivityMainBinding + +class MainActivity : Activity() { + + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + } +} \ No newline at end of file diff --git a/app-wearos/src/main/res/layout/activity_main.xml b/app-wearos/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..86325ecb --- /dev/null +++ b/app-wearos/src/main/res/layout/activity_main.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/app-wearos/src/main/res/layout/wear_tile_pods_dual.xml b/app-wearos/src/main/res/layout/wear_tile_pods_dual.xml new file mode 100644 index 00000000..178b3447 --- /dev/null +++ b/app-wearos/src/main/res/layout/wear_tile_pods_dual.xml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-wearos/src/main/res/layout/wear_tile_pods_single.xml b/app-wearos/src/main/res/layout/wear_tile_pods_single.xml new file mode 100644 index 00000000..67bd15a6 --- /dev/null +++ b/app-wearos/src/main/res/layout/wear_tile_pods_single.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-wearos/src/main/res/layout/wear_tile_preview.xml b/app-wearos/src/main/res/layout/wear_tile_preview.xml new file mode 100644 index 00000000..178b3447 --- /dev/null +++ b/app-wearos/src/main/res/layout/wear_tile_preview.xml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-wearos/src/main/res/mipmap-hdpi/ic_launcher.webp b/app-wearos/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..c209e78e Binary files /dev/null and b/app-wearos/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app-wearos/src/main/res/mipmap-mdpi/ic_launcher.webp b/app-wearos/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..4f0f1d64 Binary files /dev/null and b/app-wearos/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app-wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app-wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..948a3070 Binary files /dev/null and b/app-wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app-wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app-wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..28d4b77f Binary files /dev/null and b/app-wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app-wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app-wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..aa7d6427 Binary files /dev/null and b/app-wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app-wearos/src/main/res/values/dimens.xml b/app-wearos/src/main/res/values/dimens.xml new file mode 100644 index 00000000..1a7ba4a1 --- /dev/null +++ b/app-wearos/src/main/res/values/dimens.xml @@ -0,0 +1,15 @@ + + + + 0dp + + + 5dp + \ No newline at end of file diff --git a/app-wearos/src/main/res/values/strings.xml b/app-wearos/src/main/res/values/strings.xml new file mode 100644 index 00000000..eab5236b --- /dev/null +++ b/app-wearos/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + CAPod for WearOS + View details about your AirPood devices on your WearOS device. + \ No newline at end of file diff --git a/app-wearos/src/main/res/values/styles.xml b/app-wearos/src/main/res/values/styles.xml new file mode 100644 index 00000000..78af86cf --- /dev/null +++ b/app-wearos/src/main/res/values/styles.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 132693a8..7d7add33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.buildConfig = [ - 'compileSdk': 31, 'minSdk' : 26, - 'targetSdk' : 31, + 'compileSdk': 33, + 'targetSdk' : 33, 'version' : [ - 'major': 1, - 'minor': 3, - 'patch': 14, + 'major': 2, + 'minor': 0, + 'patch': 0, 'build': 0, ], ] @@ -22,7 +22,7 @@ buildscript { 'coroutines': '1.5.1' ], 'dagger' : [ - 'core': '2.40.5' + 'core': '2.43.2' ], 'androidx' : [ 'navigation': '2.3.5' @@ -35,7 +35,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.0.4' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin.core}" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10" classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.dagger.core}" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.androidx.navigation}" classpath 'com.bugsnag:bugsnag-android-gradle-plugin:7.0.0' diff --git a/crowdin.yaml b/crowdin.yaml index 9e09a7b3..eb0b98a1 100644 --- a/crowdin.yaml +++ b/crowdin.yaml @@ -4,9 +4,9 @@ "files": [ { - "source": "/app/src/main/res/values/strings.xml", + "source": "/app-phone/src/main/res/values/strings.xml", "dest": "/strings.xml", - "translation": "/app/src/main/res/values-%android_code%/%original_file_name%", + "translation": "/app-phone/src/main/res/values-%android_code%/%original_file_name%", # "update_option" : "update_without_changes", "languages_mapping": &stringmapping { "android_code": { @@ -83,9 +83,9 @@ } } }, { - "source": "/app/src/gplay/res/values/strings.xml", + "source": "/app-phone/src/gplay/res/values/strings.xml", "dest": "/strings-gplay.xml", - "translation": "/app/src/gplay/res/values-%android_code%/strings.xml", + "translation": "/app-phone/src/gplay/res/values-%android_code%/strings.xml", # "update_option" : "update_without_changes", "languages_mapping": &stringmapping { "android_code": { @@ -162,9 +162,9 @@ } } }, { - "source": "/app/src/foss/res/values/strings.xml", + "source": "/app-phone/src/foss/res/values/strings.xml", "dest": "/strings-foss.xml", - "translation": "/app/src/foss/res/values-%android_code%/strings.xml", + "translation": "/app-phone/src/foss/res/values-%android_code%/strings.xml", # "update_option" : "update_without_changes", "languages_mapping": &stringmapping { "android_code": { diff --git a/settings.gradle b/settings.gradle index 4fc256ae..ba44d233 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,4 @@ rootProject.name = "Companion App for AirPods" -include ':app' +include ':app-phone' +include ':app-wearos' +include ':app-common'