mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

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.
pull/1653/head^2
James Rich 2025-03-07 14:25:46 -06:00 zatwierdzone przez GitHub
rodzic 3d86dc349e
commit d40672df40
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/build.gradle
Wyświetl plik

@ -165,7 +165,7 @@ dependencies {
//Individual dependencies //Individual dependencies
implementation(libs.appintro) implementation(libs.appintro)
implementation(libs.awesome.app.rating) googleImplementation(libs.awesome.app.rating)
implementation(libs.core.splashscreen) implementation(libs.core.splashscreen)
implementation(libs.emoji2.emojipicker) implementation(libs.emoji2.emojipicker)
implementation(libs.kotlinx.collections.immutable) implementation(libs.kotlinx.collections.immutable)

4
app/src/main/java/com/geeksville/mesh/MainActivity.kt
Wyświetl plik

@ -59,6 +59,7 @@ import com.geeksville.mesh.android.BindFailedException
import com.geeksville.mesh.android.GeeksvilleApplication import com.geeksville.mesh.android.GeeksvilleApplication
import com.geeksville.mesh.android.Logging import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.android.ServiceClient import com.geeksville.mesh.android.ServiceClient
import com.geeksville.mesh.android.dpToPx
import com.geeksville.mesh.android.getBluetoothPermissions import com.geeksville.mesh.android.getBluetoothPermissions
import com.geeksville.mesh.android.getNotificationPermissions import com.geeksville.mesh.android.getNotificationPermissions
import com.geeksville.mesh.android.hasBluetoothPermission import com.geeksville.mesh.android.hasBluetoothPermission
@ -450,6 +451,7 @@ class MainActivity : AppCompatActivity(), Logging {
} }
} }
@Suppress("MagicNumber")
private fun checkAlertDnD() { private fun checkAlertDnD() {
if ( if (
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
@ -470,7 +472,7 @@ class MainActivity : AppCompatActivity(), Logging {
val messageTextView = TextView(this).also { val messageTextView = TextView(this).also {
it.text = message it.text = message
it.movementMethod = LinkMovementMethod.getInstance() it.movementMethod = LinkMovementMethod.getInstance()
it.setPadding(resources.getDimension(R.dimen.margin_normal).toInt()) it.setPadding(dpToPx(16f))
} }
MaterialAlertDialogBuilder(this) MaterialAlertDialogBuilder(this)
.setTitle(R.string.alerts_dnd_request_title) .setTitle(R.string.alerts_dnd_request_title)