Migration to Jetpack Compose

common/build.gradle.kts

@@ -44,23 +44,37 @@ android {
 }
 
 dependencies {
-    api(kotlin("stdlib"))
+    api(androidx.activity.compose)
+    api(androidx.compose.animation)
+    api(androidx.compose.foundation)
+    api(androidx.compose.material)
+    api(androidx.compose.runtime.livedata)
+    api(androidx.compose.ui)
+    api(androidx.compose.ui.tooling)
+    api(androidx.compose.ui.tooling.preview)
+    api(androidx.compose.ui.viewbinding)
+    api(androidx.constraintlayout.compose)
+    api(androidx.core)
+    api(androidx.fragment)
+    api(androidx.lifecycle.viewmodel.compose)
+    api(androidx.room)
+    api(androidx.room.runtime)
+    api(rmr.flipper)
+    api(rmr.itemsadapter.viewbinding)
+    api(stack.accompanist.themeadapter.core)
+    api(stack.accompanist.themeadapter.material)
+    api(stack.kotlinx.coroutines.android)
     api(stack.okhttp)
+    api(stack.timber)
+    kapt(androidx.room.compiler)
+    // legacy
     api(androidx.appcompat)
-    api(stack.material)
     api(androidx.constraintlayout)
-    api(stack.kotlinx.coroutines.android)
-    api(androidx.lifecycle.runtime)
     api(androidx.lifecycle.livedata)
     api(androidx.lifecycle.livedata.core)
+    api(androidx.lifecycle.runtime)
     api(androidx.lifecycle.viewmodel)
-    api(androidx.room.runtime)
-    api(androidx.room)
-    api(androidx.core)
-    api(rmr.itemsadapter.viewbinding)
-    api(rmr.flipper)
-    api(stack.timber)
-    kapt(androidx.room.compiler)
+    api(stack.material)
 }
 
 tasks.register("prepareKotlinBuildScriptModel") {}

core/build.gradle.kts

@@ -39,6 +39,11 @@ android {
 
     buildFeatures {
         viewBinding = true
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = androidx.versions.compose.compiler.get()
     }
     namespace = "com.redmadrobot.debug.core"
 }

core/src/main/AndroidManifest.xml

@@ -9,6 +9,13 @@
             android:taskAffinity="com.redmadrobot.debug_panel.DebugActivity"
             android:theme="@style/DebugPanelTheme" />
 
+        <activity
+            android:name=".ui.debugpanel.DebugBottomSheetActivity"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:theme="@style/DebugBottomSheetTheme"
+            android:windowSoftInputMode="adjustResize" />
+
         <activity-alias
             android:name="com.redmadrobot.debug_panel.DebugLauncherActivity"
             android:enabled="true"

core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt

@@ -1,12 +1,13 @@
 package com.redmadrobot.debug.core
 
+import android.app.Activity
 import android.app.Application
-import androidx.fragment.app.FragmentManager
+import android.content.Intent
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
 import com.redmadrobot.debug.core.annotation.DebugPanelInternal
-import com.redmadrobot.debug.core.inapp.DebugBottomSheet
 import com.redmadrobot.debug.core.plugin.Plugin
+import com.redmadrobot.debug.core.ui.debugpanel.DebugBottomSheetActivity
 import com.redmadrobot.debug.core.util.ApplicationLifecycleHandler
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
@@ -35,12 +36,17 @@ public object DebugPanel {
         return instance?.getEventFlow() ?: emptyFlow()
     }
 
-    public fun showPanel(fragmentManager: FragmentManager) {
+    public fun showPanel(activity: Activity) {
         if (isInitialized) {
-            DebugBottomSheet.show(fragmentManager)
+            openDebugBottomSheet(activity)
         }
     }
 
+    private fun openDebugBottomSheet(activity: Activity) {
+        val intent = Intent(activity, DebugBottomSheetActivity::class.java)
+        activity.startActivity(intent)
+    }
+
     private fun createDebugPanelInstance(application: Application, plugins: List<Plugin>) {
         instance = DebugPanelInstance(application, plugins)
     }

core/src/main/kotlin/com/redmadrobot/debug/core/extension/ComposeExt.kt

@@ -0,0 +1,46 @@
+package com.redmadrobot.debug.core.extension
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.redmadrobot.debug.core.annotation.DebugPanelInternal
+
+@DebugPanelInternal
+@Composable
+public inline fun <reified T : ViewModel> provideViewModel(crossinline block: () -> T): T {
+    return viewModel(
+        factory = object : ViewModelProvider.Factory {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                @Suppress("UNCHECKED_CAST")
+                return block() as T
+            }
+        }
+    )
+}
+
+
+@DebugPanelInternal
+@Composable
+public fun OnLifecycleEvent(onEvent: (event: Lifecycle.Event) -> Unit) {
+    val eventHandler by rememberUpdatedState(onEvent)
+    val lifecycleOwner by rememberUpdatedState(LocalLifecycleOwner.current)
+
+    DisposableEffect(lifecycleOwner) {
+        val lifecycle = lifecycleOwner.lifecycle
+        val observer = LifecycleEventObserver { _, event ->
+            eventHandler(event)
+        }
+
+        lifecycle.addObserver(observer)
+        onDispose {
+            lifecycle.removeObserver(observer)
+        }
+    }
+}

common/src/main/kotlin/com/redmadrobot/debug/common/extension/CoroutinesExtension.kt → core/src/main/kotlin/com/redmadrobot/debug/core/extension/CoroutinesExtension.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug.common.extension
+package com.redmadrobot.debug.core.extension
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope

common/src/main/kotlin/com/redmadrobot/debug/common/extension/LifecicleExt.kt → core/src/main/kotlin/com/redmadrobot/debug/core/extension/LifecicleExt.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug.common.extension
+package com.redmadrobot.debug.core.extension
 
 import androidx.annotation.MainThread
 import androidx.fragment.app.Fragment

core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt

@@ -1,8 +1,10 @@
 package com.redmadrobot.debug.core.extension
 
+import androidx.fragment.app.Fragment
 import com.redmadrobot.debug.core.DebugPanelInstance
 import com.redmadrobot.debug.core.annotation.DebugPanelInternal
 import com.redmadrobot.debug.core.plugin.Plugin
+import com.redmadrobot.debug.core.ui.debugpanel.DebugActivity
 
 @PublishedApi
 internal fun getPlugin(pluginName: String): Plugin {
@@ -20,3 +22,7 @@ public inline fun <reified T : Plugin> getPlugin(): T {
     return plugin as T
 }
 
+@DebugPanelInternal
+public fun Fragment.isSettingMode(): Boolean {
+    return activity?.javaClass == DebugActivity::class.java
+}