From edc2d4596675cc24d387e1b22a6b33545f603308 Mon Sep 17 00:00:00 2001 From: Hy4ri Date: Tue, 16 Jun 2026 00:36:58 +0300 Subject: [PATCH] fix: correct log response key to 'lines' and convert refresh text to icon button in LogsScreen --- .../java/com/m57/hermescontrol/data/model/LogResponse.kt | 3 ++- .../main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt | 6 +++++- .../java/com/m57/hermescontrol/ui/logs/LogsViewModel.kt | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/LogResponse.kt b/app/src/main/java/com/m57/hermescontrol/data/model/LogResponse.kt index 48876d42..bbdefdcf 100644 --- a/app/src/main/java/com/m57/hermescontrol/data/model/LogResponse.kt +++ b/app/src/main/java/com/m57/hermescontrol/data/model/LogResponse.kt @@ -1,5 +1,6 @@ package com.m57.hermescontrol.data.model data class LogResponse( - val logs: List, + val lines: List? = null, + val logs: List? = null, ) diff --git a/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt index c61ea5a3..4489e55b 100644 --- a/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt +++ b/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.Refresh import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -79,7 +80,10 @@ fun LogsScreen( title = { Text("System Logs") }, actions = { IconButton(onClick = { viewModel.loadLogs() }) { - Text("Refresh", style = MaterialTheme.typography.bodyMedium) + Icon( + imageVector = Icons.Filled.Refresh, + contentDescription = "Refresh", + ) } }, ) diff --git a/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsViewModel.kt index 64c1a74b..a4722e7a 100644 --- a/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsViewModel.kt +++ b/app/src/main/java/com/m57/hermescontrol/ui/logs/LogsViewModel.kt @@ -31,7 +31,9 @@ class LogsViewModel : ViewModel() { ApiClient.hermesApi.getLogs() } if (response.isSuccessful) { - _uiState.update { it.copy(isLoading = false, logs = response.body()?.logs.orEmpty()) } + val body = response.body() + val logsList = body?.lines ?: body?.logs ?: emptyList() + _uiState.update { it.copy(isLoading = false, logs = logsList) } } else { _uiState.update { it.copy(