Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to use drawables as a divider #196

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ability to use drawables as a divider #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion library/src/main/java/com/shawnlin/numberpicker/NumberPicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,18 @@ public class NumberPicker extends LinearLayout {
public static final int LEFT = 2;

@Retention(SOURCE)
@IntDef({SIDE_LINES, UNDERLINE})
@IntDef({SIDE_LINES, UNDERLINE, DRAWABLE_AS_DIVIDER})
public @interface DividerType {
}

public static final int SIDE_LINES = 0;
public static final int UNDERLINE = 1;
public static final int DRAWABLE_AS_DIVIDER = 2;

/**
* The default drawable resource ID for drawable divider.
*/
public static final int DEFAULT_DRAWABLE_DIVIDER_RES = 0;

/**
* The default update interval during long press.
Expand Down Expand Up @@ -129,6 +135,11 @@ public class NumberPicker extends LinearLayout {
*/
private static final int DEFAULT_DIVIDER_COLOR = 0xFF000000;

/**
* The default alpha value for the drawable divider.
*/
private static final int DEFAULT_DIVIDER_DRAWABLE_ALPHA_VALUE = 100;

/**
* The default max value of this widget.
*/
Expand Down Expand Up @@ -305,6 +316,16 @@ public static Formatter getTwoDigitFormatter() {
*/
private int mTextColor = DEFAULT_TEXT_COLOR;

/**
* The drawable divider resource.
*/
private int mDividerResource = DEFAULT_DRAWABLE_DIVIDER_RES;

/**
* The alpha value for the drawable divider
*/
private int mDividerDrawableAlphaValue = DEFAULT_DIVIDER_DRAWABLE_ALPHA_VALUE;

/**
* The size of the text.
*/
Expand Down Expand Up @@ -1896,6 +1917,17 @@ private void drawHorizontalDividers(Canvas canvas) {
);
mDividerDrawable.draw(canvas);
break;
case DRAWABLE_AS_DIVIDER:
final int drawableLeft = (getWidth() - mDividerLength)/ 2;
final int drawableTop = (getHeight() - mDividerThickness)/2;
final int drawableRight = (getWidth() + mDividerLength)/ 2;
final int drawableBottom = (getHeight() + mDividerThickness)/2;

mDividerDrawable = getResources().getDrawable(mDividerResource);
mDividerDrawable.setBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
mDividerDrawable.setAlpha(mDividerDrawableAlphaValue);
mDividerDrawable.draw(canvas);
break;
}
}

Expand Down Expand Up @@ -1937,6 +1969,16 @@ private void drawVerticalDividers(Canvas canvas) {
);
mDividerDrawable.draw(canvas);
break;
case DRAWABLE_AS_DIVIDER:
final int drawableLeft = (getWidth() - mDividerLength) / 2;
final int drawableTop = (getHeight() - mDividerThickness) / 2;
final int drawableRight = (getWidth() + mDividerLength) / 2;
final int drawableBottom = (getHeight() + mDividerThickness) / 2;
mDividerDrawable = getResources().getDrawable(mDividerResource);
mDividerDrawable.setBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
mDividerDrawable.setAlpha(mDividerDrawableAlphaValue);
mDividerDrawable.draw(canvas);
break;
}
}

Expand Down Expand Up @@ -2679,6 +2721,11 @@ public void setDividerColor(@ColorInt int color) {
mDividerDrawable = new ColorDrawable(color);
}

public void setDividerDrawableResource(int drawableResourceId)
{
mDividerResource = drawableResourceId;
}

public void setDividerColorResource(@ColorRes int colorId) {
setDividerColor(ContextCompat.getColor(mContext, colorId));
}
Expand Down
1 change: 1 addition & 0 deletions library/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<attr name="np_dividerType" format="enum">
<enum name="side_lines" value="0" />
<enum name="underline" value="1" />
<enum name="drawable_as_divider" value="2" />
</attr>
<attr name="np_dividerColor" format="color" />
<attr name="np_dividerDistance" format="dimension" />
Expand Down
7 changes: 7 additions & 0 deletions sample/src/main/java/com/shawnlin/numberpicker/sample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(toolbar);

