Desktop refresh

Author: jdamcd

desktop/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
 dependencies {
     implementation(project(":shared"))
     implementation(compose.desktop.currentOs)
+    implementation(compose.material3)
     implementation(libs.compose.viewmodel)
     implementation(libs.coroutines.swing)
     implementation(libs.koin)

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/ArrivalsView.kt

@@ -13,9 +13,16 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Icon
 import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -27,7 +34,8 @@ import com.jdamcd.arrivals.Arrival
 
 @Composable
 fun ArrivalsView(
-    state: ArrivalsState
+    state: ArrivalsState,
+    onClickRefresh: () -> Unit
 ) {
     Column(
         modifier = Modifier
@@ -37,7 +45,7 @@ fun ArrivalsView(
     ) {
         when (state) {
             is ArrivalsState.Loading -> Loading()
-            is ArrivalsState.Data -> Data(state)
+            is ArrivalsState.Data -> Data(state, onClickRefresh)
             is ArrivalsState.Error -> Error(state.message)
         }
     }
@@ -49,12 +57,12 @@ private fun Loading() {
         modifier = Modifier.fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
-        CircularProgressIndicator(color = Text)
+        CircularProgressIndicator(color = LedYellow)
     }
 }
 
 @Composable
-private fun Data(state: ArrivalsState.Data) {
+private fun Data(state: ArrivalsState.Data, onClickRefresh: () -> Unit) {
     Column(
         modifier = Modifier
             .padding(32.dp)
@@ -68,8 +76,11 @@ private fun Data(state: ArrivalsState.Data) {
     Row(
         modifier = Modifier
             .background(color = Footer)
-            .padding(16.dp)
+            .padding(start = 32.dp, end = 28.dp, bottom = 4.dp)
             .fillMaxWidth()
+            .height(70.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
             text = state.result.station,
@@ -78,6 +89,29 @@ private fun Data(state: ArrivalsState.Data) {
                 fontSize = 32.sp
             )
         )
+        Box(
+            modifier = Modifier.size(42.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            if (state.refreshing) {
+                CircularProgressIndicator(color = LedYellow, modifier = Modifier.size(22.dp))
+            } else {
+                TextButton(
+                    onClick = { onClickRefresh() },
+                    colors = ButtonDefaults.textButtonColors(
+                        contentColor = Text,
+                        backgroundColor = Footer
+                    )
+                ) {
+                    Icon(
+                        Icons.Rounded.Refresh,
+                        contentDescription = "Refresh",
+                        modifier = Modifier.size(32.dp),
+                        tint = Text
+                    )
+                }
+            }
+        }
     }
 }
 

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/ArrivalsViewModel.kt

@@ -4,36 +4,55 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.jdamcd.arrivals.Arrivals
 import com.jdamcd.arrivals.ArrivalsInfo
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class ArrivalsViewModel(arrivals: Arrivals) : ViewModel() {
+class ArrivalsViewModel(private val arrivals: Arrivals) : ViewModel() {
 
     private val _uiState = MutableStateFlow<ArrivalsState>(ArrivalsState.Loading)
     val uiState: StateFlow<ArrivalsState> = _uiState.asStateFlow()
 
+    private var job: Job? = null
+
     init {
-        viewModelScope.launch {
+        startUpdates()
+    }
+
+    fun refresh() {
+        startUpdates()
+    }
+
+    private fun startUpdates() {
+        job?.cancel()
+        job = viewModelScope.launch {
             while (true) {
-                try {
-                    val result = arrivals.latest()
-                    _uiState.value = ArrivalsState.Data(result)
-                } catch (e: Exception) {
-                    if (_uiState.value !is ArrivalsState.Data) {
-                        _uiState.value = ArrivalsState.Error(e.message ?: "Unknown error")
-                    }
-                }
+                update()
                 delay(60_000L) // 60 seconds
             }
         }
     }
+
+    private suspend fun update() {
+        if (_uiState.value is ArrivalsState.Data) {
+            _uiState.value = ArrivalsState.Data((_uiState.value as ArrivalsState.Data).result, true)
+        }
+        try {
+            val result = arrivals.latest()
+            _uiState.value = ArrivalsState.Data(result, false)
+        } catch (e: Exception) {
+            if (_uiState.value !is ArrivalsState.Data) {
+                _uiState.value = ArrivalsState.Error(e.message ?: "Unknown error")
+            }
+        }
+    }
 }
 
 sealed class ArrivalsState {
     data object Loading : ArrivalsState()
-    data class Data(val result: ArrivalsInfo) : ArrivalsState()
+    data class Data(val result: ArrivalsInfo, val refreshing: Boolean) : ArrivalsState()
     data class Error(val message: String) : ArrivalsState()
 }

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/Main.kt

@@ -28,6 +28,6 @@ fun main() = application {
         state = windowState,
         title = "Arrivals"
     ) {
-        ArrivalsView(state)
+        ArrivalsView(state, viewModel::refresh)
     }
 }