bump PDF.js to 5.4.296; bump targetSdk to 36; edge-to-edge improvements

app/build.gradle.kts

@@ -48,7 +48,7 @@ android {
     defaultConfig {
         applicationId = "app.grapheneos.pdfviewer"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 32
         versionName = versionCode.toString()
     }

app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java

@@ -29,7 +29,10 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
@@ -38,6 +41,8 @@
 
 import com.google.android.material.snackbar.Snackbar;
 
+import org.json.JSONObject;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -265,6 +270,23 @@ public void onLoaded() {
         public String getPassword() {
             return mEncryptedDocumentPassword != null ? mEncryptedDocumentPassword : "";
         }
+
+        @JavascriptInterface
+        public String getInsets() {
+            WindowInsetsCompat wic = ViewCompat.getRootWindowInsets(binding.getRoot());
+            int types = WindowInsetsCompat.Type.statusBars()
+                    | WindowInsetsCompat.Type.navigationBars()
+                    | WindowInsetsCompat.Type.displayCutout();
+            Insets insets = (wic != null) ? wic.getInsetsIgnoringVisibility(types) : Insets.NONE;
+
+            HashMap<String, Integer> insetMap = new HashMap<>(4);
+            insetMap.put("top", insets.top + binding.toolbar.getHeight());
+            insetMap.put("right", insets.right);
+            insetMap.put("bottom", insets.bottom);
+            insetMap.put("left", insets.left);
+
+            return new JSONObject(insetMap).toString();
+        }
     }
 
     private void showWebViewCrashed() {
@@ -279,11 +301,19 @@ private void showWebViewCrashed() {
     @SuppressLint({"SetJavaScriptEnabled"})
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+        WindowCompat.enableEdgeToEdge(getWindow());
 
         binding = PdfviewerBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.getRoot(), (v, insets) -> {
+            if (mUri != null) {
+                binding.webview.evaluateJavascript("updateInsets()", null);
+            }
+            return insets;
+        });
+
         viewModel = new ViewModelProvider(this, ViewModelProvider.AndroidViewModelFactory.getInstance(getApplication())).get(PdfViewModel.class);
 
         viewModel.getOutline().observe(this, requested -> {

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

@@ -4,6 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,12 +23,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
     <ScrollView
         android:id="@+id/webview_alert_layout"
         android:layout_width="match_parent"

package.json

@@ -4,6 +4,6 @@
     "@stylistic/eslint-plugin": "^5.4.0",
     "esbuild": "^0.25.10",
     "eslint": "^9.37.0",
-    "pdfjs-dist": "^5.4.149"
+    "pdfjs-dist": "^5.4.296"
   }
 }