Skip to content

[FloatingActionButton] Add customizable minTouchTargetSize attribute #5052

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

Open
pubiqq wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −4
Open

[FloatingActionButton] Add customizable minTouchTargetSize attribute #5052

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
8 changes: 6 additions & 2 deletions lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.internal.ViewUtils;
import com.google.android.material.internal.VisibilityAwareImageButton;
import com.google.android.material.resources.MaterialAttributes;
import com.google.android.material.resources.MaterialResources;
import com.google.android.material.shadow.ShadowViewDelegate;
import com.google.android.material.shape.ShapeAppearanceModel;
Expand Down Expand Up @@ -237,8 +238,6 @@ public FloatingActionButton(
final float pressedTranslationZ =
a.getDimension(R.styleable.FloatingActionButton_pressedTranslationZ, 0f);
compatPadding = a.getBoolean(R.styleable.FloatingActionButton_useCompatPadding, false);
int minTouchTargetSize =
getResources().getDimensionPixelSize(R.dimen.mtrl_fab_min_touch_target);

setMaxImageSize(a.getDimensionPixelSize(R.styleable.FloatingActionButton_maxImageSize, 0));

Expand All @@ -254,6 +253,11 @@ public FloatingActionButton(
boolean ensureMinTouchTargetSize =
a.getBoolean(R.styleable.FloatingActionButton_ensureMinTouchTargetSize, false);

int minTouchTargetSize =
a.getDimensionPixelSize(
R.styleable.FloatingActionButton_minTouchTargetSize,
MaterialAttributes.resolveMinimumAccessibleTouchTarget(context));

setEnabled(a.getBoolean(R.styleable.FloatingActionButton_android_enabled, true));

a.recycle();
Expand Down
5 changes: 3 additions & 2 deletions lib/java/com/google/android/material/floatingactionbutton/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
<attr name="fabCustomSize" format="dimension"/>
<!-- Elevation value for the FAB -->
<attr name="elevation"/>
<!-- Whether to extend the bounds of the FloatingActionButton to meet
@dimen/mtrl_fab_min_touch_target. -->
<!-- Whether to extend the bounds of the FAB to meet minTouchTargetSize. -->
<attr name="ensureMinTouchTargetSize"/>
<!-- The minimum size of the FAB's touch target. -->
<attr name="minTouchTargetSize"/>
<!-- TranslationZ value for the FAB when hovered, focused, or hovered and focused. -->
<attr name="hoveredFocusedTranslationZ" format="dimension"/>
<!-- TranslationZ value for the FAB when pressed-->
Expand Down
1 change: 1 addition & 0 deletions lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@
<item name="android:background">@null</item>
<item name="enforceMaterialTheme">true</item>
<item name="ensureMinTouchTargetSize">true</item>
<item name="minTouchTargetSize">@dimen/mtrl_fab_min_touch_target</item>
<item name="elevation">@dimen/mtrl_fab_elevation</item>
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
<item name="tint">@color/mtrl_fab_icon_text_color_selector</item>
Expand Down