Merge remote-tracking branch 'origin/develop' into feat/dashboard

# Conflicts:
#	app/src/main/res/layout/fragment_main.xml
#	course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt

Author: PavloNetrebchuk

app/src/main/res/layout/fragment_main.xml

@@ -20,6 +20,7 @@
         android:layout_height="wrap_content"
         app:itemIconTint="@color/bottom_nav_color"
         app:itemTextColor="@color/bottom_nav_color"
+        android:background="@color/background"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -33,6 +33,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -131,7 +132,6 @@ private fun LogistrationScreen(
                 LogistrationLogoView()
                 Text(
                     text = stringResource(id = R.string.pre_auth_title),
-                    color = MaterialTheme.appColors.textPrimary,
                     style = MaterialTheme.appTypography.headlineSmall,
                     modifier = Modifier
                         .testTag("txt_screen_title")
@@ -177,7 +177,8 @@ private fun LogistrationScreen(
                         },
                     text = stringResource(id = R.string.pre_auth_explore_all_courses),
                     color = MaterialTheme.appColors.primary,
-                    style = MaterialTheme.appTypography.labelLarge
+                    style = MaterialTheme.appTypography.labelLarge,
+                    textDecoration = TextDecoration.Underline
                 )
 
                 Spacer(modifier = Modifier.weight(1f))

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

@@ -49,6 +49,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -195,7 +196,8 @@ internal fun LoginScreen(
                                 modifier = Modifier.testTag("txt_${state.agreement.name}"),
                                 fullText = linkedText.text,
                                 hyperLinks = linkedText.links,
-                                linkTextColor = MaterialTheme.appColors.primary,
+                                linkTextColor = MaterialTheme.appColors.textHyperLink,
+                                linkTextDecoration = TextDecoration.Underline,
                                 action = { link ->
                                     onEvent(AuthEvent.OpenLink(linkedText.links, link))
                                 },
@@ -264,7 +266,7 @@ private fun AuthForm(
                         onEvent(AuthEvent.ForgotPasswordClick)
                     },
                 text = stringResource(id = R.string.auth_forgot_password),
-                color = MaterialTheme.appColors.primary,
+                color = MaterialTheme.appColors.info_variant,
                 style = MaterialTheme.appTypography.labelLarge
             )
         }
@@ -275,6 +277,8 @@ private fun AuthForm(
             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))
                 }
