Skip to content

Commit

Permalink
[SplitButton] Updated Split Button to match spec and address feedback.
Browse files Browse the repository at this point in the history 
Updated padding values on leading and trailing buttons and fixed the trailing icon sizing. Resolved screenshot diffs in the formatting fragment.

PiperOrigin-RevId: 713303721
  • Loading branch information
@kendrickumstattd @leticiarossi
kendrickumstattd authored and leticiarossi committed Jan 8, 2025
1 parent b4585cd commit c1e73c8
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 14 deletions.
36 changes: 24 additions & 12 deletions catalog/java/io/material/catalog/button/res/layout/cat_split_button_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -53,8 +55,8 @@
android:id="@+id/expand_more_or_less_filled_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:minWidth="@dimen/mtrl_min_touch_target_size"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"/>
Expand All @@ -66,6 +68,8 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -75,8 +79,8 @@
android:id="@+id/expand_more_or_less_filled_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:minWidth="@dimen/mtrl_min_touch_target_size"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"/>
Expand All @@ -88,6 +92,8 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -99,8 +105,8 @@
android:id="@+id/expand_more_or_less_filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:minWidth="@dimen/mtrl_min_touch_target_size"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"/>
Expand All @@ -121,6 +127,8 @@
style="?attr/materialButtonTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -133,10 +141,10 @@
android:id="@+id/expand_more_or_less_tonal_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"/>
</com.google.android.material.button.MaterialSplitButton>

Expand All @@ -147,6 +155,8 @@
style="?attr/materialButtonTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -156,8 +166,8 @@
android:id="@+id/expand_more_or_less_tonal_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:minWidth="@dimen/mtrl_min_touch_target_size"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"/>
Expand All @@ -170,6 +180,8 @@
style="?attr/materialButtonTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingStart="@dimen/m3_comp_split_button_small_leading_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_leading_button_trailing_space"
android:minWidth="@dimen/mtrl_min_touch_target_size"
Expand All @@ -181,8 +193,8 @@
android:id="@+id/expand_more_or_less_tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/m3_comp_split_button_small_trailing_button_leading_space"
android:paddingEnd="@dimen/m3_comp_split_button_small_trailing_button_trailing_space"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:minWidth="@dimen/mtrl_min_touch_target_size"
android:contentDescription="@string/cat_split_button_label_chevron"
app:icon="@drawable/m3_split_button_chevron_avd"/>
Expand Down
8 changes: 6 additions & 2 deletions lib/java/com/google/android/material/button/res/drawable/m3_split_button_chevron_avd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@
<animated-selector 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:width="22dp"
android:height="22dp"
android:width="20dp"
android:height="20dp"
tools:ignore="NewApi">

<item
android:id="@+id/checked"
android:drawable="@drawable/ic_expand_less_22px"
app:iconSize="20dp"
app:iconPadding="0dp"
android:state_checked="true" />

<item
android:id="@+id/unchecked"
android:drawable="@drawable/ic_expand_more_22px"
app:iconSize="20dp"
app:iconPadding="0dp"
android:state_checked="false" />

<transition
Expand Down
4 changes: 4 additions & 0 deletions lib/java/com/google/android/material/button/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@

<style name="Widget.Material3.SplitButton.IconButton.Filled" parent="Widget.Material3.Button.IconButton.Filled">
<item name="android:insetLeft">0dp</item>
<item name="android:paddingTop">6dp</item>
<item name="android:paddingBottom">6dp</item>
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
<item name="backgroundTint">@color/m3_button_background_color_selector</item>
Expand All @@ -154,6 +156,8 @@

<style name="Widget.Material3.SplitButton.IconButton.Filled.Tonal" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
<item name="android:insetLeft">0dp</item>
<item name="android:paddingTop">6dp</item>
<item name="android:paddingBottom">6dp</item>
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
<item name="backgroundTint">@color/m3_button_background_color_selector</item>
Expand Down

0 comments on commit c1e73c8

Please sign in to comment.