fix: address PR comments

openedx · May 23, 2024 · 926facf · 926facf
1 parent c6b32c5
commit 926facf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 50 deletions.
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
@@ -64,7 +64,7 @@ import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.HyperlinkText
-import org.openedx.core.ui.OpenEdXSecondaryButton
+import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.WindowSize
 import org.openedx.core.ui.WindowType
 import org.openedx.core.ui.displayCutoutForLandscape
@@ -274,9 +274,11 @@ private fun AuthForm(
         if (state.showProgress) {
             CircularProgressIndicator(color = MaterialTheme.appColors.primary)
         } else {
-            OpenEdXSecondaryButton(
+            OpenEdXButton(
                 modifier = buttonWidth.testTag("btn_sign_in"),
                 text = stringResource(id = coreR.string.core_sign_in),
+                textColor = MaterialTheme.appColors.primaryButtonText,
+                backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
                 onClick = {
                     onEvent(AuthEvent.SignIn(login = login, password = password))
                 }
@@ -327,7 +329,7 @@ private fun PasswordTextField(
         colors = TextFieldDefaults.outlinedTextFieldColors(
             textColor = MaterialTheme.appColors.textFieldText,
             backgroundColor = MaterialTheme.appColors.textFieldBackground,
-            focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
+            unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.textFieldText,
         ),
         shape = MaterialTheme.appShapes.textFieldShape,

diff --git a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
@@ -72,7 +72,7 @@ import org.openedx.core.domain.model.RegistrationField
 import org.openedx.core.domain.model.RegistrationFieldType
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
-import org.openedx.core.ui.OpenEdXSecondaryButton
+import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.SheetContent
 import org.openedx.core.ui.WindowSize
 import org.openedx.core.ui.WindowType
@@ -434,9 +434,11 @@ internal fun SignUpView(
                                         CircularProgressIndicator(color = MaterialTheme.appColors.primary)
                                     }
                                 } else {
-                                    OpenEdXSecondaryButton(
+                                    OpenEdXButton(
                                         modifier = buttonWidth.testTag("btn_create_account"),
                                         text = stringResource(id = R.string.auth_create_account),
+                                        textColor = MaterialTheme.appColors.primaryButtonText,
+                                        backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
                                         onClick = {
                                             showErrorMap.clear()
                                             onRegisterClick(AuthType.PASSWORD)

diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt
@@ -254,7 +254,7 @@ fun LoginTextField(
         colors = TextFieldDefaults.outlinedTextFieldColors(
             textColor = MaterialTheme.appColors.textFieldText,
             backgroundColor = MaterialTheme.appColors.textFieldBackground,
-            focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
+            unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.textFieldText,
         ),
         shape = MaterialTheme.appShapes.textFieldShape,

diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -1045,25 +1045,6 @@ fun OfflineModeDialog(
     }
 }
 
-@Composable
-fun OpenEdXSecondaryButton(
-    modifier: Modifier = Modifier.fillMaxWidth(),
-    text: String = "",
-    onClick: () -> Unit,
-    enabled: Boolean = true,
-    content: (@Composable RowScope.() -> Unit)? = null
-) {
-    OpenEdXButton(
-        modifier = modifier,
-        text = text,
-        onClick = onClick,
-        enabled = enabled,
-        textColor = MaterialTheme.appColors.primaryButtonText,
-        backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
-        content = content
-    )
-}
-
 @Composable
 fun OpenEdXButton(
     modifier: Modifier = Modifier.fillMaxWidth(),
@@ -1099,26 +1080,6 @@ fun OpenEdXButton(
     }
 }
 
-@Composable
-fun OpenEdXSecondaryOutlinedButton(
-    modifier: Modifier = Modifier.fillMaxWidth(),
-    text: String = "",
-    onClick: () -> Unit,
-    enabled: Boolean = true,
-    content: (@Composable RowScope.() -> Unit)? = null
-) {
-    OpenEdXOutlinedButton(
-        modifier = modifier,
-        text = text,
-        onClick = onClick,
-        enabled = enabled,
-        textColor = MaterialTheme.appColors.secondaryButtonBorderedText,
-        backgroundColor = MaterialTheme.appColors.secondaryButtonBorderedBackground,
-        borderColor = MaterialTheme.appColors.secondaryButtonBorder,
-        content = content
-    )
-}
-
 @Composable
 fun OpenEdXOutlinedButton(
     modifier: Modifier = Modifier.fillMaxWidth(),
@@ -1203,11 +1164,13 @@ fun ConnectionErrorView(
             textAlign = TextAlign.Center
         )
         Spacer(Modifier.height(16.dp))
-        OpenEdXSecondaryButton(
+        OpenEdXButton(
             modifier = Modifier
                 .widthIn(Dp.Unspecified, 162.dp),
             text = stringResource(id = R.string.core_reload),
-            onClick = onReloadClick
+            textColor = MaterialTheme.appColors.primaryButtonText,
+            backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
+            onClick = onReloadClick,
         )
     }
 }
@@ -1218,22 +1181,27 @@ fun AuthButtonsPanel(
     onSignInClick: () -> Unit,
 ) {
     Row {
-        OpenEdXSecondaryButton(
+        OpenEdXButton(
             modifier = Modifier
                 .testTag("btn_register")
                 .width(0.dp)
                 .weight(1f),
             text = stringResource(id = R.string.core_register),
+            textColor = MaterialTheme.appColors.primaryButtonText,
+            backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
             onClick = { onRegisterClick() }
         )
 
-        OpenEdXSecondaryOutlinedButton(
+        OpenEdXOutlinedButton(
             modifier = Modifier
                 .testTag("btn_sign_in")
                 .width(100.dp)
                 .padding(start = 16.dp),
             text = stringResource(id = R.string.core_sign_in),
-            onClick = { onSignInClick() }
+            onClick = { onSignInClick() },
+            textColor = MaterialTheme.appColors.secondaryButtonBorderedText,
+            backgroundColor = MaterialTheme.appColors.secondaryButtonBorderedBackground,
+            borderColor = MaterialTheme.appColors.secondaryButtonBorder,
         )
     }
 }