[MBL-16456][Student][Teacher] Pages that import styles through global…

… CSS does not load (#1827) refs: MBL-16456 affects: Student, Teacher release note: Fixed a bug where pages with global CSS don't load * Student fix. * Teacher fix (cherry picked from commit 347694f)
instructure · Jan 16, 2023 · f15601e · f15601e
1 parent 4ade2bf
commit f15601e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 31 deletions.
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt
@@ -126,12 +126,6 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable {
                 }
             }
         }
-
-        val layoutParams = getCanvasWebView()?.layoutParams
-        layoutParams?.let {
-            it.height = ViewGroup.LayoutParams.WRAP_CONTENT
-            getCanvasWebView()?.layoutParams = it
-        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

diff --git a/apps/student/src/main/res/layout/fragment_webview.xml b/apps/student/src/main/res/layout/fragment_webview.xml
@@ -35,21 +35,12 @@
         app:theme="@style/ToolBarStyle"
         tools:targetApi="lollipop" />
 
-    <ScrollView
+    <com.instructure.pandautils.views.CanvasWebViewWrapper
+        android:id="@+id/canvasWebViewWrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:scrollbarStyle="outsideOverlay"
-        android:clipToPadding="false"
-        android:layout_below="@id/toolbar">
-
-        <com.instructure.pandautils.views.CanvasWebViewWrapper
-            android:id="@+id/canvasWebViewWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/backgroundLightest"/>
-
-    </ScrollView>
+        android:layout_below="@id/toolbar"
+        android:background="@color/backgroundLightest" />
 
     <ProgressBar
         android:id="@+id/webViewLoading"

diff --git a/apps/teacher/src/main/res/layout/fragment_page_details.xml b/apps/teacher/src/main/res/layout/fragment_page_details.xml
@@ -32,21 +32,13 @@
         app:theme="@style/ToolBarStyle"
         tools:ignore="UnusedAttribute" />
 
-    <ScrollView
+    <com.instructure.pandautils.views.CanvasWebViewWrapper
+        android:id="@+id/canvasWebViewWraper"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        android:scrollbarStyle="outsideOverlay"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:clipToPadding="false">
-
-        <com.instructure.pandautils.views.CanvasWebViewWrapper
-            android:id="@+id/canvasWebViewWraper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </ScrollView>
+        android:layout_marginBottom="8dp" />
 
     <com.instructure.loginapi.login.view.CanvasLoadingView
         android:id="@+id/loading"