Skip to content

Chore: Migration to maretial3 #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PavloNetrebchuk wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Chore: Migration to maretial3 #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e726a7
chore: migration to material3
PavloNetrebchuk Jan 29, 2026
bd9f319
fix: status bar padding
PavloNetrebchuk Jan 29, 2026
21236e9
fix: status bar padding
PavloNetrebchuk Jan 29, 2026
6e88d81
fix: detekt wangs fix
PavloNetrebchuk Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.rememberScaffoldState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand Down Expand Up @@ -118,23 +118,22 @@ private fun LogistrationScreen(
var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
mutableStateOf(TextFieldValue(""))
}
val scaffoldState = rememberScaffoldState()
val scrollState = rememberScrollState()
Scaffold(
scaffoldState = scaffoldState,
modifier = Modifier
.semantics {
testTagsAsResourceId = true
}
.fillMaxSize()
.navigationBarsPadding(),
backgroundColor = MaterialTheme.appColors.background
.fillMaxSize(),
containerColor = MaterialTheme.appColors.background,
contentWindowInsets = WindowInsets()
) {
Surface(
modifier = Modifier
.padding(it)
.fillMaxSize()
.verticalScroll(scrollState)
.navigationBarsPadding()
.displayCutoutForLandscape(),
color = MaterialTheme.appColors.background
) {
Expand Down
28 changes: 14 additions & 14 deletions auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -20,13 +21,14 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.rememberScaffoldState
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -127,21 +129,22 @@ private fun RestorePasswordScreen(
onBackClick: () -> Unit,
onRestoreButtonClick: (String) -> Unit,
) {
val scaffoldState = rememberScaffoldState()
val scrollState = rememberScrollState()
var email by rememberSaveable { mutableStateOf("") }
var isEmailError by rememberSaveable { mutableStateOf(false) }
val keyboardController = LocalSoftwareKeyboardController.current
val snackbarHostState = remember { SnackbarHostState() }

Scaffold(
scaffoldState = scaffoldState,
modifier = Modifier
.semantics {
testTagsAsResourceId = true
}
.fillMaxSize()
.navigationBarsPadding(),
backgroundColor = MaterialTheme.appColors.background
containerColor = MaterialTheme.appColors.background,
snackbarHost = { SnackbarHost(snackbarHostState) },
contentWindowInsets = WindowInsets()
) { paddingValues ->

val contentPaddings by remember {
Expand Down Expand Up @@ -192,10 +195,7 @@ private fun RestorePasswordScreen(
contentDescription = null
)

HandleUIMessage(
uiMessage = uiMessage,
scaffoldState = scaffoldState
)
HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)

Column(
modifier = Modifier
Expand Down
38 changes: 20 additions & 18 deletions auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -20,14 +21,15 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.TextFieldDefaults
import androidx.compose.material.rememberScaffoldState
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand Down Expand Up @@ -88,18 +90,19 @@ internal fun LoginScreen(
uiMessage: UIMessage?,
onEvent: (AuthEvent) -> Unit,
) {
val scaffoldState = rememberScaffoldState()
val scrollState = rememberScrollState()
val snackbarHostState = remember { SnackbarHostState() }

Scaffold(
scaffoldState = scaffoldState,
modifier = Modifier
.semantics {
testTagsAsResourceId = true
}
.fillMaxSize()
.navigationBarsPadding(),
backgroundColor = MaterialTheme.appColors.background
containerColor = MaterialTheme.appColors.background,
snackbarHost = { SnackbarHost(snackbarHostState) },
contentWindowInsets = WindowInsets()
) {
val contentPaddings by remember {
mutableStateOf(
Expand Down Expand Up @@ -133,10 +136,7 @@ internal fun LoginScreen(
contentScale = ContentScale.FillBounds,
contentDescription = null
)
HandleUIMessage(
uiMessage = uiMessage,
scaffoldState = scaffoldState
)
HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
if (state.isLogistrationEnabled) {
Box(
modifier = Modifier
Expand Down Expand Up @@ -364,9 +364,11 @@ private fun PasswordTextField(
passwordTextFieldValue = it
onValueChanged(it.text.trim())
},
colors = TextFieldDefaults.outlinedTextFieldColors(
textColor = MaterialTheme.appColors.textFieldText,
backgroundColor = MaterialTheme.appColors.textFieldBackground,
colors = OutlinedTextFieldDefaults.colors(
focusedTextColor = MaterialTheme.appColors.textFieldText,
unfocusedTextColor = MaterialTheme.appColors.textFieldText,
focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
cursorColor = MaterialTheme.appColors.textFieldText,
),
Expand Down
Loading
Loading