1
+ @file:Suppress(" MatchingDeclarationName" )
2
+
1
3
package com.spendesk.grapes.compose.appbar
2
4
3
5
import androidx.annotation.DrawableRes
4
6
import androidx.annotation.StringRes
5
7
import androidx.compose.foundation.layout.RowScope
6
- import androidx.compose.foundation.layout.Spacer
7
8
import androidx.compose.foundation.layout.WindowInsets
8
- import androidx.compose.foundation.layout.width
9
9
import androidx.compose.material3.Icon
10
10
import androidx.compose.material3.NavigationBar
11
11
import androidx.compose.material3.NavigationBarDefaults
@@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
17
17
import androidx.compose.ui.res.painterResource
18
18
import androidx.compose.ui.res.stringResource
19
19
import androidx.compose.ui.tooling.preview.Preview
20
- import androidx.compose.ui.unit.sp
21
20
import com.spendesk.grapes.compose.R
22
21
import com.spendesk.grapes.compose.theme.GrapesTheme
23
22
@@ -27,7 +26,9 @@ import com.spendesk.grapes.compose.theme.GrapesTheme
27
26
**/
28
27
29
28
interface GrapesNavigationItem {
29
+
30
30
@get:StringRes val title: Int
31
+
31
32
@get:DrawableRes val icon: Int
32
33
}
33
34
@@ -40,8 +41,8 @@ fun GrapesNavigationBar(
40
41
windowInsets : WindowInsets = NavigationBarDefaults .windowInsets,
41
42
) {
42
43
NavigationBar (
43
- containerColor = GrapesTheme .colors.mainWhite ,
44
- contentColor = GrapesTheme .colors.mainPrimaryNormal ,
44
+ containerColor = GrapesTheme .colors.structureSurface ,
45
+ contentColor = GrapesTheme .colors.primaryNormal ,
45
46
windowInsets = windowInsets,
46
47
modifier = modifier,
47
48
) {
@@ -63,11 +64,11 @@ private fun RowScope.GrapesNavigationBarItem(
63
64
) {
64
65
val textStyle = GrapesTheme .typography.titleS
65
66
val colors = NavigationBarItemDefaults .colors(
66
- indicatorColor = GrapesTheme .colors.mainWhite ,
67
- selectedIconColor = GrapesTheme .colors.mainPrimaryNormal ,
68
- selectedTextColor = GrapesTheme .colors.mainPrimaryNormal ,
69
- unselectedIconColor = GrapesTheme .colors.mainNeutralDarker ,
70
- unselectedTextColor = GrapesTheme .colors.mainNeutralDarker ,
67
+ indicatorColor = GrapesTheme .colors.structureSurface ,
68
+ selectedIconColor = GrapesTheme .colors.primaryNormal ,
69
+ selectedTextColor = GrapesTheme .colors.primaryNormal ,
70
+ unselectedIconColor = GrapesTheme .colors.neutralDark ,
71
+ unselectedTextColor = GrapesTheme .colors.neutralDark ,
71
72
)
72
73
73
74
NavigationBarItem (
@@ -95,15 +96,15 @@ private fun RowScope.GrapesNavigationBarItem(
95
96
private fun Preview () {
96
97
GrapesTheme {
97
98
val tabs = listOf (
98
- object : GrapesNavigationItem {
99
+ object : GrapesNavigationItem {
99
100
override val title: Int = R .string.grapes_top_app_bar_back_icon_description
100
101
override val icon: Int = R .drawable.ic_add
101
102
},
102
- object : GrapesNavigationItem {
103
+ object : GrapesNavigationItem {
103
104
override val title: Int = R .string.grapes_top_app_bar_close_icon_description
104
105
override val icon: Int = R .drawable.ic_arrow_back
105
106
},
106
- object : GrapesNavigationItem {
107
+ object : GrapesNavigationItem {
107
108
override val title: Int = R .string.grapes_top_app_bar_more_icon_description
108
109
override val icon: Int = R .drawable.ic_more_vertical
109
110
}
0 commit comments