Merge pull request navasmdc#139 from filipc/switchMemoryLeakFix

Switch memory leak fix
ruhui · Apr 4, 2015 · 9e94e99 · 9e94e99
2 parents 3feb01c + 8b76586
commit 9e94e99
Showing 1 changed file with 43 additions and 39 deletions.
diff --git a/MaterialDesign/src/com/gc/materialdesign/views/Switch.java b/MaterialDesign/src/com/gc/materialdesign/views/Switch.java
@@ -1,10 +1,5 @@
 package com.gc.materialdesign.views;
 
-import com.gc.materialdesign.R;
-import com.gc.materialdesign.utils.Utils;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -19,47 +14,53 @@
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.gc.materialdesign.R;
+import com.gc.materialdesign.utils.Utils;
+import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.view.ViewHelper;
+
 public class Switch extends CustomView {
 
-	int backgroundColor = Color.parseColor("#4CAF50");
+    private int backgroundColor = Color.parseColor("#4CAF50");
 
-	Ball ball;
+    private Ball ball;
 
-	boolean check = false;
-	boolean eventCheck = false;
-	boolean press = false;
+    private boolean check      = false;
+    private boolean eventCheck = false;
+    private boolean press      = false;
 
-	OnCheckListener onCheckListener;
+    private OnCheckListener onCheckListener;
+    private Bitmap bitmap;
 
-	public Switch(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		setAttributes(attrs);
-		setOnClickListener(new OnClickListener() {
+    public Switch(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setAttributes(attrs);
+        setOnClickListener(new OnClickListener() {
 
-			@Override
-			public void onClick(View arg0) {
-				if (check)
-					setChecked(false);
-				else
-					setChecked(true);
-			}
-		});
-	}
+            @Override
+            public void onClick(View arg0) {
+                if (check)
+                    setChecked(false);
+                else
+                    setChecked(true);
+            }
+        });
+    }
 
-	// Set atributtes of XML to View
-	protected void setAttributes(AttributeSet attrs) {
+    // Set atributtes of XML to View
+    protected void setAttributes(AttributeSet attrs) {
 
-		setBackgroundResource(R.drawable.background_transparent);
+        setBackgroundResource(R.drawable.background_transparent);
 
-		// Set size of view
-		setMinimumHeight(Utils.dpToPx(48, getResources()));
-		setMinimumWidth(Utils.dpToPx(80, getResources()));
+        // Set size of view
+        setMinimumHeight(Utils.dpToPx(48, getResources()));
+        setMinimumWidth(Utils.dpToPx(80, getResources()));
 
-		// Set background Color
-		// Color by resource
-		int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML,
-				"background", -1);
-		if (bacgroundColor != -1) {
+        // Set background Color
+        // Color by resource
+        int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML,
+                "background", -1);
+        if (bacgroundColor != -1) {
 			setBackgroundColor(getResources().getColor(bacgroundColor));
 		} else {
 			// Color by hexadecimal
@@ -121,12 +122,15 @@ public boolean onTouchEvent(MotionEvent event) {
 	@Override
 	protected void onDraw(Canvas canvas) {
 		super.onDraw(canvas);
-		if (!placedBall)
-			placeBall();
+		if (!placedBall) {
+            placeBall();
+        }
 
 		// Crop line to transparent effect
-		Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(),
-				canvas.getHeight(), Bitmap.Config.ARGB_8888);
+        if(null == bitmap) {
+            bitmap = Bitmap.createBitmap(canvas.getWidth(),
+                    canvas.getHeight(), Bitmap.Config.ARGB_8888);
+        }
 		Canvas temp = new Canvas(bitmap);
 		Paint paint = new Paint();
 		paint.setAntiAlias(true);