TouchInstinct
/
AndroidSwipeLayout
300
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SwipeLayout: Allow match_parent and wrap_content 

This patch makes SwipeLayout extend FrameLayout, which has a complete
measuring function and allows useage of match_parent and wrap_content.

Tested in app: https://github.com/PaperAirplane-Dev-Team/BlackLight
Works just all right.

Signed-off-by: Peter Cai <xqsx43cxy@126.com>
This commit is contained in:
Peter Cai 2014-08-26 13:28:55 +08:00
parent ccb48c6752
commit c7c8bac09a
1 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
library/src/main/java/com/daimajia/swipe/SwipeLayout.java
View File

@ -11,13 +11,14 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.widget.AdapterView;
import android.widget.FrameLayout;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SwipeLayout extends ViewGroup{
public class SwipeLayout extends FrameLayout {
private ViewDragHelper mDragHelper;
@ -588,57 +589,12 @@ public class SwipeLayout extends ViewGroup{
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int widthMode = MeasureSpec.getMode(widthMeasureSpec);
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
int widthSize = MeasureSpec.getSize(widthMeasureSpec);
int heightSize = MeasureSpec.getSize(heightMeasureSpec);
int width, height;
if(heightMode == MeasureSpec.UNSPECIFIED)
heightSize = Integer.MAX_VALUE;
if(widthMode == MeasureSpec.UNSPECIFIED)
widthSize = Integer.MAX_VALUE;
measure(getSurfaceView(), widthSize, heightSize);
measure(getBottomView(), widthSize, heightSize);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right)
mDragDistance = getBottomView().getMeasuredWidth();
else
mDragDistance = getBottomView().getMeasuredHeight();
width = Math.max(getSurfaceView().getMeasuredWidth(), getBottomView().getMeasuredWidth());
height = Math.max(getBottomView().getMeasuredHeight(), getBottomView().getMeasuredHeight());
setMeasuredDimension(width, height);
}
private void measure(View child, int maxWidth, int maxHeight){
LayoutParams lp = child.getLayoutParams();
int childWidthSpec, childHeightSpec;
if(lp.width == LayoutParams.WRAP_CONTENT){
childWidthSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST);
}else if(lp.width == LayoutParams.MATCH_PARENT){
childWidthSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.EXACTLY);
}else{
childWidthSpec = MeasureSpec.makeMeasureSpec(Math.min(maxWidth, lp.width), MeasureSpec.EXACTLY);
}
if(lp.height == LayoutParams.WRAP_CONTENT){
childHeightSpec = MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST);
}else if(lp.height == LayoutParams.MATCH_PARENT) {
if(maxHeight == Integer.MAX_VALUE){
maxHeight = dp2px(80);
}
childHeightSpec = MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.EXACTLY);
}else{
childHeightSpec = MeasureSpec.makeMeasureSpec(Math.min(maxHeight, lp.height), MeasureSpec.EXACTLY);
}
child.measure(childWidthSpec, childHeightSpec);
}
@Override
@ -1058,4 +1014,4 @@ public class SwipeLayout extends ViewGroup{
private int dp2px(float dp){
return (int) (dp * getContext().getResources().getDisplayMetrics().density + 0.5f);
}
}
}