Skip to content

Commit e225928

Browse files
ppamorimppamorim
committed
Update inner library
1 parent 0dd93cf commit e225928

File tree

7 files changed

+106
-55
lines changed

7 files changed

+106
-55
lines changed

‎android-pdf-viewer/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,16 @@ android {
3434
versionName "3.2.0-beta.1"
3535
}
3636

37+
compileOptions {
38+
sourceCompatibility JavaVersion.VERSION_1_8
39+
targetCompatibility JavaVersion.VERSION_1_8
40+
}
41+
3742
}
3843

3944
dependencies {
40-
implementation 'androidx.core:core:1.2.0'
41-
api 'com.github.barteksc:pdfium-android:1.9.0'
45+
implementation 'androidx.core:core:1.3.1'
46+
api 'com.github.T-Pro:PdfiumAndroid:2.0.0'
4247
}
4348

4449
apply from: 'bintray.gradle'

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.4.2'
9-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
8+
classpath 'com.android.tools.build:gradle:4.0.1'
9+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111
}
1212
}
@@ -15,5 +15,6 @@ allprojects {
1515
repositories {
1616
google()
1717
jcenter()
18+
maven { url 'https://jitpack.io' }
1819
}
1920
}

‎gradle.properties‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Gradle settings configured through the IDE *will override*
5+
# any settings specified in this file.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
19+
20+
android.useAndroidX=true
21+
android.enableJetifier=false

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Aug 18 01:14:14 CEST 2019
1+
#Mon Sep 21 19:03:58 IST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip

‎sample/build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@ android {
2222
versionName "3.0.0"
2323
}
2424

25+
compileOptions {
26+
sourceCompatibility JavaVersion.VERSION_1_8
27+
targetCompatibility JavaVersion.VERSION_1_8
28+
}
29+
2530
}
2631

2732
dependencies {
2833
implementation project(':android-pdf-viewer')
29-
implementation 'androidx.appcompat:appcompat:1.1.0'
30-
implementation 'org.androidannotations:androidannotations-api:4.6.0'
31-
annotationProcessor "org.androidannotations:androidannotations:4.6.0"
34+
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
35+
implementation 'com.jakewharton:butterknife:10.2.3'
36+
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
3237
}

‎sample/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:label="@string/app_name"
99
android:theme="@style/Theme.AppCompat.Light">
1010
<activity
11-
android:name="PDFViewActivity_"
11+
android:name=".PDFViewActivity"
1212
android:label="@string/app_name" >
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />

‎sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java‎

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@
2121
import android.database.Cursor;
2222
import android.graphics.Color;
2323
import android.net.Uri;
24+
import android.os.Bundle;
2425
import android.provider.OpenableColumns;
2526
import androidx.annotation.NonNull;
27+
import androidx.annotation.Nullable;
2628
import androidx.core.app.ActivityCompat;
2729
import androidx.core.content.ContextCompat;
2830
import androidx.appcompat.app.AppCompatActivity;
2931
import android.util.Log;
32+
import android.view.Menu;
33+
import android.view.MenuInflater;
34+
import android.view.MenuItem;
3035
import android.widget.Toast;
3136

3237
import com.github.barteksc.pdfviewer.PDFView;
@@ -37,19 +42,14 @@
3742
import com.github.barteksc.pdfviewer.util.FitPolicy;
3843
import com.shockwave.pdfium.PdfDocument;
3944

40-
import org.androidannotations.annotations.AfterViews;
41-
import org.androidannotations.annotations.EActivity;
42-
import org.androidannotations.annotations.NonConfigurationInstance;
43-
import org.androidannotations.annotations.OnActivityResult;
44-
import org.androidannotations.annotations.OptionsItem;
45-
import org.androidannotations.annotations.OptionsMenu;
46-
import org.androidannotations.annotations.ViewById;
47-
4845
import java.util.List;
4946

