Development (#10)

* Created Java Class for managing cache

* Updated cache. Edited cards for new method additions. In progress...

* Created loading screen. Added new data into cards

* Completed new cards values

* Completed requirement #4

Now, next to the cards, a percentage will appear with the evolution of the field by the latest 24 hours

* Added load screen. Jobs persisted for requirement #6

* Updated UptadeChecker. Included now links to Play Store

* Invitation menu repaired. Solved bug #8

* Solved an error in donations - Google Play Services were not enabled/updated

* Updated loading dialog

* Added transitions for enhacement #9. Solved a problem with new cache job

* Solved bug #2 and completed extra #7. Added new libraries to "License" section

* Refactored code - enhancement #5

* Updated JavaDoc

* Updated License. Exported version "1.18" of the application

* Removed /docs because of conflicts

* Updated screenshots

* Solved exception in DataLoaderScreen for PullRequest #10

* Solved notifications problems for PullRequest #10

* Solved an error with DonationsFragment where devices with Android L were not able to make a purchase

* Solved an error with donations - in some devices the app was crashing when clicking Google Play donate button

* Solved errors in DataLoaderScreen. Optimized transitions and animations

* Solved graphic issues

* Added apk

* Solved a problem with calendar

* Updated .apk

* Updated calendar

* Update calendar function

* Updated .apk

* Corrected UI

* Updated .apk

README_conflict-20180306-220131.md

@@ -0,0 +1,36 @@
+# BitCoinPools
+
+**This is an app for retrieving latest information about BTC pools**.
+
+[![BitCoinApp - Aptiode](https://img.shields.io/badge/Download%20-Aptoide-green.svg)](https://goo.gl/5sqsNP)
+[![BitCoinApp - Releases](https://img.shields.io/badge/Download%20-GitHub%20APK-green.svg)](https://goo.gl/qeaU85)
+
+## Changelog 
+
+With the latest update, we have just integrated the option to *recieve notifications*: as this app is for getting information about [BitCoin Pools](https://en.wikipedia.org/wiki/Mining_pool) is important to know the value of the **BitCoin**. So now, you can configure notifications and more in the app.
+
+## What this app exactly does?
+
+The purpose of this application is *getting information about mining pools* avaiable on Internet [(click here for getting more information)](https://en.wikipedia.org/wiki/Mining_pool), and also giving the user **more information** for the BitCoin (as its current price)
+
+![Interface](https://github.com/Javinator9889/BitCoinPools/blob/master/screenshots/englishinterface.jpg)
+![Buttons](https://github.com/Javinator9889/BitCoinPools/blob/master/screenshots/buttons.jpg)
+
+**Now, in the latest version** I have included a notifcation system that can be *enabled or disabled* by the user in order to know when the BitCoin **reaches or not** a specific price.
+
+![Settings](https://github.com/Javinator9889/BitCoinPools/blob/master/screenshots/choosingdays.jpg)
+
+## Downloading different versions
+
+Here you have to download the newest version available, on *Aptoide* or directly from *GitHub*:
+
+[![BitCoinApp - Aptiode](https://img.shields.io/badge/Download%20-Aptoide-green.svg)](https://goo.gl/5sqsNP)
+[![BitCoinApp - Releases](https://img.shields.io/badge/Download%20-GitHub%20APK-green.svg)](https://goo.gl/qeaU85)
+
+## I have used it and I love it. What can I do?
+
+You can do:
++ **Fork** these project and *develop* your custom version: I will like to see it
++ **Rate**, giving me a star ⭐️
++ **See my other projects** in which I spent so much time working on them 💻
++ **And watch 👁** if you would like to recieve new upgardes

app/build.gradle

@@ -7,7 +7,7 @@ android {
         applicationId "javinator9889.bitcoinpools"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 30
+        versionCode 59
         versionName "1.18"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -31,27 +31,27 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.google.firebase:firebase-crash:11.8.0'
     implementation 'com.google.firebase:firebase-invites:11.8.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
-    compile 'com.android.support:preference-v14:27.0.2'
-    compile 'com.android.support:preference-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
+    compile 'com.android.support:preference-v14:27.1.0'
+    compile 'com.android.support:preference-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     compile 'ch.acra:acra:4.9.2'
     implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
         transitive = true
     }
-    implementation 'com.android.support:recyclerview-v7:27.0.2'
-    implementation 'com.android.support:support-annotations:27.0.2'
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:recyclerview-v7:27.1.0'
+    implementation 'com.android.support:support-annotations:27.1.0'
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:cardview-v7:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
     compile 'com.jpardogo.materialtabstrip:library:1.1.1'
     compile 'com.google.firebase:firebase-core:11.8.0'
     compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {

app/debug/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41},"path":"app-debug.apk","properties":{"packageId":"javinator9889.bitcoinpools","split":"","minSdkVersion":"21"}}]

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":28},"path":"app-release.apk","properties":{"packageId":"javinator9889.bitcoinpools","split":"","minSdkVersion":"21"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":59},"path":"app-release.apk","properties":{"packageId":"javinator9889.bitcoinpools","split":"","minSdkVersion":"21"}}]

app/src/main/AndroidManifest.xml

@@ -8,36 +8,48 @@
     <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
     <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="com.android.vending.BILLING" />
+
     <application
+        android:name=".BitCoinApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/CustomTheme"
-        android:name=".BitCoinApp">
+        android:theme="@style/CustomTheme">
         <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation"
-            android:screenOrientation="portrait">
+            android:name=".DataLoaderScreen"
+            android:screenOrientation="portrait"
+            android:configChanges=
+                "screenSize|smallestScreenSize|screenLayout|orientation"
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".MainActivity"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation">
+        </activity>
         <activity
             android:name=".License"
             android:configChanges="orientation"
-            android:screenOrientation="portrait">
-        </activity>
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".SpinnerActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait" />
-        <activity android:name=".FragmentViews.DonationsActivity" />
+        <activity android:name=".FragmentViews.DonationsActivity"
+            tools:ignore="InnerclassSeparator" />
 
-        <service android:name=".BackgroundJobs.JobSchedulerService"
+        <service
+            android:name=".BackgroundJobs.JobSchedulerService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            tools:ignore="InnerclassSeparator" />
+        <service android:name=".BackgroundJobs.CacheJobSchedulerService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             tools:ignore="InnerclassSeparator" />
 

app/src/main/java/javinator9889/bitcoinpools/AppUpdaterManager/CheckUpdates.java

@@ -1,15 +1,10 @@
 package javinator9889.bitcoinpools.AppUpdaterManager;
 
-import android.app.DownloadManager;
-import android.content.BroadcastReceiver;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.os.StrictMode;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
@@ -20,8 +15,6 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 
-import java.io.File;
-import java.lang.reflect.Method;
 import java.util.concurrent.ExecutionException;
 
 import javinator9889.bitcoinpools.BitCoinApp;
@@ -36,55 +29,56 @@ public class CheckUpdates {
     private static final String GITHUB_API_URL = "https://api.github.com/repos/";
     private static String CONNECTION_URL;
     private static String APP_VERSION;
-    private static JSONArray RETRIEVED_DATA;
     private static String LATEST_VERSION;
     private static String DOWNLOAD_URL = null;
-    private static String MORE_INFO;
-    private static String APK_NAME;
+    private static String MORE_INFO = Constants.GOOGLE_PLAY_URL;
     private static boolean HTML_PAGE = false;
 
     public CheckUpdates(@NonNull String GitHub_User, @NonNull String GitHub_Repo) {
         CONNECTION_URL = GITHUB_API_URL + GitHub_User + "/" + GitHub_Repo + "/releases";
         try {
-            APP_VERSION = BitCoinApp.getAppContext().getPackageManager().getPackageInfo(BitCoinApp.getAppContext().getPackageName(), 0).versionName;
+            APP_VERSION = BitCoinApp.getAppContext().getPackageManager()
+                    .getPackageInfo(BitCoinApp.getAppContext().getPackageName(), 0)
+                    .versionName;
         } catch (PackageManager.NameNotFoundException e) {
-            Log.e(Constants.LOG.CTAG, Constants.LOG.NO_INFO + e.getMessage(), new PackageManager.NameNotFoundException());
+            Log.e(Constants.LOG.CTAG, Constants.LOG.NO_INFO + e.getMessage(),
+                    new PackageManager.NameNotFoundException());
         }
         getData();
     }
 
-    public void checkForUpdates(final Context dialogContext, String title, String description, String positiveText, String negativeText, String neutralText) {
-        if (!APP_VERSION.equals(LATEST_VERSION) && (Float.parseFloat(APP_VERSION) < Float.parseFloat(LATEST_VERSION))) {
-            Log.d(Constants.LOG.CTAG, Constants.LOG.NEW_VERSION + APP_VERSION + " | " + LATEST_VERSION);
+    public void checkForUpdates(final Context dialogContext, String title, String description,
+                                String positiveText, String negativeText, String neutralText) {
+        if (!APP_VERSION.equals(LATEST_VERSION)) {
+            Log.d(Constants.LOG.CTAG, Constants.LOG.NEW_VERSION + APP_VERSION
+                    + " | " + LATEST_VERSION);
             MaterialDialog materialDialog;
             if (!HTML_PAGE) {
                 Log.d(Constants.LOG.CTAG, Constants.LOG.DOW_NOTIFICATION);
                 materialDialog = new MaterialDialog.Builder(dialogContext)
                         .title(title)
                         .content(description)
-                        .positiveText(positiveText)
                         .negativeText(negativeText)
-                        .neutralText(neutralText)
+                        .neutralText(positiveText)
                         .cancelable(false)
                         .onAny(new MaterialDialog.SingleButtonCallback() {
                             @Override
-                            public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                            public void onClick(@NonNull MaterialDialog dialog,
+                                                @NonNull DialogAction which) {
                                 switch (which) {
-                                    case POSITIVE:
-                                        DownloadManager.Request downloadRequest = new DownloadManager.Request(Uri.parse(DOWNLOAD_URL));
-                                        downloadRequest.setTitle(APK_NAME);
-                                        downloadRequest.allowScanningByMediaScanner();
-                                        downloadRequest.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                                        downloadRequest.setVisibleInDownloadsUi(true);
-                                        downloadRequest.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, APK_NAME);
-                                        final DownloadManager manager = (DownloadManager) dialogContext.getSystemService(Context.DOWNLOAD_SERVICE);
-                                        assert manager != null;
-                                        manager.enqueue(downloadRequest);
-                                        break;
                                     case NEUTRAL:
-                                        Uri webUri = Uri.parse(MORE_INFO);
-                                        Intent launchBrowser = new Intent(Intent.ACTION_VIEW, webUri);
-                                        dialogContext.startActivity(launchBrowser);
+                                        try {
+                                            Uri webUri = Uri.parse(
+                                                    "market://details?id=javinator9889.bitcoinpools");
+                                            Intent launchBrowser = new Intent(Intent.ACTION_VIEW,
+                                                    webUri);
+                                            dialogContext.startActivity(launchBrowser);
+                                        } catch (ActivityNotFoundException e) {
+                                            Uri webUri = Uri.parse(MORE_INFO);
+                                            Intent launchBrowser = new Intent(Intent.ACTION_VIEW,
+                                                    webUri);
+                                            dialogContext.startActivity(launchBrowser);
+                                        }
                                         break;
                                     case NEGATIVE:
                                         dialog.dismiss();
@@ -127,28 +121,34 @@ private void getData() {
         NetworkConnection connection = new NetworkConnection();
         connection.execute(CONNECTION_URL);
         try {
-            RETRIEVED_DATA = connection.get();
+            JSONArray RETRIEVED_DATA = connection.get();
             int jsonLength = RETRIEVED_DATA.length();
             boolean noPreRelease = false;
             for (int i = 0; (i < jsonLength) && !noPreRelease; ++i) {
                 if (!RETRIEVED_DATA.getJSONObject(i).getBoolean("prerelease")) {
                     noPreRelease = true;
                     LATEST_VERSION = RETRIEVED_DATA.getJSONObject(i).getString("tag_name");
                     boolean apkFound = false;
-                    for (int j = 0; (j < RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").length()) && !apkFound; ++j) {
-                        if (!(RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").isNull(j) && (RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").getJSONObject(j).getString("name").contains(".apk")))) {
+                    for (int j = 0; (j < RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets")
+                            .length()) && !apkFound; ++j)
+                    {
+                        if (!(RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").isNull(j)
+                                && (RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets")
+                                .getJSONObject(j).getString("name").contains(".apk"))))
+                        {
                             apkFound = true;
-                            DOWNLOAD_URL = RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").getJSONObject(0).getString("browser_download_url");
-                            APK_NAME = RETRIEVED_DATA.getJSONObject(i).getJSONArray("assets").getJSONObject(j).getString("name");
+                            DOWNLOAD_URL = RETRIEVED_DATA.getJSONObject(i)
+                                    .getJSONArray("assets").getJSONObject(0)
+                                    .getString("browser_download_url");
                         }
                     }
                     if (DOWNLOAD_URL == null) {
                         HTML_PAGE = true;
                     }
-                    MORE_INFO = RETRIEVED_DATA.getJSONObject(i).getString("html_url");
                 }
             }
-        } catch (InterruptedException | ExecutionException | JSONException | NullPointerException e) {
+        } catch (InterruptedException | ExecutionException
+                | JSONException | NullPointerException e) {
             Crashlytics.logException(e);
             Log.e(Constants.LOG.CTAG, Constants.LOG.NO_INFO + e.getMessage());
         }

app/src/main/java/javinator9889/bitcoinpools/AppUpdaterManager/NetworkConnection.java

@@ -1,6 +1,7 @@
 package javinator9889.bitcoinpools.AppUpdaterManager;
 
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -34,6 +35,7 @@ protected JSONArray doInBackground(String... url) {
         return null;
     }
 
+    @NonNull
     private String readAll(Reader httpsReader) throws IOException {
         StringBuilder response = new StringBuilder();
         int valueRead;
@@ -43,9 +45,11 @@ private String readAll(Reader httpsReader) throws IOException {
         return response.toString();
     }
 
+    @NonNull
     private JSONArray readJSONFromURL(String url) throws IOException, JSONException {
         try (InputStream JSONStream = new URL(url).openStream()) {
-            BufferedReader br = new BufferedReader(new InputStreamReader(JSONStream, Charset.forName("UTF-8")));
+            BufferedReader br = new BufferedReader(
+                    new InputStreamReader(JSONStream, Charset.forName("UTF-8")));
             String JSONText = readAll(br);
             return new JSONArray(JSONText);
         }