@@ -323,8 +327,10 @@ private fun PasswordTextField(
             onValueChanged(it.text.trim())
         },
         colors = TextFieldDefaults.outlinedTextFieldColors(
+            textColor = MaterialTheme.appColors.textFieldText,
+            backgroundColor = MaterialTheme.appColors.textFieldBackground,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground
+            cursorColor = MaterialTheme.appColors.textFieldText,
         ),
         shape = MaterialTheme.appShapes.textFieldShape,
         placeholder = {

auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt

@@ -329,7 +329,7 @@ internal fun SignUpView(
                                             modifier = Modifier
                                                 .testTag("txt_sign_up_title")
                                                 .fillMaxWidth(),
-                                            text = stringResource(id = R.string.auth_sign_up),
+                                            text = stringResource(id = coreR.string.core_register),
                                             color = MaterialTheme.appColors.textPrimary,
                                             style = MaterialTheme.appTypography.displaySmall
                                         )
@@ -437,6 +437,8 @@ internal fun SignUpView(
                                     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)

auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt

@@ -44,6 +44,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.openedx.auth.R
@@ -170,7 +171,8 @@ fun OptionalFields(
                     HyperlinkText(
                         fullText = linkedText.text,
                         hyperLinks = linkedText.links,
-                        linkTextColor = MaterialTheme.appColors.primary,
+                        linkTextColor = MaterialTheme.appColors.textHyperLink,
+                        linkTextDecoration = TextDecoration.Underline,
                         action = {
                             hyperLinkAction?.invoke(linkedText.links, it)
                         },
@@ -250,8 +252,10 @@ fun LoginTextField(
             onValueChanged(it.text.trim())
         },
         colors = TextFieldDefaults.outlinedTextFieldColors(
+            textColor = MaterialTheme.appColors.textFieldText,
+            backgroundColor = MaterialTheme.appColors.textFieldBackground,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground
+            cursorColor = MaterialTheme.appColors.textFieldText,
         ),
         shape = MaterialTheme.appShapes.textFieldShape,
         placeholder = {
@@ -332,8 +336,11 @@ fun InputRegistrationField(
                 }
             },
             colors = TextFieldDefaults.outlinedTextFieldColors(
+                textColor = MaterialTheme.appColors.textFieldText,
+                backgroundColor = MaterialTheme.appColors.textFieldBackground,
+                focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                backgroundColor = MaterialTheme.appColors.textFieldBackground
+                cursorColor = MaterialTheme.appColors.textFieldText,
             ),
             shape = MaterialTheme.appShapes.textFieldShape,
             placeholder = {

auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt

@@ -45,7 +45,7 @@ internal fun SocialAuthView(
                     .testTag("btn_google_auth")
                     .padding(top = 24.dp)
                     .fillMaxWidth(),
-                backgroundColor = MaterialTheme.appColors.background,
+                backgroundColor = MaterialTheme.appColors.authGoogleButtonBackground,
                 borderColor = MaterialTheme.appColors.primary,
                 textColor = Color.Unspecified,
                 onClick = {
@@ -62,7 +62,8 @@ internal fun SocialAuthView(
                         modifier = Modifier
                             .testTag("txt_google_auth")
                             .padding(start = 10.dp),
-                        text = stringResource(id = stringRes)
+                        text = stringResource(id = stringRes),
+                        color = MaterialTheme.appColors.primaryButtonBorderedText,
                     )
                 }
             }
@@ -87,13 +88,13 @@ internal fun SocialAuthView(
                     Icon(
                         painter = painterResource(id = R.drawable.ic_auth_facebook),
                         contentDescription = null,
-                        tint = MaterialTheme.appColors.buttonText,
+                        tint = MaterialTheme.appColors.primaryButtonText,
                     )
                     Text(
                         modifier = Modifier
                             .testTag("txt_facebook_auth")
                             .padding(start = 10.dp),
-                        color = MaterialTheme.appColors.buttonText,
+                        color = MaterialTheme.appColors.primaryButtonText,
                         text = stringResource(id = stringRes)
                     )
                 }
@@ -125,7 +126,7 @@ internal fun SocialAuthView(
                         modifier = Modifier
                             .testTag("txt_microsoft_auth")
                             .padding(start = 10.dp),
-                        color = MaterialTheme.appColors.buttonText,
+                        color = MaterialTheme.appColors.primaryButtonText,
                         text = stringResource(id = stringRes)
                     )
                 }

auth/src/main/res/values-uk/strings.xml

@@ -5,7 +5,6 @@
     <string name="auth_email">Електронна пошта</string>
     <string name="auth_invalid_email">Неправильна E-mail адреса</string>
     <string name="auth_invalid_password">Пароль занадто короткий</string>
-    <string name="auth_welcome_back">Ласкаво просимо! Будь ласка, авторизуйтесь, щоб продовжити.</string>
     <string name="auth_show_optional_fields">Показати додаткові поля</string>
     <string name="auth_hide_optional_fields">Приховати додаткові поля</string>
     <string name="auth_create_account">Створити акаунт</string>
@@ -15,6 +14,5 @@
     <string name="auth_check_your_email">Перевірте свою електронну пошту</string>
     <string name="auth_restore_password_success">Ми надіслали інструкції щодо відновлення пароля на вашу електронну пошту %s</string>
     <string name="auth_enter_password">Введіть пароль</string>
-    <string name="auth_create_new_account">Створити новий аккаунт.</string>
 
 </resources>

auth/src/main/res/values/strings.xml

@@ -11,7 +11,7 @@
     <string name="auth_email_username" tools:ignore="MissingTranslation">Email or Username</string>
     <string name="auth_invalid_email_username" tools:ignore="MissingTranslation">Invalid email or username</string>
     <string name="auth_invalid_password">Password is too short</string>
-    <string name="auth_welcome_back">Welcome back! Please authorize to continue.</string>
+    <string name="auth_welcome_back">Welcome back! Sign in to access your courses.</string>
     <string name="auth_show_optional_fields">Show optional fields</string>
     <string name="auth_hide_optional_fields">Hide optional fields</string>
     <string name="auth_create_account">Create account</string>
@@ -23,7 +23,7 @@
     <string name="auth_example_email" translatable="false">[email protected]</string>
     <string name="auth_enter_email_username" tools:ignore="MissingTranslation">Enter email or username</string>
     <string name="auth_enter_password">Enter password</string>
-    <string name="auth_create_new_account">Create new account.</string>
+    <string name="auth_create_new_account">Create an account to start learning today!</string>
     <string name="auth_compete_registration" translatable="false">Complete your registration</string>
     <string name="auth_google" tools:ignore="ExtraTranslation">Sign in with Google</string>
     <string name="auth_facebook" tools:ignore="ExtraTranslation">Sign in with Facebook</string>

build.gradle

@@ -56,6 +56,8 @@ ext {
 
     extented_spans_version = "1.3.0"
 
+    webkit_version = "1.11.0"
+
     configHelper = new ConfigHelper(projectDir, getCurrentFlavor())
 
     //testing

core/build.gradle

@@ -154,6 +154,8 @@ dependencies {
     //Play In-App Review
     api "com.google.android.play:review-ktx:$in_app_review"
 
+    api "androidx.webkit:webkit:$webkit_version"
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'