Merge remote-tracking branch 'origin/develop' into feature/accessibility

openedx · Oct 17, 2023 · 73bb5c8 · 73bb5c8
2 parents 8cc9f2e + e23a91c
commit 73bb5c8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 43 deletions.
diff --git a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
@@ -322,9 +323,13 @@ fun SequentialItem(
 }
 
 @Composable
-fun VideoTitle(text: String) {
+fun VideoTitle(
+    text: String,
+    modifier: Modifier = Modifier,
+) {
     Text(
         text = text,
+        modifier = modifier,
         color = MaterialTheme.appColors.textPrimary,
         style = MaterialTheme.appTypography.titleLarge,
         maxLines = 1,
@@ -353,6 +358,7 @@ fun NavigationUnitsButtons(
             .fillMaxWidth()
     } else {
         Modifier
+            .statusBarsPadding()
             .padding(end = 32.dp)
             .padding(top = 2.dp)
     }

diff --git a/...c/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt b/...c/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt
@@ -4,6 +4,7 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.os.SystemClock
 import android.view.View
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.getValue
@@ -66,9 +67,6 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
         super.onViewCreated(view, savedInstanceState)
 
         val insetHolder = requireActivity() as InsetHolder
-        val statusBarParams = binding.statusBarInset.layoutParams as ConstraintLayout.LayoutParams
-        statusBarParams.topMargin = insetHolder.topInset
-        binding.statusBarInset.layoutParams = statusBarParams
         val containerParams = binding.viewPager.layoutParams as ConstraintLayout.LayoutParams
         containerParams.bottomMargin = insetHolder.bottomInset
         binding.viewPager.layoutParams = containerParams
@@ -93,7 +91,10 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
             OpenEdXTheme {
                 val block by viewModel.currentBlock.observeAsState()
                 if (block?.type == BlockType.VIDEO) {
-                    VideoTitle(text = block?.displayName ?: "")
+                    VideoTitle(
+                        text = block?.displayName ?: "",
+                        modifier = Modifier.statusBarsPadding()
+                    )
                 }
             }
         }
@@ -160,7 +161,7 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
 
         binding.btnBack.setContent {
             OpenEdXTheme {
-                BackBtn {
+                BackBtn(modifier = Modifier.statusBarsPadding()) {
                     requireActivity().supportFragmentManager.popBackStack()
                 }
             }

diff --git a/course/src/main/res/layout-land/fragment_course_unit_container.xml b/course/src/main/res/layout-land/fragment_course_unit_container.xml
@@ -5,22 +5,13 @@
     android:layout_height="match_parent"
     android:background="@color/background">
 
-    <View
-        android:id="@+id/statusBarInset"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.compose.ui.platform.ComposeView
         android:id="@+id/btnBack"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="48dp"
-        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/statusBarInset" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.compose.ui.platform.ComposeView
         android:id="@+id/cv_video_title"
@@ -38,7 +29,7 @@
         android:layout_height="wrap_content"
         android:elevation="4dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarInset" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"

diff --git a/course/src/main/res/layout-w600dp-h480dp/fragment_course_unit_container.xml b/course/src/main/res/layout-w600dp-h480dp/fragment_course_unit_container.xml
@@ -5,14 +5,6 @@
     android:layout_height="match_parent"
     android:background="@color/background">
 
-    <View
-        android:id="@+id/statusBarInset"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <FrameLayout
         android:id="@+id/frameBack"
         android:layout_width="wrap_content"
@@ -22,12 +14,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/statusBarInset">
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.compose.ui.platform.ComposeView
             android:id="@+id/btnBack"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="12dp" />
 

diff --git a/course/src/main/res/layout/fragment_course_unit_container.xml b/course/src/main/res/layout/fragment_course_unit_container.xml
@@ -5,22 +5,12 @@
     android:layout_height="match_parent"
     android:background="@color/background">
 
-    <View
-        android:id="@+id/statusBarInset"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.compose.ui.platform.ComposeView
         android:id="@+id/btnBack"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/statusBarInset" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"

diff --git a/...rc/main/java/org/openedx/profile/presentation/anothers_account/AnothersProfileFragment.kt b/...rc/main/java/org/openedx/profile/presentation/anothers_account/AnothersProfileFragment.kt
@@ -199,6 +199,8 @@ private fun AnothersProfileScreen(
                         Spacer(modifier = Modifier.height(36.dp))
 
                         ProfileInfoSection(uiState.account)
+
+                        Spacer(modifier = Modifier.height(36.dp))
                     }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,6 +199,8 @@ private fun AnothersProfileScreen( @@
                             Spacer(modifier = Modifier.height(36.dp))
                             ProfileInfoSection(uiState.account)
+                            Spacer(modifier = Modifier.height(36.dp))
                         }
                     }
                 }
@@ Expand Down @@