Skip to content

Commit 6d84fe0

Browse files
committed
make account screen scrollable.
1 parent 73adb88 commit 6d84fe0

File tree

1 file changed

+26
-19
lines changed
  • mobile/src/main/java/com/windscribe/mobile/ui/preferences/account

1 file changed

+26
-19
lines changed

mobile/src/main/java/com/windscribe/mobile/ui/preferences/account/AccountScreen.kt

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ import android.content.res.Configuration
55
import android.widget.Toast
66
import androidx.compose.foundation.background
77
import androidx.compose.foundation.clickable
8+
import androidx.compose.foundation.gestures.scrollable
89
import androidx.compose.foundation.layout.Column
910
import androidx.compose.foundation.layout.Row
1011
import androidx.compose.foundation.layout.RowScope
1112
import androidx.compose.foundation.layout.Spacer
1213
import androidx.compose.foundation.layout.fillMaxWidth
1314
import androidx.compose.foundation.layout.height
15+
import androidx.compose.foundation.layout.navigationBarsPadding
1416
import androidx.compose.foundation.layout.padding
1517
import androidx.compose.foundation.layout.size
1618
import androidx.compose.foundation.layout.width
19+
import androidx.compose.foundation.rememberScrollState
1720
import androidx.compose.foundation.shape.RoundedCornerShape
21+
import androidx.compose.foundation.verticalScroll
1822
import androidx.compose.material3.Button
1923
import androidx.compose.material3.ButtonColors
2024
import androidx.compose.material3.Icon
@@ -71,31 +75,34 @@ fun AccountScreen(viewModel: AccountViewModel? = null) {
7175
val navController = LocalNavController.current
7276
val showProgress by viewModel?.showProgress?.collectAsState()
7377
?: remember { mutableStateOf(false) }
78+
val scrollState = rememberScrollState()
7479
PreferenceBackground {
7580
Column(modifier = Modifier.padding(vertical = 16.dp, horizontal = 16.dp)) {
7681
PreferencesNavBar(stringResource(R.string.my_account)) {
7782
navController.popBackStack()
7883
}
79-
Spacer(modifier = Modifier.height(20.dp))
80-
AccountInfo(viewModel)
81-
Spacer(modifier = Modifier.height(14.dp))
82-
PlanInfo(viewModel)
83-
Spacer(modifier = Modifier.height(14.dp))
84-
ActionButton(stringResource(R.string.edit_account)) {
85-
viewModel?.onManageAccountClicked()
86-
}
87-
Spacer(modifier = Modifier.height(14.dp))
88-
Text(
89-
stringResource(R.string.other),
90-
style = font12.copy(
91-
fontWeight = FontWeight.SemiBold,
92-
color = MaterialTheme.colorScheme.preferencesSubtitleColor
84+
Column(Modifier.navigationBarsPadding().verticalScroll(scrollState)) {
85+
Spacer(modifier = Modifier.height(20.dp))
86+
AccountInfo(viewModel)
87+
Spacer(modifier = Modifier.height(14.dp))
88+
PlanInfo(viewModel)
89+
Spacer(modifier = Modifier.height(14.dp))
90+
ActionButton(stringResource(R.string.edit_account)) {
91+
viewModel?.onManageAccountClicked()
92+
}
93+
Spacer(modifier = Modifier.height(14.dp))
94+
Text(
95+
stringResource(R.string.other),
96+
style = font12.copy(
97+
fontWeight = FontWeight.SemiBold,
98+
color = MaterialTheme.colorScheme.preferencesSubtitleColor
99+
)
93100
)
94-
)
95-
Spacer(modifier = Modifier.height(8.dp))
96-
VoucherCode(viewModel)
97-
Spacer(modifier = Modifier.height(14.dp))
98-
LazyLogin(viewModel)
101+
Spacer(modifier = Modifier.height(8.dp))
102+
VoucherCode(viewModel)
103+
Spacer(modifier = Modifier.height(14.dp))
104+
LazyLogin(viewModel)
105+
}
99106
}
100107
PreferenceProgressBar(showProgressBar = showProgress)
101108
HandleGoto(viewModel)

0 commit comments

Comments
 (0)