|
|
|
@ -5,7 +5,9 @@
|
|
|
|
|
package org.mozilla.fenix.compose
|
|
|
|
|
|
|
|
|
|
import androidx.compose.foundation.background
|
|
|
|
|
import androidx.compose.foundation.layout.Box
|
|
|
|
|
import androidx.compose.foundation.layout.fillMaxHeight
|
|
|
|
|
import androidx.compose.foundation.layout.size
|
|
|
|
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
|
|
|
import androidx.compose.material.DropdownMenu
|
|
|
|
|
import androidx.compose.material.DropdownMenuItem
|
|
|
|
@ -13,6 +15,10 @@ import androidx.compose.material.MaterialTheme
|
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
|
import androidx.compose.runtime.DisposableEffect
|
|
|
|
|
import androidx.compose.runtime.getValue
|
|
|
|
|
import androidx.compose.runtime.mutableStateOf
|
|
|
|
|
import androidx.compose.runtime.remember
|
|
|
|
|
import androidx.compose.runtime.setValue
|
|
|
|
|
import androidx.compose.ui.Alignment
|
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
|
import androidx.compose.ui.graphics.Color
|
|
|
|
@ -21,21 +27,24 @@ import androidx.compose.ui.platform.testTag
|
|
|
|
|
import androidx.compose.ui.unit.DpOffset
|
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
|
import org.mozilla.fenix.compose.annotation.LightDarkPreview
|
|
|
|
|
import org.mozilla.fenix.compose.button.PrimaryButton
|
|
|
|
|
import org.mozilla.fenix.theme.FirefoxTheme
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Popup action dropdown menu.
|
|
|
|
|
* Root popup action dropdown menu.
|
|
|
|
|
*
|
|
|
|
|
* @param menuItems List of items to be displayed in the menu.
|
|
|
|
|
* @param showMenu Whether or not the menu is currently displayed to the user.
|
|
|
|
|
* @param cornerShape Shape to apply to the corners of the dropdown.
|
|
|
|
|
* @param onDismissRequest Invoked when user dismisses the menu or on orientation changes.
|
|
|
|
|
* @param modifier Modifier to be applied to the menu.
|
|
|
|
|
* @param offset Offset to be added to the position of the menu.
|
|
|
|
|
*/
|
|
|
|
|
@Composable
|
|
|
|
|
fun DropdownMenu(
|
|
|
|
|
private fun Menu(
|
|
|
|
|
menuItems: List<MenuItem>,
|
|
|
|
|
showMenu: Boolean,
|
|
|
|
|
cornerShape: RoundedCornerShape,
|
|
|
|
|
onDismissRequest: () -> Unit,
|
|
|
|
|
modifier: Modifier = Modifier,
|
|
|
|
|
offset: DpOffset = DpOffset.Zero,
|
|
|
|
@ -44,10 +53,10 @@ fun DropdownMenu(
|
|
|
|
|
onDispose { onDismissRequest() }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MaterialTheme(shapes = MaterialTheme.shapes.copy(medium = RoundedCornerShape(2.dp))) {
|
|
|
|
|
MaterialTheme(shapes = MaterialTheme.shapes.copy(medium = cornerShape)) {
|
|
|
|
|
DropdownMenu(
|
|
|
|
|
expanded = showMenu && menuItems.isNotEmpty(),
|
|
|
|
|
onDismissRequest = { onDismissRequest() },
|
|
|
|
|
onDismissRequest = onDismissRequest,
|
|
|
|
|
offset = offset,
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
.background(color = FirefoxTheme.colors.layer2)
|
|
|
|
@ -76,6 +85,33 @@ fun DropdownMenu(
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Dropdown menu for presenting context-specific actions.
|
|
|
|
|
*
|
|
|
|
|
* @param menuItems List of items to be displayed in the menu.
|
|
|
|
|
* @param showMenu Whether or not the menu is currently displayed to the user.
|
|
|
|
|
* @param onDismissRequest Invoked when user dismisses the menu or on orientation changes.
|
|
|
|
|
* @param modifier Modifier to be applied to the menu.
|
|
|
|
|
* @param offset Offset to be added to the position of the menu.
|
|
|
|
|
*/
|
|
|
|
|
@Composable
|
|
|
|
|
fun ContextualMenu(
|
|
|
|
|
menuItems: List<MenuItem>,
|
|
|
|
|
showMenu: Boolean,
|
|
|
|
|
onDismissRequest: () -> Unit,
|
|
|
|
|
modifier: Modifier = Modifier,
|
|
|
|
|
offset: DpOffset = DpOffset.Zero,
|
|
|
|
|
) {
|
|
|
|
|
Menu(
|
|
|
|
|
menuItems = menuItems,
|
|
|
|
|
showMenu = showMenu,
|
|
|
|
|
cornerShape = RoundedCornerShape(size = 5.dp),
|
|
|
|
|
onDismissRequest = onDismissRequest,
|
|
|
|
|
modifier = modifier,
|
|
|
|
|
offset = offset,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Represents a text item from the dropdown menu.
|
|
|
|
|
*
|
|
|
|
@ -93,16 +129,23 @@ data class MenuItem(
|
|
|
|
|
|
|
|
|
|
@LightDarkPreview
|
|
|
|
|
@Composable
|
|
|
|
|
private fun DropdownMenuPreview() {
|
|
|
|
|
private fun ContextualMenuPreview() {
|
|
|
|
|
var showMenu by remember { mutableStateOf(false) }
|
|
|
|
|
FirefoxTheme {
|
|
|
|
|
DropdownMenu(
|
|
|
|
|
listOf(
|
|
|
|
|
MenuItem("Rename") {},
|
|
|
|
|
MenuItem("Share") {},
|
|
|
|
|
MenuItem("Remove", FirefoxTheme.colors.textWarning) {},
|
|
|
|
|
),
|
|
|
|
|
true,
|
|
|
|
|
{},
|
|
|
|
|
)
|
|
|
|
|
Box(modifier = Modifier.size(400.dp)) {
|
|
|
|
|
PrimaryButton(text = "Show menu") {
|
|
|
|
|
showMenu = true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ContextualMenu(
|
|
|
|
|
menuItems = listOf(
|
|
|
|
|
MenuItem("Rename") {},
|
|
|
|
|
MenuItem("Share") {},
|
|
|
|
|
MenuItem("Remove") {},
|
|
|
|
|
),
|
|
|
|
|
showMenu = showMenu,
|
|
|
|
|
onDismissRequest = { showMenu = false },
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|