Vadik Sirekanyan 2 лет назад
Родитель
Сommit
861702253d

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

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Search
@@ -89,6 +90,7 @@ fun MainContent(state: MainState) {
                     MainTopAppBar(
                     MainTopAppBar(
                         title = { SearchField(search.query) { search.query = it } },
                         title = { SearchField(search.query) { search.query = it } },
                         onMenuClick = search::closeSearch,
                         onMenuClick = search::closeSearch,
+                        menuIcon = Icons.Default.ArrowBack,
                     )
                     )
                 } else {
                 } else {
                     MainTopAppBar(
                     MainTopAppBar(
@@ -97,7 +99,7 @@ fun MainContent(state: MainState) {
                         items = listOf(
                         items = listOf(
                             MenuItem("Search", Icons.Default.Search) { search.openSearch() },
                             MenuItem("Search", Icons.Default.Search) { search.openSearch() },
                             MenuItem("Sort by…", IconSort) { isSortingVisible = true },
                             MenuItem("Sort by…", IconSort) { isSortingVisible = true },
-                        )
+                        ),
                     )
                     )
                 }
                 }
             }
             }

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

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