diff --git a/.gradle/2.8/taskArtifacts/cache.properties.lock b/.gradle/2.8/taskArtifacts/cache.properties.lock index 8b3eb02..2d994b2 100644 Binary files a/.gradle/2.8/taskArtifacts/cache.properties.lock and b/.gradle/2.8/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.8/taskArtifacts/fileHashes.bin b/.gradle/2.8/taskArtifacts/fileHashes.bin index 58dcb6a..6e7fec9 100644 Binary files a/.gradle/2.8/taskArtifacts/fileHashes.bin and b/.gradle/2.8/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.8/taskArtifacts/fileSnapshots.bin b/.gradle/2.8/taskArtifacts/fileSnapshots.bin index ef925e1..c53f92b 100644 Binary files a/.gradle/2.8/taskArtifacts/fileSnapshots.bin and b/.gradle/2.8/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.8/taskArtifacts/outputFileStates.bin b/.gradle/2.8/taskArtifacts/outputFileStates.bin index 5e8139e..d07451a 100644 Binary files a/.gradle/2.8/taskArtifacts/outputFileStates.bin and b/.gradle/2.8/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.8/taskArtifacts/taskArtifacts.bin b/.gradle/2.8/taskArtifacts/taskArtifacts.bin index dc71152..0f1f24a 100644 Binary files a/.gradle/2.8/taskArtifacts/taskArtifacts.bin and b/.gradle/2.8/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/libraries/appcompat_v7_23_1_1.xml b/.idea/libraries/appcompat_v7_23_1_1.xml index c7518b9..c5c006c 100644 --- a/.idea/libraries/appcompat_v7_23_1_1.xml +++ b/.idea/libraries/appcompat_v7_23_1_1.xml @@ -1,8 +1,5 @@ - - - diff --git a/.idea/libraries/support_v4_23_1_1.xml b/.idea/libraries/support_v4_23_1_1.xml index ae3691a..38f3df2 100644 --- a/.idea/libraries/support_v4_23_1_1.xml +++ b/.idea/libraries/support_v4_23_1_1.xml @@ -1,8 +1,5 @@ - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 374913d..3fecb4b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,32 @@ + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8eab5e6..b6ef384 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,5 +1,10 @@ + + + + + @@ -64,16 +69,43 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1813,7 +1845,7 @@ + + + @@ -2247,29 +2286,6 @@ - - - - - - - - - - - - - - - - - @@ -2300,6 +2316,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2345,6 +2520,26 @@ @@ -2514,14 +2715,6 @@ - - - - - - - - @@ -2556,11 +2749,98 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/classes.jar b/PdfView/build/intermediates/bundles/debug/classes.jar index 264bed0..e14d54d 100644 Binary files a/PdfView/build/intermediates/bundles/debug/classes.jar and b/PdfView/build/intermediates/bundles/debug/classes.jar differ diff --git a/PdfView/build/intermediates/bundles/debug/res/anim/slide_in.xml b/PdfView/build/intermediates/bundles/debug/res/anim/slide_in.xml index 7c09355..425217b 100644 --- a/PdfView/build/intermediates/bundles/debug/res/anim/slide_in.xml +++ b/PdfView/build/intermediates/bundles/debug/res/anim/slide_in.xml @@ -25,4 +25,4 @@ android:fromAlpha="0.0" android:toAlpha="1.0" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/anim/slide_out.xml b/PdfView/build/intermediates/bundles/debug/res/anim/slide_out.xml index abdf037..1569072 100644 --- a/PdfView/build/intermediates/bundles/debug/res/anim/slide_out.xml +++ b/PdfView/build/intermediates/bundles/debug/res/anim/slide_out.xml @@ -25,4 +25,4 @@ android:fromAlpha="1.0" android:toAlpha="0.0" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/dialog_pagenumber.xml b/PdfView/build/intermediates/bundles/debug/res/layout/dialog_pagenumber.xml index 8866eca..4f51eb5 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/dialog_pagenumber.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/dialog_pagenumber.xml @@ -44,4 +44,4 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/graphics_view.xml b/PdfView/build/intermediates/bundles/debug/res/layout/graphics_view.xml index c9a89bd..f4c8804 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/graphics_view.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/graphics_view.xml @@ -12,4 +12,4 @@ android:padding="5px"/> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/main.xml b/PdfView/build/intermediates/bundles/debug/res/layout/main.xml index 7a472e9..774162d 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/main.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/main.xml @@ -10,4 +10,4 @@ android:text="@string/hello" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/navigation_overlay.xml b/PdfView/build/intermediates/bundles/debug/res/layout/navigation_overlay.xml index a407667..74fe032 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/navigation_overlay.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/navigation_overlay.xml @@ -48,4 +48,4 @@ android:layout_weight="10" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/pdf_file_password.xml b/PdfView/build/intermediates/bundles/debug/res/layout/pdf_file_password.xml index 1891e3e..8c8d09c 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/pdf_file_password.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/pdf_file_password.xml @@ -49,4 +49,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/layout/scroll_layout.xml b/PdfView/build/intermediates/bundles/debug/res/layout/scroll_layout.xml index 8a374b3..f066192 100644 --- a/PdfView/build/intermediates/bundles/debug/res/layout/scroll_layout.xml +++ b/PdfView/build/intermediates/bundles/debug/res/layout/scroll_layout.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/bundles/debug/res/values/values.xml b/PdfView/build/intermediates/bundles/debug/res/values/values.xml index 97ceb47..be7cb96 100644 --- a/PdfView/build/intermediates/bundles/debug/res/values/values.xml +++ b/PdfView/build/intermediates/bundles/debug/res/values/values.xml @@ -1,12 +1,12 @@ - + #000000 #000000FF #9370DB #FFFFFFFF - + PdfViewer Hello World, PdfViewerActivity! diff --git a/PdfView/build/intermediates/bundles/release/classes.jar b/PdfView/build/intermediates/bundles/release/classes.jar index 31671c9..e65b939 100644 Binary files a/PdfView/build/intermediates/bundles/release/classes.jar and b/PdfView/build/intermediates/bundles/release/classes.jar differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class index a4bdd1e..94d9262 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class index 0bd723c..d71bfc4 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class index 38f69c7..f6b1ebd 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class index 31d7f38..68bfbfb 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class index 96a793e..87185d2 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class index a0eaf8c..d63d769 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class index a54b892..f833c31 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class index 0250509..a8b565d 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class index 1480952..5cf4474 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class index 6e973ae..023d610 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class index 44c159b..8dea2e4 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class index 9bf8dd1..de20e71 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class index 18db591..fbb2a75 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class index d195a06..cae1b43 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class index 3fbac74..f99e60a 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity.class index 597705d..a41f8d9 100644 Binary files a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity.class and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/PdfViewerActivity.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class index a4bdd1e..94d9262 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$1.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class index 0bd723c..d71bfc4 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$2.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class index 38f69c7..f6b1ebd 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$3.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class index 31d7f38..68bfbfb 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$4.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class index 96a793e..87185d2 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$5.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class index a0eaf8c..d63d769 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$6.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class index a54b892..f833c31 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class index 0250509..a8b565d 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$1.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class index 1480952..5cf4474 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$2.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class index 6e973ae..023d610 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$3.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class index 44c159b..8dea2e4 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$4.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class index 9bf8dd1..de20e71 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$5.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class index 18db591..fbb2a75 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$6.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class index d195a06..cae1b43 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class index 3fbac74..f6ef115 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity.class index 597705d..ee0d1e7 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity.class differ diff --git a/PdfView/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml b/PdfView/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml index ddffc43..6041966 100644 --- a/PdfView/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml +++ b/PdfView/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/incremental/mergeAssets/debug/merger.xml b/PdfView/build/intermediates/incremental/mergeAssets/debug/merger.xml index 8ff7da0..e95e4c9 100644 --- a/PdfView/build/intermediates/incremental/mergeAssets/debug/merger.xml +++ b/PdfView/build/intermediates/incremental/mergeAssets/debug/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml b/PdfView/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml index d3117d9..46269af 100644 --- a/PdfView/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml +++ b/PdfView/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml @@ -1,2 +1,2 @@ -Hello World, PdfViewerActivity!PdfViewer#9370DB#000000#000000FF#FFFFFFFF \ No newline at end of file +Hello World, PdfViewerActivity!PdfViewer#9370DB#000000#000000FF#FFFFFFFF \ No newline at end of file diff --git a/PdfView/build/intermediates/incremental/packageResourcesdebug/merger.xml b/PdfView/build/intermediates/incremental/packageResourcesdebug/merger.xml index b5bacb2..65a5b5c 100644 --- a/PdfView/build/intermediates/incremental/packageResourcesdebug/merger.xml +++ b/PdfView/build/intermediates/incremental/packageResourcesdebug/merger.xml @@ -1,2 +1,2 @@ -#9370DB#FFFFFFFF#000000#000000FFHello World, PdfViewerActivity!PdfViewer \ No newline at end of file +#9370DB#FFFFFFFF#000000#000000FFHello World, PdfViewerActivity!PdfViewer \ No newline at end of file diff --git a/PdfView/build/intermediates/manifest/tmp/manifestMerger1675983469103653749.xml b/PdfView/build/intermediates/manifest/tmp/manifestMerger927398981037327799.xml similarity index 100% rename from PdfView/build/intermediates/manifest/tmp/manifestMerger1675983469103653749.xml rename to PdfView/build/intermediates/manifest/tmp/manifestMerger927398981037327799.xml diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_in.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_in.xml index 62206b3..151f5e4 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_in.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_in.xml @@ -25,4 +25,4 @@ android:fromAlpha="0.0" android:toAlpha="1.0" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_out.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_out.xml index c54e285..35645b0 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_out.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/anim/slide_out.xml @@ -25,4 +25,4 @@ android:fromAlpha="1.0" android:toAlpha="0.0" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/dialog_pagenumber.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/dialog_pagenumber.xml index 2a3f6a0..59f1974 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/dialog_pagenumber.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/dialog_pagenumber.xml @@ -44,4 +44,4 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/graphics_view.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/graphics_view.xml index 08ba8c2..98bb1e8 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/graphics_view.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/graphics_view.xml @@ -12,4 +12,4 @@ android:padding="5px"/> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/main.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/main.xml index 9d15cb3..9d09f0f 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/main.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/main.xml @@ -10,4 +10,4 @@ android:text="@string/hello" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/navigation_overlay.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/navigation_overlay.xml index f200ed9..5d27d42 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/navigation_overlay.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/navigation_overlay.xml @@ -48,4 +48,4 @@ android:layout_weight="10" /> - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/pdf_file_password.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/pdf_file_password.xml index 75d2d01..ebe1561 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/pdf_file_password.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/pdf_file_password.xml @@ -49,4 +49,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/scroll_layout.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/scroll_layout.xml index 95f4260..a424aad 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/layout/scroll_layout.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/layout/scroll_layout.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/PdfView/build/intermediates/res/merged/androidTest/debug/values/values.xml b/PdfView/build/intermediates/res/merged/androidTest/debug/values/values.xml index 9535af8..be6ecb3 100644 --- a/PdfView/build/intermediates/res/merged/androidTest/debug/values/values.xml +++ b/PdfView/build/intermediates/res/merged/androidTest/debug/values/values.xml @@ -1,6 +1,6 @@ - + #000000 #000000FF diff --git a/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ b/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ index 609466c..0daa52d 100644 Binary files a/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ and b/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ differ diff --git a/PdfView/build/outputs/aar/PdfView-debug.aar b/PdfView/build/outputs/aar/PdfView-debug.aar index b95415a..946cccc 100644 Binary files a/PdfView/build/outputs/aar/PdfView-debug.aar and b/PdfView/build/outputs/aar/PdfView-debug.aar differ diff --git a/PdfView/build/outputs/aar/PdfView-release.aar b/PdfView/build/outputs/aar/PdfView-release.aar index 6cba07e..700b2bf 100644 Binary files a/PdfView/build/outputs/aar/PdfView-release.aar and b/PdfView/build/outputs/aar/PdfView-release.aar differ diff --git a/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java b/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java index ea15f24..a61954c 100644 --- a/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java +++ b/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java @@ -29,6 +29,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + import com.sun.pdfview.PDFFile; import com.sun.pdfview.PDFImage; import com.sun.pdfview.PDFPage; @@ -36,6 +37,7 @@ import com.sun.pdfview.PDFPaint; import com.sun.pdfview.decrypt.PDFAuthenticationFailureException; import com.sun.pdfview.decrypt.PDFPassword; import com.sun.pdfview.font.PDFFont; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -43,6 +45,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.RandomAccessFile; import java.nio.channels.FileChannel; + import net.sf.andpdf.nio.ByteBuffer; import net.sf.andpdf.pdfviewer.gui.FullScrollView; import net.sf.andpdf.refs.HardReference; @@ -54,94 +57,98 @@ import net.sf.andpdf.refs.HardReference; */ public abstract class PdfViewerActivity extends Activity { - private static final int STARTPAGE = 1; - private static final float STARTZOOM = 1.0f; + private static final int STARTPAGE = 1; + private static final float STARTZOOM = 1.0f; - private static final float MIN_ZOOM = 0.25f; - private static final float MAX_ZOOM = 3.0f; - private static final float ZOOM_INCREMENT = 1.5f; + private static final float MIN_ZOOM = 0.25f; + private static final float MAX_ZOOM = 3.0f; + private static final float ZOOM_INCREMENT = 1.5f; - private static final String TAG = "PDFVIEWER"; + private static final String TAG = "PDFVIEWER"; - public static final String EXTRA_PDFFILENAME = "net.sf.andpdf.extra.PDFFILENAME"; - public static final String EXTRA_SHOWIMAGES = "net.sf.andpdf.extra.SHOWIMAGES"; - public static final String EXTRA_ANTIALIAS = "net.sf.andpdf.extra.ANTIALIAS"; - public static final String EXTRA_USEFONTSUBSTITUTION = "net.sf.andpdf.extra.USEFONTSUBSTITUTION"; - public static final String EXTRA_KEEPCACHES = "net.sf.andpdf.extra.KEEPCACHES"; + public static final String EXTRA_PDFFILENAME = "net.sf.andpdf.extra.PDFFILENAME"; + public static final String EXTRA_SHOWIMAGES = "net.sf.andpdf.extra.SHOWIMAGES"; + public static final String EXTRA_ANTIALIAS = "net.sf.andpdf.extra.ANTIALIAS"; + public static final String EXTRA_USEFONTSUBSTITUTION = "net.sf.andpdf.extra.USEFONTSUBSTITUTION"; + public static final String EXTRA_KEEPCACHES = "net.sf.andpdf.extra.KEEPCACHES"; - public static final boolean DEFAULTSHOWIMAGES = true; - public static final boolean DEFAULTANTIALIAS = true; - public static final boolean DEFAULTUSEFONTSUBSTITUTION = false; - public static final boolean DEFAULTKEEPCACHES = false; + public static final boolean DEFAULTSHOWIMAGES = true; + public static final boolean DEFAULTANTIALIAS = true; + public static final boolean DEFAULTUSEFONTSUBSTITUTION = false; + public static final boolean DEFAULTKEEPCACHES = false; - private final static int MENU_NEXT_PAGE = 1; - private final static int MENU_PREV_PAGE = 2; - private final static int MENU_GOTO_PAGE = 3; - private final static int MENU_ZOOM_IN = 4; - private final static int MENU_ZOOM_OUT = 5; - private final static int MENU_BACK = 6; - private final static int MENU_CLEANUP = 7; + private final static int MENU_NEXT_PAGE = 1; + private final static int MENU_PREV_PAGE = 2; + private final static int MENU_GOTO_PAGE = 3; + private final static int MENU_ZOOM_IN = 4; + private final static int MENU_ZOOM_OUT = 5; + private final static int MENU_BACK = 6; + private final static int MENU_CLEANUP = 7; - private final static int DIALOG_PAGENUM = 1; + private final static int DIALOG_PAGENUM = 1; - private GraphView mOldGraphView; - private GraphView mGraphView; - private String pdffilename; - private PDFFile mPdfFile; - private int mPage; - private float mZoom; - private File mTmpFile; - private ProgressDialog progress; + private GraphView mOldGraphView; + private GraphView mGraphView; + private String pdffilename; + private PDFFile mPdfFile; + private int mPage; + private float mZoom; + private File mTmpFile; + private ProgressDialog progress; /*private View navigationPanel; private Handler closeNavigationHandler; private Thread closeNavigationThread;*/ - private PDFPage mPdfPage; + private PDFPage mPdfPage; - private Thread backgroundThread; - private Handler uiHandler; + private Thread backgroundThread; + private Handler uiHandler; - @Override public Object onRetainNonConfigurationInstance() { - // return a reference to the current instance - Log.e(TAG, "onRetainNonConfigurationInstance"); - return this; - } - - /** - * restore member variables from previously saved instance - * - * @return true if instance to restore from was found - * @see onRetainNonConfigurationInstance - */ - private boolean restoreInstance() { - mOldGraphView = null; - Log.e(TAG, "restoreInstance"); - if (getLastNonConfigurationInstance() == null) return false; - PdfViewerActivity inst = (PdfViewerActivity) getLastNonConfigurationInstance(); - if (inst != this) { - Log.e(TAG, "restoring Instance"); - mOldGraphView = inst.mGraphView; - mPage = inst.mPage; - mPdfFile = inst.mPdfFile; - mPdfPage = inst.mPdfPage; - mTmpFile = inst.mTmpFile; - mZoom = inst.mZoom; - pdffilename = inst.pdffilename; - backgroundThread = inst.backgroundThread; - // mGraphView.invalidate(); + @Override + public Object onRetainNonConfigurationInstance() { + // return a reference to the current instance + Log.e(TAG, "onRetainNonConfigurationInstance"); + return this; } - return true; - } - public abstract String getFileName(); + /** + * restore member variables from previously saved instance + * + * @return true if instance to restore from was found + * @see onRetainNonConfigurationInstance + */ + private boolean restoreInstance() { + mOldGraphView = null; + Log.e(TAG, "restoreInstance"); + if (getLastNonConfigurationInstance() == null) return false; + PdfViewerActivity inst = (PdfViewerActivity) getLastNonConfigurationInstance(); + if (inst != this) { + Log.e(TAG, "restoring Instance"); + mOldGraphView = inst.mGraphView; + mPage = inst.mPage; + mPdfFile = inst.mPdfFile; + mPdfPage = inst.mPdfPage; + mTmpFile = inst.mTmpFile; + mZoom = inst.mZoom; + pdffilename = inst.pdffilename; + backgroundThread = inst.backgroundThread; + // mGraphView.invalidate(); + } + return true; + } - /** Called when the activity is first created. */ - @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - pdffilename = getFileName(); - Log.i(TAG, "onCreate"); - //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); + public abstract String getFileName(); + + /** + * Called when the activity is first created. + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + pdffilename = getFileName(); + Log.i(TAG, "onCreate"); + //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); /*closeNavigationHandler = new Handler(); closeNavigationThread = new Thread(new Runnable() { @@ -159,352 +166,355 @@ public abstract class PdfViewerActivity extends Activity { previous.setBackgroundDrawable(null); }*/ - uiHandler = new Handler(); - restoreInstance(); - if (mOldGraphView != null) { - mGraphView = new GraphView(this); - //mGraphView.fileMillis = mOldGraphView.fileMillis; - mGraphView.mBi = mOldGraphView.mBi; - //mGraphView.mLine1 = mOldGraphView.mLine1; - //mGraphView.mLine2 = mOldGraphView.mLine2; - //mGraphView.mLine3 = mOldGraphView.mLine3; - //mGraphView.mText = mOldGraphView.mText; - //mGraphView.pageParseMillis= mOldGraphView.pageParseMillis; - //mGraphView.pageRenderMillis= mOldGraphView.pageRenderMillis; - mOldGraphView = null; - mGraphView.mImageView.setImageBitmap(mGraphView.mBi); - mGraphView.updateTexts(); - setContentView(mGraphView); - } else { - mGraphView = new GraphView(this); - Intent intent = getIntent(); - Log.i(TAG, "" + intent); - - boolean showImages = - getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_SHOWIMAGES, PdfViewerActivity.DEFAULTSHOWIMAGES); - PDFImage.sShowImages = showImages; - boolean antiAlias = - getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_ANTIALIAS, PdfViewerActivity.DEFAULTANTIALIAS); - PDFPaint.s_doAntiAlias = antiAlias; - boolean useFontSubstitution = getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_USEFONTSUBSTITUTION, - PdfViewerActivity.DEFAULTUSEFONTSUBSTITUTION); - PDFFont.sUseFontSubstitution = useFontSubstitution; - boolean keepCaches = - getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_KEEPCACHES, PdfViewerActivity.DEFAULTKEEPCACHES); - HardReference.sKeepCaches = keepCaches; - - if (intent != null) { - if ("android.intent.action.VIEW".equals(intent.getAction())) { - pdffilename = storeUriContentToFile(intent.getData()); + uiHandler = new Handler(); + restoreInstance(); + if (mOldGraphView != null) { + mGraphView = new GraphView(this); + //mGraphView.fileMillis = mOldGraphView.fileMillis; + mGraphView.mBi = mOldGraphView.mBi; + //mGraphView.mLine1 = mOldGraphView.mLine1; + //mGraphView.mLine2 = mOldGraphView.mLine2; + //mGraphView.mLine3 = mOldGraphView.mLine3; + //mGraphView.mText = mOldGraphView.mText; + //mGraphView.pageParseMillis= mOldGraphView.pageParseMillis; + //mGraphView.pageRenderMillis= mOldGraphView.pageRenderMillis; + mOldGraphView = null; + mGraphView.mImageView.setImageBitmap(mGraphView.mBi); + mGraphView.updateTexts(); + setContentView(mGraphView); } else { - pdffilename = getIntent().getStringExtra(PdfViewerActivity.EXTRA_PDFFILENAME); - } - } + mGraphView = new GraphView(this); + Intent intent = getIntent(); + Log.i(TAG, "" + intent); - if (pdffilename == null) pdffilename = "no file selected"; + boolean showImages = + getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_SHOWIMAGES, PdfViewerActivity.DEFAULTSHOWIMAGES); + PDFImage.sShowImages = showImages; + boolean antiAlias = + getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_ANTIALIAS, PdfViewerActivity.DEFAULTANTIALIAS); + PDFPaint.s_doAntiAlias = antiAlias; + boolean useFontSubstitution = getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_USEFONTSUBSTITUTION, + PdfViewerActivity.DEFAULTUSEFONTSUBSTITUTION); + PDFFont.sUseFontSubstitution = useFontSubstitution; + boolean keepCaches = + getIntent().getBooleanExtra(PdfViewerActivity.EXTRA_KEEPCACHES, PdfViewerActivity.DEFAULTKEEPCACHES); + HardReference.sKeepCaches = keepCaches; - mPage = STARTPAGE; - mZoom = STARTZOOM; - - setContent(null); - } - } - - private void setContent(String password) { - try { - parsePDF(pdffilename, password); - setContentView(mGraphView); - startRenderThread(mPage, mZoom); - } catch (PDFAuthenticationFailureException e) { - setContentView(getPdfPasswordLayoutResource()); - final EditText etPW = (EditText) findViewById(getPdfPasswordEditField()); - Button btOK = (Button) findViewById(getPdfPasswordOkButton()); - Button btExit = (Button) findViewById(getPdfPasswordExitButton()); - btOK.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - String pw = etPW.getText().toString(); - setContent(pw); - } - }); - btExit.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - finish(); - } - }); - } - } - - private synchronized void startRenderThread(final int page, final float zoom) { - if (backgroundThread != null) return; - - mGraphView.showText("reading page " + page + ", zoom:" + zoom); - //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); - backgroundThread = new Thread(new Runnable() { - public void run() { - try { - if (mPdfFile != null) { - //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); - - // File f = new File("/sdcard/andpdf.trace"); - // f.delete(); - // Log.e(TAG, "DEBUG.START"); - // Debug.startMethodTracing("andpdf"); - showPage(page, zoom); - // Debug.stopMethodTracing(); - // Log.e(TAG, "DEBUG.STOP"); - - /*if (progress != null) - progress.dismiss();*/ - } - } catch (Exception e) { - Log.e(TAG, e.getMessage(), e); - } - backgroundThread = null; - } - }); - updateImageStatus(); - backgroundThread.start(); - } - - private void updateImageStatus() { - // Log.i(TAG, "updateImageStatus: " + (System.currentTimeMillis()&0xffff)); - if (backgroundThread == null) { - mGraphView.updateUi(); - - /*if (progress != null) - progress.dismiss();*/ - return; - } - mGraphView.updateUi(); - mGraphView.postDelayed(new Runnable() { - public void run() { - updateImageStatus(); - - /*if (progress != null) - progress.dismiss();*/ - } - }, 1000); - } - - @Override public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - menu.add(Menu.NONE, MENU_PREV_PAGE, Menu.NONE, "Previous Page").setIcon(getPreviousPageImageResource()); - menu.add(Menu.NONE, MENU_NEXT_PAGE, Menu.NONE, "Next Page").setIcon(getNextPageImageResource()); - menu.add(Menu.NONE, MENU_GOTO_PAGE, Menu.NONE, "Goto Page"); - menu.add(Menu.NONE, MENU_ZOOM_OUT, Menu.NONE, "Zoom Out").setIcon(getZoomOutImageResource()); - menu.add(Menu.NONE, MENU_ZOOM_IN, Menu.NONE, "Zoom In").setIcon(getZoomInImageResource()); - if (HardReference.sKeepCaches) menu.add(Menu.NONE, MENU_CLEANUP, Menu.NONE, "Clear Caches"); - - return true; - } - - /** - * Called when a menu item is selected. - */ - @Override public boolean onOptionsItemSelected(MenuItem item) { - super.onOptionsItemSelected(item); - switch (item.getItemId()) { - case MENU_NEXT_PAGE: { - nextPage(); - break; - } - case MENU_PREV_PAGE: { - prevPage(); - break; - } - case MENU_GOTO_PAGE: { - gotoPage(); - break; - } - case MENU_ZOOM_IN: { - zoomIn(); - break; - } - case MENU_ZOOM_OUT: { - zoomOut(); - break; - } - case MENU_BACK: { - finish(); - break; - } - case MENU_CLEANUP: { - HardReference.cleanup(); - break; - } - } - return true; - } - - private void zoomIn() { - if (mPdfFile != null) { - if (mZoom < MAX_ZOOM) { - mZoom *= ZOOM_INCREMENT; - if (mZoom > MAX_ZOOM) mZoom = MAX_ZOOM; - - if (mZoom >= MAX_ZOOM) { - Log.d(TAG, "Disabling zoom in button"); - mGraphView.bZoomIn.setEnabled(false); - } else { - mGraphView.bZoomIn.setEnabled(true); - } - - mGraphView.bZoomOut.setEnabled(true); - - //progress = ProgressDialog.show(PdfViewerActivity.this, "Rendering", "Rendering PDF Page"); - startRenderThread(mPage, mZoom); - } - } - } - - private void zoomOut() { - if (mPdfFile != null) { - if (mZoom > MIN_ZOOM) { - mZoom /= ZOOM_INCREMENT; - if (mZoom < MIN_ZOOM) mZoom = MIN_ZOOM; - - if (mZoom <= MIN_ZOOM) { - Log.d(TAG, "Disabling zoom out button"); - mGraphView.bZoomOut.setEnabled(false); - } else { - mGraphView.bZoomOut.setEnabled(true); - } - - mGraphView.bZoomIn.setEnabled(true); - - //progress = ProgressDialog.show(PdfViewerActivity.this, "Rendering", "Rendering PDF Page"); - startRenderThread(mPage, mZoom); - } - } - } - - private void nextPage() { - if (mPdfFile != null) { - if (mPage < mPdfFile.getNumPages()) { - mPage += 1; - mGraphView.bZoomOut.setEnabled(true); - mGraphView.bZoomIn.setEnabled(true); - progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); - startRenderThread(mPage, mZoom); - } - } - } - - private void prevPage() { - if (mPdfFile != null) { - if (mPage > 1) { - mPage -= 1; - mGraphView.bZoomOut.setEnabled(true); - mGraphView.bZoomIn.setEnabled(true); - progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); - startRenderThread(mPage, mZoom); - } - } - } - - private void gotoPage() { - if (mPdfFile != null) { - showDialog(DIALOG_PAGENUM); - } - } - - @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_PAGENUM: - LayoutInflater factory = LayoutInflater.from(this); - final View pagenumView = factory.inflate(getPdfPageNumberResource(), null); - final EditText edPagenum = (EditText) pagenumView.findViewById(getPdfPageNumberEditField()); - edPagenum.setText(Integer.toString(mPage)); - edPagenum.setOnEditorActionListener(new TextView.OnEditorActionListener() { - - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (event == null || (event.getAction() == 1)) { - // Hide the keyboard - InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(edPagenum.getWindowToken(), 0); + if (intent != null && pdffilename == null) { + if ("android.intent.action.VIEW".equals(intent.getAction())) { + pdffilename = storeUriContentToFile(intent.getData()); + } else { + pdffilename = getIntent().getStringExtra(PdfViewerActivity.EXTRA_PDFFILENAME); + } } - return true; - } - }); - return new AlertDialog.Builder(this) - //.setIcon(R.drawable.icon) - .setTitle("Jump to page") - .setView(pagenumView) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - String strPagenum = edPagenum.getText().toString(); - int pageNum = mPage; - try { - pageNum = Integer.parseInt(strPagenum); - } catch (NumberFormatException ignore) { - } - if ((pageNum != mPage) && (pageNum >= 1) && (pageNum <= mPdfFile.getNumPages())) { - mPage = pageNum; - mGraphView.bZoomOut.setEnabled(true); - mGraphView.bZoomIn.setEnabled(true); - progress = - ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); - startRenderThread(mPage, mZoom); - } - } - }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - } - }) - .create(); + + if (pdffilename == null) pdffilename = "no file selected"; + + mPage = STARTPAGE; + mZoom = STARTZOOM; + + setContent(null); + } } - return null; - } - private class GraphView extends FullScrollView { - //private String mText; - //private long fileMillis; - //private long pageParseMillis; - //private long pageRenderMillis; - private Bitmap mBi; - //private String mLine1; - //private String mLine2; - //private String mLine3; - private ImageView mImageView; - //private TextView mLine1View; - //private TextView mLine2View; - //private TextView mLine3View; - private Button mBtPage; - private Button mBtPage2; + private void setContent(String password) { + try { + parsePDF(pdffilename, password); + setContentView(mGraphView); + startRenderThread(mPage, mZoom); + } catch (PDFAuthenticationFailureException e) { + setContentView(getPdfPasswordLayoutResource()); + final EditText etPW = (EditText) findViewById(getPdfPasswordEditField()); + Button btOK = (Button) findViewById(getPdfPasswordOkButton()); + Button btExit = (Button) findViewById(getPdfPasswordExitButton()); + btOK.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + String pw = etPW.getText().toString(); + setContent(pw); + } + }); + btExit.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + finish(); + } + }); + } + } - ImageButton bZoomOut; - ImageButton bZoomIn; + private synchronized void startRenderThread(final int page, final float zoom) { + if (backgroundThread != null) return; - public GraphView(Context context) { - super(context); + mGraphView.showText("reading page " + page + ", zoom:" + zoom); + //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); + backgroundThread = new Thread(new Runnable() { + public void run() { + try { + if (mPdfFile != null) { + //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); - //setContentView(R.layout.graphics_view); - // layout params - LinearLayout.LayoutParams lpWrap1 = - new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 1); - LinearLayout.LayoutParams lpWrap10 = - new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 10); + // File f = new File("/sdcard/andpdf.trace"); + // f.delete(); + // Log.e(TAG, "DEBUG.START"); + // Debug.startMethodTracing("andpdf"); + showPage(page, zoom); + // Debug.stopMethodTracing(); + // Log.e(TAG, "DEBUG.STOP"); - // vertical layout - LinearLayout vl = new LinearLayout(context); - vl.setLayoutParams(lpWrap10); - vl.setOrientation(LinearLayout.VERTICAL); + /*if (progress != null) + progress.dismiss();*/ + } + } catch (Exception e) { + Log.e(TAG, e.getMessage(), e); + } + backgroundThread = null; + } + }); + updateImageStatus(); + backgroundThread.start(); + } - if (mOldGraphView == null) { - progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page", true, true); - } + private void updateImageStatus() { + // Log.i(TAG, "updateImageStatus: " + (System.currentTimeMillis()&0xffff)); + if (backgroundThread == null) { + mGraphView.updateUi(); - addNavButtons(vl); - // remember page button for updates - mBtPage2 = mBtPage; + /*if (progress != null) + progress.dismiss();*/ + return; + } + mGraphView.updateUi(); + mGraphView.postDelayed(new Runnable() { + public void run() { + updateImageStatus(); - mImageView = new ImageView(context); - setPageBitmap(null); - updateImage(); - mImageView.setLayoutParams(lpWrap1); - mImageView.setPadding(5, 5, 5, 5); - vl.addView(mImageView); + /*if (progress != null) + progress.dismiss();*/ + } + }, 1000); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + menu.add(Menu.NONE, MENU_PREV_PAGE, Menu.NONE, "Previous Page").setIcon(getPreviousPageImageResource()); + menu.add(Menu.NONE, MENU_NEXT_PAGE, Menu.NONE, "Next Page").setIcon(getNextPageImageResource()); + menu.add(Menu.NONE, MENU_GOTO_PAGE, Menu.NONE, "Goto Page"); + menu.add(Menu.NONE, MENU_ZOOM_OUT, Menu.NONE, "Zoom Out").setIcon(getZoomOutImageResource()); + menu.add(Menu.NONE, MENU_ZOOM_IN, Menu.NONE, "Zoom In").setIcon(getZoomInImageResource()); + if (HardReference.sKeepCaches) menu.add(Menu.NONE, MENU_CLEANUP, Menu.NONE, "Clear Caches"); + + return true; + } + + /** + * Called when a menu item is selected. + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + super.onOptionsItemSelected(item); + switch (item.getItemId()) { + case MENU_NEXT_PAGE: { + nextPage(); + break; + } + case MENU_PREV_PAGE: { + prevPage(); + break; + } + case MENU_GOTO_PAGE: { + gotoPage(); + break; + } + case MENU_ZOOM_IN: { + zoomIn(); + break; + } + case MENU_ZOOM_OUT: { + zoomOut(); + break; + } + case MENU_BACK: { + finish(); + break; + } + case MENU_CLEANUP: { + HardReference.cleanup(); + break; + } + } + return true; + } + + private void zoomIn() { + if (mPdfFile != null) { + if (mZoom < MAX_ZOOM) { + mZoom *= ZOOM_INCREMENT; + if (mZoom > MAX_ZOOM) mZoom = MAX_ZOOM; + + if (mZoom >= MAX_ZOOM) { + Log.d(TAG, "Disabling zoom in button"); + mGraphView.bZoomIn.setEnabled(false); + } else { + mGraphView.bZoomIn.setEnabled(true); + } + + mGraphView.bZoomOut.setEnabled(true); + + //progress = ProgressDialog.show(PdfViewerActivity.this, "Rendering", "Rendering PDF Page"); + startRenderThread(mPage, mZoom); + } + } + } + + private void zoomOut() { + if (mPdfFile != null) { + if (mZoom > MIN_ZOOM) { + mZoom /= ZOOM_INCREMENT; + if (mZoom < MIN_ZOOM) mZoom = MIN_ZOOM; + + if (mZoom <= MIN_ZOOM) { + Log.d(TAG, "Disabling zoom out button"); + mGraphView.bZoomOut.setEnabled(false); + } else { + mGraphView.bZoomOut.setEnabled(true); + } + + mGraphView.bZoomIn.setEnabled(true); + + //progress = ProgressDialog.show(PdfViewerActivity.this, "Rendering", "Rendering PDF Page"); + startRenderThread(mPage, mZoom); + } + } + } + + private void nextPage() { + if (mPdfFile != null) { + if (mPage < mPdfFile.getNumPages()) { + mPage += 1; + mGraphView.bZoomOut.setEnabled(true); + mGraphView.bZoomIn.setEnabled(true); + progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); + startRenderThread(mPage, mZoom); + } + } + } + + private void prevPage() { + if (mPdfFile != null) { + if (mPage > 1) { + mPage -= 1; + mGraphView.bZoomOut.setEnabled(true); + mGraphView.bZoomIn.setEnabled(true); + progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); + startRenderThread(mPage, mZoom); + } + } + } + + private void gotoPage() { + if (mPdfFile != null) { + showDialog(DIALOG_PAGENUM); + } + } + + @Override + protected Dialog onCreateDialog(int id) { + switch (id) { + case DIALOG_PAGENUM: + LayoutInflater factory = LayoutInflater.from(this); + final View pagenumView = factory.inflate(getPdfPageNumberResource(), null); + final EditText edPagenum = (EditText) pagenumView.findViewById(getPdfPageNumberEditField()); + edPagenum.setText(Integer.toString(mPage)); + edPagenum.setOnEditorActionListener(new TextView.OnEditorActionListener() { + + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (event == null || (event.getAction() == 1)) { + // Hide the keyboard + InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(edPagenum.getWindowToken(), 0); + } + return true; + } + }); + return new AlertDialog.Builder(this) + //.setIcon(R.drawable.icon) + .setTitle("Jump to page") + .setView(pagenumView) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + String strPagenum = edPagenum.getText().toString(); + int pageNum = mPage; + try { + pageNum = Integer.parseInt(strPagenum); + } catch (NumberFormatException ignore) { + } + if ((pageNum != mPage) && (pageNum >= 1) && (pageNum <= mPdfFile.getNumPages())) { + mPage = pageNum; + mGraphView.bZoomOut.setEnabled(true); + mGraphView.bZoomIn.setEnabled(true); + progress = + ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page " + mPage, true, true); + startRenderThread(mPage, mZoom); + } + } + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + } + }) + .create(); + } + return null; + } + + private class GraphView extends FullScrollView { + //private String mText; + //private long fileMillis; + //private long pageParseMillis; + //private long pageRenderMillis; + private Bitmap mBi; + //private String mLine1; + //private String mLine2; + //private String mLine3; + private ImageView mImageView; + //private TextView mLine1View; + //private TextView mLine2View; + //private TextView mLine3View; + private Button mBtPage; + private Button mBtPage2; + + ImageButton bZoomOut; + ImageButton bZoomIn; + + public GraphView(Context context) { + super(context); + + //setContentView(R.layout.graphics_view); + // layout params + LinearLayout.LayoutParams lpWrap1 = + new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 1); + LinearLayout.LayoutParams lpWrap10 = + new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 10); + + // vertical layout + LinearLayout vl = new LinearLayout(context); + vl.setLayoutParams(lpWrap10); + vl.setOrientation(LinearLayout.VERTICAL); + + if (mOldGraphView == null) { + progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page", true, true); + } + + addNavButtons(vl); + // remember page button for updates + mBtPage2 = mBtPage; + + mImageView = new ImageView(context); + setPageBitmap(null); + updateImage(); + mImageView.setLayoutParams(lpWrap1); + mImageView.setPadding(5, 5, 5, 5); + vl.addView(mImageView); /*mImageView = (ImageView) findViewById(R.id.pdf_image); if (mImageView == null) { Log.i(TAG, "mImageView is null!!!!!!"); @@ -552,104 +562,104 @@ public abstract class PdfViewerActivity extends Activity { }); */ - //addNavButtons(vl); + //addNavButtons(vl); - setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 100)); - setBackgroundColor(Color.LTGRAY); - setHorizontalScrollBarEnabled(true); - setHorizontalFadingEdgeEnabled(true); - setVerticalScrollBarEnabled(true); - setVerticalFadingEdgeEnabled(true); - addView(vl); - } - - private void addNavButtons(ViewGroup vg) { - - addSpace(vg, 6, 6); - - LinearLayout.LayoutParams lpChild1 = - new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 1); - LinearLayout.LayoutParams lpWrap10 = - new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 10); - - Context context = vg.getContext(); - LinearLayout hl = new LinearLayout(context); - hl.setLayoutParams(lpWrap10); - hl.setOrientation(LinearLayout.HORIZONTAL); - - // zoom out button - bZoomOut = new ImageButton(context); - bZoomOut.setBackgroundDrawable(null); - bZoomOut.setLayoutParams(lpChild1); - //bZoomOut.setText("-"); - //bZoomOut.setWidth(40); - bZoomOut.setImageResource(getZoomOutImageResource()); - bZoomOut.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - zoomOut(); + setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, 100)); + setBackgroundColor(Color.LTGRAY); + setHorizontalScrollBarEnabled(true); + setHorizontalFadingEdgeEnabled(true); + setVerticalScrollBarEnabled(true); + setVerticalFadingEdgeEnabled(true); + addView(vl); } - }); - hl.addView(bZoomOut); - // zoom in button - bZoomIn = new ImageButton(context); - bZoomIn.setBackgroundDrawable(null); - bZoomIn.setLayoutParams(lpChild1); - //bZoomIn.setText("+"); - //bZoomIn.setWidth(40); - bZoomIn.setImageResource(getZoomInImageResource()); - bZoomIn.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - zoomIn(); - } - }); - hl.addView(bZoomIn); + private void addNavButtons(ViewGroup vg) { - addSpace(hl, 6, 6); + addSpace(vg, 6, 6); - // prev button - ImageButton bPrev = new ImageButton(context); - bPrev.setBackgroundDrawable(null); - bPrev.setLayoutParams(lpChild1); - //bPrev.setText("<"); - //bPrev.setWidth(40); - bPrev.setImageResource(getPreviousPageImageResource()); - bPrev.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - prevPage(); - } - }); - hl.addView(bPrev); + LinearLayout.LayoutParams lpChild1 = + new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 1); + LinearLayout.LayoutParams lpWrap10 = + new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 10); - // page button - mBtPage = new Button(context); - mBtPage.setLayoutParams(lpChild1); - String maxPage = ((mPdfFile == null) ? "0" : Integer.toString(mPdfFile.getNumPages())); - mBtPage.setText(mPage + "/" + maxPage); - mBtPage.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - gotoPage(); - } - }); - hl.addView(mBtPage); + Context context = vg.getContext(); + LinearLayout hl = new LinearLayout(context); + hl.setLayoutParams(lpWrap10); + hl.setOrientation(LinearLayout.HORIZONTAL); - // next button - ImageButton bNext = new ImageButton(context); - bNext.setBackgroundDrawable(null); - bNext.setLayoutParams(lpChild1); - //bNext.setText(">"); - //bNext.setWidth(40); - bNext.setImageResource(getNextPageImageResource()); - bNext.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - nextPage(); - } - }); - hl.addView(bNext); + // zoom out button + bZoomOut = new ImageButton(context); + bZoomOut.setBackgroundDrawable(null); + bZoomOut.setLayoutParams(lpChild1); + //bZoomOut.setText("-"); + //bZoomOut.setWidth(40); + bZoomOut.setImageResource(getZoomOutImageResource()); + bZoomOut.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + zoomOut(); + } + }); + hl.addView(bZoomOut); - addSpace(hl, 20, 20); + // zoom in button + bZoomIn = new ImageButton(context); + bZoomIn.setBackgroundDrawable(null); + bZoomIn.setLayoutParams(lpChild1); + //bZoomIn.setText("+"); + //bZoomIn.setWidth(40); + bZoomIn.setImageResource(getZoomInImageResource()); + bZoomIn.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + zoomIn(); + } + }); + hl.addView(bZoomIn); - // exit button + addSpace(hl, 6, 6); + + // prev button + ImageButton bPrev = new ImageButton(context); + bPrev.setBackgroundDrawable(null); + bPrev.setLayoutParams(lpChild1); + //bPrev.setText("<"); + //bPrev.setWidth(40); + bPrev.setImageResource(getPreviousPageImageResource()); + bPrev.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + prevPage(); + } + }); + hl.addView(bPrev); + + // page button + mBtPage = new Button(context); + mBtPage.setLayoutParams(lpChild1); + String maxPage = ((mPdfFile == null) ? "0" : Integer.toString(mPdfFile.getNumPages())); + mBtPage.setText(mPage + "/" + maxPage); + mBtPage.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + gotoPage(); + } + }); + hl.addView(mBtPage); + + // next button + ImageButton bNext = new ImageButton(context); + bNext.setBackgroundDrawable(null); + bNext.setLayoutParams(lpChild1); + //bNext.setText(">"); + //bNext.setWidth(40); + bNext.setImageResource(getNextPageImageResource()); + bNext.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + nextPage(); + } + }); + hl.addView(bNext); + + addSpace(hl, 20, 20); + + // exit button /* Button bExit=new Button(context); bExit.setLayoutParams(lpChild1); @@ -663,178 +673,160 @@ public abstract class PdfViewerActivity extends Activity { }); hl.addView(bExit);*/ - vg.addView(hl); + vg.addView(hl); - addSpace(vg, 6, 6); - } - - private void addSpace(ViewGroup vg, int width, int height) { - TextView tvSpacer = new TextView(vg.getContext()); - tvSpacer.setLayoutParams(new LinearLayout.LayoutParams(width, height, 1)); - tvSpacer.setText(""); - // tvSpacer.setWidth(width); - // tvSpacer.setHeight(height); - vg.addView(tvSpacer); - } - - private void showText(String text) { - Log.i(TAG, "ST='" + text + "'"); - //mText = text; - updateUi(); - } - - private void updateUi() { - uiHandler.post(new Runnable() { - public void run() { - updateTexts(); + addSpace(vg, 6, 6); } - }); - } - private void updateImage() { - uiHandler.post(new Runnable() { - public void run() { - mImageView.setImageBitmap(mBi); + private void addSpace(ViewGroup vg, int width, int height) { + TextView tvSpacer = new TextView(vg.getContext()); + tvSpacer.setLayoutParams(new LinearLayout.LayoutParams(width, height, 1)); + tvSpacer.setText(""); + // tvSpacer.setWidth(width); + // tvSpacer.setHeight(height); + vg.addView(tvSpacer); + } + + private void showText(String text) { + Log.i(TAG, "ST='" + text + "'"); + //mText = text; + updateUi(); + } + + private void updateUi() { + uiHandler.post(new Runnable() { + public void run() { + updateTexts(); + } + }); + } + + private void updateImage() { + uiHandler.post(new Runnable() { + public void run() { + mImageView.setImageBitmap(mBi); /*if (progress != null) progress.dismiss();*/ + } + }); } - }); - } - private void setPageBitmap(Bitmap bi) { - if (bi != null) { - mBi = bi; - } else { + private void setPageBitmap(Bitmap bi) { + if (bi != null) { + mBi = bi; + } else { /* mBi = Bitmap.createBitmap(100, 100, Config.RGB_565); Canvas can = new Canvas(mBi); can.drawColor(Color.RED); - + Paint paint = new Paint(); paint.setColor(Color.BLUE); can.drawCircle(50, 50, 50, paint); - + paint.setStrokeWidth(0); paint.setColor(Color.BLACK); can.drawText("Bitmap", 10, 50, paint); */ - } + } + } + + protected void updateTexts() { + + if (mPdfPage != null) { + if (mBtPage != null) + mBtPage.setText(mPdfPage.getPageNumber() + "/" + mPdfFile.getNumPages()); + if (mBtPage2 != null) + mBtPage2.setText(mPdfPage.getPageNumber() + "/" + mPdfFile.getNumPages()); + } + } } - protected void updateTexts() { - /* - mLine1 = "PdfViewer: "+mText; - float fileTime = fileMillis*0.001f; - float pageRenderTime = pageRenderMillis*0.001f; - float pageParseTime = pageParseMillis*0.001f; - mLine2 = "render page="+format(pageRenderTime,2)+", parse page="+format(pageParseTime,2)+", parse file="+format(fileTime,2); - int maxCmds = PDFPage.getParsedCommands(); - int curCmd = PDFPage.getLastRenderedCommand()+1; - mLine3 = "PDF-Commands: "+curCmd+"/"+maxCmds; - //mLine1View.setText(mLine1); - //mLine2View.setText(mLine2); - //mLine3View.setText(mLine3); - */ - if (mPdfPage != null) { - if (mBtPage != null) mBtPage.setText(mPdfPage.getPageNumber() + "/" + mPdfFile.getNumPages()); - if (mBtPage2 != null) mBtPage2.setText(mPdfPage.getPageNumber() + "/" + mPdfFile.getNumPages()); - } + private void showPage(int page, float zoom) throws Exception { + //long startTime = System.currentTimeMillis(); + //long middleTime = startTime; + try { + // free memory from previous page + mGraphView.setPageBitmap(null); + mGraphView.updateImage(); + + // Only load the page if it's a different page (i.e. not just changing the zoom level) + if (mPdfPage == null || mPdfPage.getPageNumber() != page) { + mPdfPage = mPdfFile.getPage(page, true); + } + //int num = mPdfPage.getPageNumber(); + //int maxNum = mPdfFile.getNumPages(); + float width = mPdfPage.getWidth(); + float height = mPdfPage.getHeight(); + //String pageInfo= new File(pdffilename).getName() + " - " + num +"/"+maxNum+ ": " + width + "x" + height; + //mGraphView.showText(pageInfo); + //Log.i(TAG, pageInfo); + RectF clip = null; + //middleTime = System.currentTimeMillis(); + Bitmap bi = mPdfPage.getImage((int) (width * zoom), (int) (height * zoom), clip, true, true); + mGraphView.setPageBitmap(bi); + mGraphView.updateImage(); + + if (progress != null) progress.dismiss(); + } catch (Throwable e) { + Log.e(TAG, e.getMessage(), e); + mGraphView.showText("Exception: " + e.getMessage()); + } + //long stopTime = System.currentTimeMillis(); + //mGraphView.pageParseMillis = middleTime-startTime; + //mGraphView.pageRenderMillis = stopTime-middleTime; } - /*private String format(double value, int num) { - NumberFormat nf = NumberFormat.getNumberInstance(); - nf.setGroupingUsed(false); - nf.setMaximumFractionDigits(num); - String result = nf.format(value); - return result; - }*/ - } - - private void showPage(int page, float zoom) throws Exception { - //long startTime = System.currentTimeMillis(); - //long middleTime = startTime; - try { - // free memory from previous page - mGraphView.setPageBitmap(null); - mGraphView.updateImage(); - - // Only load the page if it's a different page (i.e. not just changing the zoom level) - if (mPdfPage == null || mPdfPage.getPageNumber() != page) { - mPdfPage = mPdfFile.getPage(page, true); - } - //int num = mPdfPage.getPageNumber(); - //int maxNum = mPdfFile.getNumPages(); - float width = mPdfPage.getWidth(); - float height = mPdfPage.getHeight(); - //String pageInfo= new File(pdffilename).getName() + " - " + num +"/"+maxNum+ ": " + width + "x" + height; - //mGraphView.showText(pageInfo); - //Log.i(TAG, pageInfo); - RectF clip = null; - //middleTime = System.currentTimeMillis(); - Bitmap bi = mPdfPage.getImage((int) (width * zoom), (int) (height * zoom), clip, true, true); - mGraphView.setPageBitmap(bi); - mGraphView.updateImage(); - - if (progress != null) progress.dismiss(); - } catch (Throwable e) { - Log.e(TAG, e.getMessage(), e); - mGraphView.showText("Exception: " + e.getMessage()); - } - //long stopTime = System.currentTimeMillis(); - //mGraphView.pageParseMillis = middleTime-startTime; - //mGraphView.pageRenderMillis = stopTime-middleTime; - } - - private void parsePDF(String filename, String password) throws PDFAuthenticationFailureException { - //long startTime = System.currentTimeMillis(); - try { - File f = new File(filename); - long len = f.length(); - if (len == 0) { - mGraphView.showText("file '" + filename + "' not found"); - } else { - mGraphView.showText("file '" + filename + "' has " + len + " bytes"); - openFile(f, password); - } - } catch (PDFAuthenticationFailureException e) { - throw e; - } catch (Throwable e) { - e.printStackTrace(); - mGraphView.showText("Exception: " + e.getMessage()); - } - //long stopTime = System.currentTimeMillis(); - //mGraphView.fileMillis = stopTime-startTime; - } - - /** - *

