Merge main and common module to simplify.

app-common/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
     id("kotlin-kapt")
     id("kotlin-parcelize")
 }
-apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     compileSdk = ProjectConfig.compileSdk
@@ -28,7 +27,6 @@ android {
     }
 
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
@@ -72,28 +70,8 @@ android {
         }
     }
 
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        //noinspection WrongGradleMethod
-        tasks.withType<Test> {
-            useJUnitPlatform()
-        }
-    }
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
-
-    addBaseAndroid()
-    addBaseAndroidUi()
-    addBaseKotlin()
-    addDagger()
-    addMoshi()
-    addBaseWorkManager()
-    addNavigation()
-
-    addTesting()
 
 }

app-common/src/foss/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>

app-common/src/gplay/AndroidManifest.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-    <application>
-
-    </application>
-
-</manifest>

app-common/src/main/AndroidManifest.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.darken.capod.common">
-
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-
-    <uses-permission
-        android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH_ADMIN"
-        android:maxSdkVersion="30" />
-
-    <uses-permission
-        android:name="android.permission.ACCESS_COARSE_LOCATION"
-        android:maxSdkVersion="30" />
-    <uses-permission
-        android:name="android.permission.ACCESS_FINE_LOCATION"
-        android:maxSdkVersion="30" />
-
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH_SCAN"
-        android:usesPermissionFlags="neverForLocation" />
-
-    <application>
-        <receiver
-            android:name=".bluetooth.BleScanResultReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="eu.darken.capod.bluetooth.DELIVER_SCAN_RESULTS" />
-            </intent-filter>
-        </receiver>
-    </application>
-</manifest>

app/build.gradle.kts

@@ -122,9 +122,10 @@ android {
         unitTests {
             isIncludeAndroidResources = true
         }
-    }
-    tasks.withType<Test> {
-        useJUnitPlatform()
+        //noinspection WrongGradleMethod
+        tasks.withType<Test> {
+            useJUnitPlatform()
+        }
     }
 }
 

app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt

