@@ -5,16 +5,20 @@ import android.content.res.Configuration
5
5
import android.widget.Toast
6
6
import androidx.compose.foundation.background
7
7
import androidx.compose.foundation.clickable
8
+ import androidx.compose.foundation.gestures.scrollable
8
9
import androidx.compose.foundation.layout.Column
9
10
import androidx.compose.foundation.layout.Row
10
11
import androidx.compose.foundation.layout.RowScope
11
12
import androidx.compose.foundation.layout.Spacer
12
13
import androidx.compose.foundation.layout.fillMaxWidth
13
14
import androidx.compose.foundation.layout.height
15
+ import androidx.compose.foundation.layout.navigationBarsPadding
14
16
import androidx.compose.foundation.layout.padding
15
17
import androidx.compose.foundation.layout.size
16
18
import androidx.compose.foundation.layout.width
19
+ import androidx.compose.foundation.rememberScrollState
17
20
import androidx.compose.foundation.shape.RoundedCornerShape
21
+ import androidx.compose.foundation.verticalScroll
18
22
import androidx.compose.material3.Button
19
23
import androidx.compose.material3.ButtonColors
20
24
import androidx.compose.material3.Icon
@@ -71,31 +75,34 @@ fun AccountScreen(viewModel: AccountViewModel? = null) {
71
75
val navController = LocalNavController .current
72
76
val showProgress by viewModel?.showProgress?.collectAsState()
73
77
? : remember { mutableStateOf(false ) }
78
+ val scrollState = rememberScrollState()
74
79
PreferenceBackground {
75
80
Column (modifier = Modifier .padding(vertical = 16 .dp, horizontal = 16 .dp)) {
76
81
PreferencesNavBar (stringResource(R .string.my_account)) {
77
82
navController.popBackStack()
78
83
}
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
+ )
93
100
)
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
+ }
99
106
}
100
107
PreferenceProgressBar (showProgressBar = showProgress)
101
108
HandleGoto (viewModel)
0 commit comments