FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve AccountSelectionScreen UI

This commit is contained in:
Shinokuni 2024-07-10 19:02:21 +02:00
parent ba7b2b7108
commit 36d9aef2bb
1 changed files with 100 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/src/main/java/com/readrops/app/account/selection/AccountSelectionScreen.kt
View File

@ -29,6 +29,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.BuildConfig
import com.readrops.app.R
import com.readrops.app.account.credentials.AccountCredentialsScreen
import com.readrops.app.account.credentials.AccountCredentialsScreenMode
@ -36,6 +37,7 @@ import com.readrops.app.home.HomeScreen
import com.readrops.app.util.components.AndroidScreen
import com.readrops.app.util.components.SelectableImageText
import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.Account
@ -58,20 +60,32 @@ class AccountSelectionScreen : AndroidScreen() {
is NavState.GoToAccountCredentialsScreen -> {
val accountType = (state as NavState.GoToAccountCredentialsScreen).accountType
val account = Account(accountType = accountType, accountName = stringResource(id = accountType.typeName))
val account = Account(
accountType = accountType,
accountName = stringResource(id = accountType.typeName)
)
navigator.push(AccountCredentialsScreen(account, AccountCredentialsScreenMode.NEW_CREDENTIALS))
navigator.push(
AccountCredentialsScreen(
account,
AccountCredentialsScreenMode.NEW_CREDENTIALS
)
)
screenModel.resetNavState()
}
else -> {}
}
Column(
modifier = Modifier.fillMaxSize()
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier
.fillMaxSize()
.weight(1f)
.padding(MaterialTheme.spacing.mediumSpacing)
) {
Image(
@ -95,32 +109,74 @@ class AccountSelectionScreen : AndroidScreen() {
) {
Text(
text = stringResource(id = R.string.choose_account),
style = MaterialTheme.typography.labelLarge
style = MaterialTheme.typography.titleMedium,
modifier = Modifier.align(Alignment.CenterHorizontally)
)
ShortSpacer()
MediumSpacer()
Text(
text = stringResource(id = R.string.local),
style = MaterialTheme.typography.bodyMedium
)
AccountType.values().forEach { accountType ->
SelectableImageText(
image = adaptiveIconPainterResource(id = accountType.iconRes),
text = stringResource(id = accountType.typeName),
style = MaterialTheme.typography.titleLarge,
onClick = { screenModel.createAccount(accountType) },
spacing = MaterialTheme.spacing.shortSpacing,
image = adaptiveIconPainterResource(id = R.mipmap.ic_launcher),
text = stringResource(id = AccountType.LOCAL.typeName),
style = MaterialTheme.typography.bodyLarge,
spacing = MaterialTheme.spacing.mediumSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
imageSize = 24.dp,
onClick = { screenModel.createAccount(AccountType.LOCAL) }
)
}
SelectableImageText(
image = adaptiveIconPainterResource(id = R.mipmap.ic_launcher),
text = stringResource(id = R.string.opml_import),
style = MaterialTheme.typography.titleLarge,
onClick = { },
spacing = MaterialTheme.spacing.shortSpacing,
style = MaterialTheme.typography.bodyLarge,
spacing = MaterialTheme.spacing.mediumSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
imageSize = 24.dp,
onClick = { }
)
MediumSpacer()
Text(
text = "External",
style = MaterialTheme.typography.bodyMedium
)
ShortSpacer()
AccountType.entries.filter { it != AccountType.LOCAL }
.forEach { accountType ->
SelectableImageText(
image = adaptiveIconPainterResource(id = accountType.iconRes),
text = stringResource(id = accountType.typeName),
style = MaterialTheme.typography.bodyLarge,
imageSize = 24.dp,
spacing = MaterialTheme.spacing.mediumSpacing,
padding = MaterialTheme.spacing.mediumSpacing,
onClick = { screenModel.createAccount(accountType) }
)
}
}
}
}
Text(
text = "v${BuildConfig.VERSION_NAME}",
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier
.align(Alignment.CenterHorizontally)
.padding(bottom = MaterialTheme.spacing.largeSpacing)
)
}
}
}
// from https://gist.github.com/tkuenneth/ddf598663f041dc79960cda503d14448