Skip to content

Commit 4c59055

Browse files
PavloNetrebchukPavloNetrebchuk
authored
Chore: Migration to maretial3 (#475)
1 parent 5843dd1 commit 4c59055

File tree

101 files changed

+2498
-2485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2498
-2485
lines changed

‎auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ import android.view.LayoutInflater
66
import android.view.ViewGroup
77
import androidx.compose.foundation.layout.Column
88
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.WindowInsets
910
import androidx.compose.foundation.layout.fillMaxSize
1011
import androidx.compose.foundation.layout.fillMaxWidth
1112
import androidx.compose.foundation.layout.height
1213
import androidx.compose.foundation.layout.navigationBarsPadding
1314
import androidx.compose.foundation.layout.padding
1415
import androidx.compose.foundation.rememberScrollState
1516
import androidx.compose.foundation.verticalScroll
16-
import androidx.compose.material.MaterialTheme
17-
import androidx.compose.material.Scaffold
18-
import androidx.compose.material.Surface
19-
import androidx.compose.material.Text
20-
import androidx.compose.material.rememberScaffoldState
17+
import androidx.compose.material3.MaterialTheme
18+
import androidx.compose.material3.Scaffold
19+
import androidx.compose.material3.Surface
20+
import androidx.compose.material3.Text
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.runtime.getValue
2323
import androidx.compose.runtime.mutableStateOf
@@ -118,23 +118,22 @@ private fun LogistrationScreen(
118118
var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
119119
mutableStateOf(TextFieldValue(""))
120120
}
121-
val scaffoldState = rememberScaffoldState()
122121
val scrollState = rememberScrollState()
123122
Scaffold(
124-
scaffoldState = scaffoldState,
125123
modifier = Modifier
126124
.semantics {
127125
testTagsAsResourceId = true
128126
}
129-
.fillMaxSize()
130-
.navigationBarsPadding(),
131-
backgroundColor = MaterialTheme.appColors.background
127+
.fillMaxSize(),
128+
containerColor = MaterialTheme.appColors.background,
129+
contentWindowInsets = WindowInsets()
132130
) {
133131
Surface(
134132
modifier = Modifier
135133
.padding(it)
136134
.fillMaxSize()
137135
.verticalScroll(scrollState)
136+
.navigationBarsPadding()
138137
.displayCutoutForLandscape(),
139138
color = MaterialTheme.appColors.background
140139
) {

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
1010
import androidx.compose.foundation.layout.Box
1111
import androidx.compose.foundation.layout.Column
1212
import androidx.compose.foundation.layout.Spacer
13+
import androidx.compose.foundation.layout.WindowInsets
1314
import androidx.compose.foundation.layout.fillMaxHeight
1415
import androidx.compose.foundation.layout.fillMaxSize
1516
import androidx.compose.foundation.layout.fillMaxWidth
@@ -20,13 +21,14 @@ import androidx.compose.foundation.layout.size
2021
import androidx.compose.foundation.layout.widthIn
2122
import androidx.compose.foundation.rememberScrollState
2223
import androidx.compose.foundation.verticalScroll
23-
import androidx.compose.material.CircularProgressIndicator
24-
import androidx.compose.material.Icon
25-
import androidx.compose.material.MaterialTheme
26-
import androidx.compose.material.Scaffold
27-
import androidx.compose.material.Surface
28-
import androidx.compose.material.Text
29-
import androidx.compose.material.rememberScaffoldState
24+
import androidx.compose.material3.CircularProgressIndicator
25+
import androidx.compose.material3.Icon
26+
import androidx.compose.material3.MaterialTheme
27+
import androidx.compose.material3.Scaffold
28+
import androidx.compose.material3.SnackbarHost
29+
import androidx.compose.material3.SnackbarHostState
30+
import androidx.compose.material3.Surface
31+
import androidx.compose.material3.Text
3032
import androidx.compose.runtime.Composable
3133
import androidx.compose.runtime.collectAsState
3234
import androidx.compose.runtime.getValue
@@ -127,21 +129,22 @@ private fun RestorePasswordScreen(
127129
onBackClick: () -> Unit,
128130
onRestoreButtonClick: (String) -> Unit,
129131
) {
130-
val scaffoldState = rememberScaffoldState()
131132
val scrollState = rememberScrollState()
132133
var email by rememberSaveable { mutableStateOf("") }
133134
var isEmailError by rememberSaveable { mutableStateOf(false) }
134135
val keyboardController = LocalSoftwareKeyboardController.current
136+
val snackbarHostState = remember { SnackbarHostState() }
135137

136138
Scaffold(
137-
scaffoldState = scaffoldState,
138139
modifier = Modifier
139140
.semantics {
140141
testTagsAsResourceId = true
141142
}
142143
.fillMaxSize()
143144
.navigationBarsPadding(),
144-
backgroundColor = MaterialTheme.appColors.background
145+
containerColor = MaterialTheme.appColors.background,
146+
snackbarHost = { SnackbarHost(snackbarHostState) },
147+
contentWindowInsets = WindowInsets()
145148
) { paddingValues ->
146149

147150
val contentPaddings by remember {
@@ -192,10 +195,7 @@ private fun RestorePasswordScreen(
192195
contentDescription = null
193196
)
194197

195-
HandleUIMessage(
196-
uiMessage = uiMessage,
197-
scaffoldState = scaffoldState
198-
)
198+
HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
199199

200200
Column(
201201
modifier = Modifier

‎auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.Column
99
import androidx.compose.foundation.layout.Row
1010
import androidx.compose.foundation.layout.Spacer
11+
import androidx.compose.foundation.layout.WindowInsets
1112
import androidx.compose.foundation.layout.fillMaxHeight
1213
import androidx.compose.foundation.layout.fillMaxSize
1314
import androidx.compose.foundation.layout.fillMaxWidth
@@ -20,14 +21,15 @@ import androidx.compose.foundation.rememberScrollState
2021
import androidx.compose.foundation.text.KeyboardActions
2122
import androidx.compose.foundation.text.KeyboardOptions
2223
import androidx.compose.foundation.verticalScroll
23-
import androidx.compose.material.CircularProgressIndicator
24-
import androidx.compose.material.MaterialTheme
25-
import androidx.compose.material.OutlinedTextField
26-
import androidx.compose.material.Scaffold
27-
import androidx.compose.material.Surface
28-
import androidx.compose.material.Text
29-
import androidx.compose.material.TextFieldDefaults
30-
import androidx.compose.material.rememberScaffoldState
24+
import androidx.compose.material3.CircularProgressIndicator
25+
import androidx.compose.material3.MaterialTheme
26+
import androidx.compose.material3.OutlinedTextField
27+
import androidx.compose.material3.OutlinedTextFieldDefaults
28+
import androidx.compose.material3.Scaffold
29+
import androidx.compose.material3.SnackbarHost
30+
import androidx.compose.material3.SnackbarHostState
31+
import androidx.compose.material3.Surface
32+
import androidx.compose.material3.Text
3133
import androidx.compose.runtime.Composable
3234
import androidx.compose.runtime.getValue
3335
import androidx.compose.runtime.mutableStateOf
@@ -88,18 +90,19 @@ internal fun LoginScreen(
8890
uiMessage: UIMessage?,
8991
onEvent: (AuthEvent) -> Unit,
9092
) {
91-
val scaffoldState = rememberScaffoldState()
9293
val scrollState = rememberScrollState()
94+
val snackbarHostState = remember { SnackbarHostState() }
9395

9496
Scaffold(
95-
scaffoldState = scaffoldState,
9697
modifier = Modifier
9798
.semantics {
9899
testTagsAsResourceId = true
99100
}
100101
.fillMaxSize()
101102
.navigationBarsPadding(),
102-
backgroundColor = MaterialTheme.appColors.background
103+
containerColor = MaterialTheme.appColors.background,
104+
snackbarHost = { SnackbarHost(snackbarHostState) },
105+
contentWindowInsets = WindowInsets()
103106
) {
104107
val contentPaddings by remember {
105108
mutableStateOf(
@@ -133,10 +136,7 @@ internal fun LoginScreen(
133136
contentScale = ContentScale.FillBounds,
134137
contentDescription = null
135138
)
136-
HandleUIMessage(
137-
uiMessage = uiMessage,
138-
scaffoldState = scaffoldState
139-
)
139+
HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
140140
if (state.isLogistrationEnabled) {
141141
Box(
142142
modifier = Modifier
@@ -364,9 +364,11 @@ private fun PasswordTextField(
364364
passwordTextFieldValue = it
365365
onValueChanged(it.text.trim())
366366
},
367-
colors = TextFieldDefaults.outlinedTextFieldColors(
368-
textColor = MaterialTheme.appColors.textFieldText,
369-
backgroundColor = MaterialTheme.appColors.textFieldBackground,
367+
colors = OutlinedTextFieldDefaults.colors(
368+
focusedTextColor = MaterialTheme.appColors.textFieldText,
369+
unfocusedTextColor = MaterialTheme.appColors.textFieldText,
370+
focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
371+
unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
370372
unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
371373
cursorColor = MaterialTheme.appColors.textFieldText,
372374
),

0 commit comments

Comments
 (0)