Skip to content

Commit f8957ba

Browse files
EmogurovAntonEmogurovAnton
committed
feature: konfeature screen redesign
1 parent d0f7ef3 commit f8957ba

9 files changed

Lines changed: 476 additions & 194 deletions

File tree

‎panel-ui-kit/src/main/kotlin/com/redmadrobot/debug/uikit/components/PanelSearchBar.kt‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
package com.redmadrobot.debug.uikit.components
2+
3+
import androidx.compose.animation.core.animateDpAsState
4+
import androidx.compose.foundation.background
5+
import androidx.compose.foundation.layout.Row
6+
import androidx.compose.foundation.layout.fillMaxWidth
7+
import androidx.compose.foundation.layout.heightIn
8+
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.size
10+
import androidx.compose.foundation.text.BasicTextField
11+
import androidx.compose.material3.Icon
12+
import androidx.compose.material3.IconButton
13+
import androidx.compose.material3.Text
14+
import androidx.compose.runtime.Composable
15+
import androidx.compose.runtime.getValue
16+
import androidx.compose.ui.Alignment
17+
import androidx.compose.ui.Modifier
18+
import androidx.compose.ui.graphics.SolidColor
19+
import androidx.compose.ui.res.painterResource
20+
import androidx.compose.ui.unit.dp
21+
import com.redmadrobot.debug.uikit.R
22+
import com.redmadrobot.debug.uikit.theme.DebugPanelDimensions
23+
import com.redmadrobot.debug.uikit.theme.DebugPanelShapes
24+
import com.redmadrobot.debug.uikit.theme.DebugPanelTheme
25+
import com.redmadrobot.debug.uikit.theme.MonoFontFamily
26+
27+
@Suppress("LongMethod")
28+
@Composable
29+
public fun PanelSearchBar(
30+
query: String,
31+
placeholder: String,
32+
onQueryChange: (String) -> Unit,
33+
modifier: Modifier = Modifier,
34+
) {
35+
val minHeight by animateDpAsState(
36+
targetValue = if (query.isNotEmpty()) 48.dp else 40.dp,
37+
label = "",
38+
)
39+
40+
Row(
41+
modifier = modifier
42+
.fillMaxWidth()
43+
.heightIn(min = minHeight)
44+
.background(
45+
color = DebugPanelTheme.colors.surface.secondary,
46+
shape = DebugPanelShapes.medium,
47+
)
48+
.padding(horizontal = 12.dp, vertical = 8.dp),
49+
verticalAlignment = Alignment.CenterVertically,
50+
) {
51+
Icon(
52+
painter = painterResource(R.drawable.icon_search),
53+
contentDescription = null,
54+
tint = DebugPanelTheme.colors.content.tertiary,
55+
modifier = Modifier.size(size = DebugPanelDimensions.iconSizeSmall),
56+
)
57+
BasicTextField(
58+
value = query,
59+
onValueChange = onQueryChange,
60+
modifier = Modifier
61+
.weight(weight = 1f)
62+
.padding(horizontal = 8.dp),
63+
textStyle = DebugPanelTheme.typography.bodyMedium.copy(
64+
fontFamily = MonoFontFamily,
65+
color = DebugPanelTheme.colors.content.primary,
66+
),
67+
singleLine = true,
68+
cursorBrush = SolidColor(value = DebugPanelTheme.colors.content.accent),
69+
decorationBox = { innerTextField ->
70+
if (query.isEmpty()) {
71+
Text(
72+
text = placeholder,
73+
style = DebugPanelTheme.typography.bodyMedium,
74+
color = DebugPanelTheme.colors.content.tertiary,
75+
)
76+
}
77+
innerTextField()
78+
},
79+
)
80+
if (query.isNotEmpty()) {
81+
IconButton(
82+
onClick = { onQueryChange("") },
83+
modifier = Modifier.size(size = DebugPanelDimensions.iconSizeLarge),
84+
) {
85+
Icon(
86+
painter = painterResource(R.drawable.icon_clear),
87+
contentDescription = null,
88+
tint = DebugPanelTheme.colors.content.tertiary,
89+
modifier = Modifier.size(size = DebugPanelDimensions.iconSizeSmall),
90+
)
91+
}
92+
}
93+
}
94+
}

panel-ui-kit/src/main/kotlin/com/redmadrobot/debug/uikit/components/PanelTextField.kt renamed to panel-ui-kit/src/main/kotlin/com/redmadrobot/debug/uikit/components/PanelStyledTextField.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private val defaultColors: TextFieldColors
3030
)
3131

