Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed colors scheme of remotes and settings dialogs

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-08-04 00:52:19 +02:00
parent d5359effb6
commit 3de4339860
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/ui/dialogs/AuthorDialog.kt
View File

@ -1,7 +1,6 @@
package app.ui.dialogs package app.ui.dialogs
import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.* import androidx.compose.material.*
import androidx.compose.runtime.* import androidx.compose.runtime.*
@ -33,7 +32,6 @@ fun AuthorDialog(
MaterialDialog(onCloseRequested = onClose) { MaterialDialog(onCloseRequested = onClose) {
Column( Column(
modifier = Modifier modifier = Modifier
.background(MaterialTheme.colors.background)
.padding(horizontal = 8.dp), .padding(horizontal = 8.dp),
) { ) {

20
src/main/kotlin/app/ui/dialogs/EditRemotesDialog.kt
View File

@ -66,6 +66,7 @@ fun EditRemotesDialog(
MaterialDialog( MaterialDialog(
paddingVertical = 8.dp, paddingVertical = 8.dp,
paddingHorizontal = 16.dp, paddingHorizontal = 16.dp,
background = MaterialTheme.colors.surface,
onCloseRequested = onDismiss onCloseRequested = onDismiss
) { ) {
Column( Column(
@ -101,21 +102,21 @@ fun EditRemotesDialog(
Row( Row(
modifier = Modifier modifier = Modifier
.padding(bottom = 8.dp) .padding(bottom = 8.dp)
.background(MaterialTheme.colors.surface)
) { ) {
Column( Column(
modifier = Modifier modifier = Modifier
.width(200.dp) .width(200.dp)
.fillMaxHeight(), .fillMaxHeight()
.background(MaterialTheme.colors.background),
) { ) {
LazyColumn( LazyColumn(
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f)
) { ) {
items(remotesEditorData.listRemotes) { remote -> items(remotesEditorData.listRemotes) { remote ->
val background = if (remote == selectedRemote) { val background = if (remote == selectedRemote) {
MaterialTheme.colors.background MaterialTheme.colors.backgroundSelected
} else } else
MaterialTheme.colors.surface MaterialTheme.colors.background
Text( Text(
text = remote.remoteName, text = remote.remoteName,
@ -134,7 +135,7 @@ fun EditRemotesDialog(
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.background(MaterialTheme.colors.background) // .background(MaterialTheme.colors.background)
) { ) {
IconButton( IconButton(
modifier = Modifier.size(36.dp) modifier = Modifier.size(36.dp)
@ -185,17 +186,10 @@ fun EditRemotesDialog(
} }
} }
Box(
modifier = Modifier
.fillMaxHeight()
.width(1.dp)
.background(MaterialTheme.colors.borderColor)
)
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.background(MaterialTheme.colors.surface) // .background(MaterialTheme.colors.background)
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
) { ) {
if (selectedRemote != null) { if (selectedRemote != null) {

4
src/main/kotlin/app/ui/dialogs/MaterialDialog.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.Key import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.key import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.key.onPreviewKeyEvent
@ -35,6 +36,7 @@ fun MaterialDialog(
alignment: Alignment = Alignment.Center, alignment: Alignment = Alignment.Center,
paddingHorizontal: Dp = 16.dp, paddingHorizontal: Dp = 16.dp,
paddingVertical: Dp = 16.dp, paddingVertical: Dp = 16.dp,
background: Color = MaterialTheme.colors.background,
onCloseRequested: () -> Unit = {}, onCloseRequested: () -> Unit = {},
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
@ -75,7 +77,7 @@ fun MaterialDialog(
modifier = Modifier modifier = Modifier
.border(1.dp, MaterialTheme.colors.onBackground.copy(alpha = 0.1f), RoundedCornerShape(16.dp)) .border(1.dp, MaterialTheme.colors.onBackground.copy(alpha = 0.1f), RoundedCornerShape(16.dp))
.clip(RoundedCornerShape(16.dp)) .clip(RoundedCornerShape(16.dp))
.background(MaterialTheme.colors.background) .background(background)
.padding( .padding(
horizontal = paddingHorizontal, horizontal = paddingHorizontal,
vertical = paddingVertical, vertical = paddingVertical,

2
src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt
View File

@ -34,8 +34,6 @@ fun NewBranchDialog(
MaterialDialog(onCloseRequested = onReject) { MaterialDialog(onCloseRequested = onReject) {
Column( Column(
modifier = Modifier
.background(MaterialTheme.colors.background),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center, verticalArrangement = Arrangement.Center,
) { ) {

16
src/main/kotlin/app/ui/dialogs/settings/SettingsDialog.kt
View File

@ -52,6 +52,7 @@ fun SettingsDialog(
var selectedCategory by remember { mutableStateOf(SettingsCategory.UI) } var selectedCategory by remember { mutableStateOf(SettingsCategory.UI) }
MaterialDialog( MaterialDialog(
background = MaterialTheme.colors.surface,
onCloseRequested = { onCloseRequested = {
settingsViewModel.savePendingChanges() settingsViewModel.savePendingChanges()
@ -71,6 +72,7 @@ fun SettingsDialog(
modifier = Modifier modifier = Modifier
.width(200.dp) .width(200.dp)
.fillMaxHeight() .fillMaxHeight()
.background(MaterialTheme.colors.background)
) { ) {
categories.forEach { category -> categories.forEach { category ->
Category( Category(
@ -82,7 +84,11 @@ fun SettingsDialog(
} }
Column(modifier = Modifier.width(720.dp)) { Column(
modifier = Modifier
.width(720.dp)
.padding(horizontal = 16.dp)
) {
when (selectedCategory) { when (selectedCategory) {
SettingsCategory.UI -> UiSettings(settingsViewModel) SettingsCategory.UI -> UiSettings(settingsViewModel)
SettingsCategory.GIT -> GitSettings(settingsViewModel) SettingsCategory.GIT -> GitSettings(settingsViewModel)
@ -237,7 +243,7 @@ fun <T : DropDownOption> SettingDropDown(
) { ) {
var showThemeDropdown by remember { mutableStateOf(false) } var showThemeDropdown by remember { mutableStateOf(false) }
Row( Row(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
FieldTitles(title, subtitle) FieldTitles(title, subtitle)
@ -306,7 +312,7 @@ fun SettingToggle(
onValueChanged: (Boolean) -> Unit, onValueChanged: (Boolean) -> Unit,
) { ) {
Row( Row(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
FieldTitles(title, subtitle) FieldTitles(title, subtitle)
@ -329,7 +335,7 @@ fun SettingSlider(
onValueChangeFinished: () -> Unit, onValueChangeFinished: () -> Unit,
) { ) {
Row( Row(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
FieldTitles(title, subtitle) FieldTitles(title, subtitle)
@ -366,7 +372,7 @@ fun SettingIntInput(
onValueChanged: (Int) -> Unit, onValueChanged: (Int) -> Unit,
) { ) {
Row( Row(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
FieldTitles(title, subtitle) FieldTitles(title, subtitle)