diff --git a/app/build.gradle b/app/build.gradle index f17436f..c45d45a 100644 --- 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 index 53fa10a..3371fa7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -24,3 +24,6 @@ -keep class **.R$* { ; } +-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 new file mode 100644 index 0000000..4213e40 Binary files /dev/null and b/app/release/BitCoinPools-1.18.6.apk differ diff --git a/app/release/output.json b/app/release/output.json index 9fa3fe0..23c409c 100644 --- 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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 672a1be..22cb148 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,12 +6,12 @@ - + - + \ No newline at end of file diff --git a/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java b/app/src/main/java/javinator9889/bitcoinpools/FragmentViews/Tab1PoolsChart.java index 953be4e..aadeb30 100644 --- 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 new file mode 100644 index 0000000..b26a1d6 --- /dev/null +++ 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 index 22708ed..3d5fce4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -41,9 +41,9 @@ - GitHub]]> Versión 1.18.6 (07/08/18) + - Mantenimiento y corrección de errores

Versión 1.18.5 (04/07/18)

- Mantenimiento y corrección de errores
- Tamaño de la aplicación reducido
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 60d74ab..e4a10db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,6 +97,8 @@ SOFTWARE.
GitHub]]> Version 1.18.6 (07/08/18) + - Maintenance and bugs solved

Version 1.18.5 (04/07/18)

- Maintenance and bugs solved
- Reduced app size
diff --git a/build.gradle b/build.gradle index 75b16ed..5dd7796 100644 --- 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'