Skip to content

Commit 3ec4192

Browse files
committed
rearrange functions
1 parent a614624 commit 3ec4192

File tree

1 file changed

+27
-29
lines changed

1 file changed

+27
-29
lines changed

compose/snippets/src/main/java/com/example/compose/snippets/components/NavigationDrawer.kt

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ fun NavigationDrawerExamples(){
5353
Text("Navigation drawer with nested items.")
5454
}
5555
}
56-
57-
return
5856
}
5957

6058
Column(modifier = Modifier.fillMaxSize()){
@@ -80,33 +78,6 @@ private fun NavigationDrawerExamplesPreview(){
8078
NavigationDrawerExamples()
8179
}
8280

83-
// [START android_compose_components_navigationdrawergroupitem]
84-
@Composable
85-
fun NavigationDrawerGroupItem(
86-
label: @Composable () -> Unit,
87-
content: @Composable ColumnScope.() -> Unit,
88-
) {
89-
var isExpanded by rememberSaveable { mutableStateOf(false) }
90-
91-
NavigationDrawerItem(
92-
label = label,
93-
selected = isExpanded,
94-
onClick = { isExpanded = !isExpanded },
95-
icon = {
96-
Icon(
97-
imageVector = if (isExpanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown,
98-
contentDescription = if (isExpanded) "Collapse" else "Expand"
99-
)
100-
}
101-
)
102-
AnimatedVisibility(visible = isExpanded) {
103-
Column(modifier = Modifier.padding(start = 16.dp)) {
104-
content()
105-
}
106-
}
107-
}
108-
// [END android_compose_components_navigationdrawergroupitem]
109-
11081
// [START android_compose_components_simplenavigationdrawerexample]
11182
@Composable
11283
fun SimpleNavigationDrawerExample() {
@@ -137,6 +108,33 @@ private fun SimpleNavigationDrawerExamplePreview(){
137108
SimpleNavigationDrawerExample()
138109
}
139110

111+
// [START android_compose_components_navigationdrawergroupitem]
112+
@Composable
113+
fun NavigationDrawerGroupItem(
114+
label: @Composable () -> Unit,
115+
content: @Composable ColumnScope.() -> Unit,
116+
) {
117+
var isExpanded by rememberSaveable { mutableStateOf(false) }
118+
119+
NavigationDrawerItem(
120+
label = label,
121+
selected = isExpanded,
122+
onClick = { isExpanded = !isExpanded },
123+
icon = {
124+
Icon(
125+
imageVector = if (isExpanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown,
126+
contentDescription = if (isExpanded) "Collapse" else "Expand"
127+
)
128+
}
129+
)
130+
AnimatedVisibility(visible = isExpanded) {
131+
Column(modifier = Modifier.padding(start = 16.dp)) {
132+
content()
133+
}
134+
}
135+
}
136+
// [END android_compose_components_navigationdrawergroupitem]
137+
140138
// [START android_compose_components_nestednavigationdrawerexample]
141139
@Composable
142140
fun NestedNavigationDrawerExample() {

0 commit comments

Comments
 (0)