Skip to content

Commit

Permalink
fix: make Home and Config pages scrollable (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyujin-cho committed Feb 12, 2023
1 parent 42595df commit 75b0bbb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion app/src/main/java/dev/bluehouse/enablevolte/pages/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package dev.bluehouse.enablevolte.pages
import android.telephony.CarrierConfigManager
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand All @@ -27,6 +29,7 @@ import java.lang.IllegalStateException
fun Config(navController: NavController, subId: Int) {
val moder = SubscriptionModer(subId)
val carrierModer = CarrierModer(LocalContext.current)
val scrollState = rememberScrollState()

var configurable by rememberSaveable { mutableStateOf(false) }
var voLTEEnabled by rememberSaveable { mutableStateOf(false) }
Expand Down Expand Up @@ -66,7 +69,7 @@ fun Config(navController: NavController, subId: Int) {
}
}

Column(modifier = Modifier.padding(Dp(16f))) {
Column(modifier = Modifier.padding(Dp(16f)).verticalScroll(scrollState)) {
HeaderText(text = "Toggles")
BooleanPropertyView(label = "Enable VoLTE", toggled = voLTEEnabled) {
voLTEEnabled = if (voLTEEnabled) {
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/dev/bluehouse/enablevolte/pages/Home.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import android.telephony.SubscriptionInfo
import android.util.Log
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand Down Expand Up @@ -38,6 +40,7 @@ const val TAG = "HomeActivity:Home"
fun Home(navController: NavController) {
val carrierModer = CarrierModer(LocalContext.current)
val context = LocalContext.current
val scrollState = rememberScrollState()

var shizukuEnabled by rememberSaveable { mutableStateOf(false) }
var shizukuGranted by rememberSaveable { mutableStateOf(false) }
Expand Down Expand Up @@ -84,7 +87,7 @@ fun Home(navController: NavController) {
}
}

Column(modifier = Modifier.padding(Dp(16f))) {
Column(modifier = Modifier.padding(Dp(16f)).verticalScroll(scrollState)) {
HeaderText(text = "Version")
if (newerVersion.isNotEmpty()) {
ClickablePropertyView(label = BuildConfig.VERSION_NAME, value = "Newer version $newerVersion available!") {
Expand Down

0 comments on commit 75b0bbb

Please sign in to comment.