Draft: Changes from branch 0.9.0

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 subprojects {
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions.freeCompilerArgs += listOf(
-            "-opt-in=com.redmadrobot.debug_panel_core.annotation.DebugPanelInternal"
+            "-opt-in=com.redmadrobot.debug.core.annotation.DebugPanelInternal"
         )
     }
 }

debug-panel-common/build.gradle.kts → common/build.gradle.kts

@@ -40,27 +40,39 @@ android {
     buildFeatures {
         viewBinding = true
     }
-    namespace = "com.redmadrobot.debug_panel_common"
+    namespace = "com.redmadrobot.debug.panel.common"
 }
 
 dependencies {
-    api(kotlin("stdlib"))
+    api(androidx.compose.animation)
+    api(stack.accompanist.themeadapter.material)
+    api(androidx.compose.material)
+    api(androidx.compose.foundation)
+    api(androidx.compose.ui)
+    api(androidx.compose.ui.viewbinding)
+    api(androidx.compose.ui.tooling)
+    api(androidx.fragment)
+    api(androidx.constraintlayout.compose)
+    api(androidx.activity.compose)
+    api(androidx.compose.ui.tooling.preview)
+    api(androidx.lifecycle.viewmodel.compose)
+    api(androidx.room.runtime)
+    api(androidx.room)
+    api(androidx.core)
     api(stack.okhttp)
+    api(stack.kotlinx.coroutines.android)
+    api(stack.timber)
+    api(rmr.itemsadapter.viewbinding)
+    api(rmr.flipper)
+    kapt(androidx.room.compiler)
+    // legacy
     api(androidx.appcompat)
     api(stack.material)
     api(androidx.constraintlayout)
-    api(stack.kotlinx.coroutines.android)
+    api(androidx.lifecycle.viewmodel)
     api(androidx.lifecycle.runtime)
     api(androidx.lifecycle.livedata)
     api(androidx.lifecycle.livedata.core)
-    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)
 }
 
 tasks.register("prepareKotlinBuildScriptModel") {}

debug-panel-common/src/main/kotlin/com/redmadrobot/debug_panel_common/base/PluginFragment.kt → common/src/main/kotlin/com/redmadrobot/debug/common/base/PluginFragment.kt

