From 5c5bd0851df88348969dc99394ebc20a7fe3f4f8 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 25 Feb 2022 16:26:22 -0500 Subject: [PATCH 1/7] rename package to app.grapheneos.pdfviewer too --- app/src/main/AndroidManifest.xml | 2 +- .../grapheneos/pdfviewer/GestureHelper.java | 2 +- .../{org => app}/grapheneos/pdfviewer/PdfViewer.java | 10 +++++----- .../java/{org => app}/grapheneos/pdfviewer/Utils.java | 2 +- .../pdfviewer/fragment/DocumentPropertiesFragment.java | 4 ++-- .../pdfviewer/fragment/JumpToPageFragment.java | 4 ++-- .../pdfviewer/loader/DocumentPropertiesLoader.java | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/GestureHelper.java (98%) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/PdfViewer.java (98%) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/Utils.java (99%) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java (96%) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/fragment/JumpToPageFragment.java (96%) rename app/src/main/java/{org => app}/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dfeca70..af3e51c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java b/app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java similarity index 98% rename from app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java rename to app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java index 3b8002d..2a291cd 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java similarity index 98% rename from app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java rename to app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java index 2e39a9b..6cb7d8c 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.annotation.SuppressLint; import android.app.Activity; @@ -36,10 +36,10 @@ import androidx.loader.content.Loader; import com.google.android.material.snackbar.Snackbar; -import org.grapheneos.pdfviewer.databinding.PdfviewerBinding; -import org.grapheneos.pdfviewer.fragment.DocumentPropertiesFragment; -import org.grapheneos.pdfviewer.fragment.JumpToPageFragment; -import org.grapheneos.pdfviewer.loader.DocumentPropertiesLoader; +import app.grapheneos.pdfviewer.databinding.PdfviewerBinding; +import app.grapheneos.pdfviewer.fragment.DocumentPropertiesFragment; +import app.grapheneos.pdfviewer.fragment.JumpToPageFragment; +import app.grapheneos.pdfviewer.loader.DocumentPropertiesLoader; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/Utils.java b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java similarity index 99% rename from app/src/main/java/org/grapheneos/pdfviewer/Utils.java rename to app/src/main/java/app/grapheneos/pdfviewer/Utils.java index ffc8411..0e7ae24 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/Utils.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.text.TextUtils; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java b/app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java similarity index 96% rename from app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java rename to app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java index 851d9d5..47f039b 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.fragment; +package app.grapheneos.pdfviewer.fragment; import android.app.Activity; import android.app.Dialog; @@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.grapheneos.pdfviewer.R; +import app.grapheneos.pdfviewer.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java b/app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java similarity index 96% rename from app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java rename to app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java index 5441b15..ce9f28d 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.fragment; +package app.grapheneos.pdfviewer.fragment; import android.app.Dialog; import android.os.Bundle; @@ -11,7 +11,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.grapheneos.pdfviewer.PdfViewer; +import app.grapheneos.pdfviewer.PdfViewer; public class JumpToPageFragment extends DialogFragment { public static final String TAG = "JumpToPageFragment"; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java similarity index 97% rename from app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java rename to app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java index 0b341ca..d9f2e62 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.loader; +package app.grapheneos.pdfviewer.loader; import android.content.Context; import android.database.Cursor; @@ -19,8 +19,8 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import org.grapheneos.pdfviewer.R; -import org.grapheneos.pdfviewer.Utils; +import app.grapheneos.pdfviewer.R; +import app.grapheneos.pdfviewer.Utils; public class DocumentPropertiesLoader extends AsyncTaskLoader> { public static final String TAG = "DocumentPropertiesLoader"; From b9da0073b761968a1db362dd8314bbd8dbbe27dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:28:52 +0000 Subject: [PATCH 2/7] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/validate-gradle-wrapper.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9c25b8..d109a0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Set up JDK 17 diff --git a/.github/workflows/validate-gradle-wrapper.yml b/.github/workflows/validate-gradle-wrapper.yml index 64aa173..b5f0b31 100644 --- a/.github/workflows/validate-gradle-wrapper.yml +++ b/.github/workflows/validate-gradle-wrapper.yml @@ -7,5 +7,5 @@ jobs: name: Validation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 From 26e6d7757428edfaee76c7223e5e0d6387be7b5a Mon Sep 17 00:00:00 2001 From: June Date: Tue, 8 Mar 2022 22:29:31 +0000 Subject: [PATCH 3/7] Update pdf.js to 2.13.216 tag 070a365be5a7579f4ddd5a9a2d4efcd281c2d64f Signed-off-by: June --- third_party/pdfjs-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/pdfjs-dist b/third_party/pdfjs-dist index a7fc0d3..070a365 160000 --- a/third_party/pdfjs-dist +++ b/third_party/pdfjs-dist @@ -1 +1 @@ -Subproject commit a7fc0d33a11d032741f44d0b623780253747da10 +Subproject commit 070a365be5a7579f4ddd5a9a2d4efcd281c2d64f From ea519819c6906ba36f08f4eb677583cfd6fde170 Mon Sep 17 00:00:00 2001 From: June Date: Fri, 11 Mar 2022 03:59:47 +0000 Subject: [PATCH 4/7] Update gradle to 7.4.1 Signed-off-by: June --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1debed0..ffe61b4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From cb4a0e86840b5a52054c647021e92ffe9f1ac58e Mon Sep 17 00:00:00 2001 From: June Date: Sat, 12 Mar 2022 23:06:56 -0500 Subject: [PATCH 5/7] Target SDK 12L/12.1 GrapheneOS is now on 12.1 Signed-off-by: June --- 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 94fc41c..f88cf9d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,7 +38,7 @@ android { defaultConfig { applicationId = "app.grapheneos.pdfviewer" minSdk = 26 - targetSdk = 31 + targetSdk = 32 versionCode = 12 versionName = versionCode.toString() resourceConfigurations.add("en") From 0c21e13459bf22d49971ece3eb3e2aa9715b0e83 Mon Sep 17 00:00:00 2001 From: emschu Date: Sat, 5 Mar 2022 11:55:45 +0100 Subject: [PATCH 6/7] add basic support to share documents via an additional item in options menu, add share icon Signed-off-by: emschu --- .../app/grapheneos/pdfviewer/PdfViewer.java | 18 +++++++++++++++++- app/src/main/res/drawable/ic_share_24dp.xml | 10 ++++++++++ app/src/main/res/menu/pdf_viewer.xml | 6 ++++++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_share_24dp.xml diff --git a/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java index 6cb7d8c..a1e72bf 100644 --- a/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java @@ -399,6 +399,18 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE); } + private void shareDocument() { + if (mUri != null) { + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.setDataAndTypeAndNormalize(mUri, "application/pdf"); + shareIntent.putExtra(Intent.EXTRA_STREAM, mUri); + shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + startActivity(Intent.createChooser(shareIntent, getString(R.string.action_share))); + } else { + Log.w(TAG, "Cannot share unexpected null URI"); + } + } + private void zoomIn(float value, boolean end) { if (mZoomRatio < MAX_ZOOM_RATIO) { mZoomRatio = Math.min(mZoomRatio + value, MAX_ZOOM_RATIO); @@ -506,7 +518,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader final int[] ids = { R.id.action_zoom_in, R.id.action_zoom_out, R.id.action_jump_to_page, R.id.action_next, R.id.action_previous, R.id.action_first, R.id.action_last, R.id.action_rotate_clockwise, R.id.action_rotate_counterclockwise, - R.id.action_view_document_properties }; + R.id.action_view_document_properties, R.id.action_share }; if (mDocumentState < STATE_LOADED) { for (final int id : ids) { final MenuItem item = menu.findItem(id); @@ -527,6 +539,7 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader 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_share), mUri != null); enableDisableMenuItem(menu.findItem(R.id.action_next), mPage < mNumPages); enableDisableMenuItem(menu.findItem(R.id.action_previous), mPage > 1); @@ -572,6 +585,9 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader new JumpToPageFragment() .show(getSupportFragmentManager(), JumpToPageFragment.TAG); return true; + } else if (itemId == R.id.action_share) { + shareDocument(); + return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml new file mode 100644 index 0000000..2f13bb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/menu/pdf_viewer.xml b/app/src/main/res/menu/pdf_viewer.xml index e72fcbd..acdd788 100644 --- a/app/src/main/res/menu/pdf_viewer.xml +++ b/app/src/main/res/menu/pdf_viewer.xml @@ -37,6 +37,12 @@ android:title="@string/action_zoom_in" app:showAsAction="ifRoom" /> + + WebView out-of-date Your current WebView version is %d. The WebView should be at least version %d for the PDF Viewer to work. + Share From 94c947305b71975fe84ac917e196ade08a83b5ac Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 20 Mar 2022 05:15:49 -0400 Subject: [PATCH 7/7] increment version to 13 --- 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 f88cf9d..01fe6bd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -39,7 +39,7 @@ android { applicationId = "app.grapheneos.pdfviewer" minSdk = 26 targetSdk = 32 - versionCode = 12 + versionCode = 13 versionName = versionCode.toString() resourceConfigurations.add("en") }