Add developer setting button to send notifications (#1554)

* Testing notifications

Author: yschimke

androidApp/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
         xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
 <!--
     <uses-permission android:name="androidx.car.app.MAP_TEMPLATES"/>

gradle/libs.versions.toml

@@ -43,6 +43,8 @@ protolayout = "1.3.0-alpha10"
 robolectric = "4.14.1"
 room = "2.6.1"
 tiles-tooling-preview = "1.5.0-alpha10"
+wear = "1.3.0"
+wearPhoneInteractions = "1.1.0"
 work-runtime-ktx = "2.10.0"
 spring = "3.4.4"
 generativeai = "0.9.0-1.0.1-wasm"
@@ -69,6 +71,8 @@ androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayou
 androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version = "1.0.0-alpha27" }
 androidx-protolayout-proto = { module = "androidx.wear.protolayout:protolayout-proto", version.ref = "protolayout" }
 androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles-tooling-preview" }
+androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
+androidx-wear-phone-interactions = { module = "androidx.wear:wear-phone-interactions", version.ref = "wearPhoneInteractions" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work-runtime-ktx" }
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "work-runtime-ktx" }
 lifecyle-runtime = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "composeLifecyleRuntime" }

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/di/KoinAndroid.kt

@@ -34,6 +34,7 @@ import dev.johnoreilly.confetti.settings.WearSettingsSerializer
 import dev.johnoreilly.confetti.shared.BuildConfig
 import dev.johnoreilly.confetti.utils.AndroidDateService
 import dev.johnoreilly.confetti.utils.DateService
+import dev.johnoreilly.confetti.work.NotificationSender
 import dev.johnoreilly.confetti.work.RefreshWorker
 import dev.johnoreilly.confetti.work.SessionNotificationSender
 import dev.johnoreilly.confetti.work.SessionNotificationWorker
@@ -116,6 +117,9 @@ actual fun platformModule() = module {
             registerSerializer(WearSettingsSerializer)
         }
     }
+    single<NotificationSender> {
+        get<SessionNotificationSender>()
+    }
 }
 
 val Context.settingsStore by preferencesDataStore("settings")

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/work/SessionNotificationSender.kt

@@ -15,25 +15,26 @@ import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.shared.R
 import dev.johnoreilly.confetti.utils.DateService
