fix: openedx theme breaking changes

openedx · Apr 18, 2024 · e59f589 · e59f589
1 parent 7b32a1d
commit e59f589
Show file tree

Hide file tree

Showing 23 changed files with 152 additions and 114 deletions.
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
@@ -302,11 +302,11 @@ fun InputRegistrationField(
     }
     val isSingleLine = registrationField.type != RegistrationFieldType.TEXTAREA
     val helperTextColor = if (registrationField.errorInstructions.isEmpty()) {
-        MaterialTheme.appColors.primary
+        MaterialTheme.appColors.textSecondary
     } else if (isErrorShown) {
         MaterialTheme.appColors.error
     } else {
-        MaterialTheme.appColors.textFieldHint
+        MaterialTheme.appColors.textSecondary
     }
     val helperText = if (registrationField.errorInstructions.isEmpty()) {
         registrationField.instructions
@@ -381,11 +381,11 @@ fun SelectableRegisterField(
     onClick: (String, List<RegistrationField.Option>) -> Unit
 ) {
     val helperTextColor = if (registrationField.errorInstructions.isEmpty()) {
-        MaterialTheme.appColors.primary
+        MaterialTheme.appColors.textSecondary
     } else if (isErrorShown) {
         MaterialTheme.appColors.error
     } else {
-        MaterialTheme.appColors.textFieldHint
+        MaterialTheme.appColors.textSecondary
     }
     val helperText = if (registrationField.errorInstructions.isEmpty()) {
         registrationField.instructions

diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt
@@ -31,7 +31,7 @@ internal fun CheckboxField(
             checked = checkedState,
             colors = CheckboxDefaults.colors(
                 checkedColor = MaterialTheme.appColors.primary,
-                uncheckedColor = MaterialTheme.appColors.primary
+                uncheckedColor = MaterialTheme.appColors.textFieldText
             ),
             onCheckedChange = {
                 checkedState = it

diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt
@@ -45,9 +45,9 @@ internal fun SocialAuthView(
                     .testTag("btn_google_auth")
                     .padding(top = 24.dp)
                     .fillMaxWidth(),
-                backgroundColor = MaterialTheme.appColors.buttonSecondaryBackground,
-                borderColor = MaterialTheme.appColors.textFieldBorder,
-                textColor = Color.Black,
+                backgroundColor = MaterialTheme.appColors.authGoogleButtonBackground,
+                borderColor = MaterialTheme.appColors.primary,
+                textColor = Color.Unspecified,
                 onClick = {
                     onEvent(AuthType.GOOGLE)
                 }
@@ -62,8 +62,8 @@ internal fun SocialAuthView(
                         modifier = Modifier
                             .testTag("txt_google_auth")
                             .padding(start = 10.dp),
-                        color = Color.Black,
-                        text = stringResource(id = stringRes)
+                        text = stringResource(id = stringRes),
+                        color = MaterialTheme.appColors.primaryButtonBorderedText,
                     )
                 }
             }
@@ -88,13 +88,13 @@ internal fun SocialAuthView(
                     Icon(
                         painter = painterResource(id = R.drawable.ic_auth_facebook),
                         contentDescription = null,
-                        tint = MaterialTheme.appColors.onSecondary,
+                        tint = MaterialTheme.appColors.primaryButtonText,
                     )
                     Text(
                         modifier = Modifier
                             .testTag("txt_facebook_auth")
                             .padding(start = 10.dp),
-                        color = MaterialTheme.appColors.onSecondary,
+                        color = MaterialTheme.appColors.primaryButtonText,
                         text = stringResource(id = stringRes)
                     )
                 }
@@ -126,7 +126,7 @@ internal fun SocialAuthView(
                         modifier = Modifier
                             .testTag("txt_microsoft_auth")
                             .padding(start = 10.dp),
-                        color = MaterialTheme.appColors.onSecondary,
+                        color = MaterialTheme.appColors.primaryButtonText,
                         text = stringResource(id = stringRes)
                     )
                 }

diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt b/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt
@@ -180,7 +180,7 @@ fun FeedbackDialog(
                 colors = TextFieldDefaults.outlinedTextFieldColors(
                     backgroundColor = MaterialTheme.appColors.cardViewBackground,
                     unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                    textColor = MaterialTheme.appColors.textFieldHint
+                    textColor = MaterialTheme.appColors.textFieldText
                 ),
             )
 
@@ -320,8 +320,8 @@ fun DefaultTextButton(
     val textColor: Color
     val backgroundColor: Color
     if (isEnabled) {
-        textColor = MaterialTheme.appColors.buttonText
-        backgroundColor = MaterialTheme.appColors.buttonBackground
+        textColor = MaterialTheme.appColors.primaryButtonText
+        backgroundColor = MaterialTheme.appColors.primaryButtonBackground
     } else {
         textColor = MaterialTheme.appColors.inactiveButtonText
         backgroundColor = MaterialTheme.appColors.inactiveButtonBackground
@@ -345,7 +345,6 @@ fun DefaultTextButton(
         ) {
             Text(
                 text = text,
-                color = MaterialTheme.appColors.onSecondary,
                 style = MaterialTheme.appTypography.labelLarge
             )
         }

diff --git a/core/src/main/java/org/openedx/core/presentation/global/app_upgrade/AppUpdateUI.kt b/core/src/main/java/org/openedx/core/presentation/global/app_upgrade/AppUpdateUI.kt
@@ -275,7 +275,7 @@ fun TransparentTextButton(
     ) {
         Text(
             modifier = Modifier.testTag("txt_secondary"),
-            color = MaterialTheme.appColors.textPrimary,
+            color = MaterialTheme.appColors.textAccent,
             style = MaterialTheme.appTypography.labelLarge,
             text = text
         )
@@ -292,7 +292,7 @@ fun DefaultTextButton(
             .testTag("btn_primary")
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = MaterialTheme.appColors.textPrimary
+            backgroundColor = MaterialTheme.appColors.primaryButtonBackground
         ),
         elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
@@ -305,7 +305,7 @@ fun DefaultTextButton(
             Text(
                 modifier = Modifier.testTag("txt_primary"),
                 text = text,
-                color = MaterialTheme.appColors.buttonText,
+                color = MaterialTheme.appColors.primaryButtonText,
                 style = MaterialTheme.appTypography.labelLarge
             )
         }
@@ -401,4 +401,4 @@ private fun AppUpgradeRecommendDialogPreview() {
             onUpdateClick = {}
         )
     }
-}
+}
diff --git a/core/src/main/java/org/openedx/core/presentation/settings/VideoQualityFragment.kt b/core/src/main/java/org/openedx/core/presentation/settings/VideoQualityFragment.kt
@@ -233,7 +233,7 @@ private fun QualityOption(
                 Text(
                     modifier = Modifier.testTag("txt_video_quality_description_${title.tagId()}"),
                     text = description,
-                    color = MaterialTheme.appColors.textPrimary,
+                    color = MaterialTheme.appColors.textSecondary,
                     style = MaterialTheme.appTypography.labelMedium
                 )
             }

diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -219,19 +219,20 @@ fun SearchBar(
             }
         },
         colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textFieldText,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground,
-            focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-            cursorColor = MaterialTheme.appColors.textFieldText,
-            leadingIconColor = MaterialTheme.appColors.textFieldText
+            textColor = MaterialTheme.appColors.textPrimary,
+            backgroundColor = if (isFocused) MaterialTheme.appColors.background else MaterialTheme.appColors.textFieldBackground,
+            focusedBorderColor = MaterialTheme.appColors.primary,
+            unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
+            cursorColor = MaterialTheme.appColors.primary,
+            leadingIconColor = MaterialTheme.appColors.textPrimary
         ),
         placeholder = {
             Text(
                 modifier = Modifier
                     .testTag("txt_search_placeholder")
                     .fillMaxWidth(),
                 text = label,
-                color = MaterialTheme.appColors.textFieldHint,
+                color = MaterialTheme.appColors.textSecondary,
                 style = MaterialTheme.appTypography.bodyMedium
             )
         },
@@ -240,7 +241,7 @@ fun SearchBar(
                 modifier = Modifier.padding(start = 16.dp),
                 imageVector = Icons.Filled.Search,
                 contentDescription = null,
-                tint = if (isFocused) MaterialTheme.appColors.textFieldText else MaterialTheme.appColors.textFieldHint
+                tint = if (isFocused) MaterialTheme.appColors.primary else MaterialTheme.appColors.onSurface
             )
         },
         trailingIcon = {
@@ -310,18 +311,18 @@ fun SearchBarStateless(
             }
         },
         colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textFieldText,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground,
