guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

android - fix app menu

Browse Source
This commit is contained in:
Emmanuel Hansen 2023-10-22 21:47:34 +00:00
parent ba745514a1
commit f560431792
1 changed files with 38 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/HomeViews.kt
View File

@ -30,6 +30,8 @@ import androidx.compose.material3.AlertDialogDefaults
import androidx.compose.material3.BottomAppBar import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.BottomAppBarDefaults import androidx.compose.material3.BottomAppBarDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.FloatingActionButtonDefaults import androidx.compose.material3.FloatingActionButtonDefaults
@ -48,14 +50,11 @@ import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
@ -130,7 +129,8 @@ class HomeViews {
navController?.navigate("user") navController?.navigate("user")
}) { }) {
Image( Image(
bitmap = BitmapFactory.decodeByteArray(pic, 0, pic.size).asImageBitmap(), bitmap = BitmapFactory.decodeByteArray(pic, 0, pic.size)
.asImageBitmap(),
contentDescription = "user image", contentDescription = "user image",
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = Modifier modifier = Modifier
@ -154,7 +154,7 @@ class HomeViews {
}, },
bottomBar = { bottomBar = {
BottomAppBar(actions = { BottomAppBar(actions = {
if (showAppActions.value) { if (!showAppActions.value) {
IconButton(onClick = { IconButton(onClick = {
}) { }) {
Icon( Icon(
@ -163,73 +163,42 @@ class HomeViews {
) )
} }
val showAppMenu = remember { mutableStateOf(false) } val showAppMenu = remember { mutableStateOf(false) }
IconButton(onClick = { Box {
showAppMenu.value = true IconButton(onClick = {
}) { showAppMenu.value = true
Icon(
Icons.Filled.Menu,
contentDescription = "Menu"
)
}
if (true) {
AlertDialog(onDismissRequest = {
showAppMenu.value = false
}) { }) {
Surface(shape = MaterialTheme.shapes.medium, color = Color.Black) { Icon(
Row { Icons.Filled.Menu,
IconButton(onClick = { contentDescription = "Menu"
openTitleUpdateDialog.value = true )
}) { }
Column( DropdownMenu(
modifier = Modifier expanded = showAppMenu.value,
.fillMaxSize() onDismissRequest = { showAppMenu.value = false }) {
) { DropdownMenuItem(text = {
Icon( Text(text = "Manage Updates")
painter = painterResource(R.drawable.app_update), }, onClick = {
contentDescription = "Updates",
tint = MaterialTheme.colorScheme.onSurface,
modifier = Modifier
.width(20.dp)
.height(20.dp)
.align(Alignment.CenterHorizontally)
)
Text(
text = "Updates",
fontWeight = FontWeight.Bold,
modifier = Modifier.align(Alignment.CenterHorizontally),
color = MaterialTheme.colorScheme.onSurface
)
} openTitleUpdateDialog.value = true
} }, leadingIcon = {
IconButton(onClick = { Icon(
openDlcDialog.value = true painter = painterResource(R.drawable.app_update),
}) { contentDescription = "Updates",
Column( tint = MaterialTheme.colorScheme.onSurface
modifier = Modifier )
.fillMaxSize() })
) { DropdownMenuItem(text = {
Icon( Text(text = "Manage DLC")
imageVector = org.ryujinx.android.Icons.download(), }, onClick = {
contentDescription = "Dlc",
tint = MaterialTheme.colorScheme.onSurface,
modifier = Modifier
.width(20.dp)
.height(20.dp)
.align(Alignment.CenterHorizontally)
)
Text(
text = "DLC",
fontWeight = FontWeight.Bold,
modifier = Modifier.align(Alignment.CenterHorizontally),
color = MaterialTheme.colorScheme.onSurface
)
} openDlcDialog.value = true
} }, leadingIcon = {
} Icon(
} imageVector = org.ryujinx.android.Icons.download(),
contentDescription = "Dlc",
tint = MaterialTheme.colorScheme.onSurface
)
})
} }
} }
} }