Merge branch 'dev' into better-reload (396aaf07) · Commits · e / os / PdfViewer

app/build.gradle

+4 −11

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ android {
		targetSdkVersion 29
		versionCode 24
		versionName "3.3"
		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
		vectorDrawables.useSupportLibrary = true

		javaCompileOptions {
		@@ -66,6 +65,10 @@ android {
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
		}
		}
		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_8
		targetCompatibility JavaVersion.VERSION_1_8
		}
		}

		dependencies {
		@@ -73,10 +76,6 @@ dependencies {
		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.legacy:legacy-support-v4:1.0.0'
		testImplementation 'junit:junit:4.12'
		androidTestImplementation 'androidx.test:runner:1.2.0'
		androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

		//Intro Library
		implementation 'com.github.paolorotolo:appintro:v5.1.0'
		@@ -84,9 +83,6 @@ dependencies {
		//Library for Card View Layout
		implementation 'androidx.cardview:cardview:1.0.0'

		//Ripple Effect Library
		implementation 'com.balysv:material-ripple:1.0.2'

		//Rating Library
		implementation 'io.github.kobakei:ratethisapp:1.2.0'

		@@ -104,9 +100,6 @@ dependencies {
		//Changelog Library (Proguard config not needed)
		implementation 'io.github.tonnyl:whatsnew:0.1.1'

		//Circle Image View
		implementation 'de.hdodenhof:circleimageview:2.2.0'

		//Theme Engine
		implementation 'com.jaredrummler:cyanea:1.0.2'
		}

app/src/androidTest/java/com/gsnathan/pdfviewer/ExampleInstrumentedTest.java

deleted100755 → 0

+0 −26

Original line number	Diff line number	Diff line
		package com.gsnathan.pdfviewer;

		import android.content.Context;
		import androidx.test.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static org.junit.Assert.*;

		/**
		* Instrumented test, which will execute on an Android device.
		*
		* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
		*/
		@RunWith(AndroidJUnit4.class)
		public class ExampleInstrumentedTest {
		@Test
		public void useAppContext() throws Exception {
		// Context of the app under test.
		Context appContext = InstrumentationRegistry.getTargetContext();

		assertEquals("com.gsnathan.pdfviewer", appContext.getPackageName());
		}
		}

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/assets/pdf_sample.pdf

deleted100644 → 0

−78.9 KiB

File deleted.

View file

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

+7 −44

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) {
		@@ -89,10 +84,6 @@ public class AboutActivity extends CyaneaAppCompatActivity {
		startActivity(Utils.linkIntent("https://github.com/JavaCafe01/PdfViewer/blob/master/privacy_policy.md"));
		}

		public void showMaterial(View v) {
		startActivity(Utils.linkIntent("https://materialdesignicons.com/"));
		}

		public void showLicense(View v) {
		startActivity(Utils.linkIntent("https://github.com/JavaCafe01/PdfViewer/blob/master/LICENSE"));
		}
		@@ -142,27 +133,6 @@ public class AboutActivity extends CyaneaAppCompatActivity {
		.setWebsite("http://developer.android.com/tools/support-library/index.html")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("HtmlTextView for Android")
		.addCopyrightNotice("Copyright 2013 Dominik Schürmann")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/PrivacyApps/html-textview")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("LicenseTextView")
		.addCopyrightNotice("Copyright 2016 JGabrielFreitas")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/jgabrielfreitas/LicenseTextView")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("EasyFeedback")
		.addCopyrightNotice("Copyright 2017 Ramankit Singh")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/webianks/EasyFeedback")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("Material Design Icons")
		.addCopyrightNotice("Copyright 2014, Austin Andrews")
		@@ -178,24 +148,17 @@ public class AboutActivity extends CyaneaAppCompatActivity {
		.build()
		)
		.addAttributions(
		new Attribution.Builder("Cyanea")
		.addCopyrightNotice("Copyright 2018 Jared Rummler")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/jaredrummler/Cyanea")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("PhysicsLayout")
		.addCopyrightNotice("Copyright 2016 John Carlson")
		new Attribution.Builder("RateThisApp")
		.addCopyrightNotice("Copyright 2017 Keisuke Kobayashi")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/Jawnnypoo/PhysicsLayout")
		.setWebsite("https://github.com/kobakei/Android-RateThisApp")
		.build()
		)
		.addAttributions(
		new Attribution.Builder("fab-speed-dial")
		.addCopyrightNotice("Copyright 2016 Yavor Ivanov")
		new Attribution.Builder("Cyanea")
		.addCopyrightNotice("Copyright 2018 Jared Rummler")
		.addLicense(License.APACHE)
		.setWebsite("https://github.com/yavski/fab-speed-dial")
		.setWebsite("https://github.com/jaredrummler/Cyanea")
		.build()
		)
		.build();