bollwerkadmin/bollwerk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

release: v1.7.24 – ResourceDetailScreen with markdown rendering

Browse source
This commit is contained in:
Jens Reinemann 2026-05-18 23:42:09 +02:00
parent 26117ac23f
commit c24a32b033
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -15,8 +15,8 @@ android {
applicationId = "de.bollwerk.app" applicationId = "de.bollwerk.app"
minSdk = 26 minSdk = 26
targetSdk = 35 targetSdk = 35
versionCode = 23 versionCode = 24
versionName = "1.7.23" versionName = "1.7.24"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField("boolean", "FEATURE_CAMERA_ENABLED", "false") buildConfigField("boolean", "FEATURE_CAMERA_ENABLED", "false")

8
app/src/main/java/de/bollwerk/app/ui/resources/ResourceListScreen.kt
View file

@ -109,6 +109,14 @@ internal fun ResourceListScreen(
} }
} }
// Show error message from refresh
uiState.errorMessage?.let { msg ->
LaunchedEffect(msg) {
snackbarHostState.showSnackbar(msg)
viewModel.clearError()
}
}
Scaffold( Scaffold(
topBar = { topBar = {
TopAppBar( TopAppBar(

9
app/src/main/java/de/bollwerk/app/ui/resources/ResourceListViewModel.kt
View file

@ -36,7 +36,8 @@ internal data class ResourceListUiState(
val sortMode: SortMode = SortMode.TITLE_ASC, val sortMode: SortMode = SortMode.TITLE_ASC,
val isLoading: Boolean = false, val isLoading: Boolean = false,
val allTags: List<String> = emptyList(), val allTags: List<String> = emptyList(),
val downloadStates: Map<String, DownloadState> = emptyMap() val downloadStates: Map<String, DownloadState> = emptyMap(),
val errorMessage: String? = null
) )
@HiltViewModel @HiltViewModel
@ -62,6 +63,8 @@ internal class ResourceListViewModel @Inject constructor(
_uiState.update { it.copy(isLoading = true) } _uiState.update { it.copy(isLoading = true) }
try { try {
resourceRepository.refreshFromServer() resourceRepository.refreshFromServer()
} catch (_: Exception) {
_uiState.update { it.copy(errorMessage = "Aktualisierung fehlgeschlagen") }
} finally { } finally {
_uiState.update { it.copy(isLoading = false) } _uiState.update { it.copy(isLoading = false) }
} }
@ -117,4 +120,8 @@ internal class ResourceListViewModel @Inject constructor(
state.copy(downloadStates = state.downloadStates + (guid to DownloadState.Idle)) state.copy(downloadStates = state.downloadStates + (guid to DownloadState.Idle))
} }
} }
fun clearError() {
_uiState.update { it.copy(errorMessage = null) }
}
} }