fix: Release 5.0.0 App Navigation Issues (#1826)

fix: Release 5.0.0 app navigation issues - Facebook Authentication - Register screen error layout - Highlighted fields of Course Dashboard - WebView scrolling issue within CoordinatorLayout - Introduce NestedScrollWebView to resolve scrolling problems when using WebView within a CoordinatorLayout. - Organisation name visibility on expended toolbar on CourseDashboard - Shift date snackbar reappears on screen rotation - play the first video on the subsection click from the videos tab - Bulk Download Warning Popup - YouTube videos and flying messages - Update firebaseRemoteConfig configurations - Add screen for unsupported subsections instated of the first component - `CourseUnitNavigationActivity` code improvements - fullscreen for YouTube video with minor code improvements --------- Co-authored-by: Farhan Arshad <[email protected]> Co-authored-by: Omer Habib <[email protected]> fixes: LEARNER-9625
openedx-unsupported · Sep 28, 2023 · 6ef292f · 6ef292f
1 parent 9882175
commit 6ef292f
Show file tree

Hide file tree

Showing 25 changed files with 337 additions and 137 deletions.
diff --git a/OpenEdXMobile/res/drawable/selectable_box_overlay.xml b/OpenEdXMobile/res/drawable/selectable_box_overlay.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/black">
+    android:color="@color/transparent_black_13">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="@color/transparent_white_26" />

diff --git a/OpenEdXMobile/res/layout/activity_course_tabs_dashboard.xml b/OpenEdXMobile/res/layout/activity_course_tabs_dashboard.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragment_container_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:id="@+id/flying_message"
-            style="@style/flying_message"
-            android:visibility="gone" />
-
-    </FrameLayout>
+        android:layout_height="match_parent" />
 </layout>
diff --git a/OpenEdXMobile/res/layout/activity_course_unit_navigation.xml b/OpenEdXMobile/res/layout/activity_course_unit_navigation.xml
@@ -140,11 +140,6 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <TextView
-                android:id="@+id/flying_message"
-                style="@style/flying_message"
-                android:visibility="gone" />
-
             <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/pager2"
                 android:layout_width="match_parent"
@@ -157,6 +152,17 @@
                 android:id="@+id/stateLayout"
                 layout="@layout/layout_error_state"
                 android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/flying_message"
+                style="@style/flying_message"
+                android:visibility="gone" />
+
+            <include
+                android:id="@+id/container_layout_not_available"
+                layout="@layout/layout_component_not_available"
+                android:visibility="gone" />
+
         </RelativeLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

diff --git a/OpenEdXMobile/res/layout/course_dashboard_toolbar.xml b/OpenEdXMobile/res/layout/course_dashboard_toolbar.xml
@@ -99,7 +99,7 @@
                 android:id="@+id/collapsed_toolbar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/collapsed_toolbar_height"
-                android:background="@color/primaryLightColor"
+                android:background="@color/transparent"
                 app:layout_collapseMode="pin">
 
                 <LinearLayout

diff --git a/OpenEdXMobile/res/layout/fragment_course_tabs_dashboard.xml b/OpenEdXMobile/res/layout/fragment_course_tabs_dashboard.xml
@@ -33,6 +33,11 @@
             android:id="@+id/loading_error"
             layout="@layout/layout_error_state"
             android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/flying_message"
+            style="@style/flying_message"
+            android:visibility="gone" />
     </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OpenEdXMobile/res/layout/fragment_course_unit_grade.xml b/OpenEdXMobile/res/layout/fragment_course_unit_grade.xml
@@ -1,6 +1,5 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -75,60 +74,10 @@
 
             </androidx.cardview.widget.CardView>
 
-            <LinearLayout
+            <include
                 android:id="@+id/container_layout_not_available"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/content_error_icon"
-                    android:layout_width="@dimen/unit_unavailable_error_icon_size"
-                    android:layout_height="@dimen/unit_unavailable_error_icon_size"
-                    android:layout_margin="@dimen/widget_margin_double"
-                    app:srcCompat="@drawable/ic_laptop"
-                    app:tint="@color/neutralXXDark" />
-
-                <TextView
-                    android:id="@+id/not_available_message"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/edx_quadruple_margin"
-                    android:layout_marginEnd="@dimen/edx_quadruple_margin"
-                    android:layout_marginBottom="@dimen/widget_margin_double"
-                    android:gravity="center"
-                    android:singleLine="false"
-                    android:textAlignment="center"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/edx_base"
-                    tools:text="@string/assessment_not_available" />
-
-                <TextView
-                    android:id="@+id/not_available_message_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/edx_quadruple_margin"
-                    android:layout_marginEnd="@dimen/edx_quadruple_margin"
-                    android:layout_marginBottom="@dimen/widget_margin_double"
-                    android:gravity="center"
-                    android:singleLine="false"
-                    android:text="@string/assessment_explore_on_web"
-                    android:textAlignment="center"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/edx_base" />
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/view_on_web_button"
-                    style="@style/edX.Widget.SecondaryActionButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/widget_margin_double"
-                    android:text="@string/assessment_view_on_web" />
-
-            </LinearLayout>
+                layout="@layout/layout_component_not_available"
+                android:visibility="gone" />
         </FrameLayout>
     </ScrollView>
 </layout>
diff --git a/OpenEdXMobile/res/layout/fragment_webview_discovery.xml b/OpenEdXMobile/res/layout/fragment_webview_discovery.xml
@@ -34,19 +34,13 @@
                     android:visibility="gone"
                     tools:visibility="visible" />
 
-                <androidx.core.widget.NestedScrollView
+                <org.edx.mobile.view.custom.NestedScrollWebView
+                    android:id="@+id/webview"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                    <org.edx.mobile.view.custom.EdxWebView
-                        android:id="@+id/webview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@color/neutralLight" />
-
-                </androidx.core.widget.NestedScrollView>
+                    android:background="@color/neutralLight"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             </LinearLayout>
 

diff --git a/OpenEdXMobile/res/layout/layout_component_not_available.xml b/OpenEdXMobile/res/layout/layout_component_not_available.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container_layout_not_available"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/content_error_icon"
+        android:layout_width="@dimen/unit_unavailable_error_icon_size"
+        android:layout_height="@dimen/unit_unavailable_error_icon_size"
+        android:layout_margin="@dimen/widget_margin_double"
+        app:srcCompat="@drawable/ic_laptop"
+        app:tint="@color/neutralXXDark" />
+
+    <TextView
+        android:id="@+id/not_available_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/edx_quadruple_margin"
+        android:layout_marginEnd="@dimen/edx_quadruple_margin"
+        android:layout_marginBottom="@dimen/widget_margin_double"
+        android:gravity="center"
+        android:singleLine="false"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="@dimen/edx_base"
+        tools:text="@string/assessment_not_available" />
+
+    <TextView
+        android:id="@+id/not_available_message_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/edx_quadruple_margin"
+        android:layout_marginEnd="@dimen/edx_quadruple_margin"
+        android:layout_marginBottom="@dimen/widget_margin_double"
+        android:gravity="center"
+        android:singleLine="false"
+        android:text="@string/assessment_explore_on_web"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="@dimen/edx_base" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/view_on_web_button"
+        style="@style/edX.Widget.SecondaryActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/widget_margin_double"
+        android:text="@string/assessment_view_on_web" />
+
+</LinearLayout>
diff --git a/OpenEdXMobile/res/layout/sub_section_row_layout.xml b/OpenEdXMobile/res/layout/sub_section_row_layout.xml
@@ -15,6 +15,7 @@
         android:id="@+id/sub_section_row_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/view_selector"
         android:paddingStart="@dimen/edx_default_margin"
         android:paddingTop="@dimen/container_padding"
         android:paddingEnd="@dimen/edx_half_margin"

diff --git a/OpenEdXMobile/res/values/colors.xml b/OpenEdXMobile/res/values/colors.xml
@@ -129,6 +129,7 @@
 
     <color name="crop_circle_overlay_color">#c8000000</color>
 
+    <color name="transparent">@android:color/transparent</color>
     <color name="transparent_black">#90000000</color>
     <color name="transparent_black_80">#CC000000</color>
     <color name="transparent_black_50">#80000000</color>

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java b/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/CourseComponent.java
@@ -613,6 +613,21 @@ public CourseComponent getFirstIncompleteComponent() {
         }
     }
 
