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

Added hint to quick actions dialog

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-23 17:35:19 +02:00
parent 302376a23e
commit 90a516f5af
4 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt
View File

@ -132,8 +132,7 @@ fun RepositoryOpenPage(
Menu(
modifier = Modifier
.padding(
top = 16.dp,
bottom = 16.dp
vertical = 12.dp
)
.fillMaxWidth(),
onCreateBranch = { showNewBranchDialog = true },

76
src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
View File

@ -3,14 +3,13 @@ package com.jetpackduba.gitnuro.ui.components
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.LocalTextStyle
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.TextFieldColors
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@ -24,11 +23,13 @@ import androidx.compose.ui.graphics.takeOrElse
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors
@Composable
fun AdjustableOutlinedTextField(
value: String,
hint: String = "",
onValueChange: (String) -> Unit,
modifier: Modifier = Modifier,
enabled: Boolean = true,
@ -53,33 +54,48 @@ fun AdjustableOutlinedTextField(
val cursorColor = colors.cursorColor(isError).value
val indicatorColor by colors.indicatorColor(enabled, isError, interactionSource)
BasicTextField(
modifier = modifier
.heightIn(min = 40.dp)
.background(backgroundColor),
value = value,
onValueChange = onValueChange,
enabled = enabled,
maxLines = maxLines,
textStyle = textStyle.copy(color = textColor),
interactionSource = interactionSource,
keyboardOptions = keyboardOptions,
cursorBrush = SolidColor(cursorColor),
singleLine = singleLine,
visualTransformation = visualTransformation,
decorationBox = { innerTextField ->
Box(
modifier = Modifier
.border(
width = 1.dp,
color = indicatorColor,
shape = shape
)
.padding(horizontal = 12.dp),
contentAlignment = Alignment.CenterStart,
) {
innerTextField()
Box(
modifier = Modifier
.height(IntrinsicSize.Min)
) {
BasicTextField(
modifier = modifier
.heightIn(min = 40.dp)
.background(backgroundColor),
value = value,
onValueChange = onValueChange,
enabled = enabled,
maxLines = maxLines,
textStyle = textStyle.copy(color = textColor),
interactionSource = interactionSource,
keyboardOptions = keyboardOptions,
cursorBrush = SolidColor(cursorColor),
singleLine = singleLine,
visualTransformation = visualTransformation,
decorationBox = { innerTextField ->
Box(
modifier = Modifier
.border(
width = 1.dp,
color = indicatorColor,
shape = shape
)
.padding(horizontal = 12.dp),
contentAlignment = Alignment.CenterStart,
) {
innerTextField()
}
}
)
if (value.isEmpty() && hint.isNotEmpty()) {
Text(
hint,
color = MaterialTheme.colors.onBackgroundSecondary,
modifier = Modifier
.padding(start = 12.dp, top = 12.dp),
style = MaterialTheme.typography.body2
)
}
)
}
}

2
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt
View File

@ -168,7 +168,7 @@ private fun CloneInput(
Icon(
Icons.Default.Search,
contentDescription = null,
tint = MaterialTheme.colors.onBackground,
tint = MaterialTheme.colors.onPrimary,
)
}
}

4
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/QuickActionsDialog.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.extensions.backgroundIf
import com.jetpackduba.gitnuro.extensions.handMouseClickable
import com.jetpackduba.gitnuro.keybindings.KeybindingOption
import com.jetpackduba.gitnuro.keybindings.keybindings
import com.jetpackduba.gitnuro.keybindings.matchesBinding
import com.jetpackduba.gitnuro.theme.backgroundSelected
import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField
@ -32,7 +33,7 @@ fun QuickActionsDialog(
val textFieldFocusRequester = remember { FocusRequester() }
val items = remember {
listOf(
QuickAction("open.svg", "Open project in file manager", QuickActionType.OPEN_DIR_IN_FILE_MANAGER),
QuickAction("code.svg", "Open repository in file manager", QuickActionType.OPEN_DIR_IN_FILE_MANAGER),
QuickAction("download.svg", "Clone new repository", QuickActionType.CLONE),
)
}
@ -78,6 +79,7 @@ fun QuickActionsDialog(
) {
AdjustableOutlinedTextField(
value = searchFilter,
hint = "Search for an action or press ESC to close the dialog", // TODO don't hardcode ESC here, fix keybinding toString
onValueChange = { searchFilter = it },
maxLines = 1,
modifier = Modifier.fillMaxWidth()