Skip to content

Commit 19bd864

Browse files
paulineapaulinea
committed
Fix after rebase
# Conflicts: # gradle/libs.versions.toml
1 parent 81b4c26 commit 19bd864

File tree

7 files changed

+122
-64
lines changed

7 files changed

+122
-64
lines changed

‎core-test/src/main/java/com/orange/ouds/core/test/OudsNavigationBarTest.kt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,43 @@
1212

1313
package com.orange.ouds.core.component
1414

15-
import androidx.compose.runtime.Composable
16-
import com.orange.ouds.OudsSnapshotTest
15+
import com.orange.ouds.core.test.OudsComponentSnapshotTest
16+
import com.orange.ouds.core.test.OudsComponentTestSuite
17+
import com.orange.ouds.core.utilities.OudsPreviewableComponent
18+
import org.junit.experimental.runners.Enclosed
1719
import org.junit.runner.RunWith
18-
import org.junit.runners.Parameterized
1920

20-
@RunWith(Parameterized::class)
21-
internal class OudsNavigationBarTest(private val parameter: OudsNavigationBarPreviewParameter) : OudsSnapshotTest() {
2221

23-
companion object {
24-
@JvmStatic
25-
@Parameterized.Parameters
26-
internal fun data() = OudsNavigationBarPreviewParameterProvider().values.toList()
27-
}
28-
29-
@Composable
30-
override fun Snapshot(darkThemeEnabled: Boolean, highContrastModeEnabled: Boolean) {
31-
PreviewOudsNavigationBar(
32-
darkThemeEnabled = darkThemeEnabled,
33-
parameter = parameter
34-
)
22+
@RunWith(Enclosed::class)
23+
class OudsNavigationBarTest {
24+
25+
@RunWith(org.junit.runners.Parameterized::class)
26+
class Parameterized(parameter: Any) : OudsComponentSnapshotTest(
27+
OudsPreviewableComponent.NavigationBar.Parameterized,
28+
parameter,
29+
OudsComponentTestSuite.theme
30+
) {
31+
companion object {
32+
@JvmStatic
33+
@org.junit.runners.Parameterized.Parameters
34+
internal fun data() = OudsPreviewableComponent.NavigationBar.Parameterized.parameters
35+
}
3536
}
3637
}
3738

38-
@RunWith(Parameterized::class)
39-
internal class OudsNavigationBarItemTest(private val parameter: OudsNavigationBarItemPreviewParameter) : OudsSnapshotTest() {
40-
41-
companion object {
42-
@JvmStatic
43-
@Parameterized.Parameters
44-
internal fun data() = OudsNavigationBarItemPreviewParameterProvider().values.toList()
45-
}
46-
47-
@Composable
48-
override fun Snapshot(darkThemeEnabled: Boolean, highContrastModeEnabled: Boolean) {
49-
PreviewOudsNavigationBarItem(
50-
darkThemeEnabled = darkThemeEnabled,
51-
parameter = parameter
52-
)
39+
@RunWith(Enclosed::class)
40+
class OudsNavigationBarItemTest {
41+
42+
@RunWith(org.junit.runners.Parameterized::class)
43+
class Parameterized(parameter: Any) : OudsComponentSnapshotTest(
44+
OudsPreviewableComponent.NavigationBarItem.Parameterized,
45+
parameter,
46+
OudsComponentTestSuite.theme
47+
) {
48+
companion object {
49+
@JvmStatic
50+
@org.junit.runners.Parameterized.Parameters
51+
internal fun data() = OudsPreviewableComponent.NavigationBarItem.Parameterized.parameters
52+
}
5353
}
5454
}

‎core/src/main/java/com/orange/ouds/core/component/OudsNavigationBar.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,26 +313,26 @@ object OudsNavigationBarItem {
313313
*
314314
* @see [OudsBadge]
315315
*
316-
* @property count Optional number displayed in the badge. If not null, the badge has an [OudsBadge.Size.Medium] size. Otherwise, it has an [OudsBadge.Size.Small] size.
316+
* @property count Optional number displayed in the badge. If not null, the badge has an [OudsBadgeSize.Medium] size. Otherwise, it has an [OudsBadgeSize.Small] size.
317317
*/
318318
class Badge(val count: Int? = null) : OudsComponentContent<Nothing>(Nothing::class.java) {
319319

320320
/**
321321
* Status of the badge.
322322
* In a navigation bar it has always a negative status.
323323
*/
324-
private val status = OudsBadge.Status.Negative
324+
private val status = OudsBadgeStatus.Negative
325325

326326
@Composable
327327
override fun Content(modifier: Modifier) {
328328
if (count != null) {
329-
OudsBadge(count = count, modifier = modifier, status = this.status, size = OudsBadge.Size.Medium)
329+
OudsBadge(count = count, modifier = modifier, status = this.status, size = OudsBadgeSize.Medium)
330330
} else {
331331
val startPosition = Icon.Size / 2
332332
val badgeSize = OudsTheme.componentsTokens.badge.sizeXsmall.dp
333333
val xOffset = startPosition - badgeSize
334334
val yOffset = (startPosition - badgeSize) + 2.dp
335-
OudsBadge(modifier = modifier.offset(x = xOffset, y = -yOffset), status = this.status, size = OudsBadge.Size.ExtraSmall)
335+
OudsBadge(modifier = modifier.offset(x = xOffset, y = -yOffset), status = this.status, size = OudsBadgeSize.ExtraSmall)
336336
}
337337
}
338338

‎core/src/main/java/com/orange/ouds/core/theme/OudsColorScheme.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,6 @@ val OudsColorKeyToken.value: Color
15221522
is OudsColorKeyToken.Background -> colorScheme.fromToken(keyToken)
15231523
is OudsColorKeyToken.Border -> colorScheme.fromToken(keyToken)
15241524
is OudsColorKeyToken.Content -> colorScheme.fromToken(keyToken)
1525-
is OudsColorKeyToken.Decorative -> colorScheme.fromToken(keyToken)
15261525
is OudsColorKeyToken.Opacity -> colorScheme.fromToken(keyToken)
15271526
is OudsColorKeyToken.Overlay -> colorScheme.fromToken(keyToken)
15281527
is OudsColorKeyToken.Repository -> colorScheme.fromToken(keyToken)

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-te
4646
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
4747
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
4848
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
49-
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
49+
androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraintlayoutCompose" }
5050
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "dataStorePreferences" }
5151
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
5252
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }

‎theme-contract/src/main/java/com/orange/ouds/theme/tokens/components/OudsNavigationBarTokens.kt‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,30 @@
1212

1313
package com.orange.ouds.theme.tokens.components
1414

15-
import com.orange.ouds.theme.tokens.Mode
1615
import com.orange.ouds.theme.tokens.OudsBorderKeyToken
1716
import com.orange.ouds.theme.tokens.OudsColorKeyToken
1817
import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
19-
import com.orange.ouds.theme.tokens.OudsSingleModeColorKeyToken
20-
import com.orange.ouds.tokens.raw.DimensionRawTokens
2118

22-
class OudsNavigationBarTokens(
23-
val topActiveIndicatorBorderRadiusBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
24-
val topActiveIndicatorSizeHeight: Float = DimensionRawTokens.dimensionOutOfSystem75,
25-
val topActiveIndicatorSizeWidth: Float = DimensionRawTokens.dimension650,
26-
val topActiveIndicatorOpacity: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
27-
val colorBg: OudsColorKeyToken = OudsColorKeyToken.Always.Black,
28-
val materialActiveIndicatorColorBgSelectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
29-
val materialActiveIndicatorColorBgSelectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
30-
val materialActiveIndicatorColorBgSelectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
31-
val materialActiveIndicatorColorBgSelectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
32-
val materialActiveIndicatorColorBgUnselectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
33-
val materialActiveIndicatorColorBgUnselectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
34-
val materialActiveIndicatorColorBgUnselectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
35-
val colorContentSelectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Selected, Mode.Dark),
36-
val colorContentSelectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Focus, Mode.Dark),
37-
val colorContentSelectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Hover, Mode.Dark),
38-
val colorContentSelectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Pressed, Mode.Dark),
39-
val colorContentUnselectedDisabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Disabled, Mode.Dark),
40-
val colorContentUnselectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Content.Default, Mode.Dark),
41-
val colorContentUnselectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Focus, Mode.Dark),
42-
val colorContentUnselectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Hover, Mode.Dark),
43-
val colorContentUnselectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Pressed, Mode.Dark),
44-
)
19+
interface OudsNavigationBarTokens {
20+
val topActiveIndicatorBorderRadiusBottom: OudsBorderKeyToken.Radius
21+
val topActiveIndicatorSizeHeight: Float
22+
val topActiveIndicatorSizeWidth: Float
23+
val topActiveIndicatorOpacity: OudsOpacityKeyToken
24+
val colorBg: OudsColorKeyToken
25+
val materialActiveIndicatorColorBgSelectedEnabled: OudsColorKeyToken
26+
val materialActiveIndicatorColorBgSelectedHover: OudsColorKeyToken
27+
val materialActiveIndicatorColorBgSelectedPressed: OudsColorKeyToken
28+
val materialActiveIndicatorColorBgSelectedFocus: OudsColorKeyToken
29+
val materialActiveIndicatorColorBgUnselectedHover: OudsColorKeyToken
30+
val materialActiveIndicatorColorBgUnselectedPressed: OudsColorKeyToken
31+
val materialActiveIndicatorColorBgUnselectedFocus: OudsColorKeyToken
32+
val colorContentSelectedEnabled: OudsColorKeyToken
33+
val colorContentSelectedFocus: OudsColorKeyToken
34+
val colorContentSelectedHover: OudsColorKeyToken
35+
val colorContentSelectedPressed: OudsColorKeyToken
36+
val colorContentUnselectedDisabled: OudsColorKeyToken
37+
val colorContentUnselectedEnabled: OudsColorKeyToken
38+
val colorContentUnselectedFocus: OudsColorKeyToken
39+
val colorContentUnselectedHover: OudsColorKeyToken
40+
val colorContentUnselectedPressed: OudsColorKeyToken
41+
}

