fix: after rebase

openedx · Feb 15, 2024 · 655edf6 · 655edf6
1 parent d5cd197
commit 655edf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
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
@@ -49,7 +49,6 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.R
 import org.openedx.core.domain.model.VideoQuality
-import org.openedx.core.ui.BackBtn
 import org.openedx.core.extension.nonZero
 import org.openedx.core.extension.tagId
 import org.openedx.core.ui.Toolbar
@@ -62,7 +61,6 @@ import org.openedx.core.ui.theme.OpenEdXTheme
 import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appTypography
 import org.openedx.core.ui.windowSizeValue
-import org.openedx.profile.R
 
 class VideoQualityFragment : Fragment() {
 
@@ -173,20 +171,10 @@ private fun VideoQualityScreen(
             ) {
                 Toolbar(
                     modifier = topBarWidth,
-                    contentAlignment = Alignment.CenterStart
-                ) {
-                    Text(
-                        modifier = Modifier
-                            .fillMaxWidth(),
-                        text = title,
-                        color = MaterialTheme.appColors.textPrimary,
-                        textAlign = TextAlign.Center,
-                        style = MaterialTheme.appTypography.titleMedium
-                    )
-                    BackBtn(Modifier.padding(start = 8.dp)) {
-                        onBackClick()
-                    }
-                }
+                    label = title,
+                    canShowBackBtn = true,
+                    onBackClick = onBackClick
+                )
 
                 Column(
                     modifier = Modifier

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="core_video_quality_p360" translatable="false">360p</string>
     <string name="core_video_quality_p360_description">Lower data usage</string>
     <string name="core_video_quality_p540" translatable="false">540p</string>
-    <string name="core_video_quality_p720">720p translatable="false"</string>
+    <string name="core_video_quality_p720" translatable="false">720p</string>
     <string name="core_video_quality_p720_description">Best quality</string>
     <string name="core_user_not_active">User account is not activated. Please activate your account first.</string>
     <string name="core_email_chooser_header">Send email using…</string>