forked from MeloNX/MeloNX
expand full screen to behind cutouts
This commit is contained in:
parent
ff3099e4a1
commit
ffaa4d8ac1
src/RyujinxAndroid/app/src/main/java/org/ryujinx/android
@ -68,10 +68,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
|
|
||||||
fun setFullScreen() :Unit {
|
fun setFullScreen() :Unit {
|
||||||
requestedOrientation =
|
requestedOrientation =
|
||||||
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
|
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
|
||||||
window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
|
|
||||||
|
|
||||||
WindowCompat.setDecorFitsSystemWindows(window,false)
|
|
||||||
|
|
||||||
var insets = WindowCompat.getInsetsController(window, window.decorView)
|
var insets = WindowCompat.getInsetsController(window, window.decorView)
|
||||||
|
|
||||||
@ -130,6 +127,9 @@ class MainActivity : ComponentActivity() {
|
|||||||
|
|
||||||
initialize()
|
initialize()
|
||||||
|
|
||||||
|
window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
|
||||||
|
WindowCompat.setDecorFitsSystemWindows(window,false)
|
||||||
|
|
||||||
if(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
if(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
||||||
!Environment.isExternalStorageManager()
|
!Environment.isExternalStorageManager()
|
||||||
} else {
|
} else {
|
||||||
|
@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.safeContentPadding
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
import androidx.compose.foundation.layout.wrapContentHeight
|
import androidx.compose.foundation.layout.wrapContentHeight
|
||||||
import androidx.compose.foundation.layout.wrapContentWidth
|
import androidx.compose.foundation.layout.wrapContentWidth
|
||||||
@ -172,7 +173,8 @@ class HomeViews {
|
|||||||
var showBottomSheet = remember { mutableStateOf(false) }
|
var showBottomSheet = remember { mutableStateOf(false) }
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = Modifier.fillMaxSize(),
|
modifier = Modifier.fillMaxSize()
|
||||||
|
.safeContentPadding(),
|
||||||
topBar = {
|
topBar = {
|
||||||
navController?.apply {
|
navController?.apply {
|
||||||
MainTopBar(navController)
|
MainTopBar(navController)
|
||||||
|
@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.viewinterop.AndroidView
|
import androidx.compose.ui.viewinterop.AndroidView
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
@ -38,8 +39,11 @@ class MainView {
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun GameView(mainViewModel: MainViewModel){
|
fun GameView(mainViewModel: MainViewModel){
|
||||||
Box {
|
Box(modifier = Modifier.fillMaxSize()) {
|
||||||
var controller = GameController(mainViewModel.activity)
|
var controller = GameController(mainViewModel.activity)
|
||||||
|
Surface(color = Color.Green, modifier = Modifier.fillMaxSize()) {
|
||||||
|
|
||||||
|
}
|
||||||
AndroidView(
|
AndroidView(
|
||||||
modifier = Modifier.fillMaxSize(),
|
modifier = Modifier.fillMaxSize(),
|
||||||
factory = { context ->
|
factory = { context ->
|
||||||
@ -50,7 +54,7 @@ class MainView {
|
|||||||
controller.Compose(mainViewModel.activity.lifecycleScope, mainViewModel.activity.lifecycle)
|
controller.Compose(mainViewModel.activity.lifecycleScope, mainViewModel.activity.lifecycle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun GameStats(mainViewModel: MainViewModel){
|
fun GameStats(mainViewModel: MainViewModel){
|
||||||
var fifo = remember {
|
var fifo = remember {
|
||||||
|
@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.safeContentPadding
|
||||||
import androidx.compose.foundation.layout.wrapContentHeight
|
import androidx.compose.foundation.layout.wrapContentHeight
|
||||||
import androidx.compose.foundation.layout.wrapContentWidth
|
import androidx.compose.foundation.layout.wrapContentWidth
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
@ -108,7 +109,8 @@ class SettingViews {
|
|||||||
)
|
)
|
||||||
loaded.value = true
|
loaded.value = true
|
||||||
}
|
}
|
||||||
Scaffold(modifier = Modifier.fillMaxSize(),
|
Scaffold(modifier = Modifier.fillMaxSize()
|
||||||
|
.safeContentPadding(),
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(title = {
|
TopAppBar(title = {
|
||||||
Text(text = "Settings")
|
Text(text = "Settings")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user