Sfoglia il codice sorgente

Fixed icon content description

Vadik Sirekanyan 2 anni fa
parent
commit
b24d296e65

+ 1 - 1
app/src/main/java/org/sirekanyan/outline/MainContent.kt

@@ -90,7 +90,7 @@ fun MainContent(state: MainState) {
                     MainTopAppBar(
                         title = { SearchField(search.query) { search.query = it } },
                         onMenuClick = search::closeSearch,
-                        menuIcon = Icons.Default.ArrowBack,
+                        menuIcon = { Icon(Icons.Default.ArrowBack, "back") },
                     )
                 } else {
                     val menuItems: List<MenuItem> =

+ 2 - 2
app/src/main/java/org/sirekanyan/outline/MainTopAppBar.kt

@@ -28,13 +28,13 @@ data class MenuItem(val text: String, val icon: ImageVector, val onClick: () ->
 fun MainTopAppBar(
     title: @Composable () -> Unit,
     onMenuClick: () -> Unit,
-    menuIcon: ImageVector = Icons.Default.Menu,
+    menuIcon: @Composable () -> Unit = { Icon(Icons.Default.Menu, "menu") },
     visibleItems: List<MenuItem> = listOf(),
     overflowItems: List<MenuItem> = listOf(),
 ) {
     TopAppBar(
         title = title,
-        navigationIcon = { IconButton(onMenuClick) { Icon(menuIcon, null) } },
+        navigationIcon = { IconButton(onMenuClick, content = menuIcon) },
         actions = { MainMenu(visibleItems, overflowItems) },
         colors = TopAppBarDefaults.topAppBarColors(
             MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp).copy(alpha = 0.98f),