-import dev.johnoreilly.confetti.utils.nowInstant
+import dev.johnoreilly.confetti.work.NotificationSender.Selector
 import kotlinx.coroutines.flow.first
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toInstant
-import kotlinx.datetime.toLocalDateTime
-import kotlinx.datetime.until
-import kotlin.time.Duration.Companion.minutes
 
 class SessionNotificationSender(
     private val context: Context,
     private val repository: ConfettiRepository,
     private val dateService: DateService,
     private val notificationManager: NotificationManagerCompat,
     private val authentication: Authentication,
-) {
+): NotificationSender {
+
+    override suspend fun sendNotification(selector: Selector) {
+        val notificationsEnabled = notificationManager.areNotificationsEnabled()
+
+        println("notificationsEnabled")
+
+        if (!notificationsEnabled) {
+//            return
+        }
 
-    suspend fun sendNotification() {
         // If there is no signed-in user, skip.
         val user = authentication.currentUser.value ?: return
 
@@ -58,11 +59,6 @@ class SessionNotificationSender(
             return
         }
 
-        // If current date is not in the conference range, skip.
-        if (sessions.none { session -> session.startsAt.date == dateService.now().date }) {
-            return
-        }
-
         val bookmarks = repository.bookmarks(
             conference = conferenceId,
             uid = user.uid,
@@ -78,12 +74,9 @@ class SessionNotificationSender(
             bookmarks.contains(session.id)
         }
 
-        val sessionsTimeZone = TimeZone.of(sessionsResponse.data?.config?.timezone.orEmpty())
-        val timeZonedNow = dateService.nowInstant()
+        val now = dateService.now()
         val upcomingSessions = bookmarkedSessions.filter { session ->
-            val timeZonedStartsAt = session.startsAt.toInstant(sessionsTimeZone)
-            val untilInMinutes = timeZonedNow.until(timeZonedStartsAt, DateTimeUnit.MINUTE)
-            untilInMinutes in 0..INTERVAL.inWholeMinutes
+            selector.matches(now, session)
         }
 
         // If there are no bookmarked upcoming sessions, skip.
@@ -104,16 +97,6 @@ class SessionNotificationSender(
         }
     }
 
-    /**
-     * Creates an interval from [DateService.now] up to [INTERVAL], with the device time zone.
-     */
-    private fun createIntervalRangeFromNow(): ClosedRange<LocalDateTime> {
-        val timeZone = TimeZone.currentSystemDefault()
-        val now = dateService.now()
-        val future = (now.toInstant(timeZone) + INTERVAL).toLocalDateTime(timeZone)
-        return now..future
-    }
-
     private fun createNotificationChannel() {
         // Channels are only available on Android O+.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
@@ -141,6 +124,8 @@ class SessionNotificationSender(
             .setContentText("Starts at ${session.startsAt.time} in ${session.room?.name.orEmpty()}")
             .setGroup(GROUP)
             .setAutoCancel(true)
+            .setLocalOnly(false)
+            .extend(NotificationCompat.WearableExtender().setBridgeTag("session:reminder"))
             .build()
     }
 
@@ -167,7 +152,9 @@ class SessionNotificationSender(
             .setGroup(GROUP)
             .setGroupSummary(true)
             .setAutoCancel(true)
+            .setLocalOnly(false)
             .setStyle(style)
+            .extend(NotificationCompat.WearableExtender().setBridgeTag("session:summary"))
             .build()
     }
 
@@ -183,8 +170,5 @@ class SessionNotificationSender(
         private val CHANNEL_ID = "SessionNotification"
         private val GROUP = "dev.johnoreilly.confetti.SESSIONS_ALERT"
         private val SUMMARY_ID = 0
-
-        // Minimum interval for work manager: MIN_PERIODIC_INTERVAL_MILLIS
-        val INTERVAL = 15.minutes
     }
 }

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/work/SessionNotificationWorker.kt

@@ -4,14 +4,12 @@ import android.content.Context
 import androidx.work.Constraints
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import dev.johnoreilly.confetti.work.SessionNotificationSender.Companion.INTERVAL
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import kotlin.time.Duration.Companion.minutes
 import kotlin.time.toJavaDuration
 
 // Using a custom constructor has caused a crash inside Koin.
@@ -29,7 +27,7 @@ class SessionNotificationWorker(
         }
 
         return try {
-            notifier.sendNotification()
+            notifier.sendNotification(Selector)
             Result.success()
         } catch (e: Throwable) {
             Result.retry()
@@ -40,20 +38,9 @@ class SessionNotificationWorker(
 
         private val TAG = SessionNotificationWorker::class.java.simpleName
 
-        fun startOneTimeWorkRequest(workManager: WorkManager) {
-            val workRequest = OneTimeWorkRequestBuilder<SessionNotificationWorker>()
-                .build()
-
-            workManager.enqueueUniqueWork(
-                TAG,
-                ExistingWorkPolicy.REPLACE,
-                workRequest,
-            )
-        }
-
         fun startPeriodicWorkRequest(workManager: WorkManager) {
             val workRequest =
-                PeriodicWorkRequestBuilder<SessionNotificationWorker>(INTERVAL.toJavaDuration())
+                PeriodicWorkRequestBuilder<SessionNotificationWorker>(Selector.within.toJavaDuration())
                     .setConstraints(Constraints.Builder().setRequiresBatteryNotLow(true).build())
                     .build()
 
@@ -67,5 +54,8 @@ class SessionNotificationWorker(
         fun cancelWorkRequest(workManager: WorkManager) {
             workManager.cancelUniqueWork(TAG)
         }
+
+        // Minimum interval for work manager: MIN_PERIODIC_INTERVAL_MILLIS
+        val Selector = NotificationSender.Today(15.minutes)
     }
 }

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt

@@ -12,6 +12,7 @@ import dev.johnoreilly.confetti.ConfettiRepository
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.auth.User
 import dev.johnoreilly.confetti.decompose.AppComponent.Child
+import dev.johnoreilly.confetti.work.NotificationSender
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -44,13 +45,15 @@ class DefaultAppComponent(
     val appSettings: AppSettings by inject()
     private val repository: ConfettiRepository by inject()
     private val navigation = StackNavigation<Config>()
+    private val notificationSender: NotificationSender? by inject()
 
     private var user: User? = null
 
     private val defaultSettingsComponent = DefaultSettingsComponent(
         componentContext = componentContext,
         appSettings = appSettings,
-        authentication = authentication
+        authentication = authentication,
+        notificationSender = notificationSender,
     )
 
 

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/SettingsComponent.kt

@@ -3,6 +3,7 @@ package dev.johnoreilly.confetti.decompose
 import com.arkivanov.decompose.ComponentContext
 import dev.johnoreilly.confetti.AppSettings
 import dev.johnoreilly.confetti.auth.Authentication
+import dev.johnoreilly.confetti.work.NotificationSender
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -40,12 +41,15 @@ interface SettingsComponent {
     fun updateDarkThemeConfig(darkThemeConfig: DarkThemeConfig)
     fun updateUseExperimentalFeatures(value: Boolean)
     fun enableDeveloperMode()
+    fun sendNotifications()
+    val supportsNotifications: Boolean
 }
 
 class DefaultSettingsComponent(
     componentContext: ComponentContext,
     private val appSettings: AppSettings,
     private val authentication: Authentication,
+    private val notificationSender: NotificationSender?,
 ) : SettingsComponent, ComponentContext by componentContext {
 
     private val coroutineScope = coroutineScope()
@@ -99,6 +103,15 @@ class DefaultSettingsComponent(
         }
     }
 
+    override fun sendNotifications() {
+        coroutineScope.launch {
+            notificationSender?.sendNotification(NotificationSender.AllFuture)
+        }
+    }
+
+    override val supportsNotifications: Boolean
+        get() = notificationSender != null
+
     companion object {
         const val darkThemeConfigKey = "darkThemeConfigKey"
     }

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/settings/SettingsUI.kt

@@ -16,6 +16,7 @@ import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.Button
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -69,6 +70,8 @@ fun SettingsUI(
         onChangeUseExperimentalFeatures = component::updateUseExperimentalFeatures,
         developerSettings = developerSettings,
         onEnableDeveloperMode = component::enableDeveloperMode,
+        onSendNotifications = component::sendNotifications,
+        supportsNotifications = component.supportsNotifications,
         popBack = popBack
     )
 }
@@ -80,6 +83,8 @@ fun SettingsUI(
     onChangeDarkThemeConfig: (darkThemeConfig: DarkThemeConfig) -> Unit,
     developerSettings: DeveloperSettings?,
     onEnableDeveloperMode: () -> Unit,
+    onSendNotifications: () -> Unit,
+    supportsNotifications: Boolean,
     popBack: () -> Unit
 ) {
     val scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -139,6 +144,9 @@ fun SettingsUI(
                                 maxLines = 1,
                                 overflow = TextOverflow.Ellipsis
                             )
+                            Button(onClick = onSendNotifications, enabled = supportsNotifications) {
+                                Text("Send Notifications")
+                            }
                         }
                     }
                 }
@@ -167,7 +175,8 @@ fun SettingsUI(
                         Modifier.fillMaxWidth(),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
-                        //Text("Version: ${BuildConfig.VERSION_NAME}")
+                        // Keep version so developer mode is accessible
+                        Text("Version: ")
                     }
                 }
             }

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/work/NotificationSender.kt

@@ -0,0 +1,40 @@
+package dev.johnoreilly.confetti.work
+
+import dev.johnoreilly.confetti.fragment.SessionDetails
+import kotlinx.datetime.DateTimeUnit
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.UtcOffset
+import kotlinx.datetime.toInstant
+import kotlinx.datetime.until
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+
+interface NotificationSender {
+    sealed interface Selector {
+        fun matches(now: LocalDateTime, session: SessionDetails): Boolean
+    }
+    data class Today(val within: Duration = 15.minutes): Selector {
+        override fun matches(
+            now: LocalDateTime,
+            session: SessionDetails
+        ): Boolean {
+            if (session.startsAt.date != now.date)
+                return false
+
+            val compareInAnyTz = UtcOffset(0)
+            val until = session.startsAt.toInstant(compareInAnyTz).until(now.toInstant(compareInAnyTz), DateTimeUnit.MINUTE)
+            return until in 0..within.inWholeMinutes
+        }
+    }
+
+    data object AllFuture: Selector {
+        override fun matches(
+            now: LocalDateTime,
+            session: SessionDetails
+        ): Boolean {
+            return session.startsAt > now
+        }
+    }
+
+    suspend fun sendNotification(selector: Selector = Today())
+}

wearApp/build.gradle.kts

@@ -219,6 +219,9 @@ dependencies {
 
     implementation(libs.androidx.protolayout.material)
 
+    implementation(libs.androidx.wear)
+    implementation(libs.androidx.wear.phone.interactions)
+
     coreLibraryDesugaring(libs.desugar)
 
     debugImplementation(libs.compose.ui.manifest)