-            focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
+            textColor = MaterialTheme.appColors.textPrimary,
+            backgroundColor = if (isFocused) MaterialTheme.appColors.background else MaterialTheme.appColors.textFieldBackground,
+            focusedBorderColor = MaterialTheme.appColors.primary,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-            cursorColor = MaterialTheme.appColors.textFieldText,
-            leadingIconColor = MaterialTheme.appColors.textFieldText
+            cursorColor = MaterialTheme.appColors.primary,
+            leadingIconColor = MaterialTheme.appColors.textPrimary
         ),
         placeholder = {
             Text(
                 modifier = Modifier.fillMaxWidth(),
                 text = label,
-                color = MaterialTheme.appColors.textFieldText,
+                color = MaterialTheme.appColors.textSecondary,
                 style = MaterialTheme.appTypography.bodyMedium
             )
         },
@@ -330,7 +331,7 @@ fun SearchBarStateless(
                 modifier = Modifier.padding(start = 16.dp),
                 imageVector = Icons.Filled.Search,
                 contentDescription = null,
-                tint = if (isFocused) MaterialTheme.appColors.textFieldText else MaterialTheme.appColors.textFieldHint
+                tint = if (isFocused) MaterialTheme.appColors.primary else MaterialTheme.appColors.onSurface
             )
         },
         trailingIcon = {
@@ -1022,8 +1023,8 @@ fun OpenEdXSecondaryButton(
         text = text,
         onClick = onClick,
         enabled = enabled,
-        textColor = MaterialTheme.appColors.onSecondary,
-        backgroundColor = MaterialTheme.appColors.secondary,
+        textColor = MaterialTheme.appColors.primaryButtonText,
+        backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
         content = content
     )
 }
