Move FrameLayout layout callback to separate file

Chris Banes · Chris Banes · commit dbaadb21a53f · 2012-12-21T09:50:49.000Z
diff --git a/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java b/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java
@@ -34,9 +34,9 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import com.handmark.pulltorefresh.library.internal.CallbackFrameLayout.OnSizeChangedListener;
 import com.handmark.pulltorefresh.library.internal.FlipLoadingLayout;
 import com.handmark.pulltorefresh.library.internal.LoadingLayout;
-import com.handmark.pulltorefresh.library.internal.LoadingLayout.OnSizeChangedListener;
 import com.handmark.pulltorefresh.library.internal.RotateLoadingLayout;
 import com.handmark.pulltorefresh.library.internal.Utils;
 import com.handmark.pulltorefresh.library.internal.ViewCompat;
@@ -910,20 +910,28 @@ protected final void refreshLoadingViewsSize() {
 	}
 
 	protected final void refreshRefreshableViewSize(int width, int height) {
+		if (DEBUG) {
+			Log.d(LOG_TAG, String.format("refreshRefreshableViewSize. W: %d, H: %d", width, height));
+		}
+		
 		// We need to set the Height of the Refreshable View to the same as
 		// this layout
 		LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mRefreshableViewWrapper.getLayoutParams();
 
 		switch (getPullToRefreshScrollDirection()) {
 			case HORIZONTAL:
-				lp.width = width;
+				if (lp.weight != width) {
+					lp.width = width;
+					mRefreshableViewWrapper.requestLayout();
+				}
 				break;
 			case VERTICAL:
-			default:
-				lp.height = height;
+				if (lp.height != height) {
+					lp.height = height;
+					mRefreshableViewWrapper.requestLayout();
+				}
 				break;
 		}
-		mRefreshableViewWrapper.requestLayout();
 	}
 
 	/**
diff --git a/library/src/com/handmark/pulltorefresh/library/internal/CallbackFrameLayout.java b/library/src/com/handmark/pulltorefresh/library/internal/CallbackFrameLayout.java
@@ -0,0 +1,37 @@
+package com.handmark.pulltorefresh.library.internal;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+public class CallbackFrameLayout extends FrameLayout {
+
+	private OnSizeChangedListener mSizeChangedListener;
+
+	public CallbackFrameLayout(Context context) {
+		super(context);
+	}
+
+	public CallbackFrameLayout(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	@Override
+	public final void onSizeChanged(int w, int h, int oldw, int oldh) {
+		super.onSizeChanged(w, h, oldw, oldh);
+
+		if (null != mSizeChangedListener) {
+			mSizeChangedListener.onSizeChanged(this, w, h);
+		}
+	}
+
+	public void setOnSizeChangedListener(OnSizeChangedListener listener) {
+		mSizeChangedListener = listener;
+	}
+
+	public static interface OnSizeChangedListener {
+		void onSizeChanged(View view, int newWidth, int newHeight);
+	}
+
+}
diff --git a/library/src/com/handmark/pulltorefresh/library/internal/LoadingLayout.java b/library/src/com/handmark/pulltorefresh/library/internal/LoadingLayout.java
@@ -41,7 +41,7 @@
 import com.handmark.pulltorefresh.library.R;
 
 @SuppressLint("ViewConstructor")
-public abstract class LoadingLayout extends FrameLayout implements ILoadingLayout {
+public abstract class LoadingLayout extends CallbackFrameLayout implements ILoadingLayout {
 
 	static final String LOG_TAG = "PullToRefresh-LoadingLayout";
 
@@ -64,8 +64,6 @@ public abstract class LoadingLayout extends FrameLayout implements ILoadingLayou
 	private CharSequence mRefreshingLabel;
 	private CharSequence mReleaseLabel;
 
-	private OnSizeChangedListener mSizeChangedListener;
-
 	public LoadingLayout(Context context, final Mode mode, final Orientation scrollDirection, TypedArray attrs) {
 		super(context);
 		mMode = mode;
@@ -185,11 +183,13 @@ public LoadingLayout(Context context, final Mode mode, final Orientation scrollD
 	public final void setHeight(int height) {
 		ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) getLayoutParams();
 		lp.height = height;
+		requestLayout();
 	}
 
 	public final void setWidth(int width) {
 		ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) getLayoutParams();
 		lp.width = width;
+		requestLayout();
 	}
 
 	public final int getContentHeight() {
@@ -221,15 +221,6 @@ public final void onPull(float scaleOfLayout) {
 		}
 	}
 
-	@Override
-	public final void onSizeChanged(int w, int h, int oldw, int oldh) {
-		super.onSizeChanged(w, h, oldw, oldh);
-
-		if (null != mSizeChangedListener) {
-			mSizeChangedListener.onSizeChanged(this, w, h);
-		}
-	}
-
 	public final void pullToRefresh() {
 		if (null != mHeaderText) {
 			mHeaderText.setText(mPullLabel);
@@ -301,10 +292,6 @@ public final void setLoadingDrawable(Drawable imageDrawable) {
 		onLoadingDrawableSet(imageDrawable);
 	}
 
-	public void setOnSizeChangedListener(OnSizeChangedListener sizeChangedListener) {
-		mSizeChangedListener = sizeChangedListener;
-	}
-
 	public void setPullLabel(CharSequence pullLabel) {
 		mPullLabel = pullLabel;
 	}
@@ -396,8 +383,4 @@ private void setTextColor(ColorStateList color) {
 		}
 	}
 
-	public static interface OnSizeChangedListener {
-		void onSizeChanged(View view, int newWidth, int newHeight);
-	}
-
 }
