add wear data update on phone data change

Razeeman · Razeeman · commit 368b8e94fe3d · 2024-03-03T16:11:13.000+03:00
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/AddRunningRecordMediator.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/AddRunningRecordMediator.kt
@@ -14,6 +14,7 @@ class AddRunningRecordMediator @Inject constructor(
     private val notificationGoalTimeInteractor: NotificationGoalTimeInteractor,
     private val notificationGoalCountInteractor: NotificationGoalCountInteractor,
     private val widgetInteractor: WidgetInteractor,
+    private val wearInteractor: WearInteractor,
     private val activityStartedStoppedBroadcastInteractor: ActivityStartedStoppedBroadcastInteractor,
 ) {
 
@@ -97,6 +98,7 @@ class AddRunningRecordMediator @Inject constructor(
                 if (runningRecordInteractor.getAll().size == 1) notificationActivityInteractor.checkAndSchedule()
                 notificationGoalTimeInteractor.checkAndReschedule(listOf(typeId))
                 widgetInteractor.updateWidgets()
+                wearInteractor.updateCurrentActivities()
             }
         }
     }
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RemoveRunningRecordMediator.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RemoveRunningRecordMediator.kt
@@ -12,6 +12,7 @@ class RemoveRunningRecordMediator @Inject constructor(
     private val notificationActivityInteractor: NotificationActivityInteractor,
     private val notificationGoalTimeInteractor: NotificationGoalTimeInteractor,
     private val widgetInteractor: WidgetInteractor,
+    private val wearInteractor: WearInteractor,
     private val prefsInteractor: PrefsInteractor,
     private val activityStartedStoppedBroadcastInteractor: ActivityStartedStoppedBroadcastInteractor,
 ) {
@@ -52,6 +53,9 @@ class RemoveRunningRecordMediator @Inject constructor(
         val runningRecordIds = runningRecordInteractor.getAll().map { it.id }
         if (runningRecordIds.isEmpty()) notificationActivityInteractor.cancel()
         notificationGoalTimeInteractor.checkAndReschedule(runningRecordIds + typeId)
-        if (updateWidgets) widgetInteractor.updateWidgets()
+        if (updateWidgets) {
+            widgetInteractor.updateWidgets()
+            wearInteractor.updateCurrentActivities()
+        }
     }
 }
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/WearInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/WearInteractor.kt
@@ -0,0 +1,8 @@
+package com.example.util.simpletimetracker.domain.interactor
+
+interface WearInteractor {
+
+    suspend fun updateActivities()
+
+    suspend fun updateCurrentActivities()
+}
diff --git a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearCommunicationInteractor.kt b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearCommunicationInteractor.kt
@@ -17,19 +17,20 @@ import com.example.util.simpletimetracker.domain.model.AppColor
 import com.example.util.simpletimetracker.domain.model.RecordTag
 import com.example.util.simpletimetracker.domain.model.RunningRecord
 import com.example.util.simpletimetracker.wear_api.WearActivity
+import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
 import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
 import com.example.util.simpletimetracker.wear_api.WearSettings
-import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
 import com.example.util.simpletimetracker.wear_api.WearTag
+import dagger.Lazy
 import javax.inject.Inject
 
 class WearCommunicationInteractor @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
     private val recordTypeInteractor: RecordTypeInteractor,
     private val recordTagInteractor: RecordTagInteractor,
     private val runningRecordInteractor: RunningRecordInteractor,
