make calling icon change color depending on call state

Author: zoff99

src/main/kotlin/com/zoffcc/applications/trifa/AVState.kt

@@ -3,15 +3,19 @@ package com.zoffcc.applications.trifa
 import CAPTURE_VIDEO_FPS
 import CAPTURE_VIDEO_HEIGHT
 import CAPTURE_VIDEO_WIDTH
+import avstatestorecallstate
 import com.zoffcc.applications.ffmpegav.AVActivity
 import com.zoffcc.applications.ffmpegav.AVActivity.ffmpegav_init
 import global_prefs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import java.nio.ByteBuffer
 import java.util.concurrent.Semaphore
 
+data class AVStateCallState(val call_state: AVState.CALL_STATUS = AVState.CALL_STATUS.CALL_STATUS_NONE)
+
 data class AVState(val a: Int)
 {
     enum class CALL_DEVICES_STATE {
@@ -43,7 +47,7 @@ data class AVState(val a: Int)
     private var audio_in_source = ""
     private var video_in_device = ""
     private var video_in_source = ""
-    private var calling_state = CALL_STATUS.CALL_STATUS_NONE
+    var calling_state = CALL_STATUS.CALL_STATUS_NONE
     private var devices_state = CALL_DEVICES_STATE.CALL_DEVICES_STATE_CLOSED
     private var call_with_friend_pubkey: String? = null
     private var semaphore_avstate = CustomSemaphore(1)
@@ -140,6 +144,7 @@ data class AVState(val a: Int)
     fun calling_state_set(value: CALL_STATUS)
     {
         calling_state = value
+        avstatestorecallstate.update(status = value)
     }
 
     fun ffmpeg_init_done_get(): Boolean
@@ -502,4 +507,27 @@ fun CoroutineScope.createAVStateStore(): AVStateStore
     {
         override val stateFlow: StateFlow<AVState> = mutableStateFlow
     }
+}
+
+interface AVStateStoreCallState
+{
+    val stateFlow: StateFlow<AVStateCallState>
+    val state get() = stateFlow.value
+    fun update(status: AVState.CALL_STATUS)
+}
+
+fun CoroutineScope.createAVStateStoreCallState(): AVStateStoreCallState
+{
+    val mutableStateFlow = MutableStateFlow(AVStateCallState())
+
+    return object : AVStateStoreCallState
+    {
+        override val stateFlow: StateFlow<AVStateCallState> = mutableStateFlow
+        override fun update(status: AVState.CALL_STATUS)
+        {
+            launch {
+                mutableStateFlow.value = state.copy(call_state = status)
+            }
+        }
+    }
 }

src/main/kotlin/com/zoffcc/applications/trifa2/ChatApp.kt

@@ -48,6 +48,7 @@ import com.zoffcc.applications.trifa.TRIFAGlobals
 import com.zoffcc.applications.trifa.ToxVars
 import com.zoffcc.applications.trifa.ToxVars.TOX_MESSAGE_TYPE
 import com.zoffcc.applications.trifa.createAVStateStore
+import com.zoffcc.applications.trifa.createAVStateStoreCallState
 import com.zoffcc.applications.trifa.createContactStore
 import com.zoffcc.applications.trifa.createGroupPeerStore
 import com.zoffcc.applications.trifa.createGroupStore
@@ -69,6 +70,7 @@ val groupstore = CoroutineScope(SupervisorJob()).createGroupStore()
 val savepathstore = CoroutineScope(SupervisorJob()).createSavepathStore()
 val toxdatastore = CoroutineScope(SupervisorJob()).createToxDataStore()
 val avstatestore = CoroutineScope(SupervisorJob()).createAVStateStore()
+val avstatestorecallstate = CoroutineScope(SupervisorJob()).createAVStateStoreCallState()
 
 @Composable
 fun ChatAppWithScaffold(focusRequester: FocusRequester, displayTextField: Boolean = true, contactList: StateContacts, ui_scale: Float)
@@ -85,6 +87,7 @@ fun ChatAppWithScaffold(focusRequester: FocusRequester, displayTextField: Boolea
                     IconButton(onClick = {/* Do Something*/ }) {
                         Icon(Icons.Filled.Call, null)
                     }
+                    val curren_callstate by avstatestorecallstate.stateFlow.collectAsState()
                     IconButton(onClick = {
                         // video call button pressed
                         val friendpubkey = contactList.selectedContactPubkey
@@ -112,10 +115,9 @@ fun ChatAppWithScaffold(focusRequester: FocusRequester, displayTextField: Boolea
                         avstatestore.state.start_av_call()
                         println("toxav: set 003")
                     }) {
-                        // TODO: make this actually work!
-                        if (avstatestore.state.calling_state_get() == AVState.CALL_STATUS.CALL_STATUS_CALLING)
+                        if (curren_callstate.call_state == AVState.CALL_STATUS.CALL_STATUS_CALLING)
                         {
-                            Icon(imageVector = Icons.Filled.Videocam, contentDescription = null,
+                            Icon(imageVector = Icons.Filled.Videocam, contentDescription = "",
                                 tint = Color.Red)
                         }
                         else