Skip to content

Commit 5345e19

Browse files
Piotr Zawadzkizawadz88
authored andcommitted
Renamed drawable resources
1 parent ba462c1 commit 5345e19

22 files changed

+26
-26
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,10 @@ To do so you need to use ```AbstractStepAdapter``` instead of ```AbstractFragmen
321321
For an example of how to use it with views please see the sample app.
322322

323323
### Showing an error on tabs if step verification failed
324-
To show an error in the tabbed stepper if step verification fails you need to set `ms_showErrorState` attribute to `true`.
324+
To show an error in the tabbed stepper if step verification fails you need to set `ms_showErrorStateEnabled` attribute to `true`.
325325
<p><img src ="./gifs/error-on-tabs.gif" width="360" height="640"/></p>
326326

327-
If you want to keep the error displayed when going back to the previous step you need to also set `ms_showErrorStateOnBack` to `true`.
327+
If you want to keep the error displayed when going back to the previous step you need to also set `ms_showErrorStateOnBackEnabled` to `true`.
328328

329329
### Custom styling
330330
Basic styling can be done by choosing the active and inactive step colors.

material-stepper/src/main/java/com/stepstone/stepper/internal/widget/StepTab.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ public void setDividerWidth(int dividerWidth) {
188188
}
189189

190190
private Drawable createCircleToWarningDrawable() {
191-
return createAnimatedVectorDrawable(R.drawable.ms_avd_circle_to_warning);
191+
return createAnimatedVectorDrawable(R.drawable.ms_animated_vector_circle_to_warning_24dp);
192192
}
193193

194194
private Drawable createWarningToCircleDrawable() {
195-
return createAnimatedVectorDrawable(R.drawable.ms_avd_warning_to_circle);
195+
return createAnimatedVectorDrawable(R.drawable.ms_animated_vector_warning_to_circle_24dp);
196196
}
197197

198198
/**

material-stepper/src/main/java/com/stepstone/stepper/viewmodel/StepViewModel.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ private StepViewModel() {}
5353

5454
/**
5555
* Drawable resource ID to be used for next button's end compound drawable.
56-
* {@link com.stepstone.stepper.R.drawable#ic_chevron_end} is the default.
56+
* {@link com.stepstone.stepper.R.drawable#ms_ic_chevron_end} is the default.
5757
*/
5858
@DrawableRes
5959
private int mNextButtonEndDrawableResId;
6060

6161
/**
6262
* Drawable resource ID to be used for back button's start compound drawable.
63-
* {@link com.stepstone.stepper.R.drawable#ic_chevron_start} is the default.
63+
* {@link com.stepstone.stepper.R.drawable#ms_ic_chevron_start} is the default.
6464
*/
6565
@DrawableRes
6666
private int mBackButtonStartDrawableResId;
@@ -105,10 +105,10 @@ public static class Builder {
105105
private CharSequence mBackButtonLabel;
106106

107107
@DrawableRes
108-
private int mNextButtonEndDrawableResId = R.drawable.ic_chevron_end;
108+
private int mNextButtonEndDrawableResId = R.drawable.ms_ic_chevron_end;
109109

110110
@DrawableRes
111-
private int mBackButtonStartDrawableResId = R.drawable.ic_chevron_start;
111+
private int mBackButtonStartDrawableResId = R.drawable.ms_ic_chevron_start;
112112

113113
/**
114114
* Creates a builder for the step info.

material-stepper/src/main/res/drawable-hdpi/ic_chevron_left.png renamed to material-stepper/src/main/res/drawable-hdpi/ms_ic_chevron_left.png

File renamed without changes.

material-stepper/src/main/res/drawable-hdpi/ic_chevron_right.png renamed to material-stepper/src/main/res/drawable-hdpi/ms_ic_chevron_right.png

File renamed without changes.

material-stepper/src/main/res/drawable-mdpi/ic_chevron_left.png renamed to material-stepper/src/main/res/drawable-mdpi/ms_ic_chevron_left.png

File renamed without changes.

material-stepper/src/main/res/drawable-mdpi/ic_chevron_right.png renamed to material-stepper/src/main/res/drawable-mdpi/ms_ic_chevron_right.png

File renamed without changes.

material-stepper/src/main/res/drawable-v21/ms_avd_circle_to_warning.xml renamed to material-stepper/src/main/res/drawable-v21/ms_animated_vector_circle_to_warning_24dp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:drawable="@drawable/ms_vd_circle">
3+
android:drawable="@drawable/ms_vector_circle_24dp">
44

55
<target android:name="icon">
66
<aapt:attr name="android:animation">

material-stepper/src/main/res/drawable-v21/ms_avd_warning_to_circle.xml renamed to material-stepper/src/main/res/drawable-v21/ms_animated_vector_warning_to_circle_24dp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:drawable="@drawable/ms_vd_warning">
3+
android:drawable="@drawable/ms_vector_warning_24dp">
44

55
<target android:name="icon">
66
<aapt:attr name="android:animation">

material-stepper/src/main/res/drawable-v21/ms_vd_circle.xml renamed to material-stepper/src/main/res/drawable-v21/ms_vector_circle_24dp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<path
1212
android:name="icon"
13-
android:fillColor="#ff000000"
13+
android:fillColor="@android:color/black"
1414
android:pathData="@string/ms_circle_path" />
1515

1616
</group>

0 commit comments

Comments
 (0)