‎theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeComponentsTokens.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.orange.ouds.theme.tokens.components.OudsIconTokens
2424
import com.orange.ouds.theme.tokens.components.OudsInputTagTokens
2525
import com.orange.ouds.theme.tokens.components.OudsLinkMonoTokens
2626
import com.orange.ouds.theme.tokens.components.OudsLinkTokens
27+
import com.orange.ouds.theme.tokens.components.OudsNavigationBarTokens
2728
import com.orange.ouds.theme.tokens.components.OudsRadioButtonTokens
2829
import com.orange.ouds.theme.tokens.components.OudsSwitchTokens
2930
import com.orange.ouds.theme.tokens.components.OudsTagTokens
@@ -41,6 +42,7 @@ data class OrangeComponentsTokens(
4142
override val inputTag: OudsInputTagTokens = OrangeInputTagTokens(),
4243
override val link: OudsLinkTokens = OrangeLinkTokens(),
4344
override val linkMonochrome: OudsLinkMonoTokens = OrangeLinkMonoTokens(),
45+
override val navigationBar: OudsNavigationBarTokens = OrangeNavigationBarTokens(),
4446
override val radioButton: OudsRadioButtonTokens = OrangeRadioButtonTokens(),
4547
override val switch: OudsSwitchTokens = OrangeSwitchTokens(),
4648
override val tag: OudsTagTokens = OrangeTagTokens(),

‎theme-orange/src/main/java/com/orange/ouds/theme/orange/tokens/components/OrangeNavigationBarTokens.kt‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Software Name: OUDS Android
3+
* SPDX-FileCopyrightText: Copyright (c) Orange SA
4+
* SPDX-License-Identifier: MIT
5+
*
6+
* This software is distributed under the MIT license,
7+
* the text of which is available at https://opensource.org/license/MIT/
8+
* or see the "LICENSE" file for more details.
9+
*
10+
* Software description: Android library of reusable graphical components
11+
*/
12+
13+
package com.orange.ouds.theme.orange.tokens.components
14+
15+
import com.orange.ouds.theme.tokens.Mode
16+
import com.orange.ouds.theme.tokens.OudsBorderKeyToken
17+
import com.orange.ouds.theme.tokens.OudsColorKeyToken
18+
import com.orange.ouds.theme.tokens.OudsOpacityKeyToken
19+
import com.orange.ouds.theme.tokens.OudsSingleModeColorKeyToken
20+
import com.orange.ouds.theme.tokens.components.OudsNavigationBarTokens
21+
import com.orange.ouds.tokens.raw.DimensionRawTokens
22+
23+
data class OrangeNavigationBarTokens(
24+
override val topActiveIndicatorBorderRadiusBottom: OudsBorderKeyToken.Radius = OudsBorderKeyToken.Radius.Default,
25+
override val topActiveIndicatorSizeHeight: Float = DimensionRawTokens.dimensionOutOfSystem75,
26+
override val topActiveIndicatorSizeWidth: Float = DimensionRawTokens.dimension650,
27+
override val topActiveIndicatorOpacity: OudsOpacityKeyToken = OudsOpacityKeyToken.Opaque,
28+
override val colorBg: OudsColorKeyToken = OudsColorKeyToken.Always.Black,
29+
override val materialActiveIndicatorColorBgSelectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(
30+
OudsColorKeyToken.Opacity.Transparent,
31+
Mode.Dark
32+
),
33+
override val materialActiveIndicatorColorBgSelectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
34+
override val materialActiveIndicatorColorBgSelectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(
35+
OudsColorKeyToken.Opacity.Transparent,
36+
Mode.Dark
37+
),
38+
override val materialActiveIndicatorColorBgSelectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Opacity.Transparent, Mode.Dark),
39+
override val materialActiveIndicatorColorBgUnselectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(
40+
OudsColorKeyToken.Opacity.Transparent,
41+
Mode.Dark
42+
),
43+
override val materialActiveIndicatorColorBgUnselectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(
44+
OudsColorKeyToken.Opacity.Transparent,
45+
Mode.Dark
46+
),
47+
override val materialActiveIndicatorColorBgUnselectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(
48+
OudsColorKeyToken.Opacity.Transparent,
49+
Mode.Dark
50+
),
51+
override val colorContentSelectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Selected, Mode.Dark),
52+
override val colorContentSelectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Focus, Mode.Dark),
53+
override val colorContentSelectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Hover, Mode.Dark),
54+
override val colorContentSelectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Pressed, Mode.Dark),
55+
override val colorContentUnselectedDisabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Disabled, Mode.Dark),
56+
override val colorContentUnselectedEnabled: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Content.Default, Mode.Dark),
57+
override val colorContentUnselectedFocus: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Focus, Mode.Dark),
58+
override val colorContentUnselectedHover: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Hover, Mode.Dark),
59+
override val colorContentUnselectedPressed: OudsColorKeyToken = OudsSingleModeColorKeyToken(OudsColorKeyToken.Action.Pressed, Mode.Dark),
60+
) : OudsNavigationBarTokens

0 commit comments

Comments
 (0)