Merge pull request #57 from Sav22999/beta

1.15.1.1
Sav22999 · Nov 10, 2023 · 44c5464 · 44c5464
2 parents 725736b + 06c29ef
commit 44c5464
Show file tree

Hide file tree

Showing 62 changed files with 519 additions and 250 deletions.
diff --git a/app/.idea/.name b/app/.idea/.name
diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.saverio.pdfviewer"
         minSdk = 21
         targetSdk = 33
-        versionCode = 60
-        versionName = "1.15"
+        versionCode = 62
+        versionName = "1.15.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/com/saverio/pdfviewer/ui/SavPdfViewerLinkHandler.kt b/app/src/main/java/com/saverio/pdfviewer/ui/SavPdfViewerLinkHandler.kt
@@ -1,12 +1,15 @@
 package com.saverio.pdfviewer.ui
 
+import android.app.AlertDialog
+import android.text.Html
 import android.content.Intent
 import android.net.Uri
-import androidx.core.content.ContextCompat
 import com.github.barteksc.pdfviewer.PDFView
 import com.github.barteksc.pdfviewer.link.DefaultLinkHandler
 import com.github.barteksc.pdfviewer.link.LinkHandler
 import com.github.barteksc.pdfviewer.model.LinkTapEvent
+import com.saverio.pdfviewer.R
+
 
 class SavPdfViewerLinkHandler(private val pdfView: PDFView) : LinkHandler {
     override fun handleLinkEvent(event: LinkTapEvent) {
@@ -19,9 +22,7 @@ class SavPdfViewerLinkHandler(private val pdfView: PDFView) : LinkHandler {
 
     private fun handleUri(uri: String) {
         try {
-            pdfView.context.startActivity(
-                Intent(Intent.ACTION_VIEW, Uri.parse(uri))
-            )
+            showConfirmationDialog(uri)
         } catch (e: Exception) {
             error("No activity found for URI: $uri")
         }
@@ -31,6 +32,31 @@ class SavPdfViewerLinkHandler(private val pdfView: PDFView) : LinkHandler {
         pdfView.jumpTo(page)
     }
 
+    private fun showConfirmationDialog(url: String) {
+        val alertDialogBuilder = AlertDialog.Builder(pdfView.context)
+
+        alertDialogBuilder.setTitle("Open link")
+        alertDialogBuilder.setMessage(
+            Html.fromHtml(
+                pdfView.context.getString(R.string.confirmation_open_link).replace("{{url}}", url)
+            )
+        )
+
+        alertDialogBuilder.setPositiveButton("Yes") { dialog, which ->
+            // Yes button
+            pdfView.context.startActivity(
+                Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            )
+        }
+
+        alertDialogBuilder.setNegativeButton("No") { dialog, which ->
+            // No button
+        }
+
+        val alertDialog = alertDialogBuilder.create()
+        alertDialog.show()
+    }
+
     companion object {
         private val TAG = DefaultLinkHandler::class.java.simpleName
     }

diff --git a/app/src/main/res/drawable/ic_all_bookmarks.xml b/app/src/main/res/drawable/ic_all_bookmarks.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="14"
     android:viewportHeight="14">
     <path

diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path

diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50dp"
-    android:height="50dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="50"
     android:viewportHeight="50">
     <path

diff --git a/app/src/main/res/drawable/ic_dark_filter.xml b/app/src/main/res/drawable/ic_dark_filter.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_dark_filter_disabled.xml b/app/src/main/res/drawable/ic_dark_filter_disabled.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_dots.xml b/app/src/main/res/drawable/ic_dots.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50dp"
-    android:height="50dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/drawable/ic_exit_fullscreen.xml b/app/src/main/res/drawable/ic_exit_fullscreen.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="600"
     android:viewportHeight="600">
     <path

diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="600"
     android:viewportHeight="600">
     <path

diff --git a/app/src/main/res/drawable/ic_get_help.xml b/app/src/main/res/drawable/ic_get_help.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="670"
     android:viewportHeight="670">
     <path

diff --git a/app/src/main/res/drawable/ic_go_to_top.xml b/app/src/main/res/drawable/ic_go_to_top.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="16"
     android:viewportHeight="16">
     <path

diff --git a/app/src/main/res/drawable/ic_light_off.xml b/app/src/main/res/drawable/ic_light_off.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="667"
     android:viewportHeight="667">
     <path

diff --git a/app/src/main/res/drawable/ic_light_on.xml b/app/src/main/res/drawable/ic_light_on.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="667"
     android:viewportHeight="667">
     <path

diff --git a/app/src/main/res/drawable/ic_no_bookmark.xml b/app/src/main/res/drawable/ic_no_bookmark.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="16dp"
+    android:width="16pt"
+    android:height="20pt"
     android:viewportWidth="434"
     android:viewportHeight="584">
     <path

diff --git a/app/src/main/res/drawable/ic_open_file.xml b/app/src/main/res/drawable/ic_open_file.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="26"
     android:viewportHeight="26">
     <path

diff --git a/app/src/main/res/drawable/ic_remove_bookmark.xml b/app/src/main/res/drawable/ic_remove_bookmark.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="667"
     android:viewportHeight="667">
     <path

diff --git a/app/src/main/res/drawable/ic_scroll_horizontally.xml b/app/src/main/res/drawable/ic_scroll_horizontally.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_scroll_vertically.xml b/app/src/main/res/drawable/ic_scroll_vertically.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="18"
     android:viewportHeight="18">
     <path

diff --git a/app/src/main/res/drawable/ic_single_page.xml b/app/src/main/res/drawable/ic_single_page.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_single_page_disabled.xml b/app/src/main/res/drawable/ic_single_page_disabled.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="800"
     android:viewportHeight="800">
     <path

diff --git a/app/src/main/res/drawable/ic_yes_bookmark.xml b/app/src/main/res/drawable/ic_yes_bookmark.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="16dp"
+    android:width="16pt"
+    android:height="20pt"
     android:viewportWidth="434"
     android:viewportHeight="584">
     <path

diff --git a/app/src/main/res/drawable/ic_zoom_in.xml b/app/src/main/res/drawable/ic_zoom_in.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="640"
     android:viewportHeight="640">
     <path

diff --git a/app/src/main/res/drawable/ic_zoom_out.xml b/app/src/main/res/drawable/ic_zoom_out.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="20pt"
+    android:height="20pt"
     android:viewportWidth="640"
     android:viewportHeight="640">
     <path