|
19 | 19 | package com.neoutils.neoregex.core.sharedui.component
|
20 | 20 |
|
21 | 21 | import androidx.compose.animation.*
|
| 22 | +import androidx.compose.foundation.Image |
22 | 23 | import androidx.compose.foundation.clickable
|
23 | 24 | import androidx.compose.foundation.layout.*
|
24 | 25 | import androidx.compose.foundation.shape.RoundedCornerShape
|
25 | 26 | import androidx.compose.material.icons.Icons
|
26 |
| -import androidx.compose.material.icons.outlined.KeyboardArrowDown |
27 |
| -import androidx.compose.material3.* |
| 27 | +import androidx.compose.material.icons.rounded.KeyboardArrowDown |
| 28 | +import androidx.compose.material3.DropdownMenu |
| 29 | +import androidx.compose.material3.DropdownMenuItem |
| 30 | +import androidx.compose.material3.MaterialTheme |
| 31 | +import androidx.compose.material3.MaterialTheme.colorScheme |
| 32 | +import androidx.compose.material3.Text |
28 | 33 | import androidx.compose.runtime.*
|
29 | 34 | import androidx.compose.ui.Alignment
|
30 | 35 | import androidx.compose.ui.Modifier
|
31 | 36 | import androidx.compose.ui.draw.clip
|
| 37 | +import androidx.compose.ui.graphics.ColorFilter |
32 | 38 | import androidx.compose.ui.text.TextStyle
|
33 | 39 | import androidx.compose.ui.unit.dp
|
34 | 40 | import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
35 |
| -import com.neoutils.neoregex.core.designsystem.theme.NeoTheme |
| 41 | +import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions |
36 | 42 | import com.neoutils.neoregex.core.dispatcher.model.Navigation
|
37 | 43 | import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
|
38 | 44 | import kotlinx.coroutines.launch
|
@@ -68,25 +74,27 @@ fun Navigation(
|
68 | 74 |
|
69 | 75 | Row(
|
70 | 76 | modifier = Modifier
|
71 |
| - .clip(RoundedCornerShape(NeoTheme.dimensions.tiny)) |
72 |
| - .clickable(canSelectScreen) { expanded.value = true } |
73 |
| - .padding(NeoTheme.dimensions.tiny), |
| 77 | + .clip(RoundedCornerShape(dimensions.tiny)) |
| 78 | + .clickable(canSelectScreen) { expanded.value = true }, |
74 | 79 | verticalAlignment = Alignment.CenterVertically,
|
75 | 80 | ) {
|
76 |
| - |
77 | 81 | Text(
|
78 | 82 | text = stringResource(current.title),
|
79 |
| - style = mergedTextStyle |
| 83 | + style = mergedTextStyle, |
| 84 | + modifier = Modifier |
| 85 | + .padding(vertical = dimensions.tiny) |
| 86 | + .padding(start = dimensions.tiny) |
80 | 87 | )
|
81 | 88 |
|
82 | 89 | AnimatedVisibility(
|
83 | 90 | visible = canSelectScreen,
|
84 | 91 | enter = fadeIn() + slideInHorizontally(),
|
85 | 92 | exit = fadeOut() + slideOutHorizontally(),
|
86 | 93 | ) {
|
87 |
| - Icon( |
88 |
| - imageVector = Icons.Outlined.KeyboardArrowDown, |
89 |
| - modifier = Modifier.size(18.dp), |
| 94 | + Image( |
| 95 | + imageVector = Icons.Rounded.KeyboardArrowDown, |
| 96 | + colorFilter = ColorFilter.tint(colorScheme.onSurface), |
| 97 | + modifier = Modifier.size(24.dp), |
90 | 98 | contentDescription = null
|
91 | 99 | )
|
92 | 100 | }
|
|
0 commit comments