feat: mask session loading, fix profile loading centering
Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
parent
4524b23b3d
commit
9c189c49b4
|
|
@ -245,23 +245,33 @@ fun ProfileSettingsScreen(
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val scrollState = rememberScrollState()
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.verticalScroll(rememberScrollState())
|
.then(
|
||||||
|
if (viewModel.isLoading) {
|
||||||
|
Modifier
|
||||||
|
} else {
|
||||||
|
Modifier.verticalScroll(scrollState)
|
||||||
|
}
|
||||||
|
),
|
||||||
|
verticalArrangement = if (viewModel.isLoading) {
|
||||||
|
Arrangement.Center
|
||||||
|
} else {
|
||||||
|
Arrangement.Top
|
||||||
|
},
|
||||||
|
horizontalAlignment = if (viewModel.isLoading) {
|
||||||
|
Alignment.CenterHorizontally
|
||||||
|
} else {
|
||||||
|
Alignment.Start
|
||||||
|
}
|
||||||
) {
|
) {
|
||||||
if (viewModel.isLoading) {
|
if (viewModel.isLoading) {
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
CircularProgressIndicator(
|
CircularProgressIndicator(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(48.dp)
|
.size(48.dp)
|
||||||
)
|
)
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
RevoltAPI.userCache[RevoltAPI.selfId]?.let {
|
RevoltAPI.userCache[RevoltAPI.selfId]?.let {
|
||||||
RawUserOverview(
|
RawUserOverview(
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,11 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.safeDrawingPadding
|
import androidx.compose.foundation.layout.safeDrawingPadding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.material3.AlertDialog
|
import androidx.compose.material3.AlertDialog
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
import androidx.compose.material3.FilledTonalButton
|
import androidx.compose.material3.FilledTonalButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
|
@ -49,6 +50,7 @@ import chat.revolt.components.settings.sessions.SessionItem
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class SessionSettingsScreenViewModel : ViewModel() {
|
class SessionSettingsScreenViewModel : ViewModel() {
|
||||||
|
var isLoading by mutableStateOf(true)
|
||||||
val sessions = mutableStateListOf<Session>()
|
val sessions = mutableStateListOf<Session>()
|
||||||
var currentSession by mutableStateOf<Session?>(null)
|
var currentSession by mutableStateOf<Session?>(null)
|
||||||
var showLogoutOtherConfirmation by mutableStateOf(false)
|
var showLogoutOtherConfirmation by mutableStateOf(false)
|
||||||
|
|
@ -61,6 +63,7 @@ class SessionSettingsScreenViewModel : ViewModel() {
|
||||||
"SessionSettingsScreen",
|
"SessionSettingsScreen",
|
||||||
"Current session: $currentSession. Current session ID: ${RevoltAPI.sessionId}"
|
"Current session: $currentSession. Current session ID: ${RevoltAPI.sessionId}"
|
||||||
)
|
)
|
||||||
|
isLoading = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -80,7 +83,7 @@ class SessionSettingsScreenViewModel : ViewModel() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalFoundationApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun SessionSettingsScreen(
|
fun SessionSettingsScreen(
|
||||||
navController: NavController,
|
navController: NavController,
|
||||||
|
|
@ -135,6 +138,19 @@ fun SessionSettingsScreen(
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (viewModel.isLoading) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize(),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
verticalArrangement = Arrangement.Center
|
||||||
|
) {
|
||||||
|
CircularProgressIndicator(
|
||||||
|
modifier = Modifier
|
||||||
|
.size(48.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
LazyColumn {
|
LazyColumn {
|
||||||
stickyHeader(key = "thisDevice") {
|
stickyHeader(key = "thisDevice") {
|
||||||
Text(
|
Text(
|
||||||
|
|
@ -213,7 +229,9 @@ fun SessionSettingsScreen(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
FilledTonalButton(onClick = { viewModel.showLogoutOtherConfirmation = true }) {
|
FilledTonalButton(onClick = {
|
||||||
|
viewModel.showLogoutOtherConfirmation = true
|
||||||
|
}) {
|
||||||
Text(stringResource(R.string.logout))
|
Text(stringResource(R.string.logout))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -239,3 +257,4 @@ fun SessionSettingsScreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue