From c743c0d6a7cae1d143d04518c2bec8c7010a1b28 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Mon, 7 Feb 2022 17:42:47 +0100
Subject: [PATCH 01/15] Create layout for the PDF viewer activity
Updating insets is no longer necessary because the layout reserves the
space for the top app bar and frees it up in full-screen mode so the
WebView can fill the entire screen.
---
app/src/main/assets/viewer.css | 7 +----
app/src/main/assets/viewer.html | 1 -
app/src/main/assets/viewer.js | 10 -------
.../org/grapheneos/pdfviewer/PdfViewer.java | 21 ++++----------
app/src/main/res/layout/pdfviewer.xml | 29 +++++++++++++++++++
app/src/main/res/layout/webview.xml | 5 ----
app/src/main/res/values-night/styles.xml | 8 +++--
app/src/main/res/values/styles.xml | 10 +++++--
8 files changed, 50 insertions(+), 41 deletions(-)
create mode 100644 app/src/main/res/layout/pdfviewer.xml
delete mode 100644 app/src/main/res/layout/webview.xml
diff --git a/app/src/main/assets/viewer.css b/app/src/main/assets/viewer.css
index 7befbc5..ac479ba 100644
--- a/app/src/main/assets/viewer.css
+++ b/app/src/main/assets/viewer.css
@@ -1,13 +1,8 @@
-body, canvas, #padding {
+body, canvas {
padding: 0;
margin: 0;
}
-#padding {
- min-width: 100%;
- background: black;
-}
-
.textLayer {
position: absolute;
text-align: initial;
diff --git a/app/src/main/assets/viewer.html b/app/src/main/assets/viewer.html
index bea4678..c4f1125 100644
--- a/app/src/main/assets/viewer.html
+++ b/app/src/main/assets/viewer.html
@@ -7,7 +7,6 @@
-
diff --git a/app/src/main/assets/viewer.js b/app/src/main/assets/viewer.js
index 911b4c2..c5e4ef2 100644
--- a/app/src/main/assets/viewer.js
+++ b/app/src/main/assets/viewer.js
@@ -2,7 +2,6 @@
pdfjsLib.GlobalWorkerOptions.workerSrc = "/pdf.worker.js";
-const padding = document.getElementById("padding");
let pdfDoc = null;
let pageRendering = false;
let renderPending = false;
@@ -56,7 +55,6 @@ function display(newCanvas, zoom) {
canvas.width = newCanvas.width;
canvas.style.height = newCanvas.style.height;
canvas.style.width = newCanvas.style.width;
- padding.style.width = canvas.style.width;
canvas.getContext("2d", { alpha: false }).drawImage(newCanvas, 0, 0);
if (!zoom) {
scrollTo(0, 0);
@@ -200,14 +198,6 @@ function isTextSelected() {
return window.getSelection().toString() !== "";
}
-function updateInset() {
- const windowInsetTop = channel.getWindowInsetTop() / window.devicePixelRatio + "px";
- padding.style.paddingTop = windowInsetTop;
- textLayerDiv.style.top = windowInsetTop;
-}
-
-updateInset();
-
pdfjsLib.getDocument("https://localhost/placeholder.pdf").promise.then(function(newDoc) {
pdfDoc = newDoc;
channel.setNumPages(pdfDoc.numPages);
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
index 3dd440e..4a1c874 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
@@ -30,7 +30,7 @@ import androidx.loader.content.Loader;
import com.google.android.material.snackbar.Snackbar;
-import org.grapheneos.pdfviewer.databinding.WebviewBinding;
+import org.grapheneos.pdfviewer.databinding.PdfviewerBinding;
import org.grapheneos.pdfviewer.fragment.DocumentPropertiesFragment;
import org.grapheneos.pdfviewer.fragment.JumpToPageFragment;
import org.grapheneos.pdfviewer.loader.DocumentPropertiesLoader;
@@ -103,21 +103,15 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
private float mZoomRatio = 1f;
private int mDocumentOrientationDegrees;
private int mDocumentState;
- private int windowInsetTop;
private List mDocumentProperties;
private InputStream mInputStream;
- private WebviewBinding binding;
+ private PdfviewerBinding binding;
private TextView mTextView;
private Toast mToast;
private Snackbar snackbar;
private class Channel {
- @JavascriptInterface
- public int getWindowInsetTop() {
- return windowInsetTop;
- }
-
@JavascriptInterface
public int getPage() {
return mPage;
@@ -155,8 +149,9 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
@SuppressLint({"SetJavaScriptEnabled", "ClickableViewAccessibility"})
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = WebviewBinding.inflate(getLayoutInflater());
+ binding = PdfviewerBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
+ setSupportActionBar(binding.toolbar);
binding.webview.setBackgroundColor(Color.TRANSPARENT);
@@ -164,12 +159,6 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
WebView.setWebContentsDebuggingEnabled(true);
}
- binding.webview.setOnApplyWindowInsetsListener((view, insets) -> {
- windowInsetTop = insets.getSystemWindowInsetTop();
- binding.webview.evaluateJavascript("updateInset()", null);
- return insets;
- });
-
final WebSettings settings = binding.webview.getSettings();
settings.setAllowContentAccess(false);
settings.setAllowFileAccess(false);
@@ -412,6 +401,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+ getSupportActionBar().show();
}
private void hideSystemUi() {
@@ -422,6 +412,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
View.SYSTEM_UI_FLAG_FULLSCREEN |
View.SYSTEM_UI_FLAG_IMMERSIVE);
+ getSupportActionBar().hide();
}
@Override
diff --git a/app/src/main/res/layout/pdfviewer.xml b/app/src/main/res/layout/pdfviewer.xml
new file mode 100644
index 0000000..db4657f
--- /dev/null
+++ b/app/src/main/res/layout/pdfviewer.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/webview.xml b/app/src/main/res/layout/webview.xml
deleted file mode 100644
index 36674fc..0000000
--- a/app/src/main/res/layout/webview.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 0be3c24..4ed1b8d 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,9 +1,13 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7c3f7d7..1ede99c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,14 @@
-
-
+
+
+
+
+
\ No newline at end of file
From f07b6350df804d80be2b13164790cb23a3804509 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sat, 19 Feb 2022 14:35:31 +0100
Subject: [PATCH 02/15] Center canvas
---
app/src/main/assets/viewer.css | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/src/main/assets/viewer.css b/app/src/main/assets/viewer.css
index ac479ba..999ba10 100644
--- a/app/src/main/assets/viewer.css
+++ b/app/src/main/assets/viewer.css
@@ -3,6 +3,11 @@ body, canvas {
margin: 0;
}
+canvas {
+ margin: auto;
+ display: block;
+}
+
.textLayer {
position: absolute;
text-align: initial;
From c7a0ae858e0515380d7afbfbaee1a8411a9c67bf Mon Sep 17 00:00:00 2001
From: MHShetty
Date: Wed, 11 Aug 2021 14:41:22 +0530
Subject: [PATCH 03/15] Use a grey background while viewing a document
---
app/src/main/assets/viewer.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/src/main/assets/viewer.css b/app/src/main/assets/viewer.css
index 999ba10..9f136d5 100644
--- a/app/src/main/assets/viewer.css
+++ b/app/src/main/assets/viewer.css
@@ -8,6 +8,10 @@ canvas {
display: block;
}
+body {
+ background-color: #c0c0c0;
+}
+
.textLayer {
position: absolute;
text-align: initial;
From 6468f5012f2304ab422b8b41301be7ddf9209996 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sat, 19 Feb 2022 14:52:24 +0100
Subject: [PATCH 04/15] Use default window color in dark theme
---
app/src/main/res/values-night/styles.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 4ed1b8d..f96de1a 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -4,7 +4,6 @@
From 8453e2f2c6007d33dc257e937e9e42c9a85b4094 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sat, 19 Feb 2022 15:02:25 +0100
Subject: [PATCH 05/15] Use M3 theme
---
.../pdfviewer/fragment/DocumentPropertiesFragment.java | 9 +++++----
.../pdfviewer/fragment/JumpToPageFragment.java | 5 +++--
app/src/main/res/values-night/styles.xml | 4 ++--
app/src/main/res/values/styles.xml | 6 +++---
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java b/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java
index a287065..851d9d5 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java
@@ -6,14 +6,15 @@ import android.os.Bundle;
import android.widget.ArrayAdapter;
import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import org.grapheneos.pdfviewer.R;
+
import java.util.ArrayList;
import java.util.List;
-import org.grapheneos.pdfviewer.R;
-
public class DocumentPropertiesFragment extends DialogFragment {
public static final String TAG = "DocumentPropertiesFragment";
@@ -44,7 +45,7 @@ public class DocumentPropertiesFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Activity activity = requireActivity();
- final AlertDialog.Builder dialog = new AlertDialog.Builder(activity)
+ final MaterialAlertDialogBuilder dialog = new MaterialAlertDialogBuilder(activity)
.setPositiveButton(android.R.string.ok, null);
if (mDocumentProperties != null) {
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java b/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java
index c907acf..5441b15 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java
@@ -7,9 +7,10 @@ import android.widget.FrameLayout;
import android.widget.NumberPicker;
import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
import org.grapheneos.pdfviewer.PdfViewer;
public class JumpToPageFragment extends DialogFragment {
@@ -45,7 +46,7 @@ public class JumpToPageFragment extends DialogFragment {
FrameLayout.LayoutParams.WRAP_CONTENT,
Gravity.CENTER));
- return new AlertDialog.Builder(requireActivity())
+ return new MaterialAlertDialogBuilder(requireActivity())
.setView(layout)
.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
mPicker.clearFocus();
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index f96de1a..3743572 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,12 +1,12 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1ede99c..a3ed4e9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,14 @@
-
-
+
-
+
\ No newline at end of file
From 1fbfc8619990e2444c1039225fadcadc3c1c8cba Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sun, 20 Feb 2022 13:27:08 +0100
Subject: [PATCH 06/15] Disable animated layout changes for the top app bar
At least temporarily. Prevents unsightly layout shifts
---
app/src/main/res/layout/pdfviewer.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/src/main/res/layout/pdfviewer.xml b/app/src/main/res/layout/pdfviewer.xml
index db4657f..7b1fcd7 100644
--- a/app/src/main/res/layout/pdfviewer.xml
+++ b/app/src/main/res/layout/pdfviewer.xml
@@ -7,7 +7,6 @@
From 7b0948383a2e657d49403c25f6d4782c60977795 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sun, 20 Feb 2022 17:29:02 +0100
Subject: [PATCH 07/15] Add margins to toolbar
---
.../java/org/grapheneos/pdfviewer/PdfViewer.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
index 4a1c874..96d9cfe 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
@@ -13,6 +13,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewGroup;
import android.webkit.CookieManager;
import android.webkit.JavascriptInterface;
import android.webkit.WebResourceRequest;
@@ -25,6 +26,9 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
@@ -153,6 +157,17 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
setContentView(binding.getRoot());
setSupportActionBar(binding.toolbar);
+ // Margins for the toolbar are needed, so that content of the toolbar
+ // is not covered by a system button navigation bar when in landscape.
+ ViewCompat.setOnApplyWindowInsetsListener(binding.toolbar, (v, windowInsets) -> {
+ Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+ ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+ mlp.leftMargin = insets.left;
+ mlp.rightMargin = insets.right;
+ v.setLayoutParams(mlp);
+ return windowInsets;
+ });
+
binding.webview.setBackgroundColor(Color.TRANSPARENT);
if (BuildConfig.DEBUG) {
From 660321cb3873fc82ecb509404b4ce9b705bb974a Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Sun, 20 Feb 2022 17:11:07 +0100
Subject: [PATCH 08/15] Use vectors for menu icons
Material icons (rounded)
---
.../ic_insert_drive_file_white_24dp.png | Bin 153 -> 0 bytes
.../ic_navigate_before_white_24dp.png | Bin 132 -> 0 bytes
.../ic_navigate_next_white_24dp.png | Bin 133 -> 0 bytes
.../drawable-hdpi/ic_pageview_white_24dp.png | Bin 360 -> 0 bytes
.../ic_rotate_left_white_24dp.png | Bin 433 -> 0 bytes
.../ic_rotate_right_white_24dp.png | Bin 427 -> 0 bytes
.../drawable-hdpi/ic_zoom_in_white_24dp.png | Bin 422 -> 0 bytes
.../drawable-hdpi/ic_zoom_out_white_24dp.png | Bin 412 -> 0 bytes
.../ic_insert_drive_file_white_24dp.png | Bin 133 -> 0 bytes
.../ic_navigate_before_white_24dp.png | Bin 116 -> 0 bytes
.../ic_navigate_next_white_24dp.png | Bin 113 -> 0 bytes
.../drawable-mdpi/ic_pageview_white_24dp.png | Bin 226 -> 0 bytes
.../ic_rotate_left_white_24dp.png | Bin 271 -> 0 bytes
.../ic_rotate_right_white_24dp.png | Bin 272 -> 0 bytes
.../drawable-mdpi/ic_zoom_in_white_24dp.png | Bin 257 -> 0 bytes
.../drawable-mdpi/ic_zoom_out_white_24dp.png | Bin 249 -> 0 bytes
.../ic_insert_drive_file_white_24dp.png | Bin 206 -> 0 bytes
.../ic_navigate_before_white_24dp.png | Bin 136 -> 0 bytes
.../ic_navigate_next_white_24dp.png | Bin 144 -> 0 bytes
.../drawable-xhdpi/ic_pageview_white_24dp.png | Bin 392 -> 0 bytes
.../ic_rotate_left_white_24dp.png | Bin 536 -> 0 bytes
.../ic_rotate_right_white_24dp.png | Bin 535 -> 0 bytes
.../drawable-xhdpi/ic_zoom_in_white_24dp.png | Bin 486 -> 0 bytes
.../drawable-xhdpi/ic_zoom_out_white_24dp.png | Bin 470 -> 0 bytes
.../ic_insert_drive_file_white_24dp.png | Bin 283 -> 0 bytes
.../ic_navigate_before_white_24dp.png | Bin 202 -> 0 bytes
.../ic_navigate_next_white_24dp.png | Bin 213 -> 0 bytes
.../ic_pageview_white_24dp.png | Bin 601 -> 0 bytes
.../ic_rotate_left_white_24dp.png | Bin 798 -> 0 bytes
.../ic_rotate_right_white_24dp.png | Bin 787 -> 0 bytes
.../drawable-xxhdpi/ic_zoom_in_white_24dp.png | Bin 737 -> 0 bytes
.../ic_zoom_out_white_24dp.png | Bin 731 -> 0 bytes
.../ic_insert_drive_file_white_24dp.png | Bin 372 -> 0 bytes
.../ic_navigate_before_white_24dp.png | Bin 197 -> 0 bytes
.../ic_navigate_next_white_24dp.png | Bin 206 -> 0 bytes
.../ic_pageview_white_24dp.png | Bin 770 -> 0 bytes
.../ic_rotate_left_white_24dp.png | Bin 1043 -> 0 bytes
.../ic_rotate_right_white_24dp.png | Bin 1033 -> 0 bytes
.../ic_zoom_in_white_24dp.png | Bin 954 -> 0 bytes
.../ic_zoom_out_white_24dp.png | Bin 925 -> 0 bytes
.../res/drawable/baseline_first_page_24.xml | 10 ---------
.../res/drawable/baseline_last_page_24.xml | 10 ---------
.../main/res/drawable/ic_first_page_24dp.xml | 9 ++++++++
.../drawable/ic_insert_drive_file_24dp.xml | 9 ++++++++
.../main/res/drawable/ic_last_page_24dp.xml | 9 ++++++++
.../res/drawable/ic_navigate_before_24dp.xml | 9 ++++++++
.../res/drawable/ic_navigate_next_24dp.xml | 9 ++++++++
.../main/res/drawable/ic_pageview_24dp.xml | 9 ++++++++
.../main/res/drawable/ic_rotate_left_24dp.xml | 9 ++++++++
.../res/drawable/ic_rotate_right_24dp.xml | 9 ++++++++
app/src/main/res/drawable/ic_zoom_in_24dp.xml | 9 ++++++++
.../main/res/drawable/ic_zoom_out_24dp.xml | 9 ++++++++
app/src/main/res/menu/pdf_viewer.xml | 20 +++++++++---------
53 files changed, 100 insertions(+), 30 deletions(-)
delete mode 100644 app/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_navigate_before_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_navigate_next_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_pageview_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_rotate_left_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_rotate_right_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_zoom_in_white_24dp.png
delete mode 100644 app/src/main/res/drawable-hdpi/ic_zoom_out_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_navigate_before_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_navigate_next_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_pageview_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_rotate_left_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_rotate_right_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_zoom_in_white_24dp.png
delete mode 100644 app/src/main/res/drawable-mdpi/ic_zoom_out_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_navigate_before_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_navigate_next_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_pageview_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_rotate_left_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_rotate_right_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_zoom_in_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_zoom_out_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_navigate_before_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_navigate_next_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_pageview_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_rotate_left_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_rotate_right_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_zoom_in_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_zoom_out_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_navigate_before_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_navigate_next_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pageview_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_rotate_left_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_rotate_right_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_zoom_in_white_24dp.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_zoom_out_white_24dp.png
delete mode 100755 app/src/main/res/drawable/baseline_first_page_24.xml
delete mode 100755 app/src/main/res/drawable/baseline_last_page_24.xml
create mode 100644 app/src/main/res/drawable/ic_first_page_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_insert_drive_file_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_last_page_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_navigate_before_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_navigate_next_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_pageview_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_rotate_left_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_rotate_right_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_zoom_in_24dp.xml
create mode 100644 app/src/main/res/drawable/ic_zoom_out_24dp.xml
diff --git a/app/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
deleted file mode 100644
index 84755e48817d86d61d09e70489b6c94b5c1f4d38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8f~SjPh{y4_XAbf<81OJ3(CJ7}
zndX``b76v-N7DYNg?AXzx0$@j_%O$-MDb9#M4)m=#h>FoD;{~Q*wnG^Q^%Sa9jkV9
zthk}E_JdQ<#r;ZwuA-qP*1MK2|9P?TocWEMO!)@USli?GV)cP`F?hQAxvX|k0wldT1B5}8r;B5V$MLsUPI59R2sj5iURcJu
zTy^?CB{^H^0>%9e|k0wldT1B8K;kEe@ch{y4_7awvqC@`=lDjqy`
zt?bgBcUl?E^Co`GYj}UY^}!vTz!O|)k6&pXbz#4y#ia^1mT=&a`ZL03BHPQ%B6EUgq9P}
zZ}jjif1&8PgCOwt4B?mK1A%z%|86_VL?l?ZAfkl(I)@w)c^8FHLf$1IRA9e>R*dP>
zVZf{iG~^Jc=eZ)z2R-7#typH5iXpq2hp7kp?LQIYa&gT~UT2&3yt
zJF`K3X|15e(spf7M_M~*sk9v%G>}#g+C*B-2F>s|JR{I8IhE(`Z4g{atK`&
zfVnrup_bQU0Cug3nnFj+6$d*mH+`d1egJrCWCOtcI?&;T`AOe%%|7b`U{nQl{d99-
zeZsfgt?ji1b_~MM6seVko#VdBpp1GC)JIdKS$zXfZ69Gn1;W#p1CUlX1{k}Tdyic4$2zpLgCqYp8zX$gYC8y
zTW)3fbjS^F0jbrx3EA_DT%^SSwq0rxwUHNg3sB;jZu7rL-vh7Q{X4&7-Mu0bhQjq9
b`uETu0LzN3Aus#!00000NkvXXu0mjfO`N~E
diff --git a/app/src/main/res/drawable-hdpi/ic_rotate_right_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_rotate_right_white_24dp.png
deleted file mode 100644
index fa7fccd3ed79dcd298a10b551df8c80498498e3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 427
zcmV;c0aX5pP)ItUvpNNJQdH%C
zCEEZARRzu2@blq=P7QP$z|bXk0lasj<`>NYR?Q|a`<>$xQ%wnKZGaUs$=2RFHZe8t
zlkTsfM_|>SWc_a(otWtxb!ET`@d1%+pp*7I%{LzM>UxWr=IS<`Qwvo?sa5E3}k_(y3
zEZEe|L%|YwX+|FE8{?iJ4>{xucww(Rb=gPzN;Ps0@XBdHnlsM-*ju^SEC3i8eE;Ug
z6)PBb2wZ6Sp=-PhFr9UXAXvTK6is>g2VR&;hT{~r1eeFJ2p
Vjmj#Yq-g*E002ovPDHLkV1f{0y&nJo
diff --git a/app/src/main/res/drawable-hdpi/ic_zoom_in_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_zoom_in_white_24dp.png
deleted file mode 100644
index 637329408a28249f61fd4aee845891b153a466ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 422
zcmV;X0a^ZuP)_r!kZa!Q5tM<9G1lvl#Np6PVfYXTMr9oR$7-
zJ+I)+m7cE3mSYcqne|dAIk1q=42;!fP_k_T0N}-$b--Po%Ifx9y0_4n8#`TI@fdKc
z4xpeqS!x9+soeo?)FBj5w|OdAo%*2;ppd!&^kXQdf)kZf{Z;QMs1GQvUxpAwAFi^H
QT>t<807*qoM6N<$f(6mHd;kCd
diff --git a/app/src/main/res/drawable-hdpi/ic_zoom_out_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_zoom_out_white_24dp.png
deleted file mode 100644
index 7772ceea714619719877d3bab5fb286a9e0979bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 412
zcmV;N0b~A&P)I|w$@3Bq7y
zv4zOu7Z|26$(1wN+VeM;!_UX%!X13hqGQFL6Jv+AWCn3k%N>%*!0ksx1-Of$6L8j^zd3!Mb~ggE7#f4JJ)Z&q?JfiJ7&-)#kBZho6GL0z
z!BV>D08C>j^91&j#mqf8ilKoLG*%PEAK=+nG31L!P}}_THXXxp-@jIP0k19;Ml$OT
z+yiRMG1SGbne^0PDi5J98!CU#vt!GEn>3ZwZ98{oX09=H)IISOa4ip@Aj2e;fa2tC
z09W!53aIN86+i*?QyxMAbp;s5P)zl|Q9z9seWM_sP@LbDcsnH${Es030000~5;q+UmdnXs1e(j>>FVdQ&MBb@07N}3VE_OC
diff --git a/app/src/main/res/drawable-mdpi/ic_navigate_before_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_navigate_before_white_24dp.png
deleted file mode 100644
index 4d7869d26f59e9104ff46a6b9778da2660594811..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@TxU(&b&bP0l+XkK{KX?Y
diff --git a/app/src/main/res/drawable-mdpi/ic_pageview_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_pageview_white_24dp.png
deleted file mode 100644
index 2e1a81034d524a37eba09ad31e4a50c91dcc4ab2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 226
zcmV<803H8{P)FvRP8B8@jA5U#>fvker_#<P5m;(KmJQz6%=1_t5L(apg^c+bF8I0E*=RAS~=%?aYO32C9{4XQ^a6R2vWOJ=t20NV;_SBDDuJ^1&FK{a)Mp)WBMib@I|c
c=lxOe3D?Zy(M=wjng9R*07*qoM6N<$fYqee%yU
zlQteHurqio_qOKf6n0(il{2n?>PS}p*%i9fODoPMQ}SfFNYuHY!mQ&i{}!ejs-9_@
S9G(pFI)kUHpUXO@geCywQ*$B!
diff --git a/app/src/main/res/drawable-mdpi/ic_rotate_right_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_rotate_right_white_24dp.png
deleted file mode 100644
index 675092806aa29a3a17520639d52c118d4445f7a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 272
zcmV+r0q_2aP)OgZ{V4flM6TG&s;2ucTrwIaWQvld4-|ob2bvktSMK%FZmma
z{0@rzhM^+UuP#jd(6VUXdS7krMY%m884WHAk4%peJ{CfmfjuxI(qY*
z|C!miR-0v*4NhJZ6P1+~b%t2twOExuG4=E>f{
z*|(j?#1}qQ8B668jgqlc8Z=7AQfcs^WGqGFL&1nK00z(x^&Ee&XK3jnD0nN2y@!K)v3ewzpR#T-|!dGh9lY1-Lgkp@eAr=1H*8jNvDI}Z#JPl+LZ(#{1{
z8oc0~cDDFPgHLSI&I~tidGhX#NxE3!W@&8b#iu*I(#^<9(-)4abTjqsmdKI;Vst
E0NwCNssI20
diff --git a/app/src/main/res/drawable-xhdpi/ic_navigate_before_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_navigate_before_white_24dp.png
deleted file mode 100644
index 62f3590eef334980b01a178f9479afb3a389d383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}te@_?3kch)?&mQD$FyLW1_?jz7
zLP);Fn@?2YlA~SwlZ@pJv78L2PM!GhtR09h&wjsiqPqXSV-MaR-FzY`KIvk_86Ccp
jJ9j+!teeN^AgRCaAJ3g9ySr}zjb`w4^>bP0l+XkKZbLLy
diff --git a/app/src/main/res/drawable-xhdpi/ic_navigate_next_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_navigate_next_white_24dp.png
deleted file mode 100644
index 93dec392d64168f33fada4a4aa7bd9905e3eb6c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da8DPcwfvt
z*@J~!)tS+m>1CQ*RAwCGyfdMbOnCUBivF>5sNVRQBIFaJ<}>4m)>(;ITTCJ
zEwqsDOv3r#{=ywyFP=1M(hxFWk2Xg}gm{>-AB601l^vl32Dr>n0()HMAOY9;Tfl`e
z4GQ>VDbi%(7TEBBmzXkO!4k(yzEt;ii0v+I+?kt*vLsdlT?=K+$w7(Jb6tQPXsF(Ns;-
z)&UdSc8RBB_j4TpW!u+Sa=Olfs@;`93q<7czMKp_Eda9{#G4j?h>AG4M8*=Y3czMc
zi+~(H0d3|$PY^0VBtg752L!Qo3J9VD4go!Lck>8K|XK`@Ij-Hm?j&5
zoB2S8Z9rc#a0jrhE#;8s0PEU>gml`Jz2g+1$4{`7v`Gz~0e1DI0l^3!CzhW9Fean|
z&F*I9Yr2GZbXfuLR&zR#Ma^?t2Gk;725bTN?355oetBTil&jhN71Oo=@X1+0alj}<
zx(NW_jc(!ZfL4?02Le9~IaaQ9>^1Lu6!>OF_rK|`+gvy6MfUrpS=Ssd-@d2k2si=`
aGw=&zxWdmj(HV*W0000IGRo@o($I)h#ZwOGB9%uHmJFoPz(;lXJyf?CBF_@P)DsU(V<-p+}yyASTR^cTolit=r#Oy)H?{uUPBaF?GfD_%%#Bt=$ye8=Gow-
zC>p1&eM>6q=N}f-4{Ca(sVQyDb3%t6B_%y_j+sMjt3O)h4}*GO_YXeTuE|6M4cZGIj13GAHL0|*z#s>7zCWF8<+KUY+
z(T4oRl|0l!dy4~x{~LIZd!nh}6V0H#+JGEwJqT=~3L?J@{lqqS|o9Ik~=fu-0#
zn(%;DFpAV{jAyhv#0sq7x~(C`=%DraX$ORJTm_3CPM3Jbb&A9Q8C`r=Y%ooW7Bg&e
zjjv=P4iLua5~@Tyi~)pKE50nE(I)07*qoM6N<$f=v0>=Kufz
diff --git a/app/src/main/res/drawable-xhdpi/ic_zoom_out_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_zoom_out_white_24dp.png
deleted file mode 100644
index 8c6ccea7b868ef0e31882985e38a4b3d7ae6bd64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 470
zcmV;{0V)28P)@ECRS1d$?5Z6Jtjf0}N2MKW-LS$%#nZ{n4xBz+$j-($m{mq*<
zk)tQ?nRyqJ^m(L#fvA|{m?j-kQaUs^VpjhOYy2R~1FQO5jBrjrXOvYO-*_ZXi*Xgh
z2#+{jE?8%hA%>Y^gG;;?Wfj3W&J*+cgaz6-rwYd!&UZ$YfeN=cD+R(`88cNc)+x&
z=nIVTjJZ=NR&j2rC<9|OF6j7})P
zi3R_eVwcPdw#%5()K(Lq&bsyI0x4_Bbf>AG4m-Kby09c-#l^%UGs{zXGMryqJkPLY
Y&k!-k0jdOFS95FODHr{Oil1=oPcW94JZ4uC&44$rj
JF6*2UngBYURH*;}
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pageview_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pageview_white_24dp.png
deleted file mode 100644
index d292effbda904a3f7969c9b39b4a682d51e7b4d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 601
zcmV-f0;c_mP)I0+nmFo6rIXcu*T?Hczpm!Q-U)>NGfGwocApVs5R*;aCro-mc9cQYl6erIiZ;}pq)@2eM
zL_&wWJ0j6RbwaePgLVkfo({SoL<1cZsJuWC)Mu3$DwHTtqQWd|oQDD(vp|Z=T*@LR
z`GeLO$EjDQl_%(ix41vv3O9LyR8EGJ3uqnp*VnQK9V6dPk$JZ1b4{Nu<|vAX3rB`(O#0@s{)G)x2HR5>)Y)
z+vsh2yT_KGlDF)m*YkGch9L1auF<>lc6a`@?@%ePH?)P`hPQiU37YkmbLdsQUCk1-
z<}HhKl+}TFYo9Ga=cL|tnjYD{@<9BKU08x(QLLvpM0OxJj(1=SI-xA~1!`>4|
zR4E`o3!GVl;1li^_nM(K2pYE{y<%wpnR;b(k_8B$#RNK`h!gjcp*09jSz?SVrp$ZJ
zc&3xAKmb4ZNR21lBjGMjc|)6@01Psu7hD>H^c2!_E{#A2BzurTY6k)-q$Y#~Nm3KS
zf+VR4qkx7+r1q$P^xP*zyE>>ri0V2hrAyv@A^H73UygF-+{dAVaHK4=#{laF>{2Je
n>7d{jK@k)|5fniYG{XG?nsW>4=RKEC00000NkvXXu0mjf_2v&I
diff --git a/app/src/main/res/drawable-xxhdpi/ic_rotate_left_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_rotate_left_white_24dp.png
deleted file mode 100644
index bdfcbca828b68fd778f7d7e6e89ba3c04578d249..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 798
zcmV+(1L6FMP)Fp+FQyA*Y^A}RzeEb`(-L4*zx
zl!a7ar1ts`NI`W83Q64+cGI12m*~f^&W`&$&)7ioeU7t-4?8cauHl@;Ya*=H2bthV
zF*;al5TwD8qFf};YfuB3^^T3+f>!X1%!*Ru?I~N%Qx@(t-FzjrB+cGl)XR7T;P4#U
z#{fy}Su}Zj+vhV#YI3}S=P9J4CP3>6I~>X5fyiS-(~99
z#SbKSPp%#)0+5!}>oS*Zv6Hy011jPt{2_%M|HB@a$#o}jq$s88pqof>${c=`MYqdr
z--HBrR6#45K^jU+?{Zmw3?s!TR0B05%~9@hwRNNgZDk(myc%c>sV^-?PO$UQexxxK
zP$?GD?nN%yoR956vRIQj=oHdNLi&TxNVS=RZX0|C0F*i?_S-4jfi$6a+t(Wb)$85%ok(|$fbQ!(7*8U7G6MR7RI59=
zR%vtg>Q1g9#*zB8K?6vmYU`nMDGN09QArZ1MGaKI4ANr_P8KhaqO4L~n%
zfc*|r1r;;(m$P4)Q$+%4ni8EC#TEc&H8>SaBEbdSSLs*GazNu|w{zZ*qr2I#A%#;(
z_98FkR(>JD6y@f(V`@n7*8MGnZM?)@l4|q&L)9bzfFZ&Te}5JS8N|Y#MT7Ybt0Tk#
z={vogwf&-z9=?&<9B0gL>4k;kxCOIt(;V_*({mFaltAN@d9^K^%OzqNfu?9B*V~Qr
zQaXt(3N+0PN|xr+LLm`Gu^d73jL=BIQh%N*;W)RjuL2%&onsXG;WN3$2tWZS00p1`
c6o53wZ-Cqgpa}7w>;M1&07*qoM6N<$f}b#H$p8QV
diff --git a/app/src/main/res/drawable-xxhdpi/ic_rotate_right_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_rotate_right_white_24dp.png
deleted file mode 100644
index 6d73012561e6e9418f2d630d8193a4fd87f61049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 787
zcmV+u1MK{XP)hVL
z2{Sx34oW;V3ZC-R7%-k10WMGJqnxL-QOQ#}Si<{!%4Mo~nqPD>$e&D8o2U6g7pIwI
zcAk<)h67A6SDuo^t6U?T50o5sFiAMSu~122FGZ@|;B!7C*d-PyDGX4l$Pe`D34&bY
z1toaNT0PDp2lQ+7yUBe8y;1
z92~-Ril<1Xh_~>W@rk0Ni%HBB>l6U<6)g%x7N3$lor;Qcxb`RzPkly<0@00+
zIj(5vED4j(_l$%%=Iii(Q*hv*{DA|)<)rp_}JN-U70
z6QecWj}Ea-4fkqnG5D6CehzrOAN0Ki=p6;TX0b$~xu6V3_^V91d7w{R;lB#m=72IT
zoI48S$kIxTRJLdNn}@NW97slD&OB&=B@kd@L+tZ$JyQjdbODcK~qt`~x>g8#~U+;}c|9MVi+Dm5_1)K%+=I8lX$0YyeOX(uD@-
z8L71a;hF>2hV-NXsw2e$fMQ5>!vBUyBE4vUD*xLZDk0?qfX0w^H9!kU%K<=ZNOKyX
z9MXM&m--QDL<7`G4QawBXbP!Hy9UUxg>+5Q2dJG}q)m(tXb^kfeJotZ-WM&9;V1T{
zJ+7O<-X2B|)Q5#+c_PhVA=UY;2{L@cS<&?_$=zAU*(^pEl%R~W8zxD(o}A(qXNSbK
zL54IHoWTRDjM76JF_QE!#u|?_R-{EAWXK9BQ0HWHL54JC{B=kX>5Pmn$dF(O3vbn#
zB~A_4fY!&~cJT>w#nj*r1AgRW=>3@_BHQ!OwIs%se|>@I;*#F4$#`
zk%qs}kHJZX=1hh&oSl$X1}TtI;edp6>Yro?ffOFdkZvFylL`kUq>~0xw*p9;6eh@!
z@=h{@Mfyc|I3OV%tAO-L!U-E>=;l~BA%lb@oKQhR5>ChWf5+zFT&`y>)@|;qnM3Dk{
zX35aj2$@%Ga7X3bvCcp}WnS=!f9C^z^^keQ0)BJPJc-)sbn_Xv?9o*_ooAfko&xDw
ztxmblHx|f{rkNPcq{*_#Wd)^9eVxZ;n{~!0@d`8JjB#GJaoT68>?pq_S!H&L70>*6
z?Tc>To=G1}j(dyg)fBS(&ZJK&XHh$vUD?_!2h!fSel4L5>nJB3$R}I~c2!5G-FmY|
z9qDnw-qNZel(qU!+>uUjCHO%Np*c}-AppN5_!$kMyeOCnzz++4Q$y%f6b$ex(Ifa1
z4WXha*eu4YM$Ai!;cE?{k|-DpAQThBr7)~eN(|p<2o=J1hU6{F2H-~ozoj8GD+(?K
z;FkqIts#^V1up}1>hFRd(hzF1-m)=Adcu0kT8u_m7e&uWIgl-U73`YP2?N%Re&;~G
zx5$@9D}1yH=X_GHEo$57g+9;sEHO+ENn)hvVT5I?@BCTMCZiwH6_i|ZOt=0j?Kw*9
zT0e!3^pz6KTeqiLN=y-_$r?LUS2BiPc6{h;|GMa&@xz+@V?;lz-2O%7mNnUxIj)P6
zF|;zs44a&AO^F*$*kYO??-R+MxXFXli2*NgVS
zce*$hNuLo@ada)wwkl-hV=5FsC)E4*jDt)D|B?8wr!IWgTTscqYIn4V0dUAW1Y}9z7KOhqi^sPPIw7!dLw*NrLf;=eP`^JY9k?(#X=nCd
zcgzlKvHty0=g_lyrE}%$KcD@NJa^2A$V!HX=v7zCg9d&s2ko((e7)78&qol`;+
E02^zJCIA2c
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_navigate_before_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_navigate_before_white_24dp.png
deleted file mode 100644
index a68bc5fb5f3f79165ed908b0443fb85cf623faa4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgdOTemLn>~)J-?Cnkb?;8!FYx*
z8NV2c_cE5sZgVNvq$8-%#BMD5CX5lN_Q3V8*P_e*txA2qT#x5xC->|>TUzJ-xvFXX
z{~G_Nr>Cdu$M38831<9X&#n`(;X~TPyn{`x*AHE6V&(2`XXO^FOHEwm6=xAX?d+kY
ppLn=Ce;z&*vvXQ&HrVvz^WNAq$9(*;8V^t@!wntd&6WQwJ+p+1PTqbq@BWMl+0$kT6`h(j
zujNhAWCh127EU1*j|pH#z0`*FdpZ4?r19|VC$)7R5|L5HPQl0ue
y$thvy<2^HG@At@<^MB$6tN&9k*vJE|X^`?i5X2&#ENa&Vvenbo&t;ucLK6T|$WlN6
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pageview_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pageview_white_24dp.png
deleted file mode 100644
index 9df7fddd5e5711f7591a6aebff2e2689263307b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 770
zcmV+d1O5DoP);IO1!MUKu{V}K??trq6jM7+$)GzilFF4ffPcRnFZY|
zT26)v>b*ZEW8d!IbJ%&?g!2gJ``kXy#RuLqZ&bc;KA+F$^Z9%}pN|v)JCt!iot#JkoRUJ-F+H5i0F0vQoG}T2Wt3qOjIczBOD-v~$PfwR-im8L
z#rVVdj6=d5FlgB9qT&`Xqus_R0OoSUwEa1^0R69Sfm-FX{XUm~KZcLT)_`_XbO*?5
zPxla8`@}<6fjdAZbT>kjvZ1T2J3umYw?vc{LRV>bfVR+Gi74%bt~#6nw6FP+D3!IB
zbIk$G*XJmN*7G#|Q3%J~@`s_Sal9biIxjtAH(X)kBe9bi|x9K=?C=%R@O
zcL31>Fw;TixZ^fW-Y#fEDDoHN!C;fHGg
zzzSU`%RFS7J4V8~djM3JqYq`ACZ6ySfZs;KP1fB2^oj&zNz*}sX4*+I%q05&P?PZ8
zIl!KUuqGd1CrAfa2sij99$+E7lMJvE-hfU}As;mG4PKYI
zPhsF&t~x@!0#VDCc*qwuwBz*?3Ax4#+|)6F~y5o{YY3+!Q%ro|>~56cC1W4gdR
z%?fRxX_4k4rZ&02Nlfo)*2rrH*o)~mm5zI{J*trKIJN~U6>BjKkWffSFo5Y9m5My3
zLkbaHm~tu=U6?j2L~O#;p=e<>relg0mS8%gXkk943yKzMFbn`qJ{aGE+|@9
zg6WK+h1HmjsZ?}f+N==q2Br>`iae%I6(T;vlvAl#i)oOALPCN;Oi!y+EX1}#Az>w^
z3GPwp_!ZM$g@k>WPRa##VHzQ&5Rl;#rd@J@W!N?<1Z>8(Om1)-(_hrdG3pt{^t)VP
zJ+^n`81G`+AXi8+gy}yXl0&Ru9McGOa)&LLejy`g$Z{In+j5C{{K;*-WaJD^JmI47}A=m`XDlb-Xi2$+?WSBK7
zKklc8qGX}C?^&eEAi>N0jW1d7cb4Z>S!CG32p+QFHON-#R1HY;8YeKwf~mlI=Bm1|
zl%4c5!8NjQ-57o3c|g^RMxJB~?Xqxyw|I)IVzF2(7K_DVu~^KJ{{gcd!j-&U@aod7k&2^TPZ2NQp!u68MTY
zz*n3x$yaBC0oH5>HEouFWFkg{XeURoOf(_F_i~dJ>U$98^
z!m9)sXD3-1DCct)s$OU#$Z1xp1i?OIfkKg|RncGtmnqeUrvL;w#C(M!&ryb0Cih75
zHKpDmtw5AIKt`d+bBsxSa*vIa+N-j#?Ps1sQQ#QU*2^t&{En@Uw93NtK1~Wmfk9^c
zLbF_=8`~*7h2VPcl2#}R3}Wh#JLLEi(>N;?iWz%JsRHg`9Mc7wW(w_K?yn
zumjsua)qBUou@?=FlD!9i7Xc|osb)>!S;+QV$v?n0Ug+GmkaE|G{PcP1axao$Z`qO
zR=L2Bm|oW`uvK%$9!%eLTtg*qiS&+(*ueZ&SF}jcwrP%LGi*BOc})sS1@H1FN|U;C|)>=X@%m2K}-)S
zUic7GyCTFEOg*X=+c15g2=NJ~PF0Kbn9h+>L`ZWH(>hg)W!UakM7Rgj1WQysPGNdO
z5#eo2C*%UJVY)<%B7nyjCSNXa7q)gqfakE?DmVBE(-2uXhQ~0b<8p<~*mlSXT*6}rTR%;5h8zRTIKzCo#nY79M@r6+
z;|S9pk!z&*l2ZFHYD;(6Yag&w+in59Z25{X12kw_#G2}k|`?NQ}!O~#dB00000NkvXXu0mjf
DE6>#G
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zoom_in_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_zoom_in_white_24dp.png
deleted file mode 100644
index b636f6e3cb678da16a53b25ac5e974789325381b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 954
zcmV;r14aCaP)j(yV<3Zdbq)4r$c^k8ejnCpjGa
zaG0aB-2rj_Ac(hE?F@L%2ZE}SZCAi|ToHyE-?k&*xyQ#pVV+@+
zJi$Tr56Kn}9haya(k24#ap>~#AGExU<&sb|5ip4A6G>kiWvHR**B?+s_1gDVBdGRt
z2RuTx;&C+q;Bmzos)u?5W{}mnA1EM>jcihHzy-1eM4$k{60$R$0SQ!30|)e?vh)Rv
zB0E6@4iJ=(z0nttM>Zck!2Pf43fMw697@1TWb66@%E*$T1f-Fb^aWIqbs?l_jvCaB
z?7hB#Yh)dv1jLYizUu+@UH=MwG+HyK`0pv=wc44DoP^id;x`bm
zVF=U&a{+=FvpD!+GeHc2pwVx-1LVn2q*c5Bdu$PIg1=?`?9r?p<;>&mR}%s9JY7>3Mim}
c0tyJ;AK9!R=?G29w*UYD07*qoM6N<$g1^0>_y7O^
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_white_24dp.png
deleted file mode 100644
index d85e242b97041c9907ee8e2c94417645c034edbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 925
zcmV;O17iG%P)KhH-uTH!aML{-J?H`c7zwK5;MQKT|Me!dHL3}|J
zrHG>2rCTGSAXQR9T#9YNcNB@0)2v7A(pEqx3sh-Em5X$0bCKqE
z!gxlY&BK1)6V@s@Z4Q27jdm#WqoT)t)~M$>^Bkd|(cwG(z~ve{^bG`D$K@$0MTG@wedL51#4nVobwSZ!4^?b$=v5QQ
zvVyHjR{pV#$JpNRy_!V83brNr$02MV=~WBpr;P1@d}9gQ3AKnJY!BoYJF#6;2;9Kd
zBcC{rX@eaKfix9NXXF#FFVa%`9cBHyxM>Q
zrg{0o9ZW~m1{}k5Q@&8d)T=fii)mTDP{PzD0}YaaZcOjw3+tFVWS~JZkizsyzOas|
zLk1co11U@u`9cX(mkcyW2D&kQkS`Q5^{EZ$$5fOr+{ScNZNPC%cjXHOObcoQ7BMZ#
z7ltwYsWza9X-K}1#{RpwVUh*PXl>$IXmC(m%X!4LWdGTg%D2`NQ~fK^;7Twy?UkmD*dhE#RXHijVUge#BEe@!6a@YiVG%i8&O;^fm>d2!8mSt#RX%y
-
-
diff --git a/app/src/main/res/drawable/baseline_last_page_24.xml b/app/src/main/res/drawable/baseline_last_page_24.xml
deleted file mode 100755
index 0efc8c6..0000000
--- a/app/src/main/res/drawable/baseline_last_page_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_first_page_24dp.xml b/app/src/main/res/drawable/ic_first_page_24dp.xml
new file mode 100644
index 0000000..59d6aa5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_first_page_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml b/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml
new file mode 100644
index 0000000..d35c045
--- /dev/null
+++ b/app/src/main/res/drawable/ic_insert_drive_file_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_last_page_24dp.xml b/app/src/main/res/drawable/ic_last_page_24dp.xml
new file mode 100644
index 0000000..4807df6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_last_page_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_navigate_before_24dp.xml b/app/src/main/res/drawable/ic_navigate_before_24dp.xml
new file mode 100644
index 0000000..e233407
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_before_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_navigate_next_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_24dp.xml
new file mode 100644
index 0000000..f7f29d6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_next_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_pageview_24dp.xml b/app/src/main/res/drawable/ic_pageview_24dp.xml
new file mode 100644
index 0000000..8a3ce2d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pageview_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_rotate_left_24dp.xml b/app/src/main/res/drawable/ic_rotate_left_24dp.xml
new file mode 100644
index 0000000..1777343
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rotate_left_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_rotate_right_24dp.xml b/app/src/main/res/drawable/ic_rotate_right_24dp.xml
new file mode 100644
index 0000000..5b80f8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rotate_right_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_zoom_in_24dp.xml b/app/src/main/res/drawable/ic_zoom_in_24dp.xml
new file mode 100644
index 0000000..ab4ab2f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_in_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_zoom_out_24dp.xml b/app/src/main/res/drawable/ic_zoom_out_24dp.xml
new file mode 100644
index 0000000..aa7acf4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_out_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/menu/pdf_viewer.xml b/app/src/main/res/menu/pdf_viewer.xml
index e1cc94d..e72fcbd 100644
--- a/app/src/main/res/menu/pdf_viewer.xml
+++ b/app/src/main/res/menu/pdf_viewer.xml
@@ -9,61 +9,61 @@
- #DEFFFFFF
- #212121
+ - @android:color/transparent
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a3ed4e9..183233f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
- #000000
- #212121
+ - @android:color/transparent
From 2571335eeb2ff142eb63c42516337fc2fd5f35fc Mon Sep 17 00:00:00 2001
From: Daniel Micay
Date: Wed, 23 Feb 2022 17:14:51 -0500
Subject: [PATCH 12/15] increment version to 11
---
app/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 90686be..1655cc5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,7 +32,7 @@ android {
applicationId = "app.grapheneos.pdfviewer"
minSdk = 26
targetSdk = 31
- versionCode = 10
+ versionCode = 11
versionName = versionCode.toString()
resourceConfigurations.add("en")
}
From e6add76a9fff3d956e2eb5a8feafe1d45188b1d9 Mon Sep 17 00:00:00 2001
From: smdyv <88971341+smdyv@users.noreply.github.com>
Date: Fri, 25 Feb 2022 13:52:20 +0100
Subject: [PATCH 13/15] Handle out-of-date WebView
Disable the open document menu item and show the user a relevant view.
---
.../org/grapheneos/pdfviewer/PdfViewer.java | 25 +++++++
.../res/drawable/ic_error_outline_24dp.xml | 9 +++
app/src/main/res/layout/pdfviewer.xml | 65 +++++++++++++++++++
app/src/main/res/values/strings.xml | 3 +
4 files changed, 102 insertions(+)
create mode 100644 app/src/main/res/drawable/ic_error_outline_24dp.xml
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
index 4e049f2..2e39a9b 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
@@ -3,6 +3,7 @@ package org.grapheneos.pdfviewer;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
+import android.content.pm.PackageInfo;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.net.Uri;
@@ -53,6 +54,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
private static final String STATE_ZOOM_RATIO = "zoomRatio";
private static final String STATE_DOCUMENT_ORIENTATION_DEGREES = "documentOrientationDegrees";
private static final String KEY_PROPERTIES = "properties";
+ private static final int MIN_WEBVIEW_RELEASE = 89;
private static final String CONTENT_SECURITY_POLICY =
"default-src 'none'; " +
@@ -324,6 +326,28 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
}
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ // The user could have left the activity to update the WebView
+ invalidateOptionsMenu();
+ if (getWebViewRelease() >= MIN_WEBVIEW_RELEASE) {
+ binding.webviewOutOfDateLayout.setVisibility(View.GONE);
+ binding.webview.setVisibility(View.VISIBLE);
+ } else {
+ binding.webview.setVisibility(View.GONE);
+ binding.webviewOutOfDateMessage.setText(getString(R.string.webview_out_of_date_message, getWebViewRelease(), MIN_WEBVIEW_RELEASE));
+ binding.webviewOutOfDateLayout.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private int getWebViewRelease() {
+ PackageInfo webViewPackage = WebView.getCurrentWebViewPackage();
+ String webViewVersionName = webViewPackage.versionName;
+ return Integer.parseInt(webViewVersionName.substring(0, webViewVersionName.indexOf(".")));
+ }
+
@NonNull
@Override
public Loader> onCreateLoader(int id, Bundle args) {
@@ -500,6 +524,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
mDocumentState = STATE_END;
}
+ enableDisableMenuItem(menu.findItem(R.id.action_open), getWebViewRelease() >= MIN_WEBVIEW_RELEASE);
enableDisableMenuItem(menu.findItem(R.id.action_zoom_in), mZoomRatio != MAX_ZOOM_RATIO);
enableDisableMenuItem(menu.findItem(R.id.action_zoom_out), mZoomRatio != MIN_ZOOM_RATIO);
enableDisableMenuItem(menu.findItem(R.id.action_next), mPage < mNumPages);
diff --git a/app/src/main/res/drawable/ic_error_outline_24dp.xml b/app/src/main/res/drawable/ic_error_outline_24dp.xml
new file mode 100644
index 0000000..9b8c530
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_outline_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/pdfviewer.xml b/app/src/main/res/layout/pdfviewer.xml
index 7b1fcd7..8c01e23 100644
--- a/app/src/main/res/layout/pdfviewer.xml
+++ b/app/src/main/res/layout/pdfviewer.xml
@@ -25,4 +25,69 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 345df9b..89224f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,7 @@
Cannot open file with invalid MIME type
Cannot open legacy file paths from insecure apps
Received I/O error trying to open content
+
+ WebView out-of-date
+ Your current WebView version is %d. The WebView should be at least version %d for the PDF Viewer to work.
From 74a9f9983d449b85ff8b21f7d90fceef8de5b313 Mon Sep 17 00:00:00 2001
From: Daniel Micay
Date: Fri, 25 Feb 2022 11:20:16 -0500
Subject: [PATCH 14/15] increment version to 12
---
app/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1655cc5..3937a53 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,7 +32,7 @@ android {
applicationId = "app.grapheneos.pdfviewer"
minSdk = 26
targetSdk = 31
- versionCode = 11
+ versionCode = 12
versionName = versionCode.toString()
resourceConfigurations.add("en")
}
From e68880b45d4cab0cb98982cb09bf7b21e4c623a4 Mon Sep 17 00:00:00 2001
From: Daniel Micay
Date: Fri, 25 Feb 2022 12:13:36 -0500
Subject: [PATCH 15/15] add separate release target for Play Store
---
app/build.gradle.kts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3937a53..94fc41c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,13 @@ android {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
}
+
+ create("play") {
+ storeFile = rootProject.file(keystoreProperties["storeFile"]!!)
+ storePassword = keystoreProperties["storePassword"] as String
+ keyAlias = keystoreProperties["uploadKeyAlias"] as String
+ keyPassword = keystoreProperties["uploadKeyPassword"] as String
+ }
}
}
@@ -51,6 +58,14 @@ android {
}
}
+ create("play") {
+ initWith(getByName("release"))
+ applicationIdSuffix = ".play"
+ if (useKeystoreProperties) {
+ signingConfig = signingConfigs.getByName("play")
+ }
+ }
+
buildFeatures {
viewBinding = true
}