Skip to content

Commit 58a1a55

Browse files
Piotr Zawadzkizawadz88
Piotr Zawadzki
authored and
zawadz88
committed
Fixed margins of bottom navigation buttons so that they fit the default 8dp grid
1 parent e94495b commit 58a1a55

File tree

8 files changed

+78
-60
lines changed

8 files changed

+78
-60
lines changed

‎material-stepper/src/main/res/drawable-v21/ms_default_button_background.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:color="?attr/colorControlHighlight">
4+
5+
<item android:id="@android:id/mask">
6+
7+
<inset xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:insetBottom="@dimen/ms_nav_bar_button_margin"
9+
android:insetLeft="@dimen/ms_nav_bar_button_margin"
10+
android:insetRight="@dimen/ms_nav_bar_button_margin"
11+
android:insetTop="@dimen/ms_nav_bar_button_margin">
12+
<shape android:shape="rectangle">
13+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
14+
<solid android:color="@color/ms_white" />
15+
<padding
16+
android:bottom="@dimen/ms_material_button_padding_vertical"
17+
android:left="@dimen/ms_material_button_padding_horizontal"
18+
android:right="@dimen/ms_material_button_padding_horizontal"
19+
android:top="@dimen/ms_material_button_padding_vertical" />
20+
</shape>
21+
</inset>
22+
</item>
23+
</ripple>

‎material-stepper/src/main/res/drawable/ms_default_button_background.xml‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,23 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<item android:state_pressed="true">
5-
<inset xmlns:android="http://schemas.android.com/apk/res/android"
6-
android:insetLeft="@dimen/ms_button_inset_horizontal"
7-
android:insetTop="@dimen/ms_button_inset_vertical"
8-
android:insetRight="@dimen/ms_button_inset_horizontal"
9-
android:insetBottom="@dimen/ms_button_inset_vertical">
5+
6+
<inset xmlns:android="http://schemas.android.com/apk/res/android" android:insetBottom="@dimen/ms_nav_bar_button_margin" android:insetLeft="@dimen/ms_nav_bar_button_margin" android:insetRight="@dimen/ms_nav_bar_button_margin" android:insetTop="@dimen/ms_nav_bar_button_margin">
107
<shape android:shape="rectangle">
11-
<corners android:radius="@dimen/ms_button_corner_radius" />
8+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
129
<solid android:color="@color/ms_defaultButtonBackgroundColor" />
13-
<padding android:left="@dimen/ms_button_padding_horizontal"
14-
android:top="@dimen/ms_button_padding_vertical"
15-
android:right="@dimen/ms_button_padding_horizontal"
16-
android:bottom="@dimen/ms_button_padding_vertical" />
10+
<padding android:bottom="@dimen/ms_material_button_padding_vertical" android:left="@dimen/ms_material_button_padding_horizontal" android:right="@dimen/ms_material_button_padding_horizontal" android:top="@dimen/ms_material_button_padding_vertical" />
1711
</shape>
1812
</inset>
1913
</item>
2014

2115
<item>
22-
<inset xmlns:android="http://schemas.android.com/apk/res/android"
23-
android:insetLeft="@dimen/ms_button_inset_horizontal"
24-
android:insetTop="@dimen/ms_button_inset_vertical"
25-
android:insetRight="@dimen/ms_button_inset_horizontal"
26-
android:insetBottom="@dimen/ms_button_inset_vertical">
16+
17+
<inset xmlns:android="http://schemas.android.com/apk/res/android" android:insetBottom="@dimen/ms_nav_bar_button_margin" android:insetLeft="@dimen/ms_nav_bar_button_margin" android:insetRight="@dimen/ms_nav_bar_button_margin" android:insetTop="@dimen/ms_nav_bar_button_margin">
2718
<shape android:shape="rectangle">
28-
<corners android:radius="@dimen/ms_button_corner_radius" />
19+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
2920
<solid android:color="@android:color/transparent" />
30-
<padding android:left="@dimen/ms_button_padding_horizontal"
31-
android:top="@dimen/ms_button_padding_vertical"
32-
android:right="@dimen/ms_button_padding_horizontal"
33-
android:bottom="@dimen/ms_button_padding_vertical" />
21+
<padding android:bottom="@dimen/ms_material_button_padding_vertical" android:left="@dimen/ms_material_button_padding_horizontal" android:right="@dimen/ms_material_button_padding_horizontal" android:top="@dimen/ms_material_button_padding_vertical" />
3422
</shape>
3523
</inset>
3624
</item>

