Prevent crash when OutOfMemoryError is thrown while creating bitmaps #4

davidmigloz · Aug 9, 2019 · 7a9e3b2 · 7a9e3b2
1 parent 634ead3
commit 7a9e3b2
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## `1.4.1` (10/08/19)
+
+- Prevent crash when OutOfMemoryError is thrown while creating bitmaps #4
+
 ## `1.4.0` (17/12/18)
 
 - Fix NPE when replacing state before view being measured #3

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,7 +5,7 @@ ext {
     //----------------------------------------------------------------------------------------------
 
     // Android Plugin for Gradle : https://developer.android.com/studio/releases/gradle-plugin.html#updating-plugin
-    androidGradle = '3.4.0-alpha08'
+    androidGradle = '3.5.0-rc02'
 
     gradleDependencies = [
             androidGradle: "com.android.tools.build:gradle:${androidGradle}",
@@ -16,13 +16,13 @@ ext {
     //----------------------------------------------------------------------------------------------
 
     // AndroidX Core : https://developer.android.com/jetpack/androidx/androidx-rn
-    androidXCore = "1.0.0"
+    androidXCore = "1.0.2"
     // Android Annotations : https://developer.android.com/topic/libraries/support-library/packages#annotations
-    annotations = "1.0.0"
+    annotations = "1.1.0"
     // Constraint Layout : https://developer.android.com/training/constraint-layout/index.html
     constraintLayout = '1.1.3'
     // AppCompat : https://developer.android.com/topic/libraries/support-library/packages#v7-appcompat
-    appcompat = '1.0.0'
+    appcompat = '1.0.2'
 
 
     appDependencies = [
@@ -50,7 +50,7 @@ ext {
     // JUnit (unit testing framework) : http://junit.org/junit4/
     junit = '4.12'
     // Mockito (mocking framework) : http://site.mockito.org/
-    mockito = '2.23.0'
+    mockito = '2.27.0'
 
     testDependencies = [
             junit  : "junit:junit:${junit}",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-milestone-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 ext.versionMajor = 1 // API Changes, adding big new feature, redesign the App
-ext.versionMinor = 2 // New features in a backwards-compatible manner
+ext.versionMinor = 4 // New features in a backwards-compatible manner
 ext.versionPatch = 1 // Backwards-compatible bug fixes
 ext.versionClassifier = null // Pre-releases (alpha, beta, rc, SNAPSHOT...)
 

diff --git a/lib/src/main/java/com/davidmiguel/multistateswitch/MultiStateSwitch.java b/lib/src/main/java/com/davidmiguel/multistateswitch/MultiStateSwitch.java
@@ -320,11 +320,14 @@ private void populateView() {
         if (getNumberStates() == 0 || !hasDrawingArea()) {
             return;
         }
-        calculateDrawingSizes();
-        populateStates();
-        calculateBounds();
-        determineCenterPositions(false);
-        initialized = true;
+        try {
+            calculateDrawingSizes();
+            populateStates();
+            calculateBounds();
+            determineCenterPositions(false);
+            initialized = true;
+        } catch (Exception e) { // Ignored
+        }
     }
 
     /**

diff --git a/lib/src/main/java/com/davidmiguel/multistateswitch/StateListener.java b/lib/src/main/java/com/davidmiguel/multistateswitch/StateListener.java
@@ -15,5 +15,4 @@ public interface StateListener {
      * @param state      state instance.
      */
     void onStateSelected(int stateIndex, @NonNull State state);
-
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.davidmiguel.multistateswitch">
+    package="com.davidmiguel.multistateswitch.sample">
 
     <application
         android:allowBackup="true"
@@ -9,13 +9,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".sample.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
diff --git a/sample/src/main/java/com/davidmiguel/multistateswitch/sample/MainActivity.java b/sample/src/main/java/com/davidmiguel/multistateswitch/sample/MainActivity.java
@@ -8,11 +8,10 @@
 import android.graphics.Color;
 import android.os.Bundle;
 
-import com.davidmiguel.multistateswitch.R;
 import com.davidmiguel.multistateswitch.State;
 import com.davidmiguel.multistateswitch.StateListener;
 import com.davidmiguel.multistateswitch.StateStyle;
-import com.davidmiguel.multistateswitch.databinding.ActivityMainBinding;
+import com.davidmiguel.multistateswitch.sample.databinding.ActivityMainBinding;
 
 import java.util.Arrays;