Skip to content

Commit 3a20da2

Browse files
Added scrolling on SignInFragment and RestorePasswordFragment (#44)
1 parent cf07a61 commit 3a20da2

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import android.view.ViewGroup
77
import androidx.compose.foundation.Image
88
import androidx.compose.foundation.background
99
import androidx.compose.foundation.layout.*
10+
import androidx.compose.foundation.rememberScrollState
11+
import androidx.compose.foundation.verticalScroll
1012
import androidx.compose.material.*
1113
import androidx.compose.runtime.*
1214
import androidx.compose.runtime.livedata.observeAsState
@@ -77,9 +79,11 @@ private fun RestorePasswordScreen(
7779
onRestoreButtonClick: (String) -> Unit
7880
) {
7981
val scaffoldState = rememberScaffoldState()
82+
val scrollState = rememberScrollState()
8083
var email by rememberSaveable {
8184
mutableStateOf("")
8285
}
86+
8387
Scaffold(
8488
scaffoldState = scaffoldState,
8589
modifier = Modifier
@@ -170,13 +174,15 @@ private fun RestorePasswordScreen(
170174
}
171175

172176
Surface(
173-
modifier = Modifier.fillMaxWidth(),
177+
modifier = Modifier
178+
.fillMaxWidth(),
174179
color = MaterialTheme.appColors.background,
175180
shape = MaterialTheme.appShapes.screenBackgroundShape
176181
) {
177182
Column(
178183
modifier = Modifier
179184
.fillMaxHeight()
185+
.verticalScroll(scrollState)
180186
.background(MaterialTheme.appColors.background),
181187
horizontalAlignment = Alignment.CenterHorizontally
182188
) {

auth/src/main/java/org/openedx/auth/presentation/signin/SignInFragment.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import android.view.ViewGroup
88
import androidx.compose.foundation.Image
99
import androidx.compose.foundation.background
1010
import androidx.compose.foundation.layout.*
11+
import androidx.compose.foundation.rememberScrollState
1112
import androidx.compose.foundation.text.KeyboardActions
1213
import androidx.compose.foundation.text.KeyboardOptions
14+
import androidx.compose.foundation.verticalScroll
1315
import androidx.compose.material.*
1416
import androidx.compose.runtime.*
1517
import androidx.compose.runtime.livedata.observeAsState
@@ -99,6 +101,7 @@ private fun LoginScreen(
99101
onForgotPasswordClick: () -> Unit
100102
) {
101103
val scaffoldState = rememberScaffoldState()
104+
val scrollState = rememberScrollState()
102105

103106
Scaffold(
104107
scaffoldState = scaffoldState,
@@ -167,12 +170,14 @@ private fun LoginScreen(
167170
Surface(
168171
color = MaterialTheme.appColors.background,
169172
shape = MaterialTheme.appShapes.screenBackgroundShape,
170-
modifier = Modifier.fillMaxWidth()
173+
modifier = Modifier
174+
.fillMaxSize()
171175
) {
172176
Box(contentAlignment = Alignment.TopCenter) {
173177
Column(
174178
modifier = Modifier
175179
.background(MaterialTheme.appColors.background)
180+
.verticalScroll(scrollState)
176181
.then(contentPaddings),
177182
) {
178183
Text(

0 commit comments

Comments
 (0)