From 626604c03c504acf6928702eb1109116eb1c1560 Mon Sep 17 00:00:00 2001 From: Yuriy Elistratov Date: Thu, 24 Apr 2025 01:47:58 +0400 Subject: [PATCH 1/3] Core: Fix unregistered broadcast receiver --- .../debug/core/util/ApplicationLifecycleHandler.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt index a383ffc7..93ea920a 100644 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt +++ b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt @@ -4,8 +4,8 @@ import android.app.Activity import android.app.Application import android.content.BroadcastReceiver import android.content.IntentFilter +import androidx.activity.ComponentActivity import androidx.core.content.ContextCompat -import androidx.fragment.app.FragmentActivity import com.redmadrobot.debug.core.inapp.shake.ShakeController import timber.log.Timber @@ -51,8 +51,7 @@ internal class ApplicationLifecycleHandler( override fun onActivityPaused(activity: Activity) { --openActivityCount - - (activity as? FragmentActivity)?.let { + (activity as? ComponentActivity)?.let { activity.unregisterReceiver(debugPanelBroadcastReceiver) } if (openActivityCount == 0) onAppPaused() From b5283765f293e955dc57e7b3900411c8f593cc2d Mon Sep 17 00:00:00 2001 From: Yuriy Elistratov Date: Thu, 24 Apr 2025 01:49:29 +0400 Subject: [PATCH 2/3] Core: Fix not opened debug panel bottom sheet from notification on newer API --- .../com/redmadrobot/debug/core/util/DebugPanelNotification.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt index bcc00e4a..41851c01 100644 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt +++ b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt @@ -82,7 +82,9 @@ internal class DebugPanelNotification(private val context: Context) { } private fun getPanelPendingIntent(context: Context): PendingIntent? { - val openPanelIntent = Intent(DebugPanelBroadcastReceiver.ACTION_OPEN_DEBUG_PANEL) + val openPanelIntent = Intent(DebugPanelBroadcastReceiver.ACTION_OPEN_DEBUG_PANEL).apply { + setPackage(context.packageName) + } return PendingIntent.getBroadcast( context, 0, From b716b2b9da9eb1ed5af61a983d27e88fd1cfe6e1 Mon Sep 17 00:00:00 2001 From: Yuriy Elistratov Date: Thu, 24 Apr 2025 01:50:03 +0400 Subject: [PATCH 3/3] Build: Update version of version catalog --- buildSrc/settings.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- panel-common/build.gradle.kts | 2 -- settings.gradle.kts | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 7aa99318..585c7475 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -30,7 +30,7 @@ dependencyResolutionManagement { } versionCatalogs { - val version = "2024.12.12" // Keep it in sync with root settings.gradle.kts + val version = "2025.03.10" // Keep it in sync with root settings.gradle.kts create("rmr") { from("com.redmadrobot.versions:versions-redmadrobot:$version") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/panel-common/build.gradle.kts b/panel-common/build.gradle.kts index 8b3ff17a..ab96e009 100644 --- a/panel-common/build.gradle.kts +++ b/panel-common/build.gradle.kts @@ -64,8 +64,6 @@ dependencies { api(rmr.flipper) api(rmr.itemsadapter.viewbinding) api(rmr.konfeature) - api(stack.accompanist.themeadapter.core) - api(stack.accompanist.themeadapter.material) api(stack.kotlinx.coroutines.android) api(stack.okhttp) api(stack.timber) diff --git a/settings.gradle.kts b/settings.gradle.kts index b6fefb94..485a9e30 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,7 +31,7 @@ dependencyResolutionManagement { } versionCatalogs { - val version = "2024.12.12" // Keep it in sync with buildSrc/settings.gradle.kts + val version = "2025.03.10" // Keep it in sync with buildSrc/settings.gradle.kts create("rmr") { from("com.redmadrobot.versions:versions-redmadrobot:$version") }