Skip to content

Commit 4583c59

Browse files
Piotr Zawadzkizawadz88
Piotr Zawadzki
authored andcommitted
- fixed Rendering issues when library is included in external projects
1 parent 89b5d67 commit 4583c59

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Quoting the [documentation](https://www.google.com/design/spec/components/steppe
1313
1414
## Download (from JCenter)
1515
```groovy
16-
compile 'com.stepstone.stepper:material-stepper:2.3.1'
16+
compile 'com.stepstone.stepper:material-stepper:2.3.2'
1717
```
1818

1919
## Supported steppers

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
POM_GROUP_ID=com.stepstone.stepper
2121
POM_ARTIFACT_ID=material-stepper
22-
POM_VERSION=2.3.1
22+
POM_VERSION=2.3.2

material-stepper/src/main/res/layout/ms_step_tab.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,20 @@
1515

1616
<TextView
1717
android:id="@+id/ms_stepNumber"
18-
style="?attr/ms_stepTabNumberStyle" />
18+
style="?attr/ms_stepTabNumberStyle"
19+
tools:style="@style/MSStepTabNumber" />
1920

2021
<ImageView
2122
android:id="@+id/ms_stepDoneIndicator"
2223
style="?attr/ms_stepTabDoneIndicatorStyle"
23-
android:visibility="gone" />
24+
android:visibility="gone"
25+
tools:style="@style/MSStepTabDoneIndicator" />
2426

2527
<ImageView
2628
android:id="@+id/ms_stepErrorIndicator"
2729
style="?attr/ms_stepTabErrorIndicatorStyle"
28-
android:visibility="gone" />
30+
android:visibility="gone"
31+
tools:style="@style/MSStepTabErrorIndicator" />
2932

3033
</FrameLayout>
3134

@@ -36,13 +39,15 @@
3639
android:layout_height="wrap_content"
3740
android:layout_centerVertical="true"
3841
android:layout_toEndOf="@+id/ms_iconContainer"
39-
android:layout_toRightOf="@+id/ms_iconContainer" />
42+
android:layout_toRightOf="@+id/ms_iconContainer"
43+
tools:style="@style/MSStepTabTitle" />
4044

4145
<View
4246
android:id="@+id/ms_stepDivider"
4347
style="?attr/ms_stepTabDividerStyle"
4448
android:layout_centerVertical="true"
4549
android:layout_toEndOf="@+id/ms_stepTitle"
46-
android:layout_toRightOf="@+id/ms_stepTitle" />
50+
android:layout_toRightOf="@+id/ms_stepTitle"
51+
tools:style="@style/MSStepTabDivider" />
4752

4853
</merge>

material-stepper/src/main/res/layout/ms_step_tab_container.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
style="?attr/ms_stepTabContainerStyle"
66
tools:layout_height="@dimen/ms_step_tab_height"
77
tools:layout_width="wrap_content"
8+
tools:style="@style/MSStepTabContainer"
89
tools:theme="@style/MSDefaultStepperLayoutTheme" />

material-stepper/src/main/res/layout/ms_stepper_layout.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<com.stepstone.stepper.internal.TabsContainer
1111
android:id="@+id/ms_stepTabsContainer"
1212
style="?attr/ms_tabsContainerStyle"
13-
android:layout_width="match_parent" />
13+
android:layout_width="match_parent"
14+
tools:style="@style/MSStepTabsContainer" />
1415

1516
<com.stepstone.stepper.internal.NonSwipeableViewPager
1617
android:id="@+id/ms_stepPager"
@@ -21,7 +22,8 @@
2122
<RelativeLayout
2223
android:id="@+id/ms_bottomNavigation"
2324
style="?attr/ms_bottomNavigationStyle"
24-
android:layout_width="match_parent">
25+
android:layout_width="match_parent"
26+
tools:style="@style/MSBottomNavigation">
2527

2628
<Button
2729
android:id="@+id/ms_stepPrevButton"
@@ -32,6 +34,7 @@
3234
android:drawableLeft="@drawable/ic_chevron_start"
3335
android:drawableStart="@drawable/ic_chevron_start"
3436
tools:drawableTint="@color/ms_material_grey_400"
37+
tools:style="@style/MSNavBarButton.Back"
3538
tools:text="@string/ms_back"
3639
tools:textColor="@color/ms_bottomNavigationButtonTextColor" />
3740

@@ -53,6 +56,7 @@
5356
android:indeterminate="false"
5457
android:visibility="gone"
5558
tools:progress="33"
59+
tools:style="@style/MSColorableProgressBar"
5660
tools:visibility="visible" />
5761

5862
</FrameLayout>
@@ -66,6 +70,7 @@
6670
tools:drawableEnd="@drawable/ic_chevron_end"
6771
tools:drawableRight="@drawable/ic_chevron_end"
6872
tools:drawableTint="@color/ms_material_grey_400"
73+
tools:style="@style/MSNavBarButton.Next"
6974
tools:text="@string/ms_next"
7075
tools:textColor="@color/ms_bottomNavigationButtonTextColor"
7176
tools:visibility="visible" />
@@ -78,6 +83,7 @@
7883
android:layout_centerVertical="true"
7984
android:alpha="0"
8085
android:visibility="gone"
86+
tools:style="@style/MSNavBarButton.Complete"
8187
tools:text="@string/ms_complete"
8288
tools:textColor="@color/ms_bottomNavigationButtonTextColor" />
8389

material-stepper/src/main/res/layout/ms_tabs_container.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
style="?attr/ms_stepTabsScrollViewStyle"
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
14-
android:fillViewport="true">
14+
android:fillViewport="true"
15+
tools:style="@style/MSStepTabsScrollView">
1516

1617
<LinearLayout
1718
android:id="@+id/ms_stepTabsInnerContainer"
1819
style="?attr/ms_stepTabsInnerContainerStyle"
1920
android:layout_width="wrap_content"
2021
android:layout_height="wrap_content"
21-
android:orientation="horizontal" />
22+
android:orientation="horizontal"
23+
tools:style="@style/MSStepTabsInnerContainer" />
2224

2325
</HorizontalScrollView>
2426

0 commit comments

Comments
 (0)