Skip to content

Commit

Permalink
field and method name refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@dongjunkun
dongjunkun committed Sep 20, 2016
1 parent 5a136e8 commit a77005a
Show file tree
Hide file tree
Showing 16 changed files with 307 additions and 307 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 28 additions & 28 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ dependencies {
|cv_semicircle_color|color|半圆的颜色，一般需要和背景色一致|
|cv_semicircle_gap|dimension|半圆之前的间隔|
|cv_semicircle_radius|dimension|半圆的半径|
|cv_is_top_semicircle|boolean|是否绘制顶部半圆锯齿|
|cv_is_bottom_semicircle|boolean|是否绘制底部半圆锯齿|
|cv_is_left_semicircle|boolean|是否绘制左侧半圆锯齿|
|cv_is_right_semicircle|boolean|是否绘制右侧半圆锯齿|
|cv_is_top_dash_line|boolean|是否绘制顶部虚线|
|cv_is_bottom_dash_line|boolean|是否绘制底部虚线|
|cv_is_left_dash_line|boolean|是否绘制左侧虚线|
|cv_is_right_dash_line|boolean|是否绘制右侧虚线|
|cv_top_dash_line_margin|dimension|顶部虚线距离View顶部的距离|
|cv_bottom_dash_line_margin|dimension|底部虚线距离View底部的距离|
|cv_left_dash_line_margin|dimension|左侧虚线距离View左侧的距离|
|cv_right_dash_line_margin|dimension|右侧虚线距离View右侧的距离|
|cv_is_semicircle_top|boolean|是否绘制顶部半圆锯齿|
|cv_is_semicircle_bottom|boolean|是否绘制底部半圆锯齿|
|cv_is_semicircle_left|boolean|是否绘制左侧半圆锯齿|
|cv_is_semicircle_right|boolean|是否绘制右侧半圆锯齿|
|cv_is_dash_line_top|boolean|是否绘制顶部虚线|
|cv_is_dash_line_bottom|boolean|是否绘制底部虚线|
|cv_is_dash_line_left|boolean|是否绘制左侧虚线|
|cv_is_dash_line_right|boolean|是否绘制右侧虚线|
|cv_dash_line_margin_top|dimension|顶部虚线距离View顶部的距离|
|cv_dash_line_margin_bottom|dimension|底部虚线距离View底部的距离|
|cv_dash_line_margin_left|dimension|左侧虚线距离View左侧的距离|
|cv_dash_line_margin_right|dimension|右侧虚线距离View右侧的距离|

使用
~~~
Expand All @@ -62,14 +62,14 @@ dependencies {
app:cv_dash_line_gap="5dp"
app:cv_dash_line_height="2dp"
app:cv_dash_line_length="10dp"
app:cv_is_bottom_dash_line="true"
app:cv_is_bottom_semicircle="false"
app:cv_is_left_dash_line="true"
app:cv_is_left_semicircle="false"
app:cv_is_right_dash_line="true"
app:cv_is_right_semicircle="false"
app:cv_is_top_dash_line="true"
app:cv_is_top_semicircle="false"
app:cv_is_dash_line_bottom="true"
app:cv_is_semicircle_bottom="false"
app:cv_is_dash_line_left="true"
app:cv_is_semicircle_left="false"
app:cv_is_dash_line_right="true"
app:cv_is_semicircle_right="false"
app:cv_is_dash_line_top="true"
app:cv_is_semicircle_top="false"
app:cv_semicircle_color="@android:color/white"
app:cv_semicircle_gap="8dp"
app:cv_semicircle_radius="4dp">
Expand Down Expand Up @@ -143,14 +143,14 @@ public class CustomView extends YourView{
app:cv_dash_line_gap="5dp"
app:cv_dash_line_height="2dp"
app:cv_dash_line_length="10dp"
app:cv_is_bottom_dash_line="false"
app:cv_is_bottom_semicircle="true"
app:cv_is_left_dash_line="true"
app:cv_is_left_semicircle="false"
app:cv_is_right_dash_line="true"
app:cv_is_right_semicircle="false"
app:cv_is_top_dash_line="false"
app:cv_is_top_semicircle="true"
app:cv_is_dash_line_bottom="false"
app:cv_is_semicircle_bottom="true"
app:cv_is_dash_line_left="true"
app:cv_is_semicircle_left="false"
app:cv_is_dash_line_right="true"
app:cv_is_semicircle_right="false"
app:cv_is_dash_line_top="false"
app:cv_is_semicircle_top="true"
app:cv_semicircle_color="@android:color/white"
app:cv_semicircle_gap="8dp"
app:cv_semicircle_radius="6dp"/>
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/yyydjk/com/couponview/ExampleInstrumentedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;

/**
* Instrumentation test, which will execute on an Android device.
Expand Down
33 changes: 16 additions & 17 deletions app/src/main/java/yyydjk/com/couponview/fragments/CouponCustomFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,50 +56,50 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
mSemicircleTop.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setTopSemicircle(isChecked);
mCouponView.setSemicircleTop(isChecked);
}
});
mSemicircleBottom.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setBottomSemicircle(isChecked);
mCouponView.setSemicircleBottom(isChecked);
}
});
mSemicircleLeft.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setLeftSemicircle(isChecked);
mCouponView.setSemicircleLeft(isChecked);
}
});
mSemicircleRight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setRightSemicircle(isChecked);
mCouponView.setSemicircleRight(isChecked);
}
});

mDashLineTop.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setTopDashLine(isChecked);
mCouponView.setDashLineTop(isChecked);
}
});
mDashLineBottom.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setBottomDashLine(isChecked);
mCouponView.setDashLineBottom(isChecked);
}
});
mDashLineLeft.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setLeftDashLine(isChecked);
mCouponView.setDashLineLeft(isChecked);
}
});
mDashLineRight.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mCouponView.setRightDashLine(isChecked);
mCouponView.setDashLineRight(isChecked);
}
});
mSbSemicircleRadius.setProgress((int) mCouponView.getSemicircleRadius());
Expand Down Expand Up @@ -191,11 +191,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

mSbTopDashLineMargin.setProgress((int) mCouponView.getTopDashLineMargin());
mSbTopDashLineMargin.setProgress((int) mCouponView.getDashLineMarginTop());
mSbTopDashLineMargin.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mCouponView.setTopDashLineMargin(dp2Px(progress));
mCouponView.setDashLineMarginTop(dp2Px(progress));
}

@Override
Expand All @@ -210,12 +210,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
});



mSbBottomDashLineMargin.setProgress((int) mCouponView.getBottomDashLineMargin());
mSbBottomDashLineMargin.setProgress((int) mCouponView.getDashLineMarginBottom());
mSbBottomDashLineMargin.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mCouponView.setBottomDashLineMargin(dp2Px(progress));
mCouponView.setDashLineMarginBottom(dp2Px(progress));
}

@Override
Expand All @@ -229,11 +228,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

mSbLeftDashLineMargin.setProgress((int) mCouponView.getLeftDashLineMargin());
mSbLeftDashLineMargin.setProgress((int) mCouponView.getDashLineMarginLeft());
mSbLeftDashLineMargin.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mCouponView.setLeftDashLineMargin(dp2Px(progress));
mCouponView.setDashLineMarginLeft(dp2Px(progress));
}

@Override
Expand All @@ -247,11 +246,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

mSbRightDashLineMargin.setProgress((int) mCouponView.getRightDashLineMargin());
mSbRightDashLineMargin.setProgress((int) mCouponView.getDashLineMarginRight());
mSbRightDashLineMargin.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mCouponView.setRightDashLineMargin(dp2Px(progress));
mCouponView.setDashLineMarginRight(dp2Px(progress));
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/yyydjk/com/couponview/fragments/CouponDashLineFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class CouponDashLineFragment extends Fragment {

private CommonAdapter<Integer> commonAdapter;
private List<Integer> list = new ArrayList<>();

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
Expand Down Expand Up @@ -63,7 +64,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, Recycle
outRect.set(dp2Px(6), dp2Px(6), dp2Px(6), 0);
}
});
mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(),2));
mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
mRecyclerView.setAdapter(commonAdapter);
}

Expand Down
96 changes: 48 additions & 48 deletions app/src/main/java/yyydjk/com/couponview/widget/CouponImageView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,99 +95,99 @@ public void setDashLineColor(int dashLineColor) {
helper.setDashLineColor(dashLineColor);
}

public boolean isTopSemicircle() {
return helper.isTopSemicircle();
public boolean isSemicircleTop() {
return helper.isSemicircleTop();
}

public void setTopSemicircle(boolean topSemicircle) {
helper.setTopSemicircle(topSemicircle);
public void setSemicircleTop(boolean semicircleTop) {
helper.setSemicircleTop(semicircleTop);
}

public boolean isBottomSemicircle() {
return helper.isBottomSemicircle();
public boolean isSemicircleBottom() {
return helper.isSemicircleBottom();
}

public void setBottomSemicircle(boolean bottomSemicircle) {
helper.setBottomSemicircle(bottomSemicircle);
public void setSemicircleBottom(boolean semicircleBottom) {
helper.setSemicircleBottom(semicircleBottom);
}

public boolean isLeftSemicircle() {
return helper.isLeftSemicircle();
public boolean isSemicircleLeft() {
return helper.isSemicircleLeft();
}

public void setLeftSemicircle(boolean leftSemicircle) {
helper.setLeftSemicircle(leftSemicircle);
public void setSemicircleLeft(boolean semicircleLeft) {
helper.setSemicircleLeft(semicircleLeft);
}

public boolean isRightSemicircle() {
return helper.isRightSemicircle();
public boolean isSemicircleRight() {
return helper.isSemicircleRight();
}

public void setRightSemicircle(boolean rightSemicircle) {
helper.setRightSemicircle(rightSemicircle);
public void setSemicircleRight(boolean semicircleRight) {
helper.setSemicircleRight(semicircleRight);
}

public boolean isTopDashLine() {
return helper.isTopDashLine();
public boolean isDashLineTop() {
return helper.isDashLineTop();
}

public void setTopDashLine(boolean topDashLine) {
helper.setTopDashLine(topDashLine);
public void setDashLineTop(boolean dashLineTop) {
helper.setDashLineTop(dashLineTop);
}

public boolean isBottomDashLine() {
return helper.isBottomDashLine();
public boolean DashLineBottom() {
return helper.isDashLineBottom();
}

public void setBottomDashLine(boolean bottomDashLine) {
helper.setBottomDashLine(bottomDashLine);
public void setDashLineBottom(boolean dashLineBottom) {
helper.setDashLineBottom(dashLineBottom);
}

public boolean isLeftDashLine() {
return helper.isLeftDashLine();
public boolean isDashLineLeft() {
return helper.isDashLineLeft();
}

public void setLeftDashLine(boolean leftDashLine) {
helper.setLeftDashLine(leftDashLine);
public void setDashLineLeft(boolean dashLineLeft) {
helper.setDashLineLeft(dashLineLeft);
}

public boolean isRightDashLine() {
return helper.isRightDashLine();
public boolean isDashLineRight() {
return helper.isDashLineRight();
}

public void setRightDashLine(boolean rightDashLine) {
helper.setRightDashLine(rightDashLine);
public void setDashLineRight(boolean dashLineRight) {
helper.setDashLineRight(dashLineRight);
}

public float getTopDashLineMargin() {
return helper.getTopDashLineMargin();
public float getDashLineMarginTop() {
return helper.getDashLineMarginTop();
}

public void setTopDashLineMargin(float topDashLineMargin) {
helper.setTopDashLineMargin(topDashLineMargin);
public void setDashLineMarginTop(float dashLineMarginTop) {
helper.setDashLineMarginTop(dashLineMarginTop);
}

public float getBottomDashLineMargin() {
return helper.getBottomDashLineMargin();
public float getDashLineMarginBottom() {
return helper.getDashLineMarginBottom();
}

public void setBottomDashLineMargin(float bottomDashLineMargin) {
helper.setBottomDashLineMargin(bottomDashLineMargin);
public void setDashLineMarginBottom(float dashLineMarginBottom) {
helper.setDashLineMarginBottom(dashLineMarginBottom);
}

public float getLeftDashLineMargin() {
return helper.getLeftDashLineMargin();
public float getDashLineMarginLeft() {
return helper.getDashLineMarginLeft();
}

public void setLeftDashLineMargin(float leftDashLineMargin) {
helper.setLeftDashLineMargin(leftDashLineMargin);
public void setDashLineMarginLeft(float dashLineMarginLeft) {
helper.setDashLineMarginLeft(dashLineMarginLeft);
}

public float getRightDashLineMargin() {
return helper.getRightDashLineMargin();
public float getDashLineMarginRight() {
return helper.getDashLineMarginRight();
}

public void setRightDashLineMargin(float rightDashLineMargin) {
helper.setRightDashLineMargin(rightDashLineMargin);
public void setDashLineMarginRight(float dashLineMarginRight) {
helper.setDashLineMarginRight(dashLineMarginRight);
}
}
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
android:layout_height="wrap_content"/>

<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

</LinearLayout>
Loading

0 comments on commit a77005a

Please sign in to comment.