Skip to content

Some fixes of broadcast receiver and update version of version catalog #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions panel-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Loading