From b2a83f8c0fa216b6474d604f0b428be6fa8437cb Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Sat, 28 Oct 2023 15:23:39 +0000
Subject: [PATCH] android - make settings view scrollable, bump version
---
src/RyujinxAndroid/app/build.gradle | 4 ++--
.../src/main/java/org/ryujinx/android/views/SettingViews.kt | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/RyujinxAndroid/app/build.gradle b/src/RyujinxAndroid/app/build.gradle
index f23aca82c..a2ecc7554 100644
--- a/src/RyujinxAndroid/app/build.gradle
+++ b/src/RyujinxAndroid/app/build.gradle
@@ -11,8 +11,8 @@ android {
applicationId "org.ryujinx.android"
minSdk 30
targetSdk 33
- versionCode 1
- versionName "1.0"
+ versionCode 10001
+ versionName '1.0.1'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt
index 1870b4261..d1d00251c 100644
--- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt
+++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/views/SettingViews.kt
@@ -21,6 +21,8 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.KeyboardArrowUp
@@ -140,7 +142,9 @@ class SettingViews {
}
})
}) { contentPadding ->
- Column(modifier = Modifier.padding(contentPadding)) {
+ Column(modifier = Modifier
+ .padding(contentPadding)
+ .verticalScroll(rememberScrollState())) {
ExpandableView(onCardArrowClick = { }, title = "System") {
Column(modifier = Modifier.fillMaxWidth()) {
Row(