Make notification permission flow less intrusive

teambtcmap · Nov 5, 2024 · fb1e4cd · fb1e4cd
1 parent c058c19
commit fb1e4cd
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 40 deletions.
diff --git a/app/src/androidMain/kotlin/app/AppModule.kt b/app/src/androidMain/kotlin/app/AppModule.kt
@@ -39,7 +39,7 @@ import element_comment.ElementCommentQueries
 import element_comment.ElementCommentRepo
 
 val appModule = module {
-    single { Database(get<Context>().getDatabasePath("btcmap-2024-10-30.db").absolutePath).conn }
+    single { Database(get<Context>().getDatabasePath("btcmap-2024-11-05.db").absolutePath).conn }
 
     single { ApiImpl() }.bind(Api::class)
 

diff --git a/app/src/androidMain/kotlin/conf/Conf.kt b/app/src/androidMain/kotlin/conf/Conf.kt
@@ -11,7 +11,7 @@ data class Conf(
     val viewportWestLon: Double,
     val showAtms: Boolean,
     val showSyncSummary: Boolean,
-    val showAllNewElements: Boolean,
+    val notifyOfNewElementsNearby: Boolean,
 )
 
 fun Conf.mapViewport(): BoundingBox {

diff --git a/app/src/androidMain/kotlin/conf/ConfQueries.kt b/app/src/androidMain/kotlin/conf/ConfQueries.kt
@@ -50,7 +50,7 @@ class ConfQueries(private val conn: SQLiteConnection) {
                 it.bindDouble(5, conf.viewportWestLon)
                 it.bindLong(6, if (conf.showAtms) 1 else 0)
                 it.bindLong(7, if (conf.showSyncSummary) 1 else 0)
-                it.bindLong(8, if (conf.showAllNewElements) 1 else 0)
+                it.bindLong(8, if (conf.notifyOfNewElementsNearby) 1 else 0)
                 it.step()
             }
         }
@@ -80,7 +80,7 @@ class ConfQueries(private val conn: SQLiteConnection) {
                     viewportWestLon = it.getDouble(4),
                     showAtms = it.getBoolean(5),
                     showSyncSummary = it.getBoolean(6),
-                    showAllNewElements = it.getBoolean(7),
+                    notifyOfNewElementsNearby = it.getBoolean(7),
                 )
             } else {
                 null

diff --git a/app/src/androidMain/kotlin/conf/ConfRepo.kt b/app/src/androidMain/kotlin/conf/ConfRepo.kt
@@ -42,7 +42,7 @@ class ConfRepo(
             viewportWestLon = -68.933333 - 0.04 + 0.03,
             showAtms = false,
             showSyncSummary = false,
-            showAllNewElements = false,
+            notifyOfNewElementsNearby = false,
         )
     }
 }
diff --git a/app/src/androidMain/kotlin/map/MapFragment.kt b/app/src/androidMain/kotlin/map/MapFragment.kt
@@ -7,7 +7,6 @@ import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.Paint
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -102,10 +101,6 @@ class MapFragment : Fragment() {
         }
     }
 
