diff --git a/.gradle/2.8/taskArtifacts/cache.properties.lock b/.gradle/2.8/taskArtifacts/cache.properties.lock index 2992c36..7d9072d 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 341ed11..bbc7beb 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 06f3248..f0e9285 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 d07451a..6d516a1 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 1793ece..c457f2e 100644 Binary files a/.gradle/2.8/taskArtifacts/taskArtifacts.bin and b/.gradle/2.8/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c0fe31a..cf7a959 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,6 +6,7 @@ + @@ -32,28 +33,24 @@ - - - + + + + + + + + + - - + + - - - - - - - - - - - + @@ -61,11 +58,31 @@ + + + + + + + + + + + + + + + + + + + + - + @@ -73,6 +90,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1802,7 +1868,7 @@ @@ -2245,6 +2315,8 @@ + + @@ -2267,6 +2339,20 @@ + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - @@ -2563,54 +2645,13 @@ + @@ -2641,9 +2682,6 @@ - - - @@ -2666,8 +2704,39 @@ + + - + + + + + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3147,6 +3180,12 @@ + + + + + + @@ -3196,6 +3235,7 @@ + @@ -3238,6 +3278,7 @@ + @@ -3408,13 +3449,6 @@ - - - - - - - @@ -3436,6 +3470,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3444,59 +3510,176 @@ - + - + - - + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + \ 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 e14d54d..afab8c1 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/release/classes.jar b/PdfView/build/intermediates/bundles/release/classes.jar index 77a465b..105662e 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 94d9262..3fda628 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 d71bfc4..8beb7c9 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 f6b1ebd..9b7098e 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 68bfbfb..464b10e 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 87185d2..7b982d8 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 d63d769..cf6a6cb 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 f833c31..e2687dc 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 a8b565d..1ab391e 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 5cf4474..2d1ebb4 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 023d610..651b499 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 8dea2e4..9da7003 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 de20e71..b9d71cc 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 fbb2a75..2a12633 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 cae1b43..ecd2876 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 f99e60a..0db6e24 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 a41f8d9..9276321 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/debug/net/sf/andpdf/pdfviewer/gui/PdfView$1.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$1.class new file mode 100644 index 0000000..b3bd311 Binary files /dev/null and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$1.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$2.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$2.class new file mode 100644 index 0000000..b7a983d Binary files /dev/null and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$2.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$3.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$3.class new file mode 100644 index 0000000..9bb40c2 Binary files /dev/null and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView$3.class differ diff --git a/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView.class b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView.class new file mode 100644 index 0000000..65394e6 Binary files /dev/null and b/PdfView/build/intermediates/classes/debug/net/sf/andpdf/pdfviewer/gui/PdfView.class differ diff --git a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$ParserState.class b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$ParserState.class index 074dbf7..92294fa 100644 Binary files a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$ParserState.class and b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$ParserState.class differ diff --git a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$Tok.class b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$Tok.class index 821c2c8..296fe01 100644 Binary files a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$Tok.class and b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser$Tok.class differ diff --git a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser.class b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser.class index f7002cf..886c50e 100644 Binary files a/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser.class and b/PdfView/build/intermediates/classes/release/com/sun/pdfview/PDFParser.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 9b7098e..6348b67 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 464b10e..8807065 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$7.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$7.class index e2687dc..a06fa9f 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 1ab391e..838fa25 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 2d1ebb4..3b0d4e5 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 651b499..3451cbe 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 9da7003..5d518b9 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 b9d71cc..c5db018 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 2a12633..4957e9e 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 deleted file mode 100644 index ecd2876..0000000 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/PdfViewerActivity$GraphView$7.class and /dev/null 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 0db6e24..829e0b6 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 9276321..fdb65de 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/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$1.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$1.class index ce3adbe..a80b68c 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$1.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$1.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$2.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$2.class index 0f50aa0..91b685a 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$2.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$2.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$3.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$3.class index 6e2be93..124fc60 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$3.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView$3.class differ diff --git a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView.class b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView.class index 11a334a..819954a 100644 Binary files a/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView.class and b/PdfView/build/intermediates/classes/release/net/sf/andpdf/pdfviewer/gui/PdfView.class differ diff --git a/PdfView/build/intermediates/manifest/tmp/manifestMerger927398981037327799.xml b/PdfView/build/intermediates/manifest/tmp/manifestMerger4371703232981982998.xml similarity index 100% rename from PdfView/build/intermediates/manifest/tmp/manifestMerger927398981037327799.xml rename to PdfView/build/intermediates/manifest/tmp/manifestMerger4371703232981982998.xml diff --git a/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ b/PdfView/build/intermediates/res/resources-debug-androidTest.ap_ index 0daa52d..60e559d 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 946cccc..0d86323 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 de87413..f47b23b 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/com/sun/pdfview/PDFParser.java b/PdfView/src/main/java/com/sun/pdfview/PDFParser.java index 93283bf..397e165 100644 --- a/PdfView/src/main/java/com/sun/pdfview/PDFParser.java +++ b/PdfView/src/main/java/com/sun/pdfview/PDFParser.java @@ -54,7 +54,9 @@ import com.sun.pdfview.font.PDFFont; */ public class PDFParser extends BaseWatchable { - /** emit a file of DCT stream data. */ + /** + * emit a file of DCT stream data. + */ public final static String DEBUG_DCTDECODE_DATA = "debugdctdecode"; static final boolean RELEASE = true; static final int PDF_CMDS_RANGE1_MIN = 1; @@ -76,11 +78,13 @@ public class PDFParser extends BaseWatchable { private boolean resend = false; private Tok tok; private boolean catchexceptions; // Indicates state of BX...EX - /** a weak reference to the page we render into. For the page + /** + * a weak reference to the page we render into. For the page * to remain available, some other code must retain a strong reference to it. */ private WeakReference pageRef; - /** the actual command, for use within a singe iteration. Note that + /** + * the actual command, for use within a singe iteration. Note that * this must be released at the end of each iteration to assure the * page can be collected if not in use */ @@ -88,7 +92,7 @@ public class PDFParser extends BaseWatchable { // ---- result variables byte[] stream; HashMap resources; -// public static int debuglevel = 4000; + // public static int debuglevel = 4000; // TODO [FHe]: changed for debugging public static int debuglevel = -1; @@ -121,7 +125,7 @@ public class PDFParser extends BaseWatchable { * on to a PDFParser. */ public PDFParser(PDFPage cmds, byte[] stream, - HashMap resources) { + HashMap resources) { super(); this.pageRef = new WeakReference(cmds); @@ -137,43 +141,76 @@ public class PDFParser extends BaseWatchable { ///////////////////////////////////////////////////////////////// // B E G I N R E A D E R S E C T I O N ///////////////////////////////////////////////////////////////// + /** * a token from a PDF Stream */ static class Tok { - /** begin bracket < */ + /** + * begin bracket < + */ public static final int BRKB = 11; - /** end bracket > */ + /** + * end bracket > + */ public static final int BRKE = 10; - /** begin array [ */ + /** + * begin array [ + */ public static final int ARYB = 9; - /** end array ] */ + /** + * end array ] + */ public static final int ARYE = 8; - /** String (, readString looks for trailing ) */ + /** + * String (, readString looks for trailing ) + */ public static final int STR = 7; - /** begin brace { */ + /** + * begin brace { + */ public static final int BRCB = 5; - /** end brace } */ + /** + * end brace } + */ public static final int BRCE = 4; - /** number */ + /** + * number + */ public static final int NUM = 3; - /** keyword */ + /** + * keyword + */ public static final int CMD = 2; - /** name (begins with /) */ + /** + * name (begins with /) + */ public static final int NAME = 1; - /** unknown token */ + /** + * unknown token + */ public static final int UNK = 0; - /** end of stream */ + /** + * end of stream + */ public static final int EOF = -1; - /** the string value of a STR, NAME, or CMD token */ + /** + * the string value of a STR, NAME, or CMD token + */ public String name; - /** the value of a NUM token */ + /** + * the value of a NUM token + */ public double value; - /** the type of the token */ + /** + * the type of the token + */ public int type; - /** a printable representation of the token */ + /** + * a printable representation of the token + */ @Override public String toString() { if (type == NUM) { @@ -372,7 +409,7 @@ public class PDFParser extends BaseWatchable { * character, which has already been read, and end with a balanced ')' * character. A '\' character starts an escape sequence of up * to three octal digits.

- * + *

*

Parenthesis must be enclosed by a balanced set of parenthesis, * so a string may enclose balanced parenthesis.

* @@ -384,7 +421,7 @@ public class PDFParser extends BaseWatchable { int parenLevel = 0; final StringBuffer sb = new StringBuffer(); - for (int to = stream_.length; loc < to;) { + for (int to = stream_.length; loc < to; ) { int c = stream_[loc++]; if (c == ')') { if (parenLevel-- == 0) { @@ -425,7 +462,7 @@ public class PDFParser extends BaseWatchable { * character, which has already been read, and end with a '>' * character. Each byte in the array is made up of two hex characters, * the first being the high-order bit. - * + *

* We translate the byte arrays into char arrays by combining two bytes * into a character, and then translate the character array into a string. * [JK FIXME this is probably a really bad idea!] @@ -440,7 +477,7 @@ public class PDFParser extends BaseWatchable { char w = (char) 0; // read individual bytes and format into a character array - for (int to = stream_.length; (loc < to) && (stream_[loc] != '>');) { + for (int to = stream_.length; (loc < to) && (stream_[loc] != '>'); ) { final char c = (char) stream_[loc]; byte b = (byte) 0; @@ -478,6 +515,7 @@ public class PDFParser extends BaseWatchable { ///////////////////////////////////////////////////////////////// // B E G I N P A R S E R S E C T I O N ///////////////////////////////////////////////////////////////// + /** * Called to prepare for some iterations */ @@ -505,16 +543,16 @@ public class PDFParser extends BaseWatchable { /** * parse the stream. commands are added to the PDFPage initialized * in the constructor as they are encountered. - *

+ *

* Page numbers in comments refer to the Adobe PDF specification.
* commands are listed in PDF spec 32000-1:2008 in Table A.1 * * @return

  • Watchable.RUNNING when there are commands to be processed - *
  • Watchable.COMPLETED when the page is done and all - * the commands have been processed - *
  • Watchable.STOPPED if the page we are rendering into is - * no longer available - *
+ *
  • Watchable.COMPLETED when the page is done and all + * the commands have been processed + *
  • Watchable.STOPPED if the page we are rendering into is + * no longer available + * */ public int iterate() throws Exception { // make sure the page is still available, and create the reference @@ -662,7 +700,7 @@ public class PDFParser extends BaseWatchable { path = new Path(); break; case 'f': - // the fall-through is intended! + // the fall-through is intended! case 'F': // fill the path (close/not close identical) cmds.addPath(path, PDFShapeCmd.FILL | clip); @@ -952,11 +990,11 @@ public class PDFParser extends BaseWatchable { break; case 'Q' + ('q' << 8): processQCmd(); - // 'q'-cmd - // push the parser state - parserStates.push((ParserState) state.clone()); - // push graphics state - cmds.addPush(); + // 'q'-cmd + // push the parser state + parserStates.push((ParserState) state.clone()); + // push graphics state + cmds.addPush(); break; default: if (catchexceptions) { @@ -1025,6 +1063,7 @@ public class PDFParser extends BaseWatchable { path = null; cmds = null; } + boolean errorwritten = false; public void dumpStreamToError() { @@ -1068,10 +1107,12 @@ public class PDFParser extends BaseWatchable { ///////////////////////////////////////////////////////////////// // H E L P E R S ///////////////////////////////////////////////////////////////// + /** * get a property from a named dictionary in the resources of this * content stream. - * @param name the name of the property in the dictionary + * + * @param name the name of the property in the dictionary * @param inDict the name of the dictionary in the resources * @return the value of the property in the dictionary */ @@ -1092,6 +1133,7 @@ public class PDFParser extends BaseWatchable { * Insert a PDF object into the command stream. The object must * either be an Image or a Form, which is a set of PDF commands * in a stream. + * * @param obj the object to insert, an Image or a Form. */ private void doXObject(PDFObject obj) throws IOException { @@ -1111,8 +1153,9 @@ public class PDFParser extends BaseWatchable { /** * Parse image data into a Java BufferedImage and add the image * command to the page. + * * @param obj contains the image data, and a dictionary describing - * the width, height and color space of the image. + * the width, height and color space of the image. */ private void doImage(PDFObject obj) throws IOException { cmds.addImage(PDFImage.createImage(obj, resources)); @@ -1122,8 +1165,9 @@ public class PDFParser extends BaseWatchable { * Inject a stream of PDF commands onto the page. Optimized to cache * a parsed stream of commands, so that each Form object only needs * to be parsed once. + * * @param obj a stream containing the PDF commands, a transformation - * matrix, bounding box, and resources. + * matrix, bounding box, and resources. */ private void doForm(PDFObject obj) throws IOException { // check to see if we've already parsed this sucker @@ -1186,6 +1230,7 @@ public class PDFParser extends BaseWatchable { // // return patternSpace.getPaint(pattern, components, resources); // } + /** * Parse the next object out of the PDF stream. This could be a * Double, a String, a HashMap (dictionary), Object[] array, or @@ -1198,13 +1243,13 @@ public class PDFParser extends BaseWatchable { case Tok.NUM: return new Double(tok.value); case Tok.STR: - // the fall-through is intended! + // the fall-through is intended! case Tok.NAME: return tok.name; case Tok.BRKB: { final HashMap hm = new HashMap(); String name = null; - for (Object obj = null; (obj = parseObject()) != null;) { + for (Object obj = null; (obj = parseObject()) != null; ) { if (name == null) { name = (String) obj; } else { @@ -1220,7 +1265,7 @@ public class PDFParser extends BaseWatchable { case Tok.ARYB: { // build an array final ArrayList ary = new ArrayList(); - for (Object obj = null; (obj = parseObject()) != null;) { + for (Object obj = null; (obj = parseObject()) != null; ) { ary.add(obj); } if (tok.type != Tok.ARYE) { @@ -1351,6 +1396,7 @@ public class PDFParser extends BaseWatchable { /** * add graphics state commands contained within a dictionary. + * * @param name the resource name of the graphics state dictionary */ private void setGSState(String name) throws IOException { @@ -1408,11 +1454,15 @@ public class PDFParser extends BaseWatchable { /** * pop a single float value off the stack. + * * @return the float value of the top of the stack * @throws PDFParseException if the value on the top of the stack - * isn't a number + * isn't a number */ private float popFloat() throws PDFParseException { + if (stack.isEmpty()) { + return 0; + } Object obj = stack.pop(); if (obj instanceof Double) { return ((Double) obj).floatValue(); @@ -1425,10 +1475,11 @@ public class PDFParser extends BaseWatchable { * pop an array of float values off the stack. This is equivalent * to filling an array from end to front by popping values off the * stack. + * * @param count the number of numbers to pop off the stack * @return an array of length count * @throws PDFParseException if any of the values popped off the - * stack are not numbers. + * stack are not numbers. */ private float[] popFloat(int count) throws PDFParseException { float[] ary = new float[count]; @@ -1440,6 +1491,7 @@ public class PDFParser extends BaseWatchable { /** * pop a single integer value off the stack. + * * @return the integer value of the top of the stack * @throws PDFParseException if the top of the stack isn't a number. */ @@ -1456,10 +1508,11 @@ public class PDFParser extends BaseWatchable { * pop an array of integer values off the stack. This is equivalent * to filling an array from end to front by popping values off the * stack. + * * @param count the number of numbers to pop off the stack * @return an array of length count * @throws PDFParseException if any of the values popped off the - * stack are not numbers. + * stack are not numbers. */ private float[] popFloatArray() throws PDFParseException { Object obj = stack.pop(); @@ -1480,9 +1533,10 @@ public class PDFParser extends BaseWatchable { /** * pop a String off the stack. + * * @return the String from the top of the stack * @throws PDFParseException if the top of the stack is not a NAME - * or STR. + * or STR. */ private String popString() throws PDFParseException { Object obj = stack.pop(); @@ -1495,9 +1549,10 @@ public class PDFParser extends BaseWatchable { /** * pop a PDFObject off the stack. + * * @return the PDFObject from the top of the stack * @throws PDFParseException if the top of the stack does not contain - * a PDFObject. + * a PDFObject. */ private PDFObject popObject() throws PDFParseException { Object obj = stack.pop(); @@ -1509,9 +1564,10 @@ public class PDFParser extends BaseWatchable { /** * pop an array off the stack + * * @return the array of objects that is the top element of the stack * @throws PDFParseException if the top element of the stack does not - * contain an array. + * contain an array. */ private Object[] popArray() throws PDFParseException { Object obj = stack.pop(); @@ -1528,11 +1584,17 @@ public class PDFParser extends BaseWatchable { */ class ParserState implements Cloneable { - /** the fill color space */ + /** + * the fill color space + */ PDFColorSpace fillCS; - /** the stroke color space */ + /** + * the stroke color space + */ PDFColorSpace strokeCS; - /** the text paramters */ + /** + * the text paramters + */ PDFTextFormat textFormat; /** 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 56d3c18..f74f87c 100644 --- a/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java +++ b/PdfView/src/main/java/net/sf/andpdf/pdfviewer/PdfViewerActivity.java @@ -38,6 +38,11 @@ import com.sun.pdfview.decrypt.PDFAuthenticationFailureException; import com.sun.pdfview.decrypt.PDFPassword; import com.sun.pdfview.font.PDFFont; +import net.sf.andpdf.nio.ByteBuffer; +import net.sf.andpdf.pdfviewer.gui.FullScrollView; +import net.sf.andpdf.pdfviewer.gui.PdfView; +import net.sf.andpdf.refs.HardReference; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -46,11 +51,6 @@ 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.pdfviewer.gui.PdfView; -import net.sf.andpdf.refs.HardReference; - /** * U:\Android\android-sdk-windows-1.5_r1\tools\adb push u:\Android\simple_T.pdf /data/test.pdf * @@ -117,7 +117,7 @@ public abstract class PdfViewerActivity extends Activity { * restore member variables from previously saved instance * * @return true if instance to restore from was found - * @see onRetainNonConfigurationInstance + * @see */ private boolean restoreInstance() { mOldGraphView = null; @@ -156,7 +156,7 @@ public abstract class PdfViewerActivity extends Activity { mGraphView.mBi = mOldGraphView.mBi; mOldGraphView = null; mGraphView.mImageView.setImageBitmap(mGraphView.mBi); - mGraphView.updateTexts(); +// mGraphView.updateTexts(); setContentView(mGraphView); } else { mGraphView = new GraphView(this); @@ -220,7 +220,7 @@ public abstract class PdfViewerActivity extends Activity { private synchronized void startRenderThread(final int page, final float zoom) { if (backgroundThread != null) return; - mGraphView.showText("reading page " + page + ", zoom:" + zoom); +// mGraphView.showText("reading page " + page + ", zoom:" + zoom); //progress = ProgressDialog.show(PdfViewerActivity.this, "Loading", "Loading PDF Page"); backgroundThread = new Thread(new Runnable() { public void run() { @@ -241,13 +241,13 @@ public abstract class PdfViewerActivity extends Activity { private void updateImageStatus() { // Log.i(TAG, "updateImageStatus: " + (System.currentTimeMillis()&0xffff)); if (backgroundThread == null) { - mGraphView.updateUi(); +// mGraphView.updateUi(); /*if (progress != null) progress.dismiss();*/ return; } - mGraphView.updateUi(); +// mGraphView.updateUi(); mGraphView.postDelayed(new Runnable() { public void run() { updateImageStatus(); @@ -464,7 +464,7 @@ public abstract class PdfViewerActivity extends Activity { LinearLayout.LayoutParams lpWrap10 = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); - + LayoutParams matchLp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); // vertical layout LinearLayout vl = new LinearLayout(context); vl.setLayoutParams(lpWrap10); @@ -485,10 +485,11 @@ public abstract class PdfViewerActivity extends Activity { updateImage(); mImageView.setLayoutParams(lpWrap1); // mImageView.setPadding(5, 5, 5, 5); - vl.addView(mImageView); + //vl.addView(mImageView); //TODO - vl.addView(pdfView); - pdfView.setLayoutParams(lpWrap1); +// vl.addView(pdfView); + addView(pdfView); + pdfView.setLayoutParams(matchLp); /*mImageView = (ImageView) findViewById(R.id.pdf_image); if (mImageView == null) { @@ -545,7 +546,7 @@ public abstract class PdfViewerActivity extends Activity { setHorizontalFadingEdgeEnabled(true); setVerticalScrollBarEnabled(true); setVerticalFadingEdgeEnabled(true); - addView(vl); +// addView(vl); } private void addNavButtons(ViewGroup vg) { @@ -662,19 +663,14 @@ public abstract class PdfViewerActivity extends Activity { 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 updateUi() { +// uiHandler.post(new Runnable() { +// public void run() { +// updateTexts(); +// } +// }); +// } private void updateImage() { uiHandler.post(new Runnable() { @@ -707,15 +703,15 @@ public abstract class PdfViewerActivity extends Activity { } } - 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() { +// +// 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 { @@ -747,7 +743,7 @@ public abstract class PdfViewerActivity extends Activity { if (progress != null) progress.dismiss(); } catch (Throwable e) { Log.e(TAG, e.getMessage(), e); - mGraphView.showText("Exception: " + e.getMessage()); +// mGraphView.showText("Exception: " + e.getMessage()); } //long stopTime = System.currentTimeMillis(); //mGraphView.pageParseMillis = middleTime-startTime; @@ -760,16 +756,16 @@ public abstract class PdfViewerActivity extends Activity { File f = new File(filename); long len = f.length(); if (len == 0) { - mGraphView.showText("file '" + filename + "' not found"); +// mGraphView.showText("file '" + filename + "' not found"); } else { - mGraphView.showText("file '" + filename + "' has " + len + " bytes"); +// 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()); +// mGraphView.showText("Exception: " + e.getMessage()); } //long stopTime = System.currentTimeMillis(); //mGraphView.fileMillis = stopTime-startTime; @@ -800,7 +796,7 @@ public abstract class PdfViewerActivity extends Activity { } else { mPdfFile = new PDFFile(bb, new PDFPassword(password)); } - mGraphView.showText("Anzahl Seiten:" + mPdfFile.getNumPages()); +// mGraphView.showText("Anzahl Seiten:" + mPdfFile.getNumPages()); } diff --git a/PdfView/src/main/java/net/sf/andpdf/pdfviewer/gui/PdfView.java b/PdfView/src/main/java/net/sf/andpdf/pdfviewer/gui/PdfView.java index 146b93d..6deff8a 100644 --- a/PdfView/src/main/java/net/sf/andpdf/pdfviewer/gui/PdfView.java +++ b/PdfView/src/main/java/net/sf/andpdf/pdfviewer/gui/PdfView.java @@ -5,13 +5,16 @@ import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.RectF; import android.os.Handler; +import android.util.AttributeSet; import android.util.Log; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.Toast; import com.sun.pdfview.PDFFile; +import com.sun.pdfview.PDFImage; import com.sun.pdfview.PDFPage; +import com.sun.pdfview.PDFPaint; import com.sun.pdfview.decrypt.PDFAuthenticationFailureException; import com.sun.pdfview.decrypt.PDFPassword; @@ -43,14 +46,23 @@ public class PdfView extends FullScrollView { private float mZoom; public PdfView(Context context) { - super(context); + this(context, null); + } + + public PdfView(Context context, AttributeSet attrs) { + this(context, attrs, android.R.attr.scrollViewStyle); + } + + public PdfView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + PDFImage.sShowImages = true; + PDFPaint.s_doAntiAlias = true; uiHandler = new Handler(); - LayoutParams matchLp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); + LayoutParams matchLp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); mImageView = new ImageView(context); setPageBitmap(null); updateImage(); - mImageView.setLayoutParams(matchLp); - addView(mImageView); + addView(mImageView, matchLp); setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); setBackgroundColor(Color.LTGRAY); setHorizontalScrollBarEnabled(true); @@ -170,7 +182,7 @@ public class PdfView extends FullScrollView { } } - private synchronized void startRenderThread(final int page, final float zoom) { + public synchronized void startRenderThread(final int page, final float zoom) { if (backgroundThread != null) return; backgroundThread = new Thread(new Runnable() { public void run() { @@ -199,7 +211,25 @@ public class PdfView extends FullScrollView { }, 1000); } - private void parsePDF(String filename, String password) throws PDFAuthenticationFailureException { + public void parsePDF(File f, String password) throws PDFAuthenticationFailureException { + try { + long len = f.length(); + if (len == 0) { + toastMessage("file '" + f.getName() + "' not found"); + } else { + toastMessage("file '" + f.getName() + "' has " + len + " bytes"); + openFile(f, password); + } + } catch (PDFAuthenticationFailureException e) { + throw e; + } catch (Throwable e) { + e.printStackTrace(); + toastMessage("Exception: " + e.getMessage()); + } + } + + + public void parsePDF(String filename, String password) throws PDFAuthenticationFailureException { try { File f = new File(filename); long len = f.length(); diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index c5d2dc8..b75495b 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -5,7 +5,7 @@ jar="/Users/winney/git/Android-Pdf-Viewer-Library/pdfviewsample/build/intermediates/exploded-aar/Android-Pdf-Viewer-Library/PdfView/unspecified/jars/classes.jar" jumboMode="false" revision="23.0.2" - sha1="8cad678d9043f1f93f2c277b3890e0b109ac9b24"> + sha1="933be2f099767838f02cd4a28fc5ac4c219b327f"> diff --git a/pdfviewsample/src/main/AndroidManifest.xml b/pdfviewsample/src/main/AndroidManifest.xml index 0f0444f..34c1e06 100644 --- a/pdfviewsample/src/main/AndroidManifest.xml +++ b/pdfviewsample/src/main/AndroidManifest.xml @@ -1,20 +1,21 @@ + package="com.wyx.pdfviewsample"> - - - - + + + + - - - - + + + + + + + diff --git a/pdfviewsample/src/main/assets/about.pdf b/pdfviewsample/src/main/assets/about.pdf index 6ecd317..af992a0 100755 Binary files a/pdfviewsample/src/main/assets/about.pdf and b/pdfviewsample/src/main/assets/about.pdf differ diff --git a/pdfviewsample/src/main/java/com/wyx/pdfviewsample/Main2Activity.java b/pdfviewsample/src/main/java/com/wyx/pdfviewsample/Main2Activity.java new file mode 100644 index 0000000..2648f75 --- /dev/null +++ b/pdfviewsample/src/main/java/com/wyx/pdfviewsample/Main2Activity.java @@ -0,0 +1,31 @@ +package com.wyx.pdfviewsample; + +import android.app.Activity; +import android.os.Bundle; + +import net.sf.andpdf.pdfviewer.gui.PdfView; +import net.sf.andpdf.utils.FileUtils; + +import java.io.IOException; + +public class Main2Activity extends Activity { + + PdfView pdfView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main2); + + pdfView = (PdfView) findViewById(R.id.pdf_view); + + try { + pdfView.parsePDF(FileUtils.fileFromAsset(this, "about.pdf"), null); + } catch (IOException e) { + e.printStackTrace(); + } + pdfView.startRenderThread(1, 1.0f); + + + } +} diff --git a/pdfviewsample/src/main/res/layout/activity_main2.xml b/pdfviewsample/src/main/res/layout/activity_main2.xml new file mode 100644 index 0000000..6a3c4d7 --- /dev/null +++ b/pdfviewsample/src/main/res/layout/activity_main2.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/pdfviewsample/src/main/res/values-w820dp/dimens.xml b/pdfviewsample/src/main/res/values-w820dp/dimens.xml index 308a194..63fc816 100644 --- a/pdfviewsample/src/main/res/values-w820dp/dimens.xml +++ b/pdfviewsample/src/main/res/values-w820dp/dimens.xml @@ -1,6 +1,6 @@ - - 64dp + 64dp diff --git a/pdfviewsample/src/main/res/values/dimens.xml b/pdfviewsample/src/main/res/values/dimens.xml index acf94cc..47c8224 100644 --- a/pdfviewsample/src/main/res/values/dimens.xml +++ b/pdfviewsample/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ - - 16dp - 16dp + + 16dp + 16dp diff --git a/pdfviewsample/src/main/res/values/strings.xml b/pdfviewsample/src/main/res/values/strings.xml index c99b600..e21481d 100644 --- a/pdfviewsample/src/main/res/values/strings.xml +++ b/pdfviewsample/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - PdfViewSample + PdfViewSample