Skip to content

Commit 4fff753

Browse files
committed
Add orderType in NotesTopBar
Change ic_orderType scale on orderType
1 parent f8003d3 commit 4fff753

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/NotesScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ fun NotesScreen(
5353
Scaffold(
5454
topBar = {
5555
NotesTopBar(
56+
orderType = notesViewModel.notesState.value.orderType,
5657
onSort = {
5758
notesViewModel.onEvent(NotesEvent.ToggleOrderType)
5859
}

app/src/main/java/com/vladshurakov/jetnotesapp/feature_settings/presenter/components/CustomTopAppBars.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ import androidx.compose.material3.Text
88
import androidx.compose.material3.TopAppBar
99
import androidx.compose.material3.TopAppBarDefaults
1010
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.graphics.graphicsLayer
1113
import androidx.compose.ui.res.painterResource
1214
import androidx.compose.ui.res.stringResource
1315
import com.vladshurakov.jetnotesapp.R
1416
import com.vladshurakov.jetnotesapp.theme.MainTheme
17+
import com.vladshurakov.jetnotesapp.util.OrderType
1518

1619
@OptIn(ExperimentalMaterial3Api::class)
1720
@Composable
@@ -40,8 +43,9 @@ fun CustomTopAppBar(
4043

4144
@Composable
4245
fun NotesTopBar(
46+
orderType: OrderType,
4347
onSort: () -> Unit,
44-
onSettings: () -> Unit
48+
onSettings: () -> Unit,
4549
) {
4650
CustomTopAppBar(
4751
title = stringResource(id = R.string.app_name),
@@ -50,9 +54,13 @@ fun NotesTopBar(
5054
onClick = (onSort)
5155
) {
5256
Icon(
53-
painter = painterResource(R.drawable.ic_order),
57+
painter = painterResource(id = R.drawable.ic_order),
5458
contentDescription = stringResource(id = R.string.label_order),
55-
tint = MainTheme.colors.invertColor
59+
tint = MainTheme.colors.invertColor,
60+
modifier = Modifier
61+
.graphicsLayer(
62+
scaleY = if (orderType == OrderType.Descending) 1f else -1f
63+
)
5664
)
5765
}
5866
IconButton(

0 commit comments

Comments
 (0)