@@ -1,15 +1,19 @@
-package com.redmadrobot.debug_panel_common.base
+package com.redmadrobot.debug.common.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.fragment.app.Fragment
-import com.redmadrobot.debug_panel_common.R
+import com.redmadrobot.debug.panel.common.R
 
 public open class PluginFragment(private val layoutId: Int) : Fragment() {
 
+    protected val isSettingMode: Boolean by lazy {
+        activity?.javaClass?.simpleName == "DebugActivity"
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

debug-panel-common/src/main/kotlin/com/redmadrobot/debug_panel_common/base/PluginViewModel.kt → common/src/main/kotlin/com/redmadrobot/debug/common/base/PluginViewModel.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug_panel_common.base
+package com.redmadrobot.debug.common.base
 
 import androidx.lifecycle.ViewModel
 

debug-panel-common/src/main/kotlin/com/redmadrobot/debug_panel_common/extension/CoroutinesExtension.kt → common/src/main/kotlin/com/redmadrobot/debug/common/extension/CoroutinesExtension.kt

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

debug-panel-common/src/main/kotlin/com/redmadrobot/debug_panel_common/extension/LifecicleExt.kt → common/src/main/kotlin/com/redmadrobot/debug/common/extension/LifecicleExt.kt

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

debug-panel-common/src/main/res/values/colors.xml → common/src/main/res/values/colors.xml

@@ -11,5 +11,5 @@
     <color name="black">#000000</color>
     <color name="red">#EF0000</color>
     <color name="green">#009688</color>
-    <color name="gray">#E1E5EA</color>
+    <color name="super_light_gray">#E1E5EA</color>
 </resources>

debug-panel-common/src/main/res/values/styles.xml → common/src/main/res/values/styles.xml

@@ -10,4 +10,3 @@
         <item name="colorOnSurface">@color/colorOnSurface</item>
     </style>
 </resources>
-

debug-panel-core/build.gradle.kts → core/build.gradle.kts

@@ -39,15 +39,20 @@ android {
 
     buildFeatures {
         viewBinding = true
+        compose = true
     }
-    namespace = "com.redmadrobot.panel_core"
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = androidx.versions.compose.compiler.get()
+    }
+    namespace = "com.redmadrobot.debug.panel.core"
 }
 
 kotlin {
     explicitApi()
 }
 
 dependencies {
-    implementation(project(":debug-panel-common"))
+    implementation(project(":common"))
     kapt(androidx.room.compiler)
 }

debug-panel-core/src/main/AndroidManifest.xml → core/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <application>
         <activity
-            android:name="com.redmadrobot.debug_panel_core.ui.debugpanel.DebugActivity"
+            android:name="com.redmadrobot.debug.core.ui.debugpanel.DebugActivity"
             android:exported="false"
             android:taskAffinity="com.redmadrobot.debug_panel.DebugActivity"
             android:theme="@style/DebugPanelTheme" />
@@ -14,7 +14,7 @@
             android:enabled="true"
             android:exported="true"
             android:label="@string/debug_panel"
-            android:targetActivity="com.redmadrobot.debug_panel_core.ui.debugpanel.DebugActivity"
+            android:targetActivity="com.redmadrobot.debug.core.ui.debugpanel.DebugActivity"
             android:taskAffinity="com.redmadrobot.debug_panel.DebugActivity"
             android:theme="@style/DebugPanelTheme">
             <intent-filter>

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

@@ -0,0 +1,8 @@
+package com.redmadrobot.debug.core
+
+import android.content.Context
+import com.redmadrobot.debug.core.annotation.DebugPanelInternal
+import com.redmadrobot.debug.core.plugin.PluginDependencyContainer
+
+@DebugPanelInternal
+public class CommonContainer(public val context: Context) : PluginDependencyContainer

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/DebugPanelInstance.kt → core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelInstance.kt

@@ -1,12 +1,12 @@
-package com.redmadrobot.debug_panel_core
+package com.redmadrobot.debug.core
 
 import android.app.Application
 import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.redmadrobot.debug_panel_core.internal.DebugEvent
-import com.redmadrobot.debug_panel_core.plugin.Plugin
-import com.redmadrobot.debug_panel_core.plugin.PluginManager
+import com.redmadrobot.debug.core.internal.DebugEvent
+import com.redmadrobot.debug.core.plugin.Plugin
+import com.redmadrobot.debug.core.plugin.PluginManager
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/annotation/DebugPanelInternal.kt → core/src/main/kotlin/com/redmadrobot/debug/core/annotation/DebugPanelInternal.kt

@@ -1,9 +1,9 @@
-package com.redmadrobot.debug_panel_core.annotation
+package com.redmadrobot.debug.core.annotation
 
 @RequiresOptIn(
     level = RequiresOptIn.Level.ERROR,
     message = "This is an internal part of DebugPanel. You shouldn't use it, cause it can be changed in future"
 )
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-public annotation class DebugPanelInternal
+public annotation class DebugPanelInternal

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/data/DebugDataProvider.kt → core/src/main/kotlin/com/redmadrobot/debug/core/data/DebugDataProvider.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug_panel_core.data
+package com.redmadrobot.debug.core.data
 
 public interface DebugDataProvider<T> {
     public fun provideData(): T

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)
+        }
+    }
+}

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/extension/PluginsExt.kt → core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt

@@ -1,8 +1,8 @@
-package com.redmadrobot.debug_panel_core.extension
+package com.redmadrobot.debug.core.extension
 
