This change also introduces: - Small refactor of credentials request state. - Improvements to single field password dialog (like the one used in SSH) to be able to show the password as well as to add custom message errors. Fixes #45
220 lines
8.0 KiB
Kotlin
220 lines
8.0 KiB
Kotlin
package com.jetpackduba.gitnuro.ui
|
|
|
|
import androidx.compose.animation.AnimatedVisibility
|
|
import androidx.compose.animation.Crossfade
|
|
import androidx.compose.animation.fadeIn
|
|
import androidx.compose.animation.fadeOut
|
|
import androidx.compose.foundation.background
|
|
import androidx.compose.foundation.clickable
|
|
import androidx.compose.foundation.interaction.MutableInteractionSource
|
|
import androidx.compose.foundation.layout.*
|
|
import androidx.compose.material.Card
|
|
import androidx.compose.material.LinearProgressIndicator
|
|
import androidx.compose.material.MaterialTheme
|
|
import androidx.compose.material.Text
|
|
import androidx.compose.runtime.*
|
|
import androidx.compose.ui.Alignment
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.input.key.onPreviewKeyEvent
|
|
import androidx.compose.ui.text.font.FontWeight
|
|
import androidx.compose.ui.unit.dp
|
|
import androidx.compose.ui.unit.sp
|
|
import com.jetpackduba.gitnuro.LoadingRepository
|
|
import com.jetpackduba.gitnuro.LocalTabScope
|
|
import com.jetpackduba.gitnuro.credentials.CredentialsAccepted
|
|
import com.jetpackduba.gitnuro.credentials.CredentialsRequested
|
|
import com.jetpackduba.gitnuro.credentials.CredentialsState
|
|
import com.jetpackduba.gitnuro.ui.dialogs.*
|
|
import com.jetpackduba.gitnuro.ui.dialogs.settings.SettingsDialog
|
|
import com.jetpackduba.gitnuro.viewmodels.RepositorySelectionStatus
|
|
import com.jetpackduba.gitnuro.viewmodels.TabViewModel
|
|
import kotlinx.coroutines.delay
|
|
|
|
@Composable
|
|
fun AppTab(
|
|
tabViewModel: TabViewModel,
|
|
) {
|
|
val errorManager = tabViewModel.errorsManager
|
|
val lastError by errorManager.error.collectAsState(null)
|
|
val showError by tabViewModel.showError.collectAsState()
|
|
|
|
if (lastError != null) {
|
|
LaunchedEffect(lastError) {
|
|
tabViewModel.showError.value = true
|
|
delay(5000)
|
|
tabViewModel.showError.value = false
|
|
}
|
|
}
|
|
|
|
val repositorySelectionStatus = tabViewModel.repositorySelectionStatus.collectAsState()
|
|
val repositorySelectionStatusValue = repositorySelectionStatus.value
|
|
val isProcessing by tabViewModel.processing.collectAsState()
|
|
|
|
LocalTabScope.current.appStateManager
|
|
Box {
|
|
Column(
|
|
modifier = Modifier
|
|
.background(MaterialTheme.colors.surface)
|
|
.fillMaxSize()
|
|
) {
|
|
|
|
CredentialsDialog(tabViewModel)
|
|
|
|
var showSettingsDialog by remember { mutableStateOf(false) }
|
|
if (showSettingsDialog) {
|
|
SettingsDialog(
|
|
onDismiss = { showSettingsDialog = false }
|
|
)
|
|
}
|
|
|
|
var showCloneDialog by remember { mutableStateOf(false) }
|
|
|
|
if (showCloneDialog) {
|
|
CloneDialog(
|
|
onClose = {
|
|
showCloneDialog = false
|
|
},
|
|
onOpenRepository = { dir ->
|
|
tabViewModel.openRepository(dir)
|
|
},
|
|
)
|
|
}
|
|
|
|
Box(modifier = Modifier.fillMaxSize()) {
|
|
Crossfade(targetState = repositorySelectionStatus) {
|
|
when (repositorySelectionStatusValue) {
|
|
RepositorySelectionStatus.None -> {
|
|
WelcomePage(
|
|
tabViewModel = tabViewModel,
|
|
onShowCloneDialog = { showCloneDialog = true },
|
|
onShowSettings = { showSettingsDialog = true }
|
|
)
|
|
}
|
|
|
|
is RepositorySelectionStatus.Opening -> {
|
|
LoadingRepository(repositorySelectionStatusValue.path)
|
|
}
|
|
|
|
is RepositorySelectionStatus.Open -> {
|
|
RepositoryOpenPage(
|
|
tabViewModel = tabViewModel,
|
|
onShowSettingsDialog = { showSettingsDialog = true },
|
|
onShowCloneDialog = { showCloneDialog = true },
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (isProcessing) {
|
|
Box(
|
|
modifier = Modifier
|
|
.fillMaxSize()
|
|
.background(MaterialTheme.colors.surface)
|
|
.onPreviewKeyEvent { true }, // Disable all keyboard events
|
|
contentAlignment = Alignment.Center,
|
|
) {
|
|
Column {
|
|
|
|
LinearProgressIndicator(
|
|
modifier = Modifier.width(340.dp),
|
|
color = MaterialTheme.colors.secondary,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
val safeLastError = lastError
|
|
if (safeLastError != null) {
|
|
AnimatedVisibility(
|
|
visible = showError,
|
|
enter = fadeIn(),
|
|
exit = fadeOut(),
|
|
modifier = Modifier
|
|
.align(Alignment.BottomEnd)
|
|
.padding(end = 32.dp, bottom = 32.dp)
|
|
) {
|
|
val interactionSource = remember { MutableInteractionSource() }
|
|
// TODO: Rework popup to appear on top of every other UI component, even dialogs
|
|
Card(
|
|
modifier = Modifier
|
|
.defaultMinSize(minWidth = 200.dp, minHeight = 100.dp)
|
|
.clickable(
|
|
enabled = true,
|
|
onClick = {},
|
|
interactionSource = interactionSource,
|
|
indication = null
|
|
),
|
|
backgroundColor = MaterialTheme.colors.error,
|
|
) {
|
|
Column(
|
|
modifier = Modifier
|
|
.padding(horizontal = 32.dp)
|
|
) {
|
|
Text(
|
|
text = "Error",
|
|
fontSize = 20.sp,
|
|
fontWeight = FontWeight.Medium,
|
|
modifier = Modifier
|
|
.padding(top = 16.dp),
|
|
color = MaterialTheme.colors.onError,
|
|
) // TODO Add more descriptive title
|
|
|
|
Text(
|
|
text = lastError?.message ?: "",
|
|
color = MaterialTheme.colors.onError,
|
|
modifier = Modifier
|
|
.padding(top = 8.dp, bottom = 16.dp)
|
|
.widthIn(max = 600.dp)
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@Composable
|
|
fun CredentialsDialog(gitManager: TabViewModel) {
|
|
val credentialsState = gitManager.credentialsState.collectAsState()
|
|
|
|
when (val credentialsStateValue = credentialsState.value) {
|
|
CredentialsRequested.HttpCredentialsRequested -> {
|
|
UserPasswordDialog(
|
|
onReject = {
|
|
gitManager.credentialsDenied()
|
|
},
|
|
onAccept = { user, password ->
|
|
gitManager.httpCredentialsAccepted(user, password)
|
|
}
|
|
)
|
|
}
|
|
CredentialsRequested.SshCredentialsRequested -> {
|
|
SshPasswordDialog(
|
|
onReject = {
|
|
gitManager.credentialsDenied()
|
|
},
|
|
onAccept = { password ->
|
|
gitManager.sshCredentialsAccepted(password)
|
|
}
|
|
)
|
|
}
|
|
is CredentialsRequested.GpgCredentialsRequested -> {
|
|
GpgPasswordDialog(
|
|
gpgCredentialsRequested = credentialsStateValue,
|
|
onReject = {
|
|
gitManager.credentialsDenied()
|
|
},
|
|
onAccept = { password ->
|
|
gitManager.gpgCredentialsAccepted(password)
|
|
}
|
|
)
|
|
}
|
|
|
|
is CredentialsAccepted, CredentialsState.None, CredentialsState.CredentialsDenied -> { /* Nothing to do */ }
|
|
}
|
|
}
|