50-
@EActivity(R.layout.activity_main)
51-
@OptionsMenu(R.menu.options)
52-
public class PDFViewActivity extends AppCompatActivity implements OnPageChangeListener, OnLoadCompleteListener,
47+
import butterknife.BindView;
48+
import butterknife.ButterKnife;
49+
50+
public class PDFViewActivity extends AppCompatActivity implements
51+
OnPageChangeListener,
52+
OnLoadCompleteListener,
5353
OnPageErrorListener {
5454

5555
private static final String TAG = PDFViewActivity.class.getSimpleName();
@@ -60,48 +60,63 @@ public class PDFViewActivity extends AppCompatActivity implements OnPageChangeLi
6060
public static final String SAMPLE_FILE = "sample.pdf";
6161
public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
6262

63-
@ViewById
63+
@BindView(R.id.pdfView)
6464
PDFView pdfView;
6565

66-
@NonConfigurationInstance
6766
Uri uri;
6867

69-
@NonConfigurationInstance
7068
Integer pageNumber = 0;
7169

7270
String pdfFileName;
7371

74-
@OptionsItem(R.id.pickFile)
75-
void pickFile() {
76-
int permissionCheck = ContextCompat.checkSelfPermission(this,
77-
READ_EXTERNAL_STORAGE);
72+
@Override
73+
protected void onCreate(@Nullable Bundle savedInstanceState) {
74+
super.onCreate(savedInstanceState);
75+
setContentView(R.layout.activity_main);
76+
ButterKnife.bind(this);
77+
}
7878

79-
if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
80-
ActivityCompat.requestPermissions(
81-
this,
82-
new String[]{READ_EXTERNAL_STORAGE},
83-
PERMISSION_CODE
84-
);
79+
@Override
80+
public boolean onCreateOptionsMenu(Menu menu) {
81+
MenuInflater inflater = getMenuInflater();
82+
inflater.inflate(R.menu.options, menu);
83+
return super.onCreateOptionsMenu(menu);
84+
}
8585

86-
return;
86+
@Override
87+
public boolean onOptionsItemSelected(MenuItem item) {
88+
switch (item.getItemId()) {
89+
case R.id.pickFile:
90+
int permissionCheck = ContextCompat.checkSelfPermission(this,
91+
READ_EXTERNAL_STORAGE);
92+
if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
93+
ActivityCompat.requestPermissions(
94+
this,
95+
new String[]{READ_EXTERNAL_STORAGE},
96+
PERMISSION_CODE
97+
);
98+
99+
return true;
100+
}
101+
launchPicker();
102+
return true;
103+
default:
104+
return super.onOptionsItemSelected(item);
87105
}
88-
89-
launchPicker();
90106
}
91107

92-
void launchPicker() {
93-
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
94-
intent.setType("application/pdf");
95-
try {
96-
startActivityForResult(intent, REQUEST_CODE);
97-
} catch (ActivityNotFoundException e) {
98-
//alert user that file manager not working
99-
Toast.makeText(this, R.string.toast_pick_file_error, Toast.LENGTH_SHORT).show();
108+
@Override
109+
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
110+
super.onActivityResult(requestCode, resultCode, data);
111+
if (resultCode == RESULT_OK) {
112+
uri = data.getData();
113+
displayFromUri(uri);
100114
}
101115
}
102116

103-
@AfterViews
104-
void afterViews() {
117+
@Override
118+
protected void onPostCreate(@Nullable Bundle savedInstanceState) {
119+
super.onPostCreate(savedInstanceState);
105120
pdfView.setBackgroundColor(Color.LTGRAY);
106121
if (uri != null) {
107122
displayFromUri(uri);
@@ -111,6 +126,17 @@ void afterViews() {
111126
setTitle(pdfFileName);
112127
}
113128

129+
void launchPicker() {
130+
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
131+
intent.setType("application/pdf");
132+
try {
133+
startActivityForResult(intent, REQUEST_CODE);
134+
} catch (ActivityNotFoundException e) {
135+
//alert user that file manager not working
136+
Toast.makeText(this, R.string.toast_pick_file_error, Toast.LENGTH_SHORT).show();
137+
}
138+
}
139+
114140
private void displayFromAsset(String assetFileName) {
115141
pdfFileName = assetFileName;
116142

@@ -140,14 +166,6 @@ private void displayFromUri(Uri uri) {
140166
.load();
141167
}
142168

143-
@OnActivityResult(REQUEST_CODE)
144-
public void onResult(int resultCode, Intent intent) {
145-
if (resultCode == RESULT_OK) {
146-
uri = intent.getData();
147-
displayFromUri(uri);
148-
}
149-
}
150-
151169
@Override
152170
public void onPageChanged(int page, int pageCount) {
153171
pageNumber = page;
@@ -211,6 +229,7 @@ public void printBookmarksTree(List<PdfDocument.Bookmark> tree, String sep) {
211229
@Override
212230
public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[],
213231
@NonNull int[] grantResults) {
232+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
214233
if (requestCode == PERMISSION_CODE) {
215234
if (grantResults.length > 0
216235
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {

0 commit comments

Comments
 (0)