‎material-stepper/src/main/res/values-v21/styles.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ limitations under the License.
1616
-->
1717
<resources>
1818

19-
<style name="MSNavBarButton" parent="Base.MSNavBarButton" />
20-
2119
<style name="MSStepTabsContainer" parent="Base.MSStepTabsContainer">
2220
<item name="android:background">@color/ms_white</item>
2321
<item name="android:elevation">2dp</item>

‎material-stepper/src/main/res/values/dimens.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ limitations under the License.
1818
<dimen name="ms_bottom_navigation_bar_height">48dp</dimen>
1919
<dimen name="ms_dotted_progress_bar_dot_size">10dp</dimen>
2020
<dimen name="ms_tabs_container_lateral_padding">24dp</dimen>
21+
2122
<dimen name="ms_nav_bar_button_padding">8dp</dimen>
23+
<dimen name="ms_nav_bar_button_margin">8dp</dimen>
24+
25+
<dimen name="ms_material_button_corner_radius">2dp</dimen>
26+
<dimen name="ms_material_button_padding_horizontal">8dp</dimen>
27+
<dimen name="ms_material_button_padding_vertical">4dp</dimen>
28+
2229
<dimen name="ms_progress_bar_width">96dp</dimen>
2330
<dimen name="ms_progress_bar_height">3dp</dimen>
2431
<dimen name="ms_error_drawable_padding">8dp</dimen>
@@ -34,11 +41,4 @@ limitations under the License.
3441
<dimen name="ms_step_tab_vertical_padding">24dp</dimen>
3542
<dimen name="ms_step_tab_text_lateral_padding">8dp</dimen>
3643

37-
<!-- AppCompat -->
38-
<dimen name="ms_button_inset_horizontal">@dimen/abc_button_inset_horizontal_material</dimen>
39-
<dimen name="ms_button_inset_vertical">@dimen/abc_button_inset_vertical_material</dimen>
40-
<dimen name="ms_button_corner_radius">@dimen/abc_control_corner_material</dimen>
41-
<dimen name="ms_button_padding_horizontal">@dimen/abc_button_padding_horizontal_material</dimen>
42-
<dimen name="ms_button_padding_vertical">@dimen/abc_button_padding_vertical_material</dimen>
43-
4444
</resources>

‎material-stepper/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ limitations under the License.
1515
-->
1616
<resources xmlns:tools="http://schemas.android.com/tools">
1717

18-
<style name="Base.MSNavBarButton" parent="Base.Widget.AppCompat.Button.Borderless">
18+
<style name="MSNavBarButton" parent="Base.Widget.AppCompat.Button.Borderless">
1919
<item name="android:padding">@dimen/ms_nav_bar_button_padding</item>
2020
<item name="android:textSize">@dimen/ms_navigation_button_text_size</item>
2121
<item name="android:layout_width">wrap_content</item>
2222
<item name="android:layout_height">wrap_content</item>
23-
</style>
24-
25-
<style name="MSNavBarButton" parent="Base.MSNavBarButton">
2623
<item name="android:background">@drawable/ms_default_button_background</item>
2724
</style>
2825

‎sample/src/main/java/com/stepstone/stepper/sample/adapter/SampleStepAdapter.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package com.stepstone.stepper.sample.adapter;
22

33
import android.content.Context;
4+
import android.support.annotation.IntRange;
5+
import android.support.annotation.NonNull;
46
import android.support.v4.view.ViewPager;
57
import android.util.SparseArray;
68
import android.view.View;
79
import android.view.ViewGroup;
810

911
import com.stepstone.stepper.Step;
1012
import com.stepstone.stepper.adapter.AbstractStepAdapter;
13+
import com.stepstone.stepper.sample.R;
1114
import com.stepstone.stepper.sample.step.view.StepViewSample;
15+
import com.stepstone.stepper.viewmodel.StepViewModel;
1216

