diff --git a/src/main/kotlin/app/ui/UncommitedChanges.kt b/src/main/kotlin/app/ui/UncommitedChanges.kt index 7933519..4387aa6 100644 --- a/src/main/kotlin/app/ui/UncommitedChanges.kt +++ b/src/main/kotlin/app/ui/UncommitedChanges.kt @@ -144,7 +144,6 @@ fun UncommitedChanges( } else false - }, value = commitMessage, onValueChange = { commitMessage = it }, diff --git a/src/main/kotlin/app/ui/dialogs/CloneDialog.kt b/src/main/kotlin/app/ui/dialogs/CloneDialog.kt index 892b7a3..62ecee8 100644 --- a/src/main/kotlin/app/ui/dialogs/CloneDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/CloneDialog.kt @@ -8,7 +8,9 @@ import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import app.git.CloneStatus import app.git.GitManager import app.theme.primaryTextColor @@ -41,6 +43,7 @@ fun CloneDialog( .width(400.dp) .padding(vertical = 4.dp, horizontal = 8.dp), label = { Text("URL") }, + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), maxLines = 1, value = url, onValueChange = { @@ -53,6 +56,7 @@ fun CloneDialog( .width(400.dp) .padding(vertical = 4.dp, horizontal = 8.dp), label = { Text("Directory") }, + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), maxLines = 1, value = directory, onValueChange = { diff --git a/src/main/kotlin/app/ui/dialogs/MergeDialog.kt b/src/main/kotlin/app/ui/dialogs/MergeDialog.kt index c0e4a9a..a1be12d 100644 --- a/src/main/kotlin/app/ui/dialogs/MergeDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/MergeDialog.kt @@ -38,8 +38,6 @@ fun MergeDialog( Row( verticalAlignment = Alignment.CenterVertically, ) { - - Text( text = mergeBranchName, fontWeight = FontWeight.Medium, diff --git a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt index 3f879c1..c2078ac 100644 --- a/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/NewBranchDialog.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import app.theme.primaryTextColor @OptIn(ExperimentalComposeUiApi::class) @Composable @@ -50,7 +51,7 @@ fun NewBranchDialog( value = branchField, singleLine = true, label = { Text("New branch name", fontSize = 14.sp) }, - textStyle = TextStyle(fontSize = 14.sp), + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), onValueChange = { branchField = it }, diff --git a/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt b/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt index 1b1461e..af77fec 100644 --- a/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/NewTagDialog.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import app.theme.primaryTextColor @OptIn(ExperimentalComposeUiApi::class) @Composable @@ -50,7 +51,7 @@ fun NewTagDialog( value = tagField, singleLine = true, label = { Text("New tag name", fontSize = 14.sp) }, - textStyle = TextStyle(fontSize = 14.sp), + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), onValueChange = { tagField = it }, diff --git a/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt b/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt index 35351de..8e6a33c 100644 --- a/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/PasswordDialog.kt @@ -59,7 +59,7 @@ fun PasswordDialog( value = passwordField, singleLine = true, label = { Text("Password", fontSize = 14.sp) }, - textStyle = TextStyle(fontSize = 14.sp), + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), onValueChange = { passwordField = it }, diff --git a/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt b/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt index ca75480..1390c25 100644 --- a/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt +++ b/src/main/kotlin/app/ui/dialogs/UserPasswordDialog.kt @@ -64,7 +64,7 @@ fun UserPasswordDialog( value = userField, singleLine = true, label = { Text("User", fontSize = 14.sp) }, - textStyle = TextStyle(fontSize = 14.sp), + textStyle = TextStyle(fontSize = 14.sp, color = MaterialTheme.colors.primaryTextColor), onValueChange = { userField = it },