SheWhoReignsSupreme/GoonManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(HomeScreen): improve failure ui

Browse source
This commit is contained in:
rushiiMachine 2025-03-28 12:52:57 -07:00
parent b1af433e98
commit 6d03129eb4
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/com/aliucord/manager/ui/screens/about/components/LoadFailure.kt → app/src/main/kotlin/com/aliucord/manager/ui/components/LoadFailure.kt
View file

@ -1,4 +1,4 @@
package com.aliucord.manager.ui.screens.about.components package com.aliucord.manager.ui.components
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material3.* import androidx.compose.material3.*
@ -27,7 +27,7 @@ fun LoadFailure(modifier: Modifier = Modifier) {
text = stringResource(R.string.network_load_fail), text = stringResource(R.string.network_load_fail),
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.error, color = MaterialTheme.colorScheme.error,
modifier = Modifier.padding(top = 10.dp, bottom = 2.dp), modifier = Modifier.padding(top = 4.dp, bottom = 2.dp),
) )
} }
} }

1
app/src/main/kotlin/com/aliucord/manager/ui/screens/about/AboutScreen.kt
View file

@ -20,7 +20,6 @@ import cafe.adriel.voyager.koin.getScreenModel
import com.aliucord.manager.R import com.aliucord.manager.R
import com.aliucord.manager.ui.components.* import com.aliucord.manager.ui.components.*
import com.aliucord.manager.ui.screens.about.components.LeadContributor import com.aliucord.manager.ui.screens.about.components.LeadContributor
import com.aliucord.manager.ui.screens.about.components.LoadFailure
import com.aliucord.manager.ui.util.paddings.PaddingValuesSides import com.aliucord.manager.ui.util.paddings.PaddingValuesSides
import com.aliucord.manager.ui.util.paddings.exclude import com.aliucord.manager.ui.util.paddings.exclude
import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.IgnoredOnParcel

43
app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt
View file

@ -25,8 +25,7 @@ import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.aliucord.manager.R import com.aliucord.manager.R
import com.aliucord.manager.ui.components.AnimatedVersionDisplay import com.aliucord.manager.ui.components.*
import com.aliucord.manager.ui.components.ProjectHeader
import com.aliucord.manager.ui.screens.home.components.* import com.aliucord.manager.ui.screens.home.components.*
import com.aliucord.manager.ui.screens.patchopts.PatchOptionsScreen import com.aliucord.manager.ui.screens.patchopts.PatchOptionsScreen
import com.aliucord.manager.ui.screens.plugins.PluginsScreen import com.aliucord.manager.ui.screens.plugins.PluginsScreen
@ -57,13 +56,13 @@ class HomeScreen : Screen, Parcelable {
topBar = { HomeAppBar() }, topBar = { HomeAppBar() },
) { padding -> ) { padding ->
when (model.installations) { when (model.installations) {
is InstallsState.Fetched -> PresentInstallsContent( is InstallsState.Fetched -> LoadedContent(
model = model, model = model,
padding = padding, padding = padding,
onClickInstall = { navigator.push(PatchOptionsScreen(supportedVersion = model.supportedVersion)) }, onClickInstall = { navigator.push(PatchOptionsScreen(supportedVersion = model.supportedVersion)) },
) )
InstallsState.Fetching -> LoadingInstallsContent(padding = padding) InstallsState.Fetching -> LoadingContent(padding = padding)
InstallsState.None -> NoInstallsContent( InstallsState.None -> NoInstallsContent(
onClickInstall = { navigator.push(PatchOptionsScreen(supportedVersion = model.supportedVersion)) }, onClickInstall = { navigator.push(PatchOptionsScreen(supportedVersion = model.supportedVersion)) },
@ -71,25 +70,14 @@ class HomeScreen : Screen, Parcelable {
.padding(padding.exclude(PaddingValuesSides.Bottom)), .padding(padding.exclude(PaddingValuesSides.Bottom)),
) )
InstallsState.Error -> { InstallsState.Error -> FailureContent(padding = padding)
// This is ugly asf but it should never happen
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.padding(padding),
) {
Text(
text = "Failed to fetch installations",
style = MaterialTheme.typography.labelMedium,
)
}
}
} }
} }
} }
} }
@Composable @Composable
fun LoadingInstallsContent(padding: PaddingValues) { private fun LoadingContent(padding: PaddingValues) {
Column( Column(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier modifier = Modifier
@ -102,7 +90,7 @@ fun LoadingInstallsContent(padding: PaddingValues) {
} }
@Composable @Composable
fun PresentInstallsContent( private fun LoadedContent(
model: HomeModel, model: HomeModel,
padding: PaddingValues, padding: PaddingValues,
onClickInstall: () -> Unit, onClickInstall: () -> Unit,
@ -164,7 +152,7 @@ fun PresentInstallsContent(
} }
@Composable @Composable
fun NoInstallsContent( private fun NoInstallsContent(
onClickInstall: () -> Unit, onClickInstall: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
@ -208,3 +196,20 @@ fun NoInstallsContent(
} }
} }
} }
@Composable
fun FailureContent(
padding: PaddingValues,
) {
Column(
verticalArrangement = Arrangement.spacedBy(6.dp),
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.padding(padding)
.padding(16.dp)
.fillMaxSize(),
) {
ProjectHeader()
LoadFailure(modifier = Modifier.fillMaxSize())
}
}