@@ -1034,8 +1035,8 @@ fun OpenEdXButton(
     text: String = "",
     onClick: () -> Unit,
     enabled: Boolean = true,
-    textColor: Color = MaterialTheme.appColors.onSecondary,
-    backgroundColor: Color = MaterialTheme.appColors.secondary,
+    textColor: Color = MaterialTheme.appColors.primaryButtonText,
+    backgroundColor: Color = MaterialTheme.appColors.primaryButtonBackground,
     content: (@Composable RowScope.() -> Unit)? = null
 ) {
     Button(
@@ -1076,9 +1077,9 @@ fun OpenEdXSecondaryOutlinedButton(
         text = text,
         onClick = onClick,
         enabled = enabled,
-        textColor = MaterialTheme.appColors.secondary,
-        backgroundColor = MaterialTheme.appColors.onSecondary,
-        borderColor = MaterialTheme.appColors.buttonBorder,
+        textColor = MaterialTheme.appColors.secondaryButtonBorderedText,
+        backgroundColor = MaterialTheme.appColors.secondaryButtonBorderedBackground,
+        borderColor = MaterialTheme.appColors.secondaryButtonBorder,
         content = content
     )
 }

diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
@@ -21,9 +21,16 @@ data class AppColors(
     val textFieldText: Color,
     val textFieldHint: Color,
 
-    val buttonBackground: Color,
-    val buttonSecondaryBackground: Color,
-    val buttonText: Color,
+    val primaryButtonBackground: Color,
+    val primaryButtonText: Color,
+    val primaryButtonBorder: Color,
+    val primaryButtonBorderedText: Color,
+
+    val secondaryButtonBackground: Color,
+    val secondaryButtonText: Color,
+    val secondaryButtonBorder: Color,
+    val secondaryButtonBorderedBackground: Color,
+    val secondaryButtonBorderedText: Color,
 
     val cardViewBackground: Color,
     val cardViewBorder: Color,
@@ -36,7 +43,6 @@ data class AppColors(
     val info_variant: Color,
     val onWarning: Color,
     val onInfo: Color,
-    val buttonBorder: Color,
 
     val rateStars: Color,
     val inactiveButtonBackground: Color,
@@ -50,6 +56,7 @@ data class AppColors(
     val datesSectionBarNextWeek: Color,
     val datesSectionBarUpcoming: Color,
 
+    val authGoogleButtonBackground: Color,
     val authFacebookButtonBackground: Color,
     val authMicrosoftButtonBackground: Color,
 

diff --git a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
@@ -40,9 +40,16 @@ private val DarkColorPalette = AppColors(
     textFieldText = dark_text_field_text,
     textFieldHint = dark_text_field_hint,
 
-    buttonBackground = dark_button_background,
-    buttonSecondaryBackground = dark_button_secondary_background,
-    buttonText = dark_button_text,
+    primaryButtonBackground = dark_primary_button_background,
+    primaryButtonText = dark_primary_button_text,
+    primaryButtonBorder = dark_primary_button_border,
+    primaryButtonBorderedText = dark_primary_button_bordered_text,
+
+    secondaryButtonBackground = dark_secondary_button_background,
+    secondaryButtonText = dark_secondary_button_text,
+    secondaryButtonBorder = dark_secondary_button_border,
+    secondaryButtonBorderedBackground = dark_secondary_button_bordered_background,
+    secondaryButtonBorderedText = dark_secondary_button_bordered_text,
 
     cardViewBackground = dark_card_view_background,
     cardViewBorder = dark_card_view_border,
@@ -56,11 +63,10 @@ private val DarkColorPalette = AppColors(
     info_variant = dark_info_variant,
     onWarning = dark_onWarning,
     onInfo = dark_onInfo,
-    buttonBorder = dark_button_border,
 
     rateStars = dark_rate_stars,
     inactiveButtonBackground = dark_inactive_button_background,
-    inactiveButtonText = dark_button_text,
+    inactiveButtonText = dark_primary_button_text,
 
     accessGreen = dark_access_green,
 
@@ -70,6 +76,7 @@ private val DarkColorPalette = AppColors(
     datesSectionBarNextWeek = dark_dates_section_bar_next_week,
     datesSectionBarUpcoming = dark_dates_section_bar_upcoming,
 
+    authGoogleButtonBackground = dark_auth_google_button_background,
     authFacebookButtonBackground = dark_auth_facebook_button_background,
     authMicrosoftButtonBackground = dark_auth_microsoft_button_background,
 
@@ -109,9 +116,16 @@ private val LightColorPalette = AppColors(
     textFieldText = light_text_field_text,
     textFieldHint = light_text_field_hint,
 
-    buttonBackground = light_button_background,
-    buttonSecondaryBackground = light_button_secondary_background,
-    buttonText = light_button_text,
+    primaryButtonBackground = light_primary_button_background,
+    primaryButtonText = light_primary_button_text,
+    primaryButtonBorder = light_primary_button_border,
+    primaryButtonBorderedText = light_primary_button_bordered_text,
+
+    secondaryButtonBackground = light_secondary_button_background,
+    secondaryButtonText = light_secondary_button_text,
+    secondaryButtonBorder = light_secondary_button_border,
+    secondaryButtonBorderedBackground = light_secondary_button_bordered_background,
+    secondaryButtonBorderedText = light_secondary_button_bordered_text,
 
     cardViewBackground = light_card_view_background,
     cardViewBorder = light_card_view_border,
@@ -125,11 +139,10 @@ private val LightColorPalette = AppColors(
     info_variant = light_info_variant,
     onWarning = light_onWarning,
     onInfo = light_onInfo,
-    buttonBorder = light_button_border,
 
     rateStars = light_rate_stars,
     inactiveButtonBackground = light_inactive_button_background,
-    inactiveButtonText = light_button_text,
+    inactiveButtonText = light_primary_button_text,
 
     accessGreen = light_access_green,
 
@@ -139,6 +152,7 @@ private val LightColorPalette = AppColors(
     datesSectionBarNextWeek = light_dates_section_bar_next_week,
     datesSectionBarUpcoming = light_dates_section_bar_upcoming,
 
+    authGoogleButtonBackground = light_auth_google_button_background,
     authFacebookButtonBackground = light_auth_facebook_button_background,
     authMicrosoftButtonBackground = light_auth_microsoft_button_background,