scl/strato
1
0
Fork 0
mirror of https://github.com/Takiiiiiiii/strato.git synced 2025-07-17 08:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming convention for container layouts

Browse Source
This commit is contained in:
Abandoned Cart
2023-05-16 05:21:04 -04:00
committed by Niccolò Betto
parent 27200bd5a9
commit d6252a946b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/emu/skyline/EmulationActivity.kt
View File

@ -516,21 +516,21 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
if (it.isSeparating) { if (it.isSeparating) {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) { if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {
binding.onScreenGameView.layoutParams.height = it.bounds.top binding.gameViewContainer.layoutParams.height = it.bounds.top
binding.controllerViewContainer.layoutParams.height = it.bounds.bottom - 48.toPx binding.overlayViewContainer.layoutParams.height = it.bounds.bottom - 48.toPx
binding.controllerViewContainer.updatePadding(0, 0, 0, 24.toPx) binding.overlayViewContainer.updatePadding(0, 0, 0, 24.toPx)
} }
} }
it.isSeparating it.isSeparating
} ?: false } ?: false
if (!isFolding) { if (!isFolding) {
binding.onScreenGameView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT binding.gameViewContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
binding.controllerViewContainer.updatePadding(0, 0, 0, 0) binding.overlayViewContainer.updatePadding(0, 0, 0, 0)
binding.controllerViewContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT binding.overlayViewContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
requestedOrientation = emulationSettings.orientation requestedOrientation = emulationSettings.orientation
} }
binding.onScreenGameView.requestLayout() binding.gameViewContainer.requestLayout()
binding.controllerViewContainer.requestLayout() binding.overlayViewContainer.requestLayout()
} }
/** /**

6
app/src/main/res/layout/emu_activity.xml
View File

@ -10,9 +10,9 @@
tools:ignore="RtlHardcoded"> tools:ignore="RtlHardcoded">
<FrameLayout <FrameLayout
android:id="@+id/on_screen_game_view" android:id="@+id/game_view_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent">
<emu.skyline.views.FixedRatioSurfaceView <emu.skyline.views.FixedRatioSurfaceView
android:id="@+id/game_view" android:id="@+id/game_view"
@ -22,7 +22,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/controller_view_container" android:id="@+id/overlay_view_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom"> android:layout_gravity="bottom">