3232
@Composable
33-
public fun PanelTextField(
33+
public fun PanelStyledTextField(
3434
value: String,
3535
label: String,
3636
onValueChange: (String) -> Unit,

‎panel-ui-kit/src/main/kotlin/com/redmadrobot/debug/uikit/components/PanelToggle.kt‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package com.redmadrobot.debug.uikit.components
2+
3+
import androidx.compose.animation.animateColorAsState
4+
import androidx.compose.animation.core.animateDpAsState
5+
import androidx.compose.foundation.background
6+
import androidx.compose.foundation.clickable
7+
import androidx.compose.foundation.layout.Box
8+
import androidx.compose.foundation.layout.height
9+
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.size
11+
import androidx.compose.foundation.layout.width
12+
import androidx.compose.foundation.shape.CircleShape
13+
import androidx.compose.foundation.shape.RoundedCornerShape
14+
import androidx.compose.runtime.Composable
15+
import androidx.compose.runtime.getValue
16+
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.draw.clip
18+
import androidx.compose.ui.graphics.Color
19+
import androidx.compose.ui.unit.dp
20+
import com.redmadrobot.debug.uikit.theme.DebugPanelDimensions
21+
import com.redmadrobot.debug.uikit.theme.DebugPanelTheme
22+
23+
@Composable
24+
public fun PanelToggle(
25+
checked: Boolean,
26+
onCheckedChange: (Boolean) -> Unit,
27+
modifier: Modifier = Modifier,
28+
) {
29+
val (trackColor, thumbOffset) = with(DebugPanelTheme.colors) {
30+
if (checked) content.teal to 22.dp else stroke.primary to 2.dp
31+
}
32+
val animatedTrackColor by animateColorAsState(targetValue = trackColor, label = "")
33+
val animatedThumbOffset by animateDpAsState(targetValue = thumbOffset, label = "")
34+
35+
Box(
36+
modifier = modifier
37+
.width(width = DebugPanelDimensions.toggleWidth)
38+
.height(height = DebugPanelDimensions.toggleHeight)
39+
.clip(shape = RoundedCornerShape(size = 12.dp))
40+
.background(color = animatedTrackColor)
41+
.clickable { onCheckedChange(!checked) },
42+
) {
43+
Box(
44+
modifier = Modifier
45+
.padding(start = animatedThumbOffset, top = 2.dp)
46+
.size(size = 20.dp)
47+
.background(color = Color.White, shape = CircleShape),
48+
)
49+
}
50+
}

‎panel-ui-kit/src/main/res/drawable/icon_clear.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
10+
</vector>

‎panel-ui-kit/src/main/res/drawable/icon_search.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
10+
</vector>

‎plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/EditConfigValueDialog.kt‎

Lines changed: 18 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
package com.redmadrobot.debug.plugin.konfeature.ui
22

3-
import androidx.compose.foundation.background
4-
import androidx.compose.foundation.clickable
53
import androidx.compose.foundation.layout.Arrangement
6-
import androidx.compose.foundation.layout.Box
74
import androidx.compose.foundation.layout.Row
85
import androidx.compose.foundation.layout.Spacer
96
import androidx.compose.foundation.layout.fillMaxWidth
107
import androidx.compose.foundation.layout.height
11-
import androidx.compose.foundation.layout.padding
12-
import androidx.compose.foundation.layout.size
13-
import androidx.compose.foundation.layout.width
14-
import androidx.compose.foundation.shape.CircleShape
15-
import androidx.compose.foundation.shape.RoundedCornerShape
168
import androidx.compose.foundation.text.KeyboardOptions
179
import androidx.compose.material3.Button
1810
import androidx.compose.material3.ButtonDefaults
@@ -26,15 +18,14 @@ import androidx.compose.runtime.remember
2618
import androidx.compose.runtime.setValue
2719
import androidx.compose.ui.Alignment
2820
import androidx.compose.ui.Modifier
29-
import androidx.compose.ui.draw.clip
30-
import androidx.compose.ui.graphics.Color
3121
import androidx.compose.ui.res.stringResource
3222
import androidx.compose.ui.text.input.KeyboardType
3323
import androidx.compose.ui.unit.dp
3424
import com.redmadrobot.debug.plugin.konfeature.R
3525
import com.redmadrobot.debug.plugin.konfeature.ui.data.EditDialogState
3626
import com.redmadrobot.debug.uikit.components.PanelDialog
37-
import com.redmadrobot.debug.uikit.components.PanelTextField
27+
import com.redmadrobot.debug.uikit.components.PanelStyledTextField
28+
import com.redmadrobot.debug.uikit.components.PanelToggle
3829
import com.redmadrobot.debug.uikit.theme.DebugPanelShapes
3930
import com.redmadrobot.debug.uikit.theme.DebugPanelTheme
4031

@@ -108,31 +99,31 @@ private fun EditConfigValueButtons(
10899
Spacer(modifier = Modifier.weight(weight = 1f))
109100
if (state.isDebugSource) {
110101
DebugSourceButton(
111-
onValueReset = { onValueReset.invoke(state.key) },
112-
onDismissRequest = onDismissRequest
102+
onClick = {
103+
onValueReset.invoke(state.key)
104+
onDismissRequest.invoke()
105+
}
113106
)
114107
}
115108
SaveButton(
116109
saveEnabled = saveEnabled,
117-
onValueChange = { onValueChange.invoke(state.key, value) },
118-
onDismissRequest = onDismissRequest
110+
onClick = {
111+
onValueChange.invoke(state.key, value)
112+
onDismissRequest.invoke()
113+
}
119114
)
120115
}
121116
}
122117

123118
@Composable
124119
private fun SaveButton(
125120
saveEnabled: Boolean,
126-
onValueChange: () -> Unit,
127-
onDismissRequest: () -> Unit,
121+
onClick: () -> Unit,
128122
modifier: Modifier = Modifier,
129123
) {
130124
Button(
131125
modifier = modifier,
132-
onClick = {
133-
onValueChange()
134-
onDismissRequest()
135-
},
126+
onClick = onClick,
136127
enabled = saveEnabled,
137128
shape = DebugPanelShapes.medium,
138129
) {
@@ -145,16 +136,12 @@ private fun SaveButton(
145136

146137
@Composable
147138
private fun DebugSourceButton(
148-
onValueReset: () -> Unit,
149-
onDismissRequest: () -> Unit,
139+
onClick: () -> Unit,
150140
modifier: Modifier = Modifier,
151141
) {
152142
OutlinedButton(
153143
modifier = modifier,
154-
onClick = {
155-
onValueReset()
156-
onDismissRequest()
157-
},
144+
onClick = onClick,
158145
shape = DebugPanelShapes.medium,
159146
colors = ButtonDefaults.outlinedButtonColors(
160147
contentColor = DebugPanelTheme.colors.content.error,
@@ -199,7 +186,7 @@ private fun BooleanEditInput(
199186
color = DebugPanelTheme.colors.content.primary,
200187
modifier = Modifier.weight(weight = 1f),
201188
)
202-
EditConfigDialogToggle(
189+
PanelToggle(
203190
checked = checked,
204191
onCheckedChange = { newChecked ->
205192
checked = newChecked
@@ -218,7 +205,7 @@ private fun LongEditInput(
218205
) {
219206
var text by remember { mutableStateOf(value.toString()) }
220207

221-
PanelTextField(
208+
PanelStyledTextField(
222209
value = text,
223210
onValueChange = { newText ->
224211
val newValue = newText.toLongOrNull()
@@ -243,7 +230,7 @@ private fun DoubleEditInput(
243230
) {
244231
var text by remember { mutableStateOf(value.toBigDecimal().toPlainString()) }
245232

246-
PanelTextField(
233+
PanelStyledTextField(
247234
value = text,
248235
onValueChange = { newText ->
249236
val newValue = newText.toDoubleOrNull()
@@ -267,7 +254,7 @@ private fun StringEditInput(
267254
) {
268255
var text by remember { mutableStateOf(value) }
269256

270-
PanelTextField(
257+
PanelStyledTextField(
271258
value = text,
272259
onValueChange = { newText ->
273260
text = newText
@@ -277,30 +264,3 @@ private fun StringEditInput(
277264
modifier = modifier,
278265
)
279266
}
280-
281-
@Composable
282-
private fun EditConfigDialogToggle(
283-
checked: Boolean,
284-
onCheckedChange: (Boolean) -> Unit,
285-
modifier: Modifier = Modifier,
286-
) {
287-
val (trackColor, thumbOffset) = with(DebugPanelTheme.colors) {
288-
if (checked) content.teal to 22.dp else stroke.primary to 2.dp
289-
}
290-
291-
Box(
292-
modifier = modifier
293-
.width(width = 44.dp)
294-
.height(height = 24.dp)
295-
.clip(shape = RoundedCornerShape(size = 12.dp))
296-
.background(color = trackColor)
297-
.clickable { onCheckedChange(!checked) },
298-
) {
299-
Box(
300-
modifier = Modifier
301-
.padding(start = thumbOffset, top = 2.dp)
302-
.size(size = 20.dp)
303-
.background(color = Color.White, shape = CircleShape),
304-
)
305-
}
306-
}

0 commit comments

Comments
 (0)