Add reaction option: Popup on new connection

app/src/main/java/eu/darken/capod/main/ui/settings/general/DeviceSelectionDialogFactory.kt

@@ -1,19 +1,19 @@
 package eu.darken.capod.main.ui.settings.general
 
-import android.bluetooth.BluetoothDevice
 import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.darken.capod.R
+import eu.darken.capod.common.bluetooth.BluetoothDevice2
 
 
 class DeviceSelectionDialogFactory constructor(private val context: Context) {
 
     fun create(
-        devices: List<BluetoothDevice>,
-        current: BluetoothDevice?,
-        callback: (BluetoothDevice?) -> Unit
+        devices: List<BluetoothDevice2>,
+        current: BluetoothDevice2?,
+        callback: (BluetoothDevice2?) -> Unit
     ): AlertDialog {
         return MaterialAlertDialogBuilder(context).apply {
             setTitle(R.string.settings_maindevice_address_label)

app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragmentVM.kt

@@ -30,7 +30,6 @@ class GeneralSettingsFragmentVM @Inject constructor(
     val events = SingleLiveEvent<GeneralSettingsEvents>()
 
     init {
-
         generalSettings.monitorMode.flow
             .withPrevious()
             .filter { (old, new) ->

app/src/main/java/eu/darken/capod/monitor/core/worker/MonitorWorker.kt

@@ -1,7 +1,6 @@
 package eu.darken.capod.monitor.core.worker
 
 import android.app.NotificationManager
-import android.bluetooth.BluetoothDevice
 import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
@@ -9,6 +8,7 @@ import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import eu.darken.capod.common.bluetooth.BluetoothDevice2
 import eu.darken.capod.common.bluetooth.BluetoothManager2
 import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.Bugs
@@ -30,8 +30,20 @@ import eu.darken.capod.reaction.core.autoconnect.AutoConnect
 import eu.darken.capod.reaction.core.playpause.PlayPause
 import eu.darken.capod.reaction.core.popup.PopUpReaction
 import eu.darken.capod.reaction.ui.popup.PopUpWindow
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.withContext
 
 
 @HiltWorker
@@ -130,7 +142,7 @@ class MonitorWorker @AssistedInject constructor(
             .flatMapLatest { arguments ->
                 val monitorMode = arguments[0] as MonitorMode
                 val mainAddress = arguments[1] as String?
-                val devices = arguments[2] as Collection<BluetoothDevice>
+                val devices = arguments[2] as Collection<BluetoothDevice2>
 
                 log(TAG) { "Monitor mode: $monitorMode" }
                 when (monitorMode) {
@@ -145,7 +157,7 @@ class MonitorWorker @AssistedInject constructor(
                                 log(TAG, WARN) { "Main device address not set, staying alive while any is connected" }
                             }
                             devices.any { it.address == mainAddress } -> {
-                                log(TAG) { "MainDevice is connected ($mainAddress), aborting any timeout." }
+                                log(TAG) { "Main device is connected ($mainAddress), aborting any timeout." }
                             }
                             else -> {
                                 log(TAG) { "No known Pods are connected, canceling worker soon." }

app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsFragment.kt

@@ -1,6 +1,5 @@
 package eu.darken.capod.reaction.ui
 
-import android.bluetooth.BluetoothDevice
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.Keep
@@ -11,6 +10,7 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.capod.R
+import eu.darken.capod.common.bluetooth.BluetoothDevice2
 import eu.darken.capod.common.uix.PreferenceFragment3
 import eu.darken.capod.common.upgrade.UpgradeRepo
 import eu.darken.capod.main.core.GeneralSettings
@@ -36,7 +36,7 @@ class ReactionSettingsFragment : PreferenceFragment3() {
     override val preferenceFile: Int = R.xml.preferences_reactions
 
     private var isPro: Boolean = false
-    private var bondedDevices: List<BluetoothDevice> = emptyList()
+    private var bondedDevices: List<BluetoothDevice2> = emptyList()
     private val autoConnectConditionPref by lazy { findPreference<ListPreference>(settings.autoConnectCondition.key)!! }
 
     override fun onPreferencesCreated() {
@@ -83,6 +83,11 @@ class ReactionSettingsFragment : PreferenceFragment3() {
             upgradeRepo.launchBillingFlow(requireActivity())
             preference.isChecked = false
             return true
+        } else if (preference.key == reactionSettings.showPopUpOnConnection.key && !isPro) {
+            preference as CheckBoxPreference
+            upgradeRepo.launchBillingFlow(requireActivity())
+            preference.isChecked = false
+            return true
         }
 
         return super.onPreferenceTreeClick(preference)

app/src/main/res/drawable/ic_message_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z" />
+</vector>

app/src/main/res/drawable/ic_message_outline_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20 2H4C2.9 2 2 2.9 2 4V22L6 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H5.2L4 17.2V4H20V16Z" />
+</vector>

app/src/main/res/values/strings.xml

@@ -46,10 +46,12 @@
     <string name="settings_maindevice_address_none">None</string>
     <string name="settings_maindevice_model_label">Your device model</string>
     <string name="settings_maindevice_model_description">The model of your main device. This helps the app recognize your device when it is not connected to your phone.</string>
-    <string name="settings_popup_caseopen_label">Show popup</string>
-    <string name="settings_popup_caseopen_description">Show a popup when the device case is opened (experimental).</string>
     <string name="settings_onepod_mode_label">One pod mode</string>
     <string name="settings_onepod_mode_description">Wearing both pods is not required, wearing a single pod is sufficient to trigger reactions.</string>
+    <string name="settings_popup_caseopen_label">Show case popup</string>
+    <string name="settings_popup_caseopen_description">Show a popup when the device case is opened (experimental).</string>
+    <string name="settings_popup_connected_label">Show connection popup</string>
+    <string name="settings_popup_connected_description">Show a popup when the device connects for the first time.</string>
 
 
     <string name="notification_channel_device_status_label">Device status</string>

app/src/main/res/xml/preferences_reactions.xml

@@ -33,9 +33,17 @@
         android:title="@string/settings_autoconnect_condition_label" />
 
     <CheckBoxPreference
-        android:icon="@drawable/ic_baseline_chat_24"
+        android:icon="@drawable/ic_message_outline_24"
         android:key="reaction.popup.caseopen"
         android:summary="@string/settings_popup_caseopen_description"
         android:title="@string/settings_popup_caseopen_label" />
 
+    <CheckBoxPreference
+        android:icon="@drawable/ic_message_24"
+        android:key="reaction.popup.connected"
+        android:summary="@string/settings_popup_connected_description"
+        android:title="@string/settings_popup_connected_label" />
+
+    <Preference android:enabled="false" />
+
 </PreferenceScreen>