-import com.redmadrobot.debug_panel_core.DebugPanelInstance
-import com.redmadrobot.debug_panel_core.annotation.DebugPanelInternal
-import com.redmadrobot.debug_panel_core.plugin.Plugin
+import com.redmadrobot.debug.core.DebugPanelInstance
+import com.redmadrobot.debug.core.annotation.DebugPanelInternal
+import com.redmadrobot.debug.core.plugin.Plugin
 
 @PublishedApi
 internal fun getPlugin(pluginName: String): Plugin {

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/inapp/DebugBottomSheet.kt → core/src/main/kotlin/com/redmadrobot/debug/core/inapp/DebugBottomSheet.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug_panel_core.inapp
+package com.redmadrobot.debug.core.inapp
 
 import android.app.Dialog
 import android.os.Bundle
@@ -10,9 +10,10 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.tabs.TabLayoutMediator
-import com.redmadrobot.debug_panel_core.extension.getAllPlugins
-import com.redmadrobot.panel_core.databinding.BottomSheetDebugPanelBinding
-import com.redmadrobot.debug_panel_common.R as CommonR
+import com.redmadrobot.debug.core.extension.getAllPlugins
+import com.redmadrobot.debug.panel.core.databinding.BottomSheetDebugPanelBinding
+import com.redmadrobot.debug.panel.common.R as CommonR
+
 
 internal class DebugBottomSheet : BottomSheetDialogFragment() {
 
@@ -40,7 +41,7 @@ internal class DebugBottomSheet : BottomSheetDialogFragment() {
             setBottomSheetSize()
         }
         dialog.setContentView(binding.root)
-        setViews(binding)
+        binding.setViews()
         return dialog
     }
 
@@ -49,12 +50,12 @@ internal class DebugBottomSheet : BottomSheetDialogFragment() {
         _binding = null
     }
 
-    private fun setViews(binding: BottomSheetDebugPanelBinding) {
+    private fun BottomSheetDebugPanelBinding.setViews() {
         val plugins = getAllPlugins()
             /*Only Plugins with Fragment*/
             .filter { it.getFragment() != null }
 
-        binding.debugSheetViewpager.adapter = DebugSheetViewPagerAdapter(
+        debugSheetViewpager.adapter = DebugSheetViewPagerAdapter(
             requireActivity(),
             plugins
         )
@@ -64,13 +65,14 @@ internal class DebugBottomSheet : BottomSheetDialogFragment() {
         }
 
         TabLayoutMediator(
-            binding.debugSheetTabLayout,
-            binding.debugSheetViewpager,
+            debugSheetTabLayout,
+            debugSheetViewpager,
             tabConfigurationStrategy
         ).attach()
     }
 
     private fun setBottomSheetSize() {
+        if (_binding == null) return
         val dialogContainer = binding.root.parent as? FrameLayout
         dialogContainer?.apply {
             layoutParams?.height = ViewGroup.LayoutParams.MATCH_PARENT

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/inapp/DebugSheetViewPagerAdapter.kt → core/src/main/kotlin/com/redmadrobot/debug/core/inapp/DebugSheetViewPagerAdapter.kt

@@ -1,9 +1,9 @@
-package com.redmadrobot.debug_panel_core.inapp
+package com.redmadrobot.debug.core.inapp
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.redmadrobot.debug_panel_core.plugin.Plugin
+import com.redmadrobot.debug.core.plugin.Plugin
 
 internal class DebugSheetViewPagerAdapter(
     fragmentActivity: FragmentActivity,

debug-panel-core/src/main/kotlin/com/redmadrobot/debug_panel_core/inapp/ModalLayout.kt → core/src/main/kotlin/com/redmadrobot/debug/core/inapp/ModalLayout.kt

@@ -1,4 +1,4 @@
-package com.redmadrobot.debug_panel_core.inapp
+package com.redmadrobot.debug.core.inapp
 
 import android.content.Context
 import android.graphics.Canvas
@@ -7,8 +7,8 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
-import com.redmadrobot.panel_core.R
-import com.redmadrobot.debug_panel_common.R as CommonR
+import com.redmadrobot.debug.panel.core.R
+import com.redmadrobot.debug.panel.common.R as CommonR
 
 internal class ModalLayout @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
@@ -18,7 +18,7 @@ internal class ModalLayout @JvmOverloads constructor(
      * Paint для отрисовки "ручки" модального окна
      */
     private val handlePaint = Paint().apply {
-        color = ContextCompat.getColor(context, CommonR.color.gray)
+        color = ContextCompat.getColor(context, CommonR.color.super_light_gray)
         style = Paint.Style.FILL
     }