Having issues with laying out the 'window' in the CustomAboveView

Author: jfeinstein10

library/src/com/slidingmenu/lib/CustomViewAbove.java

@@ -36,7 +36,7 @@
 import android.widget.Scroller;
 
 public class CustomViewAbove extends ViewGroup {
-	private static final String TAG = "CustomViewPager";
+	private static final String TAG = "CustomViewAbove";
 	private static final boolean DEBUG = false;
 
 	private static final boolean USE_CACHE = false;
@@ -124,7 +124,7 @@ public float getInterpolation(float t) {
 
 		private boolean mLastTouchAllowed = false;
 		private int mSlidingMenuThreshold = 30;
-		private CustomViewBehind2 mCustomViewBehind2;
+		private CustomViewBehind mCustomViewBehind;
 		private boolean mEnabled = true;
 
 		private OnPageChangeListener mOnPageChangeListener;
@@ -222,16 +222,19 @@ interface OnAdapterChangeListener {
 		interface Decor {}
 
 		public CustomViewAbove(Context context) {
-			super(context);
-			initCustomViewAbove();
+			this(context, null);
 		}
 
 		public CustomViewAbove(Context context, AttributeSet attrs) {
+			this(context, attrs, true);
+		}
+
+		public CustomViewAbove(Context context, AttributeSet attrs, boolean isAbove) {
 			super(context, attrs);
-			initCustomViewAbove();
+			initCustomViewAbove(isAbove);
 		}
 
-		void initCustomViewAbove() {
+		void initCustomViewAbove(boolean isAbove) {
 			setWillNotDraw(false);
 			setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
 			setFocusable(true);
@@ -242,9 +245,11 @@ void initCustomViewAbove() {
 			mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
 			mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
 
-			View v = new View(getContext());
-			v.setBackgroundColor(android.R.color.transparent);
-			setMenu(v);
+			if (isAbove) {
+				View v = new View(getContext());
+				v.setBackgroundColor(android.R.color.transparent);
+				setMenu(v);
+			}
 
 			final float density = context.getResources().getDisplayMetrics().density;
 			mFlingDistance = (int) (MIN_DISTANCE_FOR_FLING * density);
@@ -504,10 +509,10 @@ public int getChildWidth(int i) {
 		}
 
 		public int getBehindWidth() {
-			if (mCustomViewBehind2 == null) {
+			if (mCustomViewBehind == null) {
 				return 0;
 			} else {
-				return mCustomViewBehind2.getWidth();
+				return mCustomViewBehind.getWidth();
 			}
 		}
 
@@ -766,7 +771,7 @@ protected void setMenu(View v) {
 			if (mWindow != null) {
 				removeView((View)mWindow.object);
 			}
-			addView(v);
+			addView(v, 0);
 			mWindow = ii;
 		}
 
@@ -777,12 +782,12 @@ public void setContent(View v) {
 			if (mContent != null) {
 				removeView((View)mContent.object);
 			}
-			addView(v);
+			addView(v, 1);
 			mContent = ii;
 		}
 
-		public void setCustomViewBehind2(CustomViewBehind2 cvb) {
-			mCustomViewBehind2 = cvb;
+		public void setCustomViewBehind(CustomViewBehind cvb) {
+			mCustomViewBehind = cvb;
 		}
 
 		public void addView(View child, int index, ViewGroup.LayoutParams params) {
@@ -966,6 +971,8 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 					int childTop = 0;
 					childLeft = getChildLeft(i);
 					int childWidth = getChildWidth(i);
+					Log.v(TAG, "Child#" + i + " left:" + childLeft +
+							" right:" + (childLeft + child.getMeasuredWidth()));
 					child.layout(childLeft, childTop,
 							childLeft + childWidth,
 							childTop + child.getMeasuredHeight());
@@ -1442,8 +1449,8 @@ public void setScrollScale(float f) {
 		@Override
 		public void scrollTo(int x, int y) {
 			super.scrollTo(x, y);
-			if (mCustomViewBehind2 != null && mEnabled) {
-				mCustomViewBehind2.scrollTo((int)(x*mScrollScale), y);
+			if (mCustomViewBehind != null && mEnabled) {
+				mCustomViewBehind.scrollTo((int)(x*mScrollScale), y);
 			}
 		}
 

library/src/com/slidingmenu/lib/CustomViewBehind.java

@@ -31,7 +31,7 @@
 import android.widget.Scroller;
 
 public class CustomViewBehind extends ViewGroup {
-	private static final String TAG = "CustomViewPager";
+	private static final String TAG = "CustomViewBehind";
 	private static final boolean DEBUG = false;
 
 	private static final boolean USE_CACHE = false;
@@ -763,6 +763,9 @@ public void setContent(View v) {
 			ItemInfo ii = new ItemInfo();
 			ii.position = 0;
 			ii.object = mAdapter.instantiateItem(this, 0);
+			if (mContent != null) {
+				removeView((View)mContent.object);
+			}
 			mContent = ii;
 
 			mAdapter.notifyDataSetChanged();
@@ -946,24 +949,26 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 					ItemInfo ii;
 					int childLeft = 0;
 					int childTop = 0;
-					if (lp.isDecor) {
-						decorCount++;
-						childLeft = getChildLeft(i);
-						int childWidth = child.getMeasuredWidth();
-						child.layout(childLeft, childTop,
-								childLeft + child.getMeasuredWidth(),
-								childTop + child.getMeasuredHeight());
-					} else if ((ii = infoForChild(child)) != null) {
+//					if (lp.isDecor) {
+//						decorCount++;
+//						childLeft = getChildLeft(i);
+//						int childWidth = child.getMeasuredWidth();
+//						child.layout(childLeft, childTop,
+//								childLeft + child.getMeasuredWidth(),
+//								childTop + child.getMeasuredHeight());
+//					} else if ((ii = infoForChild(child)) != null) {
 						childTop = paddingTop;
 						if (DEBUG) Log.v(TAG, "Positioning #" + i + " " + child + " f=" + ii.object
 								+ ":" + childLeft + "," + childTop + " " + child.getMeasuredWidth()
 								+ "x" + child.getMeasuredHeight());
 						// TODO PADDING!
 						childLeft = getChildLeft(i);
+						Log.v(TAG, "Child#" + i + " left:" + childLeft +
+								" right:" + (childLeft + child.getMeasuredWidth()));
 						child.layout(childLeft, childTop,
 								childLeft + child.getMeasuredWidth(),
 								childTop + child.getMeasuredHeight());
-					}
+//					}
 				}
 			}
 			mTopPageBounds = paddingTop;

library/src/com/slidingmenu/lib/CustomViewBehind2.java

@@ -11,11 +11,11 @@ public class CustomViewBehind2 extends CustomViewAbove {
 	private static final String TAG = "CustomViewBehind2";
 
 	public CustomViewBehind2(Context context) {
-		super(context);
+		this(context, null);
 	}
 
 	public CustomViewBehind2(Context context, AttributeSet attrs) {
-		super(context, attrs);
+		super(context, attrs, false);
 	}
 
 	public int getDestScrollX() {

library/src/com/slidingmenu/lib/SlidingMenu.java

@@ -13,7 +13,7 @@ public class SlidingMenu extends RelativeLayout {
 	public static final int TOUCHMODE_MARGIN = 1;
 
 	private CustomViewAbove mViewAbove;
-	private CustomViewBehind2 mViewBehind;
+	private CustomViewBehind mViewBehind;
 
 	public SlidingMenu(Context context) {
 		this(context, null);
@@ -27,13 +27,13 @@ public SlidingMenu(Context context, AttributeSet attrs, int defStyle) {
 		super(context, attrs, defStyle);
 
 		LayoutParams behindParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-		mViewBehind = new CustomViewBehind2(context);
+		mViewBehind = new CustomViewBehind(context);
 		addView(mViewBehind, behindParams);
 		LayoutParams aboveParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
 		mViewAbove = new CustomViewAbove(context);
 		addView(mViewAbove, aboveParams);
-		// register the CustomViewBehind2 with the CustomViewAbove
-		mViewAbove.setCustomViewBehind2(mViewBehind);
+		// register the CustomViewBehind with the CustomViewAbove
+		mViewAbove.setCustomViewBehind(mViewBehind);
 
 		// now style everything!
 		TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.SlidingMenu);
@@ -91,13 +91,13 @@ public boolean isSlidingEnabled() {
 	public void setStatic(boolean b) {
 		if (b) {
 			setSlidingEnabled(false);
-			mViewAbove.setCustomViewBehind2(null);
+			mViewAbove.setCustomViewBehind(null);
 			mViewAbove.setCurrentItem(1);
 			mViewBehind.setCurrentItem(0);	
 		} else {
 			mViewAbove.setCurrentItem(1);
 			mViewBehind.setCurrentItem(1);
-			mViewAbove.setCustomViewBehind2(mViewBehind);
+			mViewAbove.setCustomViewBehind(mViewBehind);
 			setSlidingEnabled(true);
 		}
 	}