-    private val postNotificationsPermissionRequest = registerForActivityResult(
-        ActivityResultContracts.RequestMultiplePermissions(),
-    ) { }
-
     private var emptyClusterBitmap: Bitmap? = null
 
     override fun onCreateView(
@@ -437,12 +432,6 @@ class MapFragment : Fragment() {
             val text = it.toString()
             searchModel.setSearchString(text)
         }
-
-        if (Build.VERSION.SDK_INT >= 33) {
-            postNotificationsPermissionRequest.launch(
-                arrayOf(Manifest.permission.POST_NOTIFICATIONS)
-            )
-        }
     }
 
     private fun BoundingBox.toLatLngBounds(): LatLngBounds {

diff --git a/app/src/androidMain/kotlin/settings/SettingsFragment.kt b/app/src/androidMain/kotlin/settings/SettingsFragment.kt
@@ -1,9 +1,12 @@
 package settings
 
+import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -25,6 +28,10 @@ class SettingsFragment : Fragment() {
     private var _binding: FragmentSettingsBinding? = null
     private val binding get() = _binding!!
 
+    private val postNotificationsPermissionRequest = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -57,9 +64,16 @@ class SettingsFragment : Fragment() {
             conf.update { it.copy(showSyncSummary = isChecked) }
         }
 
-        binding.showAllNewElements.isChecked = conf.conf.value.showAllNewElements
-        binding.showAllNewElements.setOnCheckedChangeListener { _, isChecked ->
-            conf.update { it.copy(showAllNewElements = isChecked) }
+        binding.notifyOfNewElementsNearby.isEnabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+
+        binding.notifyOfNewElementsNearby.isChecked = conf.conf.value.notifyOfNewElementsNearby
+        binding.notifyOfNewElementsNearby.setOnCheckedChangeListener { _, isChecked ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                postNotificationsPermissionRequest.launch(
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS)
+                )
+            }
+            conf.update { it.copy(notifyOfNewElementsNearby = isChecked) }
         }
 
         val lastSyncDate = conf.conf.value.lastSyncDate

diff --git a/app/src/androidMain/kotlin/sync/SyncNotificationController.kt b/app/src/androidMain/kotlin/sync/SyncNotificationController.kt
@@ -68,7 +68,7 @@ class SyncNotificationController(
                 .notify(Random.Default.nextInt(1, Int.MAX_VALUE), builder.build())
         }
 
-        if (conf.lastSyncDate == null) {
+        if (conf.lastSyncDate == null || !conf.notifyOfNewElementsNearby) {
             return
         }
 
@@ -85,28 +85,14 @@ class SyncNotificationController(
                     endLongitude = element.lon,
                 )
 
-                val localRadiusMeters = 100_000f
-
-                val distanceThresholdMeters = if (conf.showAllNewElements) {
-                    100_000_000f
-                } else {
-                    localRadiusMeters
-                }
-
-                if (distanceMeters > distanceThresholdMeters) {
+                if (distanceMeters > 100_000f) {
                     return
                 }
 
-                val contentText = if (distanceMeters > localRadiusMeters) {
-                    context.getString(R.string.new_merchant_accepts_bitcoins)
-                } else {
-                    context.getString(R.string.new_local_merchant_accepts_bitcoins)
-                }
-
                 val builder = NotificationCompat.Builder(context, NEW_MERCHANTS_CHANNEL_ID)
                     .setSmallIcon(R.drawable.add_location)
                     .setContentTitle(element.name(context.resources))
-                    .setContentText(contentText)
+                    .setContentText(context.getString(R.string.new_local_merchant_accepts_bitcoins))
                     .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
                 NotificationManagerCompat.from(context)

diff --git a/app/src/androidMain/res/layout/fragment_settings.xml b/app/src/androidMain/res/layout/fragment_settings.xml
@@ -59,10 +59,10 @@
                 android:paddingBottom="8dp">
 
                 <com.google.android.material.materialswitch.MaterialSwitch
-                    android:id="@+id/showSyncSummary"
+                    android:id="@+id/notifyOfNewElementsNearby"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_sync_summary"
+                    android:text="@string/new_merchant_notifications"
                     android:textSize="16sp" />
 
             </LinearLayout>
@@ -79,10 +79,10 @@
                 android:paddingBottom="8dp">
 
                 <com.google.android.material.materialswitch.MaterialSwitch
-                    android:id="@+id/showAllNewElements"
+                    android:id="@+id/showSyncSummary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_all_new_elements"
+                    android:text="@string/show_sync_summary"
                     android:textSize="16sp" />
 
             </LinearLayout>

diff --git a/app/src/androidMain/res/values/strings.xml b/app/src/androidMain/res/values/strings.xml
@@ -68,6 +68,7 @@
     <string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
     <string name="delivery">Delivery</string>
     <string name="comments_d" translatable="false">Comments (%1$d)</string>
+    <string name="new_merchant_notifications" translatable="false">New merchant notifications</string>
     <plurals name="d_changes">
         <item quantity="zero">%d changes</item>
         <item quantity="one">%d change</item>