From 841c523456b0c72afc726667d12bc9a6d8563660 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 19 Sep 2022 22:42:16 +0200 Subject: [PATCH] Toolbar: show icons in overflow menu --- .../java/de/mm20/launcher2/ui/component/Toolbar.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt index a60799d6..eeea2610 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt @@ -3,13 +3,13 @@ package de.mm20.launcher2.ui.component import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.ChevronRight import androidx.compose.material.icons.rounded.MoreVert import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.integerResource -import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.ktx.toDp @@ -109,6 +109,12 @@ fun ColumnScope.OverflowMenuItems(items: List, onDismiss: () -> U Text( action.label, modifier = Modifier.weight(1f), ) + }, + leadingIcon = { + Icon(action.icon, null) + }, + trailingIcon = { + Icon(Icons.Rounded.ChevronRight, null) } ) } @@ -122,6 +128,9 @@ fun ColumnScope.OverflowMenuItems(items: List, onDismiss: () -> U Text( action.label, ) + }, + leadingIcon = { + Icon(action.icon, null) } ) }