Open a specific pdf file. Creates a DocumentInfo from the file, - * and opens that.

- * - *

Note: Mapping the file locks the file until the PDFFile - * is closed.

- * - * @param file the file to open - * @throws IOException - */ - public void openFile(File file, String password) throws IOException { - // first open the file for random access - RandomAccessFile raf = new RandomAccessFile(file, "r"); - - // extract a file channel - FileChannel channel = raf.getChannel(); - - // now memory-map a byte-buffer - ByteBuffer bb = ByteBuffer.NEW(channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size())); - // create a PDFFile from the data - if (password == null) { - mPdfFile = new PDFFile(bb); - } else { - mPdfFile = new PDFFile(bb, new PDFPassword(password)); + private void parsePDF(String filename, String password) throws PDFAuthenticationFailureException { + //long startTime = System.currentTimeMillis(); + try { + File f = new File(filename); + long len = f.length(); + if (len == 0) { + mGraphView.showText("file '" + filename + "' not found"); + } else { + mGraphView.showText("file '" + filename + "' has " + len + " bytes"); + openFile(f, password); + } + } catch (PDFAuthenticationFailureException e) { + throw e; + } catch (Throwable e) { + e.printStackTrace(); + mGraphView.showText("Exception: " + e.getMessage()); + } + //long stopTime = System.currentTimeMillis(); + //mGraphView.fileMillis = stopTime-startTime; } - mGraphView.showText("Anzahl Seiten:" + mPdfFile.getNumPages()); - } + /** + *

Open a specific pdf file. Creates a DocumentInfo from the file, + * and opens that.

+ *

+ *

Note: Mapping the file locks the file until the PDFFile + * is closed.

+ * + * @param file the file to open + * @throws IOException + */ + public void openFile(File file, String password) throws IOException { + // first open the file for random access + RandomAccessFile raf = new RandomAccessFile(file, "r"); + + // extract a file channel + FileChannel channel = raf.getChannel(); + + // now memory-map a byte-buffer + ByteBuffer bb = ByteBuffer.NEW(channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size())); + // create a PDFFile from the data + if (password == null) { + mPdfFile = new PDFFile(bb); + } else { + mPdfFile = new PDFFile(bb, new PDFPassword(password)); + } + + mGraphView.showText("Anzahl Seiten:" + mPdfFile.getNumPages()); + } /*private byte[] readBytes(File srcFile) throws IOException { @@ -851,43 +843,44 @@ public abstract class PdfViewerActivity extends Activity { return result; }*/ - private String storeUriContentToFile(Uri uri) { - String result = null; - try { - if (mTmpFile == null) { - File root = Environment.getExternalStorageDirectory(); - if (root == null) throw new Exception("external storage dir not found"); - mTmpFile = new File(root, "AndroidPdfViewer/AndroidPdfViewer_temp.pdf"); - mTmpFile.getParentFile().mkdirs(); - mTmpFile.delete(); - } else { - mTmpFile.delete(); - } - InputStream is = getContentResolver().openInputStream(uri); - OutputStream os = new FileOutputStream(mTmpFile); - byte[] buf = new byte[1024]; - int cnt = is.read(buf); - while (cnt > 0) { - os.write(buf, 0, cnt); - cnt = is.read(buf); - } - os.close(); - is.close(); - result = mTmpFile.getCanonicalPath(); - mTmpFile.deleteOnExit(); - } catch (Exception e) { - Log.e(TAG, e.getMessage(), e); + private String storeUriContentToFile(Uri uri) { + String result = null; + try { + if (mTmpFile == null) { + File root = Environment.getExternalStorageDirectory(); + if (root == null) throw new Exception("external storage dir not found"); + mTmpFile = new File(root, "AndroidPdfViewer/AndroidPdfViewer_temp.pdf"); + mTmpFile.getParentFile().mkdirs(); + mTmpFile.delete(); + } else { + mTmpFile.delete(); + } + InputStream is = getContentResolver().openInputStream(uri); + OutputStream os = new FileOutputStream(mTmpFile); + byte[] buf = new byte[1024]; + int cnt = is.read(buf); + while (cnt > 0) { + os.write(buf, 0, cnt); + cnt = is.read(buf); + } + os.close(); + is.close(); + result = mTmpFile.getCanonicalPath(); + mTmpFile.deleteOnExit(); + } catch (Exception e) { + Log.e(TAG, e.getMessage(), e); + } + return result; } - return result; - } - @Override protected void onDestroy() { - super.onDestroy(); - if (mTmpFile != null) { - mTmpFile.delete(); - mTmpFile = null; + @Override + protected void onDestroy() { + super.onDestroy(); + if (mTmpFile != null) { + mTmpFile.delete(); + mTmpFile = null; + } } - } /*private void postHideNavigation() { // Start a time to hide the panel after 3 seconds @@ -895,23 +888,23 @@ public abstract class PdfViewerActivity extends Activity { closeNavigationHandler.postDelayed(closeNavigationThread, 3000); }*/ - public abstract int getPreviousPageImageResource(); // R.drawable.left_arrow + public abstract int getPreviousPageImageResource(); // R.drawable.left_arrow - public abstract int getNextPageImageResource(); // R.drawable.right_arrow + public abstract int getNextPageImageResource(); // R.drawable.right_arrow - public abstract int getZoomInImageResource(); // R.drawable.zoom_int + public abstract int getZoomInImageResource(); // R.drawable.zoom_int - public abstract int getZoomOutImageResource(); // R.drawable.zoom_out + public abstract int getZoomOutImageResource(); // R.drawable.zoom_out - public abstract int getPdfPasswordLayoutResource(); // R.layout.pdf_file_password + public abstract int getPdfPasswordLayoutResource(); // R.layout.pdf_file_password - public abstract int getPdfPageNumberResource(); // R.layout.dialog_pagenumber + public abstract int getPdfPageNumberResource(); // R.layout.dialog_pagenumber - public abstract int getPdfPasswordEditField(); // R.id.etPassword + public abstract int getPdfPasswordEditField(); // R.id.etPassword - public abstract int getPdfPasswordOkButton(); // R.id.btOK + public abstract int getPdfPasswordOkButton(); // R.id.btOK - public abstract int getPdfPasswordExitButton(); // R.id.btExit + public abstract int getPdfPasswordExitButton(); // R.id.btExit - public abstract int getPdfPageNumberEditField(); // R.id.pagenum_edit + public abstract int getPdfPageNumberEditField(); // R.id.pagenum_edit } \ No newline at end of file diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index fe95755..6767b78 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -1,39 +1,11 @@ - - - - - - - - - - - - + sha1="37191b3bdc528f4e4708f4a7e380629a951b272d">