Skip to content

Commit b94f222

Browse files
authored
Merge pull request #440 from Goooler/replace-enum-values
Replace enum values with entries
2 parents b9f3d65 + 790d620 commit b94f222

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

TestingCodelab/app/src/androidTest/java/com/example/compose/rally/TopAppBarTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ class TopAppBarTest {
3333

3434
@Test
3535
fun rallyTopAppBarTest_currentTabSelected() {
36-
val allScreens = RallyScreen.values().toList()
3736
composeTestRule.setContent {
3837
RallyTopAppBar(
39-
allScreens = allScreens,
38+
allScreens = RallyScreen.entries,
4039
onTabSelected = { },
4140
currentScreen = RallyScreen.Accounts
4241
)
@@ -49,10 +48,9 @@ class TopAppBarTest {
4948

5049
@Test
5150
fun rallyTopAppBarTest_currentLabelExists() {
52-
val allScreens = RallyScreen.values().toList()
5351
composeTestRule.setContent {
5452
RallyTopAppBar(
55-
allScreens = allScreens,
53+
allScreens = RallyScreen.entries,
5654
onTabSelected = { },
5755
currentScreen = RallyScreen.Accounts
5856
)

TestingCodelab/app/src/main/java/com/example/compose/rally/RallyActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ class RallyActivity : ComponentActivity() {
4747
@Composable
4848
fun RallyApp() {
4949
RallyTheme {
50-
val allScreens = RallyScreen.values().toList()
5150
var currentScreen by rememberSaveable { mutableStateOf(RallyScreen.Overview) }
5251
Scaffold(
5352
topBar = {
5453
RallyTopAppBar(
55-
allScreens = allScreens,
54+
allScreens = RallyScreen.entries,
5655
onTabSelected = { screen -> currentScreen = screen },
5756
currentScreen = currentScreen
5857
)

0 commit comments

Comments
 (0)