1317
/**
1418
* A naive implementation of {@link AbstractStepAdapter}.
@@ -28,6 +32,14 @@ public StepViewSample createStep(int position) {
2832
return new StepViewSample(context);
2933
}
3034

35+
@NonNull
36+
@Override
37+
public StepViewModel getViewModel(@IntRange(from = 0) int position) {
38+
return new StepViewModel.Builder(context)
39+
.setTitle(R.string.tab_title)
40+
.create();
41+
}
42+
3143
@Override
3244
public int getCount() {
3345
return 3;

‎sample/src/main/res/drawable-v21/ms_button_background.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<item>
55

66
<inset xmlns:android="http://schemas.android.com/apk/res/android"
7-
android:insetLeft="@dimen/ms_button_inset_horizontal"
8-
android:insetTop="@dimen/ms_button_inset_vertical"
9-
android:insetRight="@dimen/ms_button_inset_horizontal"
10-
android:insetBottom="@dimen/ms_button_inset_vertical">
7+
android:insetLeft="@dimen/ms_nav_bar_button_margin"
8+
android:insetTop="@dimen/ms_nav_bar_button_margin"
9+
android:insetRight="@dimen/ms_nav_bar_button_margin"
10+
android:insetBottom="@dimen/ms_nav_bar_button_margin">
1111
<shape android:shape="rectangle">
12-
<corners android:radius="@dimen/ms_button_corner_radius" />
12+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
1313
<solid android:color="@color/colorButton" />
14-
<padding android:left="@dimen/ms_button_padding_horizontal"
15-
android:top="@dimen/ms_button_padding_vertical"
16-
android:right="@dimen/ms_button_padding_horizontal"
17-
android:bottom="@dimen/ms_button_padding_vertical" />
14+
<padding android:left="@dimen/ms_material_button_padding_horizontal"
15+
android:top="@dimen/ms_material_button_padding_vertical"
16+
android:right="@dimen/ms_material_button_padding_horizontal"
17+
android:bottom="@dimen/ms_material_button_padding_vertical" />
1818
</shape>
1919
</inset>
2020

‎sample/src/main/res/drawable/ms_button_background.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33

44
<item android:state_pressed="true">
55
<inset xmlns:android="http://schemas.android.com/apk/res/android"
6-
android:insetLeft="@dimen/ms_button_inset_horizontal"
7-
android:insetTop="@dimen/ms_button_inset_vertical"
8-
android:insetRight="@dimen/ms_button_inset_horizontal"
9-
android:insetBottom="@dimen/ms_button_inset_vertical">
6+
android:insetLeft="@dimen/ms_nav_bar_button_margin"
7+
android:insetTop="@dimen/ms_nav_bar_button_margin"
8+
android:insetRight="@dimen/ms_nav_bar_button_margin"
9+
android:insetBottom="@dimen/ms_nav_bar_button_margin">
1010
<shape android:shape="rectangle">
11-
<corners android:radius="@dimen/ms_button_corner_radius" />
11+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
1212
<solid android:color="@color/colorButtonDark" />
13-
<padding android:left="@dimen/ms_button_padding_horizontal"
14-
android:top="@dimen/ms_button_padding_vertical"
15-
android:right="@dimen/ms_button_padding_horizontal"
16-
android:bottom="@dimen/ms_button_padding_vertical" />
13+
<padding android:left="@dimen/ms_material_button_padding_horizontal"
14+
android:top="@dimen/ms_material_button_padding_vertical"
15+
android:right="@dimen/ms_material_button_padding_horizontal"
16+
android:bottom="@dimen/ms_material_button_padding_vertical" />
1717
</shape>
1818
</inset>
1919
</item>
2020

2121
<item>
2222
<inset xmlns:android="http://schemas.android.com/apk/res/android"
23-
android:insetLeft="@dimen/ms_button_inset_horizontal"
24-
android:insetTop="@dimen/ms_button_inset_vertical"
25-
android:insetRight="@dimen/ms_button_inset_horizontal"
26-
android:insetBottom="@dimen/ms_button_inset_vertical">
23+
android:insetLeft="@dimen/ms_nav_bar_button_margin"
24+
android:insetTop="@dimen/ms_nav_bar_button_margin"
25+
android:insetRight="@dimen/ms_nav_bar_button_margin"
26+
android:insetBottom="@dimen/ms_nav_bar_button_margin">
2727
<shape android:shape="rectangle">
28-
<corners android:radius="@dimen/ms_button_corner_radius" />
28+
<corners android:radius="@dimen/ms_material_button_corner_radius" />
2929
<solid android:color="@color/colorButton" />
30-
<padding android:left="@dimen/ms_button_padding_horizontal"
31-
android:top="@dimen/ms_button_padding_vertical"
32-
android:right="@dimen/ms_button_padding_horizontal"
33-
android:bottom="@dimen/ms_button_padding_vertical" />
30+
<padding android:left="@dimen/ms_material_button_padding_horizontal"
31+
android:top="@dimen/ms_material_button_padding_vertical"
32+
android:right="@dimen/ms_material_button_padding_horizontal"
33+
android:bottom="@dimen/ms_material_button_padding_vertical" />
3434
</shape>
3535
</inset>
3636
</item>

0 commit comments

Comments
 (0)