Release 1.18.6

Javinator9889 · Aug 7, 2018 · 02920b7 · 02920b7
1 parent 35c3ee2
commit 02920b7
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "javinator9889.bitcoinpools"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 72
-        versionName "1.18.5"
+        versionCode 75
+        versionName "1.18.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -31,6 +31,7 @@ android {
             renderscriptDebuggable false
             pseudoLocalesEnabled false
             zipAlignEnabled true
+            signingConfig signingConfigs.config
         }
         debug {
             minifyEnabled false
@@ -48,17 +49,17 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.google.firebase:firebase-core:11.8.0'
-    implementation 'com.google.firebase:firebase-crash:11.8.0'
-    implementation 'com.google.firebase:firebase-invites:11.8.0'
-    implementation 'com.google.firebase:firebase-appindexing:11.8.0'
-    implementation 'com.google.firebase:firebase-perf:11.8.0'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-crash:16.0.1'
+    implementation 'com.google.firebase:firebase-invites:16.0.1'
+    implementation 'com.google.firebase:firebase-appindexing:16.0.1'
+    implementation 'com.google.firebase:firebase-perf:16.0.0'
     implementation('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
         transitive = true
     }
     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'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
     implementation 'com.android.support:preference-v14:27.1.0'
     implementation 'com.android.support:preference-v7:27.1.0'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -24,3 +24,6 @@
 -keep class **.R$* {
     <fields>;
 }
+-keep public class com.github.mikephil.charting.animation.* {
+    public protected *;
+}
diff --git a/app/release/BitCoinPools-1.18.6.apk b/app/release/BitCoinPools-1.18.6.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":72,"versionName":"1.18.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":75,"versionName":"1.18.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,12 +6,12 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
-    <uses-permission android:name="android.permission.READ_LOGS" />
+    <!--<uses-permission android:name="android.permission.READ_LOGS" />-->
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
         android:name=".BitCoinApp"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -59,6 +59,6 @@
     <uses-permission
         android:name="android.permission.INTERNET"
         tools:ignore="ManifestOrder" />
-    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
+    <!--<uses-permission android:name="android.permission.CONTROL_KEYGUARD" />-->
 
 </manifest>
diff --git a/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java b/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java
@@ -118,16 +118,20 @@ public void run() {
                 data.setColors(ColorTemplate.MATERIAL_COLORS);
                 data.setValueTextSize(10f);
 
-                destinationChart.setData(new PieData(data));
-                destinationChart.setUsePercentValues(true);
-                destinationChart.setEntryLabelColor(ColorTemplate.rgb("#000000"));
-                Description description = new Description();
-                description.setText(getString(R.string.porcent));
-                destinationChart.setDescription(description);
-                destinationChart.getLegend().setEnabled(false);
-                destinationChart.setDragDecelerationFrictionCoef(0.95f);
-                destinationChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
-                destinationChart.invalidate();
+                try {
+                    destinationChart.setData(new PieData(data));
+                    destinationChart.setUsePercentValues(true);
+                    destinationChart.setEntryLabelColor(ColorTemplate.rgb("#000000"));
+                    Description description = new Description();
+                    description.setText(getString(R.string.porcent));
+                    destinationChart.setDescription(description);
+                    destinationChart.getLegend().setEnabled(false);
+                    destinationChart.setDragDecelerationFrictionCoef(0.95f);
+                    destinationChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
+                    destinationChart.invalidate();
+                } catch (Exception e) {
+                    Log.e("PieChart", "Error loading PieChart: " + e.getMessage());
+                }
             }
         }, 100);
     }

diff --git a/app/src/main/java/javinator9889/bitcoinpools/ViewPagerFixed.java b/app/src/main/java/javinator9889/bitcoinpools/ViewPagerFixed.java
@@ -0,0 +1,41 @@
+package javinator9889.bitcoinpools;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+
+/**
+ * Created by Javinator9889 on 07/08/2018.
+ * Based on: https://github.com/chrisbanes/PhotoView/issues/31
+ */
+public class ViewPagerFixed extends android.support.v4.view.ViewPager {
+    public ViewPagerFixed(Context context) {
+        super(context);
+    }
+
+    public ViewPagerFixed(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            return super.onTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            Log.e("ViewPagerFX", "Error handling \"onTouchEvent\". Full trace: "
+                    + ex.getMessage());
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        try {
+            return super.onInterceptTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -41,9 +41,9 @@
         </android.support.design.widget.TabLayout>
     </android.support.design.widget.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <javinator9889.bitcoinpools.ViewPagerFixed
         android:id="@+id/viewContainer"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -74,6 +74,8 @@
     <string name="github"><![CDATA[Accede al proyecto de GitHub justo aquí: <a href="https://github.com/Javinator9889/BitCoinPools">GitHub</a>]]></string>
     <string name="changelog">
         <![CDATA[
+        <h1>Versión 1.18.6 (07/08/18)</h1><i>
+        - Mantenimiento y corrección de errores<br /></i>
         <h1>Versión 1.18.5 (04/07/18)</h1><i>
         - Mantenimiento y corrección de errores<br />
         - Tamaño de la aplicación reducido<br /></i>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -97,6 +97,8 @@ SOFTWARE.<br />
     <string name="github"><![CDATA[Access to the GitHub project right here: <a href="https://github.com/Javinator9889/BitCoinPools">GitHub</a>]]></string>
     <string name="changelog">
         <![CDATA[
+        <h1>Version 1.18.6 (07/08/18)</h1><i>
+        - Maintenance and bugs solved<br /></i>
         <h1>Version 1.18.5 (04/07/18)</h1><i>
         - Maintenance and bugs solved<br />
         - Reduced app size<br /></i>

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'io.fabric.tools:gradle:1.24.4'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'