Get rid of AndroidAnnotations (418c9ab8) · Commits · e / os / PdfViewer

app/build.gradle

+0 −14

Original line number	Diff line number	Diff line
		@@ -40,15 +40,6 @@ android {
		versionCode 27
		versionName "3.6"
		vectorDrawables.useSupportLibrary = true

		javaCompileOptions {
		annotationProcessorOptions {
		includeCompileClasspath = true
		arguments = [
		"androidManifestFile": "$projectDir/src/main/AndroidManifest.xml".toString()
		]
		}
		}
		}

		buildFeatures {
		@@ -87,11 +78,6 @@ dependencies {
		//Pdf Viewer Library (Proguard config done)
		implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'

		//Android Annotations Library (Proguard config not needed)
		//compileOnly
		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

+4 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		android:theme="@style/Theme.Cyanea.Light.DarkActionBar">

		<activity
		android:name=".MainActivity_"
		android:name=".MainActivity"
		android:documentLaunchMode="intoExisting">
		<intent-filter>
		<action android:name="android.intent.action.VIEW" />
		@@ -74,7 +74,7 @@
		<activity-alias
		android:name=".LauncherAlias"
		android:enabled="true"
		android:targetActivity=".MainActivity_">
		android:targetActivity=".MainActivity">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

		@@ -85,7 +85,7 @@
		<activity
		android:name=".AboutActivity"
		android:label="@string/action_about"
		android:parentActivityName=".MainActivity_" />
		android:parentActivityName=".MainActivity" />

		<activity
		android:name=".MainIntroActivity"
		@@ -95,7 +95,7 @@
		<activity
		android:name=".SettingsActivity"
		android:label="@string/settings"
		android:parentActivityName=".MainActivity_" />
		android:parentActivityName=".MainActivity" />
		</application>

		</manifest>
		No newline at end of file

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

+14 −16

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ import com.jaredrummler.cyanea.prefs.CyaneaSettingsActivity;
		import com.shockwave.pdfium.PdfDocument;
		import com.shockwave.pdfium.PdfPasswordException;

		import org.androidannotations.annotations.EActivity;
		import org.jetbrains.annotations.NotNull;

		import java.io.File;
		@@ -76,7 +75,6 @@ import java.io.IOException;

		import static android.content.pm.PackageManager.PERMISSION_DENIED;

		@EActivity
		public class MainActivity extends CyaneaAppCompatActivity {

		private static final String TAG = MainActivity.class.getSimpleName();
		@@ -134,20 +132,6 @@ public class MainActivity extends CyaneaAppCompatActivity {
		}
		}

		@Override
		protected void onSaveInstanceState(@NonNull Bundle outState) {
		outState.putParcelable("uri", uri);
		outState.putInt("pageNumber", pageNumber);
		outState.putString("pdfPassword", pdfPassword);
		super.onSaveInstanceState(outState);
		}

		private void restoreInstanceState(Bundle savedState) {
		uri = savedState.getParcelable("uri");
		pageNumber = savedState.getInt("pageNumber");
		pdfPassword = savedState.getString("pdfPassword");
		}

		private void onFirstInstall() {
		boolean isFirstRun = prefManager.getBoolean("FIRSTINSTALL", true);
		if (isFirstRun) {
		@@ -168,6 +152,20 @@ public class MainActivity extends CyaneaAppCompatActivity {
		}
		}

		@Override
		protected void onSaveInstanceState(@NonNull Bundle outState) {
		outState.putParcelable("uri", uri);
		outState.putInt("pageNumber", pageNumber);
		outState.putString("pdfPassword", pdfPassword);
		super.onSaveInstanceState(outState);
		}

		private void restoreInstanceState(Bundle savedState) {
		uri = savedState.getParcelable("uri");
		pageNumber = savedState.getInt("pageNumber");
		pdfPassword = savedState.getString("pdfPassword");
		}

		private void readUriFromIntent(Intent intent) {
		Uri intentUri = intent.getData();
		if (intentUri == null) {