+    @Nullable
+    public CourseComponent getFirstIncompleteVideoComponent() {
+        List<VideoBlockModel> videos = getVideos();
+        for (CourseComponent block : videos) {
+            if (!block.isCompleted()) {
+                return block;
+            }
+        }
+        if (videos.size() > 0) {
+            return videos.get(videos.size() - 1);
+        } else {
+            return null;
+        }
+    }
+
     public boolean isEmptyComponent() {
         return type != BlockType.VIDEO &&
                 type != BlockType.HTML &&

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/EncodedVideos.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/model/course/EncodedVideos.kt
@@ -30,7 +30,8 @@ data class EncodedVideos(
     val youtubeVideoInfo: VideoInfo?
         get() = if (youtube != null && URLUtil.isNetworkUrl(youtube.url)) youtube else null
 
-    val isYoutubeVideo = youtubeVideoInfo != null
+    val isYoutubeVideo
+        get() = youtubeVideoInfo != null
 
     /**
      * Extract the Preferred Native [VideoInfo] based on their stream priority for media playback

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/db/DatabaseModelFactory.java
@@ -13,6 +13,7 @@
 import org.edx.mobile.model.course.VideoData;
 import org.edx.mobile.model.course.VideoInfo;
 import org.edx.mobile.model.db.DownloadEntry;
+import org.edx.mobile.model.video.VideoQuality;
 
 /**
  * Model Factory class for the database models.
@@ -87,9 +88,10 @@ public static VideoModel getModel(VideoResponseModel vrm) {
      * Returns an object of IVideoModel which has all the fields copied from given VideoData.
      *
      * @param vrm
+     * @param videoQuality
      * @return
      */
-    public static VideoModel getModel(VideoData vrm, VideoBlockModel block) {
+    public static VideoModel getModel(VideoData vrm, VideoBlockModel block, VideoQuality videoQuality) {
         DownloadEntry e = new DownloadEntry();
         //FIXME - current database schema is not suitable for arbitary level of course structure tree
         //solution - store the navigation path info in into one column field in the database,
@@ -100,7 +102,7 @@ public static VideoModel getModel(VideoData vrm, VideoBlockModel block) {
         IBlock root = block.getRoot();
         e.eid = root.getCourseId();
         e.duration = vrm.duration;
-        final VideoInfo preferredVideoInfo = vrm.encodedVideos.getPreferredNativeVideoInfo();
+        final VideoInfo preferredVideoInfo = vrm.encodedVideos.getPreferredVideoInfoForDownloading(videoQuality);
         e.size = preferredVideoInfo.fileSize;
         e.title = block.getDisplayName();
         e.url = preferredVideoInfo.url;

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/storage/Storage.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/storage/Storage.java
@@ -350,7 +350,7 @@ public VideoModel getDownloadEntryFromVideoModel(VideoBlockModel block){
             return video;
         }
 
-        return DatabaseModelFactory.getModel(block.getData(), block);
+        return DatabaseModelFactory.getModel(block.getData(), block, userPrefs.getVideoQuality());
     }
 
     @Override

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/ConfigUtil.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/util/ConfigUtil.kt
@@ -61,7 +61,7 @@ class ConfigUtil {
             // Check firebase enabled in config
             if (config.firebaseConfig.isEnabled) {
                 val firebaseRemoteConfig = FirebaseRemoteConfig.getInstance()
-                firebaseRemoteConfig.fetch(0).addOnCompleteListener {
+                firebaseRemoteConfig.fetchAndActivate().addOnCompleteListener {
                     try {
                         val response = JSONObject(
                             firebaseRemoteConfig

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseTabsDashboardFragment.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseTabsDashboardFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.activity.OnBackPressedCallback
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.android.billingclient.api.ProductDetails
@@ -395,7 +396,7 @@ class CourseTabsDashboardFragment : BaseFragment() {
             }
         })
 
-        courseDateViewModel.resetCourseDates.observe(viewLifecycleOwner, NonNullObserver {
+        courseDateViewModel.resetCourseDates.observe(viewLifecycleOwner, EventObserver {
             if (!CalendarUtils.isCalendarExists(contextOrThrow, accountName, calendarTitle)) {
                 showShiftDateSnackBar(true)
                 binding.toolbar.datesBanner.root.setVisibility(false)
@@ -587,6 +588,12 @@ class CourseTabsDashboardFragment : BaseFragment() {
                 binding.toolbar.collapsingToolbarLayout,
                 object : CollapsingToolbarStatListener {
                     override fun onExpanded() {
+                        binding.toolbar.collapsedToolbarLayout.setBackgroundColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.transparent
+                            )
+                        )
                         ViewAnimationUtil.startAlphaAnimation(
                             binding.toolbar.expandedToolbarLayout,
                             View.VISIBLE
@@ -599,6 +606,12 @@ class CourseTabsDashboardFragment : BaseFragment() {
                     }
 
                     override fun onCollapsed() {
+                        binding.toolbar.collapsedToolbarLayout.setBackgroundColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.primaryLightColor
+                            )
+                        )
                         ViewAnimationUtil.startAlphaAnimation(
                             binding.toolbar.expandedToolbarLayout,
                             View.INVISIBLE