From b48980957c3a2859290b6a9ff2a2ba7eae354cdc Mon Sep 17 00:00:00 2001
From: Tej Pratap Singh <email@tejpratapsingh.com>
Date: Thu, 5 Aug 2021 13:24:00 +0530
Subject: [PATCH] - Adding jitpack.yml - Reformatting code - Organising imports

---
 app/build.gradle                              |   9 +-
 .../ExampleInstrumentedTest.java              |   4 +-
 .../pdfcreatorandroid/MainActivityTest.java   |  18 +-
 .../PdfCreatorExampleActivityTest.java        |   2 +-
 .../pdfcreatorandroid/ScreenRobot.java        |  73 ++--
 app/src/main/assets/invoice.html              |   5 +-
 .../PdfCreatorExampleActivity.java            |   2 +-
 .../PdfEditorExampleActivity.java             |  54 +--
 app/src/main/res/drawable-anydpi/ic_focus.xml |   8 +-
 app/src/main/res/drawable-anydpi/ic_pdf.xml   |  19 +-
 app/src/main/res/drawable-anydpi/ic_print.xml |  23 +-
 app/src/main/res/drawable-anydpi/ic_share.xml |  23 +-
 .../main/res/layout/activity_pdf_editor.xml   |   1 -
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   4 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   4 +-
 app/src/main/res/values-v21/styles.xml        |   2 +-
 app/src/main/res/xml/file_provider_paths.xml  |   2 +-
 .../pdfcreatorandroid/ExampleUnitTest.java    |   4 +-
 jitpack.yml                                   |   2 +
 .../src/main/java/android/print/PDFPrint.java |  12 +-
 .../activity/PDFCreatorActivity.java          |  12 +-
 .../activity/PDFViewerActivity.java           |   7 +-
 .../pdfcreator/custom/TouchImageView.java     |  83 ++--
 .../custom/TouchImageViewFling.java           | 368 +++++++++---------
 .../custom/ViewPagerForPhotoView.java         |  13 +-
 .../pdfcreator/custom/ZoomLayout.java         |  20 +-
 .../pdfcreator/utils/FileManager.java         |  41 +-
 .../pdfcreator/utils/PDFUtil.java             | 148 +++----
 .../pdfcreator/views/PDFTableView.java        |   7 +-
 .../pdfcreator/views/basic/PDFTextView.java   |  53 ++-
 .../pdfcreator/views/basic/PDFView.java       |  19 +-
 .../src/main/res/drawable-anydpi/ic_left.xml  |   6 +-
 .../src/main/res/drawable-anydpi/ic_right.xml |   6 +-
 .../res/drawable/layout_rounded_corner.xml    |  14 +-
 34 files changed, 519 insertions(+), 549 deletions(-)
 create mode 100644 jitpack.yml

diff --git a/app/build.gradle b/app/build.gradle
index ec6072b..5e5a757 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
     compileSdkVersion 30