@@ -32,7 +32,7 @@ class UpgradeControlFoss @Inject constructor(
 
     override fun launchBillingFlow(activity: Activity) {
         MaterialAlertDialogBuilder(activity).apply {
-            setIcon(eu.darken.capod.common.R.drawable.ic_heart)
+            setIcon(R.drawable.ic_heart)
             setTitle(R.string.upgrade_capod_label)
             setMessage(R.string.upgrade_capod_description)
             setPositiveButton(R.string.foss_upgrade_donate_label) { _, _ ->

app/src/foss/java/eu/darken/capod/debug/autoreport/AutoReportingModule.kt

@@ -5,7 +5,6 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
-import eu.darken.capod.debug.autoreport.FossAutoReporting
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)

app/src/gplay/java/eu/darken/capod/common/upgrade/core/UpgradeRepoGplay.kt

@@ -78,7 +78,7 @@ class UpgradeRepoGplay @Inject constructor(
 
     override fun launchBillingFlow(activity: Activity) {
         MaterialAlertDialogBuilder(activity).apply {
-            setIcon(eu.darken.capod.common.R.drawable.ic_heart)
+            setIcon(R.drawable.ic_heart)
             setTitle(R.string.upgrade_capod_label)
             setMessage(R.string.upgrade_capod_description)
             setPositiveButton(R.string.general_upgrade_action) { _, _ ->

app/src/main/AndroidManifest.xml

@@ -11,6 +11,28 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
 
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <uses-permission
+        android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />
+
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+
     <uses-feature
         android:name="android.hardware.bluetooth_le"
         android:required="true" />
@@ -35,6 +57,14 @@
             </intent-filter>
         </activity>
 
+        <receiver
+            android:name=".bluetooth.BleScanResultReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="eu.darken.capod.bluetooth.DELIVER_SCAN_RESULTS" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name=".monitor.core.receiver.BluetoothEventReceiver"
             android:enabled="true"

app/src/main/java/eu/darken/capod/common/ClipboardHelper.kt

@@ -40,7 +40,7 @@ class ClipboardHelper @Inject constructor(
     }
 
     fun copyToClipboard(text: String) {
-        val clip = ClipData.newPlainText(context.getString(eu.darken.capod.common.R.string.app_name), text)
+        val clip = ClipData.newPlainText(context.getString(R.string.app_name), text)
         clipboard.setPrimaryClip(clip)
     }
 

app/src/main/java/eu/darken/capod/common/InstallId.kt

@@ -5,7 +5,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import java.io.File
-import java.util.*
+import java.util.UUID
 import java.util.regex.Pattern
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/eu/darken/capod/common/debug/Bugs.kt

@@ -1,7 +1,9 @@
 package eu.darken.capod.common.debug
 
 import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
-import eu.darken.capod.common.debug.logging.Logging.Priority.*
+import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.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

app/src/main/java/eu/darken/capod/common/flow/DynamicStateFlow.kt

@@ -6,7 +6,16 @@ import eu.darken.capod.common.debug.logging.log
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex

app/src/main/java/eu/darken/capod/common/flow/FlowExtensions.kt

@@ -8,7 +8,22 @@ import eu.darken.capod.common.error.hasCause
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.WhileSubscribed
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.scan
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transform
+import kotlinx.coroutines.flow.transformWhile
 import kotlin.time.Duration
 
 /**

app/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt

@@ -4,7 +4,12 @@ import android.content.Context
 import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.annotation.*
+import androidx.annotation.AttrRes
+import androidx.annotation.CallSuper
+import androidx.annotation.ColorRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.PluralsRes
+import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.darken.capod.common.getColorForAttr

app/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt

@@ -2,7 +2,7 @@ package eu.darken.capod.common.lists.modular.mods
 
 import eu.darken.capod.common.lists.modular.ModularAdapter
 
-class ClickMod<VHT : ModularAdapter.VH> constructor(
+class ClickMod<VHT : ModularAdapter.VH>(
     private val listener: (VHT, Int) -> Unit
 ) : ModularAdapter.Module.Binder<VHT> {
 

app/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt

@@ -4,7 +4,7 @@ import androidx.viewbinding.ViewBinding
 import eu.darken.capod.common.lists.BindableVH
 import eu.darken.capod.common.lists.modular.ModularAdapter
 
-class DataBinderMod<ItemT, HolderT> constructor(
+class DataBinderMod<ItemT, HolderT>(
     private val data: List<ItemT>,
     private val customBinder: (
         (adapter: ModularAdapter<HolderT>, vh: HolderT, pos: Int, payload: MutableList<Any>) -> Unit

app/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt

@@ -3,7 +3,7 @@ package eu.darken.capod.common.lists.modular.mods
 import android.view.ViewGroup
 import eu.darken.capod.common.lists.modular.ModularAdapter
 
-class SimpleVHCreatorMod<HolderT> constructor(
+class SimpleVHCreatorMod<HolderT>(
     private val viewType: Int = 0,
     private val factory: (ViewGroup) -> HolderT
 ) : ModularAdapter.Module.Creator<HolderT> where HolderT : ModularAdapter.VH {

app/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt

@@ -4,7 +4,7 @@ import androidx.recyclerview.widget.RecyclerView
 import eu.darken.capod.common.lists.differ.DifferItem
 import eu.darken.capod.common.lists.modular.ModularAdapter
 
-class StableIdMod<ItemT : DifferItem> constructor(
+class StableIdMod<ItemT : DifferItem>(
     private val data: List<ItemT>,
     private val customResolver: (position: Int) -> Long = {
         (data[it] as? DifferItem)?.stableId ?: RecyclerView.NO_ID

app/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt

@@ -3,14 +3,14 @@ package eu.darken.capod.common.lists.modular.mods
 import android.view.ViewGroup
 import eu.darken.capod.common.lists.modular.ModularAdapter
 
-class TypedVHCreatorMod<HolderT> constructor(
+class TypedVHCreatorMod<HolderT>(
     private val typeResolver: (Int) -> Boolean,
     private val factory: (ViewGroup) -> HolderT
 ) : ModularAdapter.Module.Typing,
     ModularAdapter.Module.Creator<HolderT> where HolderT : ModularAdapter.VH {
 
     private fun ModularAdapter<*>.determineOurViewType(): Int {
-        val typingModules = modules.filterIsInstance(ModularAdapter.Module.Typing::class.java)
+        val typingModules = modules.filterIsInstance<ModularAdapter.Module.Typing>()
         return typingModules.indexOf(this@TypedVHCreatorMod)
     }
 

app/src/main/java/eu/darken/capod/common/permissions/Permission.kt

@@ -13,8 +13,8 @@ import eu.darken.capod.common.withinApiLevel
 enum class Permission(
     val minApiLevel: Int,
     val maxApiLevel: Int = Int.MAX_VALUE,
-    @StringRes val labelRes: Int,
-    @StringRes val descriptionRes: Int,
+    @param:StringRes val labelRes: Int,
+    @param:StringRes val descriptionRes: Int,
     val permissionId: String,
     val isGranted: (Context) -> Boolean = {
         ContextCompat.checkSelfPermission(it, permissionId) == PackageManager.PERMISSION_GRANTED

app/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt

@@ -7,7 +7,7 @@ import eu.darken.capod.common.debug.logging.log
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class FlowPreference<T> constructor(
+class FlowPreference<T>(
     private val preferences: SharedPreferences,
     val key: String,
     val rawReader: (Any?) -> T,

app/src/main/java/eu/darken/capod/common/preferences/MaterialSwitchPreference.kt

@@ -3,12 +3,13 @@ package eu.darken.capod.common.preferences
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.SwitchPreferenceCompat
+import eu.darken.capod.R
 
 class MaterialSwitchPreference(context: Context, attrs: AttributeSet?) :
     SwitchPreferenceCompat(context, attrs) {
 
     init {
         // Use material switch
-        widgetLayoutResource = eu.darken.capod.common.R.layout.preference_material_switch
+        widgetLayoutResource = R.layout.preference_material_switch
     }
 }

app/src/main/java/eu/darken/capod/common/uix/ViewModel2.kt

@@ -9,9 +9,13 @@ import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.error.ErrorEventSource
 import eu.darken.capod.common.flow.DynamicStateFlow
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import kotlin.coroutines.CoroutineContext
 
 

app/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt

@@ -20,7 +20,12 @@ package eu.darken.capod.common.uix
 import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.*
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelLazy
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.get
 import kotlin.reflect.KClass
 
 /**