-    private val removeRunningRecordMediator: RemoveRunningRecordMediator,
-    private val addRunningRecordMediator: AddRunningRecordMediator,
+    private val removeRunningRecordMediator: Lazy<RemoveRunningRecordMediator>,
+    private val addRunningRecordMediator: Lazy<AddRunningRecordMediator>,
     private val appColorMapper: AppColorMapper,
 ) : WearCommunicationAPI {
 
@@ -67,10 +68,10 @@ class WearCommunicationInteractor @Inject constructor(
         val started = starting.filter { it.id !in currentsIds }
 
         stopped.forEach {
-            removeRunningRecordMediator.removeWithRecordAdd(it)
+            removeRunningRecordMediator.get().removeWithRecordAdd(it)
         }
         started.forEach { record ->
-            addRunningRecordMediator.add(
+            addRunningRecordMediator.get().add(
                 typeId = record.id,
                 timeStarted = record.startedAt,
                 tagIds = record.tags.map(WearTag::id),
diff --git a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearInteractorImpl.kt b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearInteractorImpl.kt
@@ -0,0 +1,17 @@
+package com.example.util.simpletimetracker.feature_wear
+
+import com.example.util.simpletimetracker.domain.interactor.WearInteractor
+import javax.inject.Inject
+
+class WearInteractorImpl @Inject constructor(
+    private val wearRPCServer: WearRPCServer,
+) : WearInteractor {
+
+    override suspend fun updateActivities() {
+
+    }
+
+    override suspend fun updateCurrentActivities() {
+        wearRPCServer.updateCurrentActivities()
+    }
+}
diff --git a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearModule.kt b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearModule.kt
@@ -5,6 +5,7 @@
  */
 package com.example.util.simpletimetracker.feature_wear
 
+import com.example.util.simpletimetracker.domain.interactor.WearInteractor
 import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
 import dagger.Binds
 import dagger.Module
@@ -17,4 +18,8 @@ interface WearModule {
 
     @Binds
     fun WearCommunicationInteractor.bindWearCommunicationInteractor(): WearCommunicationAPI
+
+    // TODO add base flavor noop
+    @Binds
+    fun WearInteractorImpl.bindWearInteractor(): WearInteractor
 }
diff --git a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearRPCServer.kt b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearRPCServer.kt
@@ -5,15 +5,22 @@
  */
 package com.example.util.simpletimetracker.feature_wear
 
+import android.content.Context
 import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
 import com.example.util.simpletimetracker.wear_api.WearRequests
 import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
+import com.google.android.gms.tasks.Tasks
+import com.google.android.gms.wearable.Wearable
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
 class WearRPCServer @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val api: WearCommunicationAPI,
 ) {
 
@@ -38,6 +45,22 @@ class WearRPCServer @Inject constructor(
         }
     }
 
+    suspend fun updateCurrentActivities() = withContext(Dispatchers.IO) {
+        // TODO handle errors?
+        val nodesListTask = Wearable
+            .getNodeClient(context)
+            .connectedNodes
+        val nodesList = Tasks.await(nodesListTask)
+
+        nodesList.forEach { node ->
+            Wearable.getMessageClient(context).sendMessage(
+                node.id,
+                WearRequests.DATA_UPDATED,
+                mapToBytes(WearRequests.DATA_UPDATED_CURRENT_ACTIVITIES),
+            )
+        }
+    }
+
     private suspend fun onQueryTagsForActivity(request: ByteArray): ByteArray? {
         val activityId: Long = mapFromBytes(request) ?: return null
         return mapToBytes(api.queryTagsForActivity(activityId))
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/data/WearDataRepo.kt b/wear/src/main/java/com/example/util/simpletimetracker/data/WearDataRepo.kt
@@ -0,0 +1,60 @@
+package com.example.util.simpletimetracker.data
+
+import com.example.util.simpletimetracker.wear_api.WearActivity
+import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
+import com.example.util.simpletimetracker.wear_api.WearSettings
+import com.example.util.simpletimetracker.wear_api.WearTag
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WearDataRepo @Inject constructor(
+    private val wearRPCClient: WearRPCClient,
+) {
+
+    val activitiesUpdated: SharedFlow<Unit> get() = _activitiesUpdated.asSharedFlow()
+    val currentActivitiesUpdated: SharedFlow<Unit> get() = _currentActivitiesUpdated.asSharedFlow()
+
+    private var _activitiesUpdated: MutableSharedFlow<Unit> = MutableSharedFlow(
+        extraBufferCapacity = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+    private var _currentActivitiesUpdated: MutableSharedFlow<Unit> = MutableSharedFlow(
+        extraBufferCapacity = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+
+    fun addListener() {
+        wearRPCClient.addListener {
+            _currentActivitiesUpdated.tryEmit(Unit)
+        }
+    }
+
+    fun removeListener() {
+        wearRPCClient.removeListener()
+    }
+
+    suspend fun loadActivities(): List<WearActivity> {
+        return wearRPCClient.queryActivities()
+    }
+
+    suspend fun loadCurrentActivities(): List<WearCurrentActivity> {
+        return wearRPCClient.queryCurrentActivities()
+    }
+
+    suspend fun setCurrentActivities(starting: List<WearCurrentActivity>) {
+        wearRPCClient.setCurrentActivities(starting)
+    }
+
+    suspend fun loadTagsForActivity(activityId: Long): List<WearTag> {
+        return wearRPCClient.queryTagsForActivity(activityId)
+    }
+
+    suspend fun loadSettings(): WearSettings {
+        return wearRPCClient.querySettings()
+    }
+}
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/data/WearRPCClient.kt b/wear/src/main/java/com/example/util/simpletimetracker/data/WearRPCClient.kt
@@ -5,21 +5,29 @@
  */
 package com.example.util.simpletimetracker.data
 
+import android.content.Context
 import com.example.util.simpletimetracker.wear_api.WearActivity
+import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
 import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
 import com.example.util.simpletimetracker.wear_api.WearRequests
 import com.example.util.simpletimetracker.wear_api.WearSettings
 import com.example.util.simpletimetracker.wear_api.WearTag
-import com.example.util.simpletimetracker.wear_api.WearCommunicationAPI
+import com.google.android.gms.wearable.MessageClient
+import com.google.android.gms.wearable.Wearable
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class WearRPCClient @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val messenger: Messenger,
 ) : WearCommunicationAPI {
 
     private val gson = Gson()
+    private var listener: MessageClient.OnMessageReceivedListener? = null
 
     override suspend fun ping(message: String): String {
         val response: String? = messenger
@@ -65,6 +73,28 @@ class WearRPCClient @Inject constructor(
         return response ?: throw WearRPCException("No response")
     }
 
+    fun addListener(
+        onDataChanged: () -> Unit,
+    ) {
+        listener = MessageClient.OnMessageReceivedListener {
+            if (it.path == WearRequests.DATA_UPDATED) {
+                val response: String? = it.data.let(::mapFromBytes)
+                if (response == WearRequests.DATA_UPDATED_CURRENT_ACTIVITIES) {
+                    onDataChanged()
+                }
+            }
+        }
+        listener?.let {
+            Wearable.getMessageClient(context).addListener(it)
+        }
+    }
+
+    fun removeListener() {
+        listener?.let {
+            Wearable.getMessageClient(context).removeListener(it)
+        }
+    }
+
     private fun <T> mapToBytes(data: T): ByteArray {
         return gson.toJson(data).toByteArray()
     }
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/domain/CurrentActivitiesMediator.kt b/wear/src/main/java/com/example/util/simpletimetracker/domain/CurrentActivitiesMediator.kt
@@ -1,13 +1,12 @@
 package com.example.util.simpletimetracker.domain
 
-import com.example.util.simpletimetracker.data.WearRPCClient
+import com.example.util.simpletimetracker.data.WearDataRepo
 import com.example.util.simpletimetracker.wear_api.WearCurrentActivity
-import com.example.util.simpletimetracker.wear_api.WearSettings
 import com.example.util.simpletimetracker.wear_api.WearTag
 import javax.inject.Inject
 
 class CurrentActivitiesMediator @Inject constructor(
-    private val rpc: WearRPCClient,
+    private val wearDataRepo: WearDataRepo,
 ) {
 
     suspend fun start(
@@ -19,21 +18,19 @@ class CurrentActivitiesMediator @Inject constructor(
             startedAt = System.currentTimeMillis(),
             tags = tags,
         )
-        if (settings().allowMultitasking) {
-            val currents = rpc.queryCurrentActivities()
-            this.rpc.setCurrentActivities(currents.plus(newCurrent))
+        val settings = wearDataRepo.loadSettings()
+
+        if (settings.allowMultitasking) {
+            val currents = wearDataRepo.loadCurrentActivities()
+            this.wearDataRepo.setCurrentActivities(currents.plus(newCurrent))
         } else {
-            this.rpc.setCurrentActivities(listOf(newCurrent))
+            this.wearDataRepo.setCurrentActivities(listOf(newCurrent))
         }
     }
 
     suspend fun stop(currentId: Long) {
-        val currents = rpc.queryCurrentActivities()
+        val currents = wearDataRepo.loadCurrentActivities()
         val remaining = currents.filter { it.id != currentId }
-        this.rpc.setCurrentActivities(remaining)
-    }
-
-    private suspend fun settings(): WearSettings {
-        return this.rpc.querySettings()
+        this.wearDataRepo.setCurrentActivities(remaining)
     }
 }
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/domain/StartActivityMediator.kt b/wear/src/main/java/com/example/util/simpletimetracker/domain/StartActivityMediator.kt
@@ -5,21 +5,21 @@
  */
 package com.example.util.simpletimetracker.domain
 
-import com.example.util.simpletimetracker.data.WearRPCClient
+import com.example.util.simpletimetracker.data.WearDataRepo
 import com.example.util.simpletimetracker.wear_api.WearActivity
 import com.example.util.simpletimetracker.wear_api.WearSettings
 import javax.inject.Inject
 
 class StartActivityMediator @Inject constructor(
-    private val api: WearRPCClient,
+    private val wearDataRepo: WearDataRepo,
 ) {
 
     suspend fun requestStart(
         activity: WearActivity,
         onRequestStartActivity: suspend (activity: WearActivity) -> Unit,
         onRequestTagSelection: suspend (activity: WearActivity) -> Unit,
     ) {
-        val settings = api.querySettings()
+        val settings = wearDataRepo.loadSettings()
         if (settings.showRecordTagSelection) {
             requestTagSelectionIfNeeded(
                 activity = activity,
@@ -38,11 +38,11 @@ class StartActivityMediator @Inject constructor(
         onRequestStartActivity: suspend (activity: WearActivity) -> Unit,
         onRequestTagSelection: suspend (activity: WearActivity) -> Unit,
     ) {
-        val tags = api.queryTagsForActivity(activity.id)
+        val tags = wearDataRepo.loadTagsForActivity(activity.id)
         val generalTags = tags.filter { it.isGeneral }
         val nonGeneralTags = tags.filter { !it.isGeneral }
-        val tagSelectionNeeded =
-            nonGeneralTags.isNotEmpty() || generalTags.isNotEmpty() && settings.recordTagSelectionEvenForGeneralTags
+        val tagSelectionNeeded = nonGeneralTags.isNotEmpty() ||
+            generalTags.isNotEmpty() && settings.recordTagSelectionEvenForGeneralTags
         if (tagSelectionNeeded) {
             onRequestTagSelection(activity)
         } else {
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/MainActivity.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/MainActivity.kt
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesViewModel.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesViewModel.kt
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/tagsSelection/TagsViewModel.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/tagsSelection/TagsViewModel.kt
diff --git a/wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/WearRequests.kt b/wear_api/src/main/java/com/example/util/simpletimetracker/wear_api/WearRequests.kt

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ class AddRunningRecordMediator @Inject constructor(`
`14`	`14`	`private val notificationGoalTimeInteractor: NotificationGoalTimeInteractor,`
`15`	`15`	`private val notificationGoalCountInteractor: NotificationGoalCountInteractor,`
`16`	`16`	`private val widgetInteractor: WidgetInteractor,`
	`17`	`+ private val wearInteractor: WearInteractor,`
`17`	`18`	`private val activityStartedStoppedBroadcastInteractor: ActivityStartedStoppedBroadcastInteractor,`
`18`	`19`	`) {`
`19`	`20`
`@@ -97,6 +98,7 @@ class AddRunningRecordMediator @Inject constructor(`
`97`	`98`	`if (runningRecordInteractor.getAll().size == 1) notificationActivityInteractor.checkAndSchedule()`
`98`	`99`	`notificationGoalTimeInteractor.checkAndReschedule(listOf(typeId))`
`99`	`100`	`widgetInteractor.updateWidgets()`
	`101`	`+ wearInteractor.updateCurrentActivities()`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`	`}`