improve element size in dialogue

wuan · Oct 8, 2023 · 5970f6a · 5970f6a
1 parent 2101e59
commit 5970f6a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 33 deletions.
diff --git a/app/src/main/java/org/blitzortung/android/app/Main.kt b/app/src/main/java/org/blitzortung/android/app/Main.kt
@@ -551,13 +551,7 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         Log.v(
             LOG_TAG,
-            "Main.onRequestPermissionsResult() $requestCode - ${
-                permissions.joinToString(
-                    ",",
-                    "[",
-                    "]"
-                )
-            } - ${grantResults.joinToString(",", "[", "]") { it.toString() }}"
+            "Main.onRequestPermissionsResult() $requestCode - ${permissions.joinToString()} - ${grantResults.joinToString() { it.toString() }}"
         )
         val providerRelation = LocationProviderRelation.byOrdinal[requestCode]
         if (providerRelation != null) {
@@ -580,12 +574,11 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
     @TargetApi(Build.VERSION_CODES.M)
     private fun requestLocationPermissions(sharedPreferences: SharedPreferences) {
         val locationProviderName = sharedPreferences.get(PreferenceKey.LOCATION_MODE, PASSIVE_PROVIDER)
-        val permission =
-            when (locationProviderName) {
-                PASSIVE_PROVIDER, GPS_PROVIDER -> ACCESS_FINE_LOCATION
-                NETWORK_PROVIDER -> ACCESS_COARSE_LOCATION
-                else -> null
-            }
+        val permission = when (locationProviderName) {
+            PASSIVE_PROVIDER, GPS_PROVIDER -> ACCESS_FINE_LOCATION
+            NETWORK_PROVIDER -> ACCESS_COARSE_LOCATION
+            else -> null
+        }
 
         if (permission != null) {
             val requiresBackgroundPermission = if (isAtLeast(Build.VERSION_CODES.Q)) {
@@ -598,21 +591,15 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
             Log.v(LOG_TAG, "self permission: $checkSelfPermission")
             val requiresPermission = checkSelfPermission != PackageManager.PERMISSION_GRANTED
 
-            val requestCode = (LocationProviderRelation.byProviderName[locationProviderName]?.ordinal
-                ?: Int.MAX_VALUE)
+            val requestCode = (LocationProviderRelation.byProviderName[locationProviderName]?.ordinal ?: Int.MAX_VALUE)
             if (requiresPermission) {
                 val locationText = resources.getString(R.string.location_permission_background_disclosure)
-                AlertDialog.Builder(this)
-                    .setMessage(locationText)
-                    .setCancelable(false)
+                AlertDialog.Builder(this).setMessage(locationText).setCancelable(false)
                     .setNeutralButton(android.R.string.ok) { dialog, count ->
                         requestPermission(
-                            arrayOf(permission),
-                            requestCode,
-                            R.string.location_permission_required
+                            arrayOf(permission), requestCode, R.string.location_permission_required
                         )
-                    }
-                    .show()
+                    }.show()
             } else {
                 if (requiresBackgroundPermission) {
                     requestPermission(
@@ -693,11 +680,9 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
                         }
                     }
 
-                    AlertDialog.Builder(this)
-                        .setMessage(locationText)
+                    AlertDialog.Builder(this).setMessage(locationText)
                         .setPositiveButton(android.R.string.yes, dialogClickListener)
-                        .setNegativeButton(android.R.string.no, dialogClickListener)
-                        .show()
+                        .setNegativeButton(android.R.string.no, dialogClickListener).show()
                 }
             } else {
                 Log.w(LOG_TAG, "requestWakeupPermissions() could not get PowerManager")
@@ -726,8 +711,7 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: PreferenceKey) {
-        @Suppress("NON_EXHAUSTIVE_WHEN")
-        when (key) {
+        @Suppress("NON_EXHAUSTIVE_WHEN") when (key) {
             PreferenceKey.COLOR_SCHEME -> {
                 strikeListOverlay.refresh()
             }
@@ -777,10 +761,7 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
     private fun configureMenuAccess() {
         val config = ViewConfiguration.get(this)
 
-        if (isAtLeast(Build.VERSION_CODES.LOLLIPOP) ||
-            isAtLeast(Build.VERSION_CODES.ICE_CREAM_SANDWICH) &&
-            !config.hasPermanentMenuKey()
-        ) {
+        if (isAtLeast(Build.VERSION_CODES.LOLLIPOP) || isAtLeast(Build.VERSION_CODES.ICE_CREAM_SANDWICH) && !config.hasPermanentMenuKey()) {
             binding.menu.visibility = View.VISIBLE
             binding.menu.setOnClickListener {
                 showPopupMenu(binding.menu)

diff --git a/app/src/main/res/layout/quick_settings_dialog.xml b/app/src/main/res/layout/quick_settings_dialog.xml
@@ -22,6 +22,7 @@
             android:layout_height="wrap_content"
             android:entries="@array/regions"
             android:padding="10dp"
+            android:minHeight="48dp"
             android:prompt="@string/region" />
 
         <View
@@ -40,6 +41,7 @@
             android:layout_height="wrap_content"
             android:entries="@array/raster_sizes"
             android:padding="10dp"
+            android:minHeight="48dp"
             android:prompt="@string/raster_size" />
 
         <View
@@ -58,6 +60,7 @@
             android:layout_height="wrap_content"
             android:entries="@array/count_thresholds"
             android:padding="10dp"
+            android:minHeight="48dp"
             android:prompt="@string/count_threshold" />
 
         <View
@@ -76,6 +79,7 @@
             android:layout_height="wrap_content"
             android:entries="@array/interval_durations"
             android:padding="10dp"
+            android:minHeight="48dp"
             android:prompt="@string/interval_duration" />
 
         <View
@@ -94,6 +98,7 @@
             android:layout_height="wrap_content"
             android:entries="@array/query_periods"
             android:padding="10dp"
+            android:minHeight="48dp"
             android:prompt="@string/query_period" />
     </LinearLayout>
 </ScrollView>