final NumberPicker numberPicker = findViewById(R.id.number_picker);
final NumberPicker numberPickerDrawableDividerVertical = findViewById(R.id.number_picker_drawable_divider_vertical);
final NumberPicker numberPickerDrawableDividerHorizontal = findViewById(R.id.number_picker_drawable_divider_horizontal);


// Set divider color
numberPicker.setDividerColor(ContextCompat.getColor(this, R.color.colorPrimary));
Expand Down Expand Up @@ -112,6 +115,10 @@ public void onScrollStateChange(NumberPicker picker, int scrollState) {
}
}
});

// Set drawable as divider
numberPickerDrawableDividerVertical.setDividerDrawableResource(R.drawable.blue_rectangle);
numberPickerDrawableDividerHorizontal.setDividerDrawableResource(R.drawable.accent_rectangle);
}

}
5 changes: 5 additions & 0 deletions sample/src/main/res/drawable/accent_rectangle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorAccent"/>
<corners android:radius="16dp"/>
</shape>
5 changes: 5 additions & 0 deletions sample/src/main/res/drawable/blue_rectangle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimary"/>
<corners android:radius="16dp"/>
</shape>
74 changes: 64 additions & 10 deletions sample/src/main/res/layout/content_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingStart="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_vertical_margin"
android:paddingEnd="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.shawnlin.numberpicker.sample.MainActivity"
tools:showIn="@layout/activity_main">

<com.shawnlin.numberpicker.NumberPicker
android:id="@+id/number_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="200dp"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<com.shawnlin.numberpicker.NumberPicker
android:id="@+id/number_picker_drawable_divider_vertical"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:np_selectedTextColor="@color/colorAccent"
app:np_selectedTextSize="@dimen/selected_text_size"
app:np_selectedTypeface="@string/roboto_light"
app:np_textColor="@color/colorAccent"
app:np_dividerThickness="50dp"
app:np_dividerLength="60dp"
app:np_orientation="vertical"
app:np_dividerType="drawable_as_divider"
android:layout_marginRight="50dp"
android:layout_marginEnd="50dp"
app:layout_constraintTop_toTopOf="@+id/number_picker"
app:layout_constraintBottom_toBottomOf="@+id/number_picker"
app:layout_constraintEnd_toEndOf="parent"/>

<com.shawnlin.numberpicker.NumberPicker
android:id="@+id/horizontal_number_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
app:np_width="180dp"
app:np_height="64dp"
android:layout_marginTop="40dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/number_picker"
app:np_accessibilityDescriptionEnabled="true"
app:np_dividerColor="@color/colorAccent"
app:np_dividerType="underline"
app:np_fadingEdgeEnabled="false"
app:np_height="64dp"
app:np_max="10"
app:np_min="0"
app:np_order="descending"
Expand All @@ -38,8 +68,32 @@
app:np_textColor="@color/colorAccent"
app:np_textSize="@dimen/text_size"
app:np_typeface="@string/roboto_light"
app:np_fadingEdgeEnabled="false"
app:np_wrapSelectorWheel="true"
app:np_dividerType="underline" />
app:np_width="180dp"
app:np_wrapSelectorWheel="true" />

<com.shawnlin.numberpicker.NumberPicker
android:id="@+id/number_picker_drawable_divider_horizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
app:np_orientation="horizontal"
app:np_dividerThickness="40dp"
app:np_dividerLength="70dp"
app:np_dividerType="drawable_as_divider"
app:np_height="64dp"
app:np_max="10"
app:np_min="0"
app:np_order="descending"
app:np_selectedTextColor="@color/colorPrimary"
app:np_selectedTextSize="@dimen/selected_text_size"
app:np_selectedTypeface="@string/roboto_light"
app:np_textColor="@color/colorPrimary"
app:np_textSize="@dimen/text_size"
app:np_typeface="@string/roboto_light"
app:np_width="180dp"
app:layout_constraintStart_toStartOf="@+id/horizontal_number_picker"
app:layout_constraintEnd_toEndOf="@+id/horizontal_number_picker"
app:layout_constraintTop_toBottomOf="@+id/horizontal_number_picker"/>


</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>