From d40672df401e3479bd590971c7b1c0a8a50170d6 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:25:46 -0600 Subject: [PATCH] fix #1654: Move the app rating dependency to googleImplementation (#1656) * Move the app rating dependency to googleImplementation The `awesome.app.rating` dependency is now under `googleImplementation` instead of `implementation` in `app/build.gradle`. * Refactor alert DND dialog padding Use `dpToPx` for padding in the alert DND dialog for better consistency. --- app/build.gradle | 2 +- app/src/main/java/com/geeksville/mesh/MainActivity.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bb4692aab..d1cfe959f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,7 +165,7 @@ dependencies { //Individual dependencies implementation(libs.appintro) - implementation(libs.awesome.app.rating) + googleImplementation(libs.awesome.app.rating) implementation(libs.core.splashscreen) implementation(libs.emoji2.emojipicker) implementation(libs.kotlinx.collections.immutable) diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index a10036854..f2e26f7c9 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -59,6 +59,7 @@ import com.geeksville.mesh.android.BindFailedException import com.geeksville.mesh.android.GeeksvilleApplication import com.geeksville.mesh.android.Logging import com.geeksville.mesh.android.ServiceClient +import com.geeksville.mesh.android.dpToPx import com.geeksville.mesh.android.getBluetoothPermissions import com.geeksville.mesh.android.getNotificationPermissions import com.geeksville.mesh.android.hasBluetoothPermission @@ -450,6 +451,7 @@ class MainActivity : AppCompatActivity(), Logging { } } + @Suppress("MagicNumber") private fun checkAlertDnD() { if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O @@ -470,7 +472,7 @@ class MainActivity : AppCompatActivity(), Logging { val messageTextView = TextView(this).also { it.text = message it.movementMethod = LinkMovementMethod.getInstance() - it.setPadding(resources.getDimension(R.dimen.margin_normal).toInt()) + it.setPadding(dpToPx(16f)) } MaterialAlertDialogBuilder(this) .setTitle(R.string.alerts_dnd_request_title)