Merge pull request #103 from JavaCafe01/dev

3.6 Release

README.md

@@ -1,40 +1,40 @@
-# Pdf Viewer Plus 
+<p align="center">
+
+<img src="./images/high_res.png" width="120" />
+
+<h1 align="center"> Pdf Viewer Plus </h1>
+
+</p>
+
 
 [//]: # (Shields)
 
 [![Travis Build Status](https://travis-ci.com/JavaCafe01/PdfViewer.svg?branch=master)](https://travis-ci.com/JavaCafe01/PdfViewer)
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/JavaCafe01/PdfViewer/blob/master/LICENSE)
 
-## Download
 
-<a href="https://play.google.com/store/apps/details?id=com.gsnathan.pdfviewer"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Download on Google Play" height="100"></a><a href="https://f-droid.org/en/packages/com.gsnathan.pdfviewer"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 
-<a href="https://github.com/JavaCafe01/PdfViewer/releases/latest"><img src="http://yt3dl.net/images/apk-download-badge.png" alt="Get it on Github" height="100"></a>
+<a href="https://play.google.com/store/apps/details?id=com.gsnathan.pdfviewer"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Download on Google Play" height="100"></a><a href="https://f-droid.org/en/packages/com.gsnathan.pdfviewer"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a><a href="https://github.com/JavaCafe01/PdfViewer/releases/latest"><img src="http://yt3dl.net/images/apk-download-badge.png" alt="Get it on Github" height="100"></a>
 
 ## Screenshots
 
-| Main Page |
-|:-:|
-| <img src ="./images/mainpage.png" width="190" height="340"/> |
-| [`MainActivity.java`](https://github.com/JavaCafe01/PdfViewer/blob/master/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java) |
+| Main Page | Main Page | Cyanea |
+|:-:|:-:|:-:|
+| <img src ="https://github.com/JavaCafe01/PdfViewer/blob/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="190" height="340"/> | <img src ="https://github.com/JavaCafe01/PdfViewer/blob/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="190" height="340"/> | <img src ="https://github.com/JavaCafe01/PdfViewer/blob/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="190" height="340"/> |
 
 ## Contribute
 
 You can contribute to this project in many ways:
 * Fork and make pull requests (please target dev branch)
 * Help to translate the application (By making PR)
 
-### Special Thanks!
+### Contributors
 
-| Github Users |
-| ------------- |
-| [Fs00](https://github.com/Fs00)  |
-| [Etamuk](https://github.com/Etamuk)  |
-| [Raspbeguy](https://github.com/raspbeguy)  |
-| [Greynar](https://github.com/Greynar)  |
-| [ORelio](https://github.com/ORelio)  |
-| [PFayoux](https://github.com/PFayoux)  |
+<a href="https://github.com/JavaCafe01/PdfViewer/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=JavaCafe01/PdfViewer" />
+</a>
 
+Made with [contributors-img](https://contrib.rocks)
 
 ## License
 

app/build.gradle

@@ -31,14 +31,14 @@ android {
         abortOnError false
     }
 
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "30.0.3"
     compileSdkVersion 30
     defaultConfig {
         applicationId "com.gsnathan.pdfviewer"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 26
-        versionName "3.5"
+        versionCode 27
+        versionName "3.6"
         vectorDrawables.useSupportLibrary = true
 
         javaCompileOptions {
@@ -51,6 +51,10 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             debuggable false

app/src/main/AndroidManifest.xml

@@ -70,7 +70,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Alias to allow the user to hide the app from launcher -->
+        <!-- Alias to allow the user to hide the app from launcher on Android < 10 -->
         <activity-alias
             android:name=".LauncherAlias"
             android:enabled="true"
@@ -84,7 +84,7 @@
 
         <activity
             android:name=".AboutActivity"
-            android:label="About"
+            android:label="@string/action_about"
             android:parentActivityName=".MainActivity_" />
 
         <activity
@@ -94,7 +94,7 @@
 
         <activity
             android:name=".SettingsActivity"
-            android:label="Settings"
+            android:label="@string/settings"
             android:parentActivityName=".MainActivity_" />
     </application>
 

app/src/main/assets/themes/cyanea_themes.json

@@ -3,7 +3,7 @@
     "theme_name": "Pdf Viewer Plus",
     "base_theme": "LIGHT",
     "primary": "#2481a1",
-    "primary_dark": "#1a5e76",
+    "primary_dark": "#2481a1",
     "primary_light": "#2481a1",
     "accent": "#00cc99",
     "accent_dark": "#029873",

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

@@ -24,50 +24,38 @@
 
 package com.gsnathan.pdfviewer;
 
-import android.os.Binder;
 import android.os.Bundle;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.TextView;
 
 import com.franmontiel.attributionpresenter.AttributionPresenter;
 import com.franmontiel.attributionpresenter.entities.Attribution;
 import com.franmontiel.attributionpresenter.entities.License;
+import com.gsnathan.pdfviewer.databinding.ActivityAboutBinding;
 import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity;
 
 public class AboutActivity extends CyaneaAppCompatActivity {
 
-    TextView versionView;   //shows the version
+    private ActivityAboutBinding viewBinding;
     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
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        initUI();
-        setUpToolBar();
-    }
-
-    private void setUpToolBar() {
-        Binder.clearCallingIdentity();
+        viewBinding = ActivityAboutBinding.inflate(getLayoutInflater());
+        setContentView(viewBinding.getRoot());
+        setVersionText();
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
-    private void initUI() {
-        //initialize the textview
-        versionView = (TextView) findViewById(R.id.versionTextView);
-
+    private void setVersionText() {
         // check if app is debug
         if (BuildConfig.DEBUG) {
-            versionView.setText(APP_VERSION_DEBUG);
-        } else    //if app is release
-        {
-            versionView.setText(APP_VERSION_RELEASE);
+            viewBinding.versionTextView.setText(APP_VERSION_DEBUG);
+        } else {   //if app is release
+            viewBinding.versionTextView.setText(APP_VERSION_RELEASE);
         }
     }