@@ -17,10 +19,9 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion '30.0.2'
 }
 
 dependencies {
diff --git a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ExampleInstrumentedTest.java
index 0ba3200..9f8ca9c 100644
--- a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ExampleInstrumentedTest.java
@@ -1,5 +1,7 @@
 package com.tejpratapsingh.pdfcreatorandroid;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 
 import androidx.test.InstrumentationRegistry;
@@ -8,8 +10,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/MainActivityTest.java b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/MainActivityTest.java
index 53e8700..ea4f086 100644
--- a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/MainActivityTest.java
+++ b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/MainActivityTest.java
@@ -1,14 +1,5 @@
 package com.tejpratapsingh.pdfcreatorandroid;
 
-import android.view.View;
-
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-
-import org.hamcrest.core.IsInstanceOf;
-import org.junit.Rule;
-import org.junit.Test;
-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
@@ -19,6 +10,15 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 
+import android.view.View;
+
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Rule;
+import org.junit.Test;
+
 public class MainActivityTest extends ScreenRobot<MainActivityTest> {
 
     @Rule
diff --git a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivityTest.java b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivityTest.java
index a41e591..1693f82 100644
--- a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivityTest.java
+++ b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivityTest.java
@@ -10,7 +10,7 @@ public class PdfCreatorExampleActivityTest extends ScreenRobot<PdfCreatorExample
 
     @Rule
     public ActivityScenarioRule<PdfCreatorExampleActivity> activityRule =
-            new ActivityScenarioRule<>( PdfCreatorExampleActivity.class );
+            new ActivityScenarioRule<>(PdfCreatorExampleActivity.class);
 
     @Test
     public void canGeneratePdf() {
diff --git a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ScreenRobot.java b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ScreenRobot.java
index 6e93eac..290cf47 100644
--- a/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ScreenRobot.java
+++ b/app/src/androidTest/java/com/tejpratapsingh/pdfcreatorandroid/ScreenRobot.java
@@ -1,9 +1,5 @@
 package com.tejpratapsingh.pdfcreatorandroid;
 
-import android.app.Activity;
-import androidx.annotation.IdRes;
-import androidx.annotation.StringRes;
-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -17,84 +13,87 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.not;
 
+import android.app.Activity;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.StringRes;
+
 // URL: https://gist.github.com/adavis/f35c12bdafbf2e20f66485235f9d423f
 
 public abstract class ScreenRobot<T extends ScreenRobot> {
     private Activity activityContext; // Only required for some calls
 
-    public static <T extends ScreenRobot> T withRobot (Class<T> screenRobotClass) {
-        if ( screenRobotClass == null ) {
-            throw new IllegalArgumentException( "instance class == null" );
+    public static <T extends ScreenRobot> T withRobot(Class<T> screenRobotClass) {
+        if (screenRobotClass == null) {
+            throw new IllegalArgumentException("instance class == null");
         }
 
         try {
             return screenRobotClass.newInstance();
-        }
-        catch ( IllegalAccessException iae ) {
-            throw new RuntimeException( "IllegalAccessException", iae );
-        }
-        catch ( InstantiationException ie ) {
-            throw new RuntimeException( "InstantiationException", ie );
+        } catch (IllegalAccessException iae) {
+            throw new RuntimeException("IllegalAccessException", iae);
+        } catch (InstantiationException ie) {
+            throw new RuntimeException("InstantiationException", ie);
         }
     }
 
-    public T checkIsDisplayed (@IdRes int... viewIds) {
-        for ( int viewId : viewIds ) {
-            onView( withId( viewId ) ).check( matches( isDisplayed() ) );
+    public T checkIsDisplayed(@IdRes int... viewIds) {
+        for (int viewId : viewIds) {
+            onView(withId(viewId)).check(matches(isDisplayed()));
         }
         return (T) this;
     }
 
-    public T checkIsHidden (@IdRes int... viewIds) {
-        for ( int viewId : viewIds ) {
-            onView( withId( viewId ) ).check( matches( not( isDisplayed() ) ) );
+    public T checkIsHidden(@IdRes int... viewIds) {
+        for (int viewId : viewIds) {
+            onView(withId(viewId)).check(matches(not(isDisplayed())));
         }
         return (T) this;
     }
 
-    public T checkViewHasText (@IdRes int viewId, String expected) {
-        onView( withId( viewId ) ).check( matches( withText( expected ) ) );
+    public T checkViewHasText(@IdRes int viewId, String expected) {
+        onView(withId(viewId)).check(matches(withText(expected)));
         return (T) this;
     }
 
-    public T checkViewHasText (@IdRes int viewId, @StringRes int messageResId) {
-        onView( withId( viewId ) ).check( matches( withText( messageResId ) ) );
+    public T checkViewHasText(@IdRes int viewId, @StringRes int messageResId) {
+        onView(withId(viewId)).check(matches(withText(messageResId)));
         return (T) this;
     }
 
-    public T checkViewHasHint (@IdRes int viewId, @StringRes int messageResId) {
-        onView( withId( viewId ) ).check( matches( withHint( messageResId ) ) );
+    public T checkViewHasHint(@IdRes int viewId, @StringRes int messageResId) {
+        onView(withId(viewId)).check(matches(withHint(messageResId)));
         return (T) this;
     }
 
-    public T clickOkOnView (@IdRes int viewId) {
-        onView( withId( viewId ) ).perform( click() );
+    public T clickOkOnView(@IdRes int viewId) {
+        onView(withId(viewId)).perform(click());
         return (T) this;
     }
 
-    public T enterTextIntoView (@IdRes int viewId, String text) {
-        onView( withId( viewId ) ).perform( typeText( text ) );
+    public T enterTextIntoView(@IdRes int viewId, String text) {
+        onView(withId(viewId)).perform(typeText(text));
         return (T) this;
     }
 
-    public T provideActivityContext (Activity activityContext) {
+    public T provideActivityContext(Activity activityContext) {
         this.activityContext = activityContext;
         return (T) this;
     }
 
-    public T checkDialogWithTextIsDisplayed (@StringRes int messageResId) {
-        onView( withText( messageResId ) )
-                .inRoot( withDecorView( not( activityContext.getWindow().getDecorView() ) ) )
-                .check( matches( isDisplayed() ) );
+    public T checkDialogWithTextIsDisplayed(@StringRes int messageResId) {
+        onView(withText(messageResId))
+                .inRoot(withDecorView(not(activityContext.getWindow().getDecorView())))
+                .check(matches(isDisplayed()));
         return (T) this;
     }
 
-    public T swipeLeftOnView (@IdRes int viewId) {
-        onView( withId( viewId ) ).perform( swipeLeft() );
+    public T swipeLeftOnView(@IdRes int viewId) {
+        onView(withId(viewId)).perform(swipeLeft());
         return (T) this;
     }
 
-    public T goBack () {
+    public T goBack() {
         pressBack();
         return (T) this;
     }
diff --git a/app/src/main/assets/invoice.html b/app/src/main/assets/invoice.html
index 39b4642..bb9a863 100644
--- a/app/src/main/assets/invoice.html
+++ b/app/src/main/assets/invoice.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html lang="en" dir="ltr">
+<html dir="ltr" lang="en">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
 
     <style type="text/css">
     	body{
@@ -42,6 +42,7 @@
         h4, p{
             margin:0px;
         }
+
     </style>
 
 </head>
diff --git a/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivity.java b/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivity.java
index 1ce38a4..3ce95a6 100644
--- a/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivity.java
+++ b/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfCreatorExampleActivity.java
@@ -25,10 +25,10 @@
 import com.tejpratapsingh.pdfcreator.views.PDFFooterView;
 import com.tejpratapsingh.pdfcreator.views.PDFHeaderView;
 import com.tejpratapsingh.pdfcreator.views.PDFTableView;
-import com.tejpratapsingh.pdfcreator.views.basic.PDFPageBreakView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFHorizontalView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFImageView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFLineSeparatorView;
+import com.tejpratapsingh.pdfcreator.views.basic.PDFPageBreakView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFTextView;
 
 import java.io.File;
diff --git a/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfEditorExampleActivity.java b/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfEditorExampleActivity.java
index e3547a3..064110c 100644
--- a/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfEditorExampleActivity.java
+++ b/app/src/main/java/com/tejpratapsingh/pdfcreatorandroid/PdfEditorExampleActivity.java
@@ -28,33 +28,6 @@ public class PdfEditorExampleActivity extends AppCompatActivity {
 
     private WebView webView;
 
-    public static class MyWebViewClient extends WebViewClient {
-
-        public interface OnSourceReceived {
-            void success(String html);
-        }
-
-        private final OnSourceReceived onSourceReceived;
-
-        public MyWebViewClient(OnSourceReceived onSourceReceived) {
-            this.onSourceReceived = onSourceReceived;
-        }
-
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            if (url.startsWith("source://")) {
-                try {
-                    String html = URLDecoder.decode(url, "UTF-8").substring(9);
-                    onSourceReceived.success(html);
-                } catch (UnsupportedEncodingException e) {
-                    Log.e("example", "failed to decode source", e);
-                }
-                return true;
-            }
-            // For all other links, let the WebView do it's normal thing
-            return false;
-        }
-    }
-
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -129,4 +102,31 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    public static class MyWebViewClient extends WebViewClient {
+
+        private final OnSourceReceived onSourceReceived;
+
+        public MyWebViewClient(OnSourceReceived onSourceReceived) {
+            this.onSourceReceived = onSourceReceived;
+        }
+
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            if (url.startsWith("source://")) {
+                try {
+                    String html = URLDecoder.decode(url, "UTF-8").substring(9);
+                    onSourceReceived.success(html);
+                } catch (UnsupportedEncodingException e) {
+                    Log.e("example", "failed to decode source", e);
+                }
+                return true;
+            }
+            // For all other links, let the WebView do it's normal thing
+            return false;
+        }
+
+        public interface OnSourceReceived {
+            void success(String html);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_focus.xml b/app/src/main/res/drawable-anydpi/ic_focus.xml
index dfca8dc..97d0db4 100644
--- a/app/src/main/res/drawable-anydpi/ic_focus.xml
+++ b/app/src/main/res/drawable-anydpi/ic_focus.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:alpha="0.8"
     android:tint="#000000"
-    android:alpha="0.8">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M5,15L3,15v4c0,1.1 0.9,2 2,2h4v-2L5,19v-4zM5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2v4h2L5,5zM19,3h-4v2h4v4h2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2v4zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+        android:pathData="M5,15L3,15v4c0,1.1 0.9,2 2,2h4v-2L5,19v-4zM5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2v4h2L5,5zM19,3h-4v2h4v4h2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2v4zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_pdf.xml b/app/src/main/res/drawable-anydpi/ic_pdf.xml
index 37c7606..3425294 100644
--- a/app/src/main/res/drawable-anydpi/ic_pdf.xml
+++ b/app/src/main/res/drawable-anydpi/ic_pdf.xml
@@ -1,14 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:alpha="0.8"
     android:tint="#2B2B2B"
-    android:alpha="0.8">
-  <group android:scaleX="0.052287582"
-      android:scaleY="0.052287582">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M211.65,142.8L211.65,142.8C214.2,142.8 214.2,142.8 211.65,142.8c2.55,-10.2 5.1,-15.3 5.1,-22.95v-5.1c2.55,-12.75 2.55,-22.95 0,-25.5c0,0 0,0 0,-2.55l-2.55,-2.55l0,0l0,0c0,0 0,2.55 -2.55,2.55C206.55,102 206.55,119.85 211.65,142.8L211.65,142.8zM135.15,318.75c-5.1,2.55 -10.2,5.1 -12.75,7.65c-17.85,15.3 -30.6,33.149 -33.15,40.8l0,0l0,0l0,0C104.55,364.65 119.85,349.35 135.15,318.75C137.7,318.75 137.7,318.75 135.15,318.75C137.7,318.75 135.15,318.75 135.15,318.75zM369.75,280.5c-2.55,-2.55 -12.75,-10.2 -48.45,-10.2c-2.55,0 -2.55,0 -5.1,0l0,0c0,0 0,0 0,2.55c17.85,7.65 35.7,12.75 48.45,12.75c2.55,0 2.55,0 5.1,0l0,0h2.55c0,0 0,0 0,-2.55l0,0C372.3,283.05 369.75,283.05 369.75,280.5zM408,0H51C22.95,0 0,22.95 0,51v357c0,28.05 22.95,51 51,51h357c28.05,0 51,-22.95 51,-51V51C459,22.95 436.05,0 408,0zM379.95,300.9c-5.101,2.55 -12.75,5.1 -22.95,5.1c-20.4,0 -51,-5.1 -76.5,-17.85c-43.35,5.1 -76.5,10.199 -102,20.399c-2.55,0 -2.55,0 -5.1,2.55c-30.6,53.551 -56.1,79.051 -76.5,79.051c-5.1,0 -7.65,0 -10.2,-2.551l-12.75,-7.649v-2.55c-2.55,-5.101 -2.55,-7.65 -2.55,-12.75c2.55,-12.75 17.85,-35.7 48.45,-53.551c5.1,-2.55 12.75,-7.649 22.95,-12.75c7.65,-12.75 15.3,-28.05 25.5,-45.899c12.75,-25.5 20.4,-51 28.05,-73.95l0,0c-10.2,-30.6 -15.3,-48.45 -5.1,-84.15c2.55,-10.2 10.2,-20.4 20.4,-20.4h5.1c5.1,0 10.2,2.55 15.3,5.1c17.851,17.85 10.2,58.65 0,91.8c0,2.55 0,2.55 0,2.55c10.2,28.05 25.5,51 40.8,66.3c7.65,5.1 12.75,10.2 22.95,15.3c12.75,0 22.95,-2.55 33.15,-2.55c30.6,0 51,5.1 58.649,17.85c2.551,5.101 2.551,10.2 2.551,15.3C387.6,288.15 385.05,295.8 379.95,300.9zM214.2,201.45c-5.1,17.85 -15.3,38.25 -25.5,61.2c-5.1,10.199 -10.2,17.85 -15.3,28.05h2.55h2.55l0,0c33.15,-12.75 63.75,-20.4 84.15,-22.95c-5.101,-2.55 -7.65,-5.1 -10.2,-7.65C239.7,244.8 224.4,224.4 214.2,201.45z"/>
-  </group>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.052287582"
+        android:scaleY="0.052287582">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M211.65,142.8L211.65,142.8C214.2,142.8 214.2,142.8 211.65,142.8c2.55,-10.2 5.1,-15.3 5.1,-22.95v-5.1c2.55,-12.75 2.55,-22.95 0,-25.5c0,0 0,0 0,-2.55l-2.55,-2.55l0,0l0,0c0,0 0,2.55 -2.55,2.55C206.55,102 206.55,119.85 211.65,142.8L211.65,142.8zM135.15,318.75c-5.1,2.55 -10.2,5.1 -12.75,7.65c-17.85,15.3 -30.6,33.149 -33.15,40.8l0,0l0,0l0,0C104.55,364.65 119.85,349.35 135.15,318.75C137.7,318.75 137.7,318.75 135.15,318.75C137.7,318.75 135.15,318.75 135.15,318.75zM369.75,280.5c-2.55,-2.55 -12.75,-10.2 -48.45,-10.2c-2.55,0 -2.55,0 -5.1,0l0,0c0,0 0,0 0,2.55c17.85,7.65 35.7,12.75 48.45,12.75c2.55,0 2.55,0 5.1,0l0,0h2.55c0,0 0,0 0,-2.55l0,0C372.3,283.05 369.75,283.05 369.75,280.5zM408,0H51C22.95,0 0,22.95 0,51v357c0,28.05 22.95,51 51,51h357c28.05,0 51,-22.95 51,-51V51C459,22.95 436.05,0 408,0zM379.95,300.9c-5.101,2.55 -12.75,5.1 -22.95,5.1c-20.4,0 -51,-5.1 -76.5,-17.85c-43.35,5.1 -76.5,10.199 -102,20.399c-2.55,0 -2.55,0 -5.1,2.55c-30.6,53.551 -56.1,79.051 -76.5,79.051c-5.1,0 -7.65,0 -10.2,-2.551l-12.75,-7.649v-2.55c-2.55,-5.101 -2.55,-7.65 -2.55,-12.75c2.55,-12.75 17.85,-35.7 48.45,-53.551c5.1,-2.55 12.75,-7.649 22.95,-12.75c7.65,-12.75 15.3,-28.05 25.5,-45.899c12.75,-25.5 20.4,-51 28.05,-73.95l0,0c-10.2,-30.6 -15.3,-48.45 -5.1,-84.15c2.55,-10.2 10.2,-20.4 20.4,-20.4h5.1c5.1,0 10.2,2.55 15.3,5.1c17.851,17.85 10.2,58.65 0,91.8c0,2.55 0,2.55 0,2.55c10.2,28.05 25.5,51 40.8,66.3c7.65,5.1 12.75,10.2 22.95,15.3c12.75,0 22.95,-2.55 33.15,-2.55c30.6,0 51,5.1 58.649,17.85c2.551,5.101 2.551,10.2 2.551,15.3C387.6,288.15 385.05,295.8 379.95,300.9zM214.2,201.45c-5.1,17.85 -15.3,38.25 -25.5,61.2c-5.1,10.199 -10.2,17.85 -15.3,28.05h2.55h2.55l0,0c33.15,-12.75 63.75,-20.4 84.15,-22.95c-5.101,-2.55 -7.65,-5.1 -10.2,-7.65C239.7,244.8 224.4,224.4 214.2,201.45z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_print.xml b/app/src/main/res/drawable-anydpi/ic_print.xml
index 3e2fef7..04eb9f6 100644
--- a/app/src/main/res/drawable-anydpi/ic_print.xml
+++ b/app/src/main/res/drawable-anydpi/ic_print.xml
@@ -1,16 +1,17 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:alpha="0.8"
     android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <group android:scaleX="1.1111112"
-      android:scaleY="1.1111112"
-      android:translateX="-1.3333334"
-      android:translateY="-1.3333334">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,3L6,3v4h12L18,3z"/>
-  </group>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="1.1111112"
+        android:scaleY="1.1111112"
+        android:translateX="-1.3333334"
+        android:translateY="-1.3333334">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,3L6,3v4h12L18,3z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_share.xml b/app/src/main/res/drawable-anydpi/ic_share.xml
index f67ec46..cc11daf 100644
--- a/app/src/main/res/drawable-anydpi/ic_share.xml
+++ b/app/src/main/res/drawable-anydpi/ic_share.xml
@@ -1,16 +1,17 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:alpha="0.8"
     android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <group android:scaleX="1.1111112"
-      android:scaleY="1.1111112"
-      android:translateX="-1.3333334"
-      android:translateY="-1.3333334">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-  </group>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="1.1111112"
+        android:scaleY="1.1111112"
+        android:translateX="-1.3333334"
+        android:translateY="-1.3333334">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/layout/activity_pdf_editor.xml b/app/src/main/res/layout/activity_pdf_editor.xml
index 0b3094a..f90a348 100644
--- a/app/src/main/res/layout/activity_pdf_editor.xml
+++ b/app/src/main/res/layout/activity_pdf_editor.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09b..c9ad5f9 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09b..c9ad5f9 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 13eb58b..d69c0ec 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
     </style>
 
-    <style name="AppTheme.TransparentStatusBar" parent="AppTheme" >
+    <style name="AppTheme.TransparentStatusBar" parent="AppTheme">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
index 791000e..fafa14f 100644
--- a/app/src/main/res/xml/file_provider_paths.xml
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path
         name="external_files"
         path="." />
diff --git a/app/src/test/java/com/tejpratapsingh/pdfcreatorandroid/ExampleUnitTest.java b/app/src/test/java/com/tejpratapsingh/pdfcreatorandroid/ExampleUnitTest.java
index 3bec3d8..96bf6b9 100644
--- a/app/src/test/java/com/tejpratapsingh/pdfcreatorandroid/ExampleUnitTest.java
+++ b/app/src/test/java/com/tejpratapsingh/pdfcreatorandroid/ExampleUnitTest.java
@@ -1,8 +1,8 @@
 package com.tejpratapsingh.pdfcreatorandroid;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..46c8529
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
\ No newline at end of file
diff --git a/pdfcreator/src/main/java/android/print/PDFPrint.java b/pdfcreator/src/main/java/android/print/PDFPrint.java
index 279d37d..7633127 100644
--- a/pdfcreator/src/main/java/android/print/PDFPrint.java
+++ b/pdfcreator/src/main/java/android/print/PDFPrint.java
@@ -17,12 +17,6 @@
 
 public class PDFPrint {
 
-    public interface OnPDFPrintListener {
-        void onSuccess(File file);
-
-        void onError(Exception exception);
-    }
-
     public static void generatePDFFromHTML(final Context context, final File file, final String htmlString, final OnPDFPrintListener onPDFPrintListener) {
         final WebView mWebView = new WebView(context);
         mWebView.setWebViewClient(new WebViewClient() {
@@ -159,4 +153,10 @@ public void onLayout(PrintAttributes oldAttributes, PrintAttributes newAttribute
             }
         }, printAttributes);
     }
+
+    public interface OnPDFPrintListener {
+        void onSuccess(File file);
+
+        void onError(Exception exception);
+    }
 }
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFCreatorActivity.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFCreatorActivity.java
index eff534c..bfb3012 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFCreatorActivity.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFCreatorActivity.java
@@ -23,8 +23,8 @@
 import com.tejpratapsingh.pdfcreator.views.PDFBody;
 import com.tejpratapsingh.pdfcreator.views.PDFFooterView;
 import com.tejpratapsingh.pdfcreator.views.PDFHeaderView;
-import com.tejpratapsingh.pdfcreator.views.basic.PDFPageBreakView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFImageView;
+import com.tejpratapsingh.pdfcreator.views.basic.PDFPageBreakView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFVerticalView;
 import com.tejpratapsingh.pdfcreator.views.basic.PDFView;
 
@@ -35,20 +35,16 @@
 
 public abstract class PDFCreatorActivity extends AppCompatActivity implements View.OnClickListener {
     private static final String TAG = "PDFCreatorActivity";
-
-    private int heightRequiredByHeader = 0;
-    private int heightRequiredByFooter = 0;
-    private int selectedPreviewPage = 0;
-
     LinearLayout layoutPageParent, layoutPrintPreview;
     TextView textViewGeneratingPDFHolder, textViewPageNumber, textViewPreviewNotAvailable;
     AppCompatImageView imageViewPDFPreview;
     Button buttonEmailVisit;
     ImageButton buttonNextPage, buttonPreviousPage;
-
     ArrayList<Bitmap> pagePreviewBitmapList = new ArrayList<>();
-
     File savedPDFFile = null;
+    private int heightRequiredByHeader = 0;
+    private int heightRequiredByFooter = 0;
+    private int selectedPreviewPage = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFViewerActivity.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFViewerActivity.java
index 916f7cc..809dd38 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFViewerActivity.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/activity/PDFViewerActivity.java
@@ -26,13 +26,10 @@
 import java.util.Locale;
 
 public class PDFViewerActivity extends AppCompatActivity {
-    private static final String TAG = "PDFViewerActivity";
-
     public static final String PDF_FILE_URI = "pdfFileUri";
-
-    private File pdfFile = null;
-
+    private static final String TAG = "PDFViewerActivity";
     private static LinkedList<Bitmap> pdfBitmapList = new LinkedList<>();
+    private File pdfFile = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageView.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageView.java
index a434cba..58292cb 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageView.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageView.java
@@ -15,32 +15,29 @@
 
 // https://gist.githubusercontent.com/myinnos/e14b750be9503a2b2611f5a5a74a9e6c
 public class TouchImageView extends AppCompatImageView implements GestureDetector.OnGestureListener, GestureDetector.OnDoubleTapListener {
-    private static final String TAG = "TouchImageView";
-
-    Matrix matrix;
-
     // We can be in one of these 3 states
     static final int NONE = 0;
     static final int DRAG = 1;
     static final int ZOOM = 2;
+    static final int CLICK = 3;
+    private static final String TAG = "TouchImageView";
+    protected float origWidth, origHeight;
+    Matrix matrix;
     int mode = NONE;
-
     // Remember some things for zooming
     PointF last = new PointF();
     PointF start = new PointF();
     float minScale = 1f;
     float maxScale = 3f;
     float[] m;
-
     int viewWidth, viewHeight;
-    static final int CLICK = 3;
     float saveScale = 1f;
-    protected float origWidth, origHeight;
     int oldMeasuredWidth, oldMeasuredHeight;
 
     ScaleGestureDetector mScaleDetector;
 
     Context context;
+    GestureDetector mGestureDetector;
 
     public TouchImageView(Context context) {
         super(context);
@@ -52,8 +49,6 @@ public TouchImageView(Context context, AttributeSet attrs) {
         sharedConstructing(context);
     }
 
-    GestureDetector mGestureDetector;
-
     private void sharedConstructing(Context context) {
         super.setClickable(true);
         this.context = context;
@@ -183,40 +178,6 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
         return false;
     }
 
-    private class ScaleListener extends
-            ScaleGestureDetector.SimpleOnScaleGestureListener {
-        @Override
-        public boolean onScaleBegin(ScaleGestureDetector detector) {
-            mode = ZOOM;
-            return true;
-        }
-
-        @Override
-        public boolean onScale(ScaleGestureDetector detector) {
-            float mScaleFactor = detector.getScaleFactor();
-            float origScale = saveScale;
-            saveScale *= mScaleFactor;
-            if (saveScale > maxScale) {
-                saveScale = maxScale;
-                mScaleFactor = maxScale / origScale;
-            } else if (saveScale < minScale) {
-                saveScale = minScale;
-                mScaleFactor = minScale / origScale;
-            }
-
-            if (origWidth * saveScale <= viewWidth
-                    || origHeight * saveScale <= viewHeight)
-                matrix.postScale(mScaleFactor, mScaleFactor, viewWidth / 2,
-                        viewHeight / 2);
-            else
-                matrix.postScale(mScaleFactor, mScaleFactor,
-                        detector.getFocusX(), detector.getFocusY());
-
-            fixTrans();
-            return true;
-        }
-    }
-
     void fixTrans() {
         matrix.getValues(m);
         float transX = m[Matrix.MTRANS_X];
@@ -307,4 +268,38 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         }
         fixTrans();
     }
+
+    private class ScaleListener extends
+            ScaleGestureDetector.SimpleOnScaleGestureListener {
+        @Override
+        public boolean onScaleBegin(ScaleGestureDetector detector) {
+            mode = ZOOM;
+            return true;
+        }
+
+        @Override
+        public boolean onScale(ScaleGestureDetector detector) {
+            float mScaleFactor = detector.getScaleFactor();
+            float origScale = saveScale;
+            saveScale *= mScaleFactor;
+            if (saveScale > maxScale) {
+                saveScale = maxScale;
+                mScaleFactor = maxScale / origScale;
+            } else if (saveScale < minScale) {
+                saveScale = minScale;
+                mScaleFactor = minScale / origScale;
+            }
+
+            if (origWidth * saveScale <= viewWidth
+                    || origHeight * saveScale <= viewHeight)
+                matrix.postScale(mScaleFactor, mScaleFactor, viewWidth / 2,
+                        viewHeight / 2);
+            else
+                matrix.postScale(mScaleFactor, mScaleFactor,
+                        detector.getFocusX(), detector.getFocusY());
+
+            fixTrans();
+            return true;
+        }
+    }
 }
\ No newline at end of file
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageViewFling.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageViewFling.java
index 9cb4a3b..87b8d3c 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageViewFling.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/TouchImageViewFling.java
@@ -50,43 +50,31 @@ public class TouchImageViewFling extends AppCompatImageView {
     // saved prior to the screen rotating.
     //
     private Matrix matrix, prevMatrix;
-
-    private enum State {NONE, DRAG, ZOOM, FLING, ANIMATE_ZOOM}
-
     private State state;
-
     private float minScale;
     private float maxScale;
     private float superMinScale;
     private float superMaxScale;
     private float[] m;
-
     private Context context;
     private Fling fling;
-
     private ScaleType mScaleType;
-
     private boolean imageRenderedAtLeastOnce;
     private boolean onDrawReady;
-
     private ZoomVariables delayedZoomVariables;
-
     //
     // Size of view and previous view size (ie before rotation)
     //
     private int viewWidth, viewHeight, prevViewWidth, prevViewHeight;
-
     //
     // Size of image when it is stretched to fit view. Before and After rotation.
     //
     private float matchViewWidth, matchViewHeight, prevMatchViewWidth, prevMatchViewHeight;
-
     private ScaleGestureDetector mScaleDetector;
     private GestureDetector mGestureDetector;
     private GestureDetector.OnDoubleTapListener doubleTapListener = null;
     private OnTouchListener userTouchListener = null;
     private OnTouchImageViewListener touchImageViewListener = null;
-
     public TouchImageViewFling(Context context) {
         super(context);
         sharedConstructing(context);
@@ -166,6 +154,11 @@ public void setImageURI(Uri uri) {
         fitImageToView();
     }
 
+    @Override
+    public ScaleType getScaleType() {
+        return mScaleType;
+    }
+
     @Override
     public void setScaleType(ScaleType type) {
         if (type == ScaleType.FIT_START || type == ScaleType.FIT_END) {
@@ -186,11 +179,6 @@ public void setScaleType(ScaleType type) {
         }
     }
 
-    @Override
-    public ScaleType getScaleType() {
-        return mScaleType;
-    }
-
     /**
      * Returns false if image is in initial, unzoomed state. False, otherwise.
      *
@@ -311,16 +299,6 @@ public float getMinZoom() {
         return minScale;
     }
 
-    /**
-     * Get the current zoom. This is the zoom relative to the initial
-     * scale, not the original resource.
-     *
-     * @return current zoom multiplier.
-     */
-    public float getCurrentZoom() {
-        return normalizedScale;
-    }
-
     /**
      * Set the min zoom multiplier. Default value: 1.
      *
@@ -331,6 +309,16 @@ public void setMinZoom(float min) {
         superMinScale = SUPER_MIN_MULTIPLIER * minScale;
     }
 
+    /**
+     * Get the current zoom. This is the zoom relative to the initial
+     * scale, not the original resource.
+     *
+     * @return current zoom multiplier.
+     */
+    public float getCurrentZoom() {
+        return normalizedScale;
+    }
+
     /**
      * Reset zoom and translation to initial state.
      */
@@ -745,6 +733,169 @@ public boolean canScrollHorizontally(int direction) {
         return true;
     }
 
+    private void scaleImage(double deltaScale, float focusX, float focusY, boolean stretchImageToSuper) {
+
+        float lowerScale, upperScale;
+        if (stretchImageToSuper) {
+            lowerScale = superMinScale;
+            upperScale = superMaxScale;
+
+        } else {
+            lowerScale = minScale;
+            upperScale = maxScale;
+        }
+
+        float origScale = normalizedScale;
+        normalizedScale *= deltaScale;
+        if (normalizedScale > upperScale) {
+            normalizedScale = upperScale;
+            deltaScale = upperScale / origScale;
+        } else if (normalizedScale < lowerScale) {
+            normalizedScale = lowerScale;
+            deltaScale = lowerScale / origScale;
+        }
+
+        matrix.postScale((float) deltaScale, (float) deltaScale, focusX, focusY);
+        fixScaleTrans();
+    }
+
+    /**
+     * This function will transform the coordinates in the touch event to the coordinate
+     * system of the drawable that the imageview contain
+     *
+     * @param x            x-coordinate of touch event
+     * @param y            y-coordinate of touch event
+     * @param clipToBitmap Touch event may occur within view, but outside image content. True, to clip return value
+     *                     to the bounds of the bitmap size.
+     * @return Coordinates of the point touched, in the coordinate system of the original drawable.
+     */
+    private PointF transformCoordTouchToBitmap(float x, float y, boolean clipToBitmap) {
+        matrix.getValues(m);
+        float origW = getDrawable().getIntrinsicWidth();
+        float origH = getDrawable().getIntrinsicHeight();
+        float transX = m[Matrix.MTRANS_X];
+        float transY = m[Matrix.MTRANS_Y];
+        float finalX = ((x - transX) * origW) / getImageWidth();
+        float finalY = ((y - transY) * origH) / getImageHeight();
+
+        if (clipToBitmap) {
+            finalX = Math.min(Math.max(finalX, 0), origW);
+            finalY = Math.min(Math.max(finalY, 0), origH);
+        }
+
+        return new PointF(finalX, finalY);
+    }
+
+    /**
+     * Inverse of transformCoordTouchToBitmap. This function will transform the coordinates in the
+     * drawable's coordinate system to the view's coordinate system.
+     *
+     * @param bx x-coordinate in original bitmap coordinate system
+     * @param by y-coordinate in original bitmap coordinate system
+     * @return Coordinates of the point in the view's coordinate system.
+     */
+    private PointF transformCoordBitmapToTouch(float bx, float by) {
+        matrix.getValues(m);
+        float origW = getDrawable().getIntrinsicWidth();
+        float origH = getDrawable().getIntrinsicHeight();
+        float px = bx / origW;
+        float py = by / origH;
+        float finalX = m[Matrix.MTRANS_X] + getImageWidth() * px;
+        float finalY = m[Matrix.MTRANS_Y] + getImageHeight() * py;
+        return new PointF(finalX, finalY);
+    }
+
+    private void compatPostOnAnimation(Runnable runnable) {
+        postOnAnimation(runnable);
+
+    }
+
+    private void printMatrixInfo() {
+        float[] n = new float[9];
+        matrix.getValues(n);
+        Log.d(TAG, "Scale: " + n[Matrix.MSCALE_X] + " TransX: " + n[Matrix.MTRANS_X] + " TransY: " + n[Matrix.MTRANS_Y]);
+    }
+
+    private enum State {NONE, DRAG, ZOOM, FLING, ANIMATE_ZOOM}
+
+    public interface OnTouchImageViewListener {
+        public void onMove();
+    }
+
+    private static class CompatScroller {
+        Scroller scroller;
+        OverScroller overScroller;
+        boolean isPreGingerbread;
+
+        public CompatScroller(Context context) {
+            isPreGingerbread = false;
+            overScroller = new OverScroller(context);
+        }
+
+        public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
+            if (isPreGingerbread) {
+                scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
+            } else {
+                overScroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
+            }
+        }
+
+        public void forceFinished(boolean finished) {
+            if (isPreGingerbread) {
+                scroller.forceFinished(finished);
+            } else {
+                overScroller.forceFinished(finished);
+            }
+        }
+
+        public boolean isFinished() {
+            if (isPreGingerbread) {
+                return scroller.isFinished();
+            } else {
+                return overScroller.isFinished();
+            }
+        }
+
+        public boolean computeScrollOffset() {
+            if (isPreGingerbread) {
+                return scroller.computeScrollOffset();
+            } else {
+                overScroller.computeScrollOffset();
+                return overScroller.computeScrollOffset();
+            }
+        }
+
+        public int getCurrX() {
+            if (isPreGingerbread) {
+                return scroller.getCurrX();
+            } else {
+                return overScroller.getCurrX();
+            }
+        }
+
+        public int getCurrY() {
+            if (isPreGingerbread) {
+                return scroller.getCurrY();
+            } else {
+                return overScroller.getCurrY();
+            }
+        }
+    }
+
+    private static class ZoomVariables {
+        public float scale;
+        public float focusX;
+        public float focusY;
+        public ScaleType scaleType;
+
+        public ZoomVariables(float scale, float focusX, float focusY, ScaleType scaleType) {
+            this.scale = scale;
+            this.focusX = focusX;
+            this.focusY = focusY;
+            this.scaleType = scaleType;
+        }
+    }
+
     /**
      * Gesture Listener detects a single click or long click and passes that on
      * to the view's listener.
@@ -804,10 +955,6 @@ public boolean onDoubleTapEvent(MotionEvent e) {
         }
     }
 
-    public interface OnTouchImageViewListener {
-        public void onMove();
-    }
-
     /**
      * Responsible for all touch events. Handles the heavy lifting of drag and also sends
      * touch events to Scale Detector and Gesture Detector.
@@ -925,32 +1072,6 @@ public void onScaleEnd(ScaleGestureDetector detector) {
         }
     }
 
-    private void scaleImage(double deltaScale, float focusX, float focusY, boolean stretchImageToSuper) {
-
-        float lowerScale, upperScale;
-        if (stretchImageToSuper) {
-            lowerScale = superMinScale;
-            upperScale = superMaxScale;
-
-        } else {
-            lowerScale = minScale;
-            upperScale = maxScale;
-        }
-
-        float origScale = normalizedScale;
-        normalizedScale *= deltaScale;
-        if (normalizedScale > upperScale) {
-            normalizedScale = upperScale;
-            deltaScale = upperScale / origScale;
-        } else if (normalizedScale < lowerScale) {
-            normalizedScale = lowerScale;
-            deltaScale = lowerScale / origScale;
-        }
-
-        matrix.postScale((float) deltaScale, (float) deltaScale, focusX, focusY);
-        fixScaleTrans();
-    }
-
     /**
      * DoubleTapZoom calls a series of runnables which apply
      * an animated zoom in/out graphic to the image.
@@ -959,8 +1080,8 @@ private void scaleImage(double deltaScale, float focusX, float focusY, boolean s
      */
     private class DoubleTapZoom implements Runnable {
 
-        private final long startTime;
         private static final float ZOOM_TIME = 500;
+        private final long startTime;
         private final float startZoom, targetZoom;
         private final float bitmapX, bitmapY;
         private final boolean stretchImageToSuper;
@@ -1055,52 +1176,6 @@ private double calculateDeltaScale(float t) {
         }
     }
 
-    /**
-     * This function will transform the coordinates in the touch event to the coordinate
-     * system of the drawable that the imageview contain
-     *
-     * @param x            x-coordinate of touch event
-     * @param y            y-coordinate of touch event
-     * @param clipToBitmap Touch event may occur within view, but outside image content. True, to clip return value
-     *                     to the bounds of the bitmap size.
-     * @return Coordinates of the point touched, in the coordinate system of the original drawable.
-     */
-    private PointF transformCoordTouchToBitmap(float x, float y, boolean clipToBitmap) {
-        matrix.getValues(m);
-        float origW = getDrawable().getIntrinsicWidth();
-        float origH = getDrawable().getIntrinsicHeight();
-        float transX = m[Matrix.MTRANS_X];
-        float transY = m[Matrix.MTRANS_Y];
-        float finalX = ((x - transX) * origW) / getImageWidth();
-        float finalY = ((y - transY) * origH) / getImageHeight();
-
-        if (clipToBitmap) {
-            finalX = Math.min(Math.max(finalX, 0), origW);
-            finalY = Math.min(Math.max(finalY, 0), origH);
-        }
-
-        return new PointF(finalX, finalY);
-    }
-
-    /**
-     * Inverse of transformCoordTouchToBitmap. This function will transform the coordinates in the
-     * drawable's coordinate system to the view's coordinate system.
-     *
-     * @param bx x-coordinate in original bitmap coordinate system
-     * @param by y-coordinate in original bitmap coordinate system
-     * @return Coordinates of the point in the view's coordinate system.
-     */
-    private PointF transformCoordBitmapToTouch(float bx, float by) {
-        matrix.getValues(m);
-        float origW = getDrawable().getIntrinsicWidth();
-        float origH = getDrawable().getIntrinsicHeight();
-        float px = bx / origW;
-        float py = by / origH;
-        float finalX = m[Matrix.MTRANS_X] + getImageWidth() * px;
-        float finalY = m[Matrix.MTRANS_Y] + getImageHeight() * py;
-        return new PointF(finalX, finalY);
-    }
-
     /**
      * Fling launches sequential runnables which apply
      * the fling graphic to the image. The values for the translation
@@ -1181,89 +1256,4 @@ public void run() {
             }
         }
     }
-
-    private static class CompatScroller {
-        Scroller scroller;
-        OverScroller overScroller;
-        boolean isPreGingerbread;
-
-        public CompatScroller(Context context) {
-            isPreGingerbread = false;
-            overScroller = new OverScroller(context);
-        }
-
-        public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
-            if (isPreGingerbread) {
-                scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
-            } else {
-                overScroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
-            }
-        }
-
-        public void forceFinished(boolean finished) {
-            if (isPreGingerbread) {
-                scroller.forceFinished(finished);
-            } else {
-                overScroller.forceFinished(finished);
-            }
-        }
-
-        public boolean isFinished() {
-            if (isPreGingerbread) {
-                return scroller.isFinished();
-            } else {
-                return overScroller.isFinished();
-            }
-        }
-
-        public boolean computeScrollOffset() {
-            if (isPreGingerbread) {
-                return scroller.computeScrollOffset();
-            } else {
-                overScroller.computeScrollOffset();
-                return overScroller.computeScrollOffset();
-            }
-        }
-
-        public int getCurrX() {
-            if (isPreGingerbread) {
-                return scroller.getCurrX();
-            } else {
-                return overScroller.getCurrX();
-            }
-        }
-
-        public int getCurrY() {
-            if (isPreGingerbread) {
-                return scroller.getCurrY();
-            } else {
-                return overScroller.getCurrY();
-            }
-        }
-    }
-
-    private void compatPostOnAnimation(Runnable runnable) {
-        postOnAnimation(runnable);
-
-    }
-
-    private static class ZoomVariables {
-        public float scale;
-        public float focusX;
-        public float focusY;
-        public ScaleType scaleType;
-
-        public ZoomVariables(float scale, float focusX, float focusY, ScaleType scaleType) {
-            this.scale = scale;
-            this.focusX = focusX;
-            this.focusY = focusY;
-            this.scaleType = scaleType;
-        }
-    }
-
-    private void printMatrixInfo() {
-        float[] n = new float[9];
-        matrix.getValues(n);
-        Log.d(TAG, "Scale: " + n[Matrix.MSCALE_X] + " TransX: " + n[Matrix.MTRANS_X] + " TransY: " + n[Matrix.MTRANS_Y]);
-    }
 }
\ No newline at end of file
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ViewPagerForPhotoView.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ViewPagerForPhotoView.java
index 87ef1da..7f5c888 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ViewPagerForPhotoView.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ViewPagerForPhotoView.java
@@ -1,12 +1,11 @@
 package com.tejpratapsingh.pdfcreator.custom;
 
 import android.content.Context;
-
-import androidx.viewpager.widget.ViewPager;
-
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.viewpager.widget.ViewPager;
+
 public class ViewPagerForPhotoView extends ViewPager {
 
     private boolean isLocked = false;
@@ -40,11 +39,11 @@ public void toggleLock() {
         isLocked = !isLocked;
     }
 
-    public void setLocked(boolean isLocked) {
-        this.isLocked = isLocked;
-    }
-
     public boolean isLocked() {
         return isLocked;
     }
+
+    public void setLocked(boolean isLocked) {
+        this.isLocked = isLocked;
+    }
 }
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ZoomLayout.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ZoomLayout.java
index 1eab9ec..2c3706d 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ZoomLayout.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/custom/ZoomLayout.java
@@ -14,30 +14,20 @@
  */
 public class ZoomLayout extends FrameLayout implements ScaleGestureDetector.OnScaleGestureListener {
 
-    private enum Mode {
-        NONE,
-        DRAG,
-        ZOOM
-    }
-
     private static final String TAG = "ZoomLayout";
     private static final float MIN_ZOOM = 1.0f;
     private static final float MAX_ZOOM = 4.0f;
-
     private Mode mode = Mode.NONE;
     private float scale = 1.0f;
     private float lastScaleFactor = 0f;
-
     // Where the finger first  touches the screen
     private float startX = 0f;
     private float startY = 0f;
-
     // How much to translate the canvas
     private float dx = 0f;
     private float dy = 0f;
     private float prevDx = 0f;
     private float prevDy = 0f;
-
     public ZoomLayout(Context context) {
         super(context);
         init(context);
@@ -112,14 +102,14 @@ public boolean performClick() {
         return false;
     }
 
-    // ScaleGestureDetector
-
     @Override
     public boolean onScaleBegin(ScaleGestureDetector scaleDetector) {
         Log.i(TAG, "onScaleBegin");
         return true;
     }
 
+    // ScaleGestureDetector
+
     @Override
     public boolean onScale(ScaleGestureDetector scaleDetector) {
         float scaleFactor = scaleDetector.getScaleFactor();
@@ -162,4 +152,10 @@ private void applyScaleAndTranslation() {
     private View child() {
         return getChildAt(0);
     }
+
+    private enum Mode {
+        NONE,
+        DRAG,
+        ZOOM
+    }
 }
\ No newline at end of file
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/FileManager.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/FileManager.java
index 4e9d160..a4c235c 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/FileManager.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/FileManager.java
@@ -5,7 +5,6 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.Environment;
 import android.provider.OpenableColumns;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
@@ -30,31 +29,11 @@
  */
 public class FileManager {
 
-    public enum FILE_TYPE implements Serializable {
-        IMAGE, AUDIO, VIDEO, PDF, TEXT, DOC, PPT, XLS, UNKNOWN
-    }
-
-    public enum IMAGE_QUALITY implements Serializable {
-        HIGH(1024), MID(512), LOW(256);
-
-        private int size;
-
-        IMAGE_QUALITY(int size) {
-            this.size = size;
-        }
-
-        public int getSize() {
-            return size;
-        }
-    }
-
+    private static FileManager instance;
     private final String tempDirectoryName = "temp";
     private final String tempDuplicateFileNameSuffix = "dup";
     private final String DOCUMENT_THUMBNAIL_SUFFIX = "-thumb.jpeg";
     private final int IMAGE_DOCUMENT_MAX_THUMBNAIL_SIZE = 50; // 50KB
-
-    private static FileManager instance;
-
     private FileManager() {
     }
 
@@ -534,4 +513,22 @@ public String getReadableFileSize(long fileSizeInKb) {
             return String.format(Locale.getDefault(), "%s GB", numberFormat.format((float) fileSizeInKb / (1024 * 1024)));
         }
     }
+
+    public enum FILE_TYPE implements Serializable {
+        IMAGE, AUDIO, VIDEO, PDF, TEXT, DOC, PPT, XLS, UNKNOWN
+    }
+
+    public enum IMAGE_QUALITY implements Serializable {
+        HIGH(1024), MID(512), LOW(256);
+
+        private int size;
+
+        IMAGE_QUALITY(int size) {
+            this.size = size;
+        }
+
+        public int getSize() {
+            return size;
+        }
+    }
 }
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/PDFUtil.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/PDFUtil.java
index a3defad..0126763 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/PDFUtil.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/utils/PDFUtil.java
@@ -66,6 +66,64 @@ public static PDFUtil getInstance() {
         return sInstance;
     }
 
+    public static void generatePDFFromHTML(final Context context, final File file, final String htmlString, PDFPrint.OnPDFPrintListener onPDFPrintListener) {
+        PDFPrint.generatePDFFromHTML(context, file, htmlString, onPDFPrintListener);
+    }
+
+    public static void generatePDFFromWebView(final File file, final WebView webView, PDFPrint.OnPDFPrintListener onPDFPrintListener) {
+        PDFPrint.generatePDFFromWebView(file, webView, onPDFPrintListener);
+    }
+
+    public static PrintJob printPdf(final Activity activity, File pdfFileToPrint, PrintAttributes printAttributes) {
+        return PDFPrint.printPDF(activity, pdfFileToPrint, printAttributes);
+    }
+
+    /**
+     * Convert PDF to bitmap, only works on devices above LOLLIPOP
+     *
+     * @param pdfFile pdf file
+     * @return list of bitmap of every page
+     * @throws Exception
+     */
+    public static LinkedList<Bitmap> pdfToBitmap(File pdfFile) throws Exception, IllegalStateException {
+        if (pdfFile == null || pdfFile.exists() == false) {
+            throw new IllegalStateException("PDF File Does Not Exist");
+        }
+
+        LinkedList<Bitmap> bitmaps = new LinkedList<>();
+
+        try {
+            PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY));
+
+            Bitmap bitmap;
+            final int pageCount = renderer.getPageCount();
+            for (int i = 0; i < pageCount; i++) {
+                PdfRenderer.Page page = renderer.openPage(i);
+
+                int width = page.getWidth();
+                int height = page.getHeight();
+
+                /* FOR HIGHER QUALITY IMAGES, USE:
+                int width = context.getResources().getDisplayMetrics().densityDpi / 72 * page.getWidth();
+                int height = context.getResources().getDisplayMetrics().densityDpi / 72 * page.getHeight();
+                */
+
+                bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+                page.render(bitmap, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
+
+                bitmaps.add(bitmap);
+
+                // close the page
+                page.close();
+            }
+            // close the renderer
+            renderer.close();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return bitmaps;
+    }
+
     /**
      * Generates PDF for the given content views to the file path specified.
      * <p/>
@@ -94,16 +152,22 @@ public final void generatePDF(final List<View> contentViews, final String filePa
         }
     }
 
-    public static void generatePDFFromHTML(final Context context, final File file, final String htmlString, PDFPrint.OnPDFPrintListener onPDFPrintListener) {
-        PDFPrint.generatePDFFromHTML(context, file, htmlString, onPDFPrintListener);
-    }
-
-    public static void generatePDFFromWebView(final File file, final WebView webView, PDFPrint.OnPDFPrintListener onPDFPrintListener) {
-        PDFPrint.generatePDFFromWebView(file, webView, onPDFPrintListener);
-    }
-
-    public static PrintJob printPdf(final Activity activity, File pdfFileToPrint, PrintAttributes printAttributes) {
-        return PDFPrint.printPDF(activity, pdfFileToPrint, printAttributes);
+    /**
+     * Get total number of pages
+     *
+     * @param pdfFile pdf file to get page count of
+     * @return pdf page count
+     * @throws IOException
+     * @throws Exception
+     */
+    private int getTotalPages(File pdfFile) throws IOException, Exception {
+        ParcelFileDescriptor parcelFileDescriptor = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+            PdfRenderer pdfRenderer = new PdfRenderer(parcelFileDescriptor);
+            return pdfRenderer.getPageCount();
+        } else {
+            throw new Exception("PDF cannot be processed in this device");
+        }
     }
 
     /**
@@ -314,68 +378,4 @@ public String toString() {
                     '}';
         }
     }
-
-    /**
-     * Convert PDF to bitmap, only works on devices above LOLLIPOP
-     *
-     * @param pdfFile pdf file
-     * @return list of bitmap of every page
-     * @throws Exception
-     */
-    public static LinkedList<Bitmap> pdfToBitmap(File pdfFile) throws Exception, IllegalStateException {
-        if (pdfFile == null || pdfFile.exists() == false) {
-            throw new IllegalStateException("PDF File Does Not Exist");
-        }
-
-        LinkedList<Bitmap> bitmaps = new LinkedList<>();
-
-        try {
-            PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY));
-
-            Bitmap bitmap;
-            final int pageCount = renderer.getPageCount();
-            for (int i = 0; i < pageCount; i++) {
-                PdfRenderer.Page page = renderer.openPage(i);
-
-                int width = page.getWidth();
-                int height = page.getHeight();
-
-                /* FOR HIGHER QUALITY IMAGES, USE:
-                int width = context.getResources().getDisplayMetrics().densityDpi / 72 * page.getWidth();
-                int height = context.getResources().getDisplayMetrics().densityDpi / 72 * page.getHeight();
-                */
-
-                bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-                page.render(bitmap, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
-
-                bitmaps.add(bitmap);
-
-                // close the page
-                page.close();
-            }
-            // close the renderer
-            renderer.close();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return bitmaps;
-    }
-
-    /**
-     * Get total number of pages
-     *
-     * @param pdfFile pdf file to get page count of
-     * @return pdf page count
-     * @throws IOException
-     * @throws Exception
-     */
-    private int getTotalPages(File pdfFile) throws IOException, Exception {
-        ParcelFileDescriptor parcelFileDescriptor = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-            PdfRenderer pdfRenderer = new PdfRenderer(parcelFileDescriptor);
-            return pdfRenderer.getPageCount();
-        } else {
-            throw new Exception("PDF cannot be processed in this device");
-        }
-    }
 }
\ No newline at end of file
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/PDFTableView.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/PDFTableView.java
index 6fe865c..7d00e04 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/PDFTableView.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/PDFTableView.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.util.Log;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
@@ -15,15 +14,11 @@
 import com.tejpratapsingh.pdfcreator.views.basic.PDFView;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
 
 public class PDFTableView extends PDFView implements Serializable {
     private static final String TAG = "PDFTableView";
-
-    private int[] rowWidthPercent = {};
-
     private final PDFTableRowView headerRow, firstRow;
+    private int[] rowWidthPercent = {};
 
     public PDFTableView(@NonNull Context context, @NonNull PDFTableRowView headerRow, @NonNull PDFTableRowView firstRow) {
         super(context);
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFTextView.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFTextView.java
index 1070980..a1d5181 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFTextView.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFTextView.java
@@ -21,29 +21,6 @@ public class PDFTextView extends PDFView implements Serializable {
     private static final float TEXT_SIZE_H3 = 16;
     private static final float TEXT_SIZE_P = 12;
     private static final float TEXT_SIZE_SMALL = 10;
-
-    public enum PDF_TEXT_SIZE {
-        HEADER(TEXT_SIZE_HEADER),
-        H1(TEXT_SIZE_H1),
-        H2(TEXT_SIZE_H2),
-        H3(TEXT_SIZE_H3),
-        P(TEXT_SIZE_P),
-        SMALL(TEXT_SIZE_SMALL);
-
-        // declaring private variable for getting values
-        private final float fontSize;
-
-        // getter method
-        public float getFontSize() {
-            return this.fontSize;
-        }
-
-        // enum constructor - cannot be public or protected
-        PDF_TEXT_SIZE(float action) {
-            this.fontSize = action;
-        }
-    }
-
     private SpannableString text = new SpannableString("");
 
     public PDFTextView(Context context, PDF_TEXT_SIZE size) {
@@ -66,6 +43,10 @@ protected PDFView addView(@NonNull PDFView viewToAdd) throws IllegalStateExcepti
         throw new IllegalStateException("Cannot add subview to TextView");
     }
 
+    public SpannableString getText() {
+        return text;
+    }
+
     public PDFTextView setText(SpannableString text) {
         this.text = text;
         getView().setText(text);
@@ -78,10 +59,6 @@ public PDFTextView setText(String text) {
         return this;
     }
 
-    public SpannableString getText() {
-        return text;
-    }
-
     @Override
     public PDFTextView setLayout(@NonNull ViewGroup.LayoutParams layoutParams) {
         super.setLayout(layoutParams);
@@ -102,4 +79,26 @@ public PDFTextView setTextTypeface(Typeface typeface) {
     public TextView getView() {
         return (TextView) super.getView();
     }
+
+    public enum PDF_TEXT_SIZE {
+        HEADER(TEXT_SIZE_HEADER),
+        H1(TEXT_SIZE_H1),
+        H2(TEXT_SIZE_H2),
+        H3(TEXT_SIZE_H3),
+        P(TEXT_SIZE_P),
+        SMALL(TEXT_SIZE_SMALL);
+
+        // declaring private variable for getting values
+        private final float fontSize;
+
+        // enum constructor - cannot be public or protected
+        PDF_TEXT_SIZE(float action) {
+            this.fontSize = action;
+        }
+
+        // getter method
+        public float getFontSize() {
+            return this.fontSize;
+        }
+    }
 }
diff --git a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFView.java b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFView.java
index f47edcf..eacb135 100644
--- a/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFView.java
+++ b/pdfcreator/src/main/java/com/tejpratapsingh/pdfcreator/views/basic/PDFView.java
@@ -11,17 +11,12 @@
 
 public class PDFView implements Serializable {
     private static final String TAG = "PDFView";
-
-    public int paddingTop = 0, paddingRight = 0, paddingBottom = 0, paddingLeft = 0;
-
     private final ArrayList<PDFView> childViewList = new ArrayList<>();
-
+    private final Context context;
+    public int paddingTop = 0, paddingRight = 0, paddingBottom = 0, paddingLeft = 0;
     private boolean hasParent = false;
-
     private View currentView = null;
 
-    private final Context context;
-
     protected PDFView(@NonNull Context context) {
         this.context = context;
     }
@@ -30,11 +25,6 @@ public Context getContext() {
         return context;
     }
 
-    public PDFView setView(@NonNull View view) {
-        this.currentView = view;
-        return this;
-    }
-
     public PDFView setPadding(int left, int top, int right, int bottom) {
         this.paddingTop = top;
         this.paddingRight = right;
@@ -84,6 +74,11 @@ public View getView() {
         return this.currentView;
     }
 
+    public PDFView setView(@NonNull View view) {
+        this.currentView = view;
+        return this;
+    }
+
     /**
      * Set background color
      *
diff --git a/pdfcreator/src/main/res/drawable-anydpi/ic_left.xml b/pdfcreator/src/main/res/drawable-anydpi/ic_left.xml
index 0526d54..a1550cb 100644
--- a/pdfcreator/src/main/res/drawable-anydpi/ic_left.xml
+++ b/pdfcreator/src/main/res/drawable-anydpi/ic_left.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#333333"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/pdfcreator/src/main/res/drawable-anydpi/ic_right.xml b/pdfcreator/src/main/res/drawable-anydpi/ic_right.xml
index 03473ff..e7b1665 100644
--- a/pdfcreator/src/main/res/drawable-anydpi/ic_right.xml
+++ b/pdfcreator/src/main/res/drawable-anydpi/ic_right.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#333333"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
 </vector>
diff --git a/pdfcreator/src/main/res/drawable/layout_rounded_corner.xml b/pdfcreator/src/main/res/drawable/layout_rounded_corner.xml
index 1e0fb52..9b881c2 100644
--- a/pdfcreator/src/main/res/drawable/layout_rounded_corner.xml
+++ b/pdfcreator/src/main/res/drawable/layout_rounded_corner.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFFFFF"/>
-    <stroke android:width="3dp" android:color="@color/colorWhite" />
-    <corners android:radius="10dp"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="3dp"
+        android:color="@color/colorWhite" />
+    <corners android:radius="10dp" />
+    <padding
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="0dp" />
 </shape>
\ No newline at end of file