acite/Aether
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Crash when page initialized before view model

Browse Source
This commit is contained in:
acite
2025-09-20 14:16:46 +08:00
parent 92f0e8543e
commit a298cb75e2
3 changed files with 153 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/acitelight/aether/view/ComicScreen.kt
View File

@@ -187,7 +187,7 @@ fun ComicScreen(
HorizontalDivider(thickness = 1.5.dp) HorizontalDivider(thickness = 1.5.dp)
LazyVerticalStaggeredGrid( LazyVerticalStaggeredGrid(
columns = StaggeredGridCells.Adaptive(128.dp), columns = StaggeredGridCells.Adaptive(136.dp),
contentPadding = PaddingValues(8.dp), contentPadding = PaddingValues(8.dp),
verticalItemSpacing = 8.dp, verticalItemSpacing = 8.dp,
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),

22
app/src/main/java/com/acitelight/aether/view/VideoScreen.kt
View File

@@ -118,7 +118,9 @@ fun VideoScreen(
val tabIndex by videoScreenViewModel.tabIndex val tabIndex by videoScreenViewModel.tabIndex
var menuVisibility by videoScreenViewModel.menuVisibility var menuVisibility by videoScreenViewModel.menuVisibility
var searchFilter by videoScreenViewModel.searchFilter var searchFilter by videoScreenViewModel.searchFilter
var doneInit by videoScreenViewModel.doneInit
if (doneInit)
CardPage(title = "Videos") { CardPage(title = "Videos") {
Box(Modifier.fillMaxSize()) Box(Modifier.fillMaxSize())
{ {
@@ -165,7 +167,9 @@ fun VideoScreen(
Box(Modifier.fillMaxHeight()) Box(Modifier.fillMaxHeight())
{ {
Text( Text(
text = videoScreenViewModel.videoLibrary.classes.getOrNull(tabIndex) text = videoScreenViewModel.videoLibrary.classes.getOrNull(
tabIndex
)
?: "", ?: "",
style = MaterialTheme.typography.bodyLarge, style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
@@ -179,13 +183,15 @@ fun VideoScreen(
Row( Row(
modifier = Modifier modifier = Modifier
.height(36.dp).widthIn(max = 240.dp) .height(36.dp)
.widthIn(max = 240.dp)
.background(colorScheme.primary, RoundedCornerShape(8.dp)) .background(colorScheme.primary, RoundedCornerShape(8.dp))
.padding(horizontal = 6.dp) .padding(horizontal = 6.dp)
) { ) {
Icon( Icon(
modifier = Modifier modifier = Modifier
.size(30.dp).align(Alignment.CenterVertically), .size(30.dp)
.align(Alignment.CenterVertically),
imageVector = Icons.Default.Search, imageVector = Icons.Default.Search,
contentDescription = "Catalogue" contentDescription = "Catalogue"
) )
@@ -203,12 +209,18 @@ fun VideoScreen(
) )
} }
} }
HorizontalDivider(Modifier.padding(bottom = 8.dp), 1.5.dp, DividerDefaults.color) HorizontalDivider(
Modifier.padding(bottom = 8.dp),
1.5.dp,
DividerDefaults.color
)
LazyVerticalStaggeredGrid( LazyVerticalStaggeredGrid(
columns = StaggeredGridCells.Adaptive(160.dp), columns = StaggeredGridCells.Adaptive(160.dp),
contentPadding = PaddingValues(8.dp), contentPadding = PaddingValues(8.dp),
verticalItemSpacing = 8.dp, verticalItemSpacing = 8.dp,
horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp), horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(
8.dp
),
state = state, state = state,
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {

6
app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
View File

@@ -47,6 +47,7 @@ class VideoScreenViewModel @Inject constructor(
var imageLoader: ImageLoader? = null; var imageLoader: ImageLoader? = null;
var menuVisibility = mutableStateOf(false) var menuVisibility = mutableStateOf(false)
var searchFilter = mutableStateOf("") var searchFilter = mutableStateOf("")
var doneInit = mutableStateOf(false)
suspend fun init() { suspend fun init() {
fetchManager.configured.filter { it }.first() fetchManager.configured.filter { it }.first()
@@ -69,7 +70,8 @@ class VideoScreenViewModel @Inject constructor(
val r = vl.sortedWith(compareBy(naturalOrder()) { it.video.name }) val r = vl.sortedWith(compareBy(naturalOrder()) { it.video.name })
videoLibrary.classesMap[videoLibrary.classes[0]]?.addAll(r) videoLibrary.classesMap[videoLibrary.classes[0]]?.addAll(r)
} }
} else { }
else {
videoLibrary.classes.add("Offline") videoLibrary.classes.add("Offline")
videoLibrary.updatingMap[0] = true videoLibrary.updatingMap[0] = true
videoLibrary.classesMap["Offline"] = mutableStateListOf<Video>() videoLibrary.classesMap["Offline"] = mutableStateListOf<Video>()
@@ -85,6 +87,8 @@ class VideoScreenViewModel @Inject constructor(
videoLibrary.classesMap[videoLibrary.classes[0]]?.addAll(jsonQuery) videoLibrary.classesMap[videoLibrary.classes[0]]?.addAll(jsonQuery)
} }
doneInit.value = true
} }
fun setTabIndex(index: Int) { fun setTabIndex(index: Int) {