Merge pull request #73 from JavaCafe01/dev (7ccf9f5f) · Commits · e / os / PdfViewer

.travis.yml

+30 −13

Original line number	Diff line number	Diff line
		language: android
		jdk: oraclejdk8
		sudo: required
		after_failure: "cat $TRAVIS_BUILD_DIR/app/build/outputs/lint-results-debug.xml"

		notifications:
		slack: pdfviewerplus:ODw20YfhNtVZkbdA4K3mVFnS

		before_install:
		- chmod +x gradlew
		env:
		global:
		- ANDROID_API_LEVEL=30
		- ANDROID_BUILD_TOOLS_VERSION=29.0.2
		- ANDROID_ABI=armeabi-v7a

		android:
		components:
		- tools
		- platform-tools
		- tools
		- build-tools-28.0.3
		- android-21
		- android-29
		- sys-img-armeabi-v7a-android-21
		- extra-android-m2repository
		licenses:
		- 'android-sdk-preview-license-52d11cd2'
		- 'android-sdk-license-.+'
		- 'google-gdk-license-.+'

		before_install:
		- touch $HOME/.android/repositories.cfg
		- yes \| sdkmanager "platforms;android-30"
		- yes \| sdkmanager "build-tools;29.0.2"

		before_cache:
		- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
		- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

		cache:
		directories:
		- $HOME/.gradle/caches/
		- $HOME/.gradle/wrapper/
		- $HOME/.android/build-cache

		before_script:
		# Create and start emulator
		- echo no \| android create avd --force -n test -t android-21 --abi armeabi-v7a
		- emulator -avd test -no-skin -no-audio -no-window &
		- android-wait-for-emulator
		- adb shell input keyevent 82 &
		- chmod +x gradlew

		script: ./gradlew connectedAndroidTest
		script:
		- ./gradlew clean build
		- ./gradlew test

README.md

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,13 +22,14 @@
		## Contribute

		You can contribute to this project in many ways:
		* Fork and make pull requests
		* Help to translate the application (if so contact me --> gokulswamilive@gmail.com)
		* Fork and make pull requests (please target dev branch)
		* Help to translate the application (By making PR)

		### Special Thanks!

		\| Github Users \|
		\| ------------- \|
		\| [Fs00](https://github.com/Fs00) \|
		\| [Etamuk](https://github.com/Etamuk) \|
		\| [Raspbeguy](https://github.com/raspbeguy) \|
		\| [Greynar](https://github.com/Greynar) \|

app/build.gradle

+14 −11

Original line number	Diff line number	Diff line
		@@ -31,14 +31,14 @@ android {
		abortOnError false
		}

		buildToolsVersion "28.0.3"
		compileSdkVersion 29
		buildToolsVersion "29.0.2"
		compileSdkVersion 30
		defaultConfig {
		applicationId "com.gsnathan.pdfviewer"
		minSdkVersion 21
		targetSdkVersion 29
		versionCode 24
		versionName "3.3"
		targetSdkVersion 30
		versionCode 25
		versionName "3.4"
		vectorDrawables.useSupportLibrary = true

		javaCompileOptions {
		@@ -61,17 +61,20 @@ android {

		debug {
		debuggable true
		useProguard false
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
		}
		}
		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_8
		targetCompatibility JavaVersion.VERSION_1_8
		}
		}

		dependencies {
		implementation fileTree(dir: 'libs', include: ['*.jar'])
		implementation 'androidx.appcompat:appcompat:1.1.0'
		implementation 'com.google.android.material:material:1.2.0-alpha05'
		implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
		implementation 'androidx.appcompat:appcompat:1.2.0'
		implementation 'com.google.android.material:material:1.3.0-beta01'
		implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

		//Intro Library
		implementation 'com.github.paolorotolo:appintro:v5.1.0'
		@@ -87,8 +90,8 @@ dependencies {

		//Android Annotations Library (Proguard config not needed)
		//compileOnly
		annotationProcessor 'org.androidannotations:androidannotations:4.5.2'
		implementation 'org.androidannotations:androidannotations-api:4.5.2'
		annotationProcessor 'org.androidannotations:androidannotations:4.6.0'
		implementation 'org.androidannotations:androidannotations-api:4.6.0'

		//License Presenter Library (Proguard config not needed)
		implementation 'com.github.franmontiel:AttributionPresenter:1.0.1'

app/src/main/AndroidManifest.xml

+14 −7

Original line number	Diff line number	Diff line
		@@ -19,11 +19,6 @@
		<activity
		android:name=".MainActivity_"
		android:theme="@style/Theme.Cyanea.Light.DarkActionBar">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.VIEW" />

		@@ -72,12 +67,24 @@
		<data android:scheme="content" />
		<data android:mimeType="application/pdf" />
		</intent-filter>
		</activity> <!-- About -->
		</activity>
		<!-- Alias to allow the user to hide the app from launcher -->
		<activity-alias
		android:name=".LauncherAlias"
		android:enabled="true"
		android:targetActivity=".MainActivity_">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity-alias>

		<activity
		android:name=".AboutActivity"
		android:label="About"
		android:parentActivityName=".MainActivity_"
		android:theme="@style/Theme.Cyanea.Light.NoActionBar">
		android:theme="@style/Theme.Cyanea.Light.DarkActionBar">

		<!-- The meta-data tag is required if you support API level 15 and lower -->
		<meta-data

app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ public class AboutActivity extends CyaneaAppCompatActivity {
		TextView versionView; //shows the version
		private final String APP_VERSION_RELEASE = "Version " + Utils.getAppVersion(); //contains Version + the version number
		private final String APP_VERSION_DEBUG = "Version " + Utils.getAppVersion() + "-debug"; //contains Version + the version number + debug
		private Toolbar toolbar;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -55,17 +54,13 @@ public class AboutActivity extends CyaneaAppCompatActivity {
		}

		private void setUpToolBar() {
		setSupportActionBar(toolbar);
		final long token = Binder.clearCallingIdentity();
		Binder.clearCallingIdentity();
		getSupportActionBar().setDisplayHomeAsUpEnabled(true);

		}

		private void initUI() {
		//initialize the textview
		versionView = (TextView) findViewById(R.id.versionTextView);
		//initialize the toolbar
		toolbar = (Toolbar) findViewById(R.id.toolbar_about);

		// check if app is debug
		if (BuildConfig.DEBUG) {