Skip to content
This repository was archived by the owner on Feb 12, 2026. It is now read-only.

Make possible to have a menu item without icon #24

Open
Pilou44 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make possible to have a menu item without icon #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb8f00
Make possible to have a menu item without icon
Jan 2, 2018
e1ac234
Manage padding between menu items
Jan 2, 2018
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
60 changes: 35 additions & 25 deletions library/src/main/java/io/github/kobakei/materialfabspeeddial/FabSpeedDial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,12 @@ private View createItemView(int index, final MenuItem menuItem) {
// Mini FAB
final FloatingActionButton miniFab = itemView.findViewById(R.id.fab_mini);
if (menuItem.getIcon() != null) {
miniFab.setVisibility(VISIBLE);
miniFab.setImageDrawable(menuItem.getIcon());
miniFab.setEnabled(menuItem.isEnabled());
} else {
miniFab.setVisibility(GONE);
}
miniFab.setEnabled(menuItem.isEnabled());

if (miniFabBackgroundColor != null) {
miniFab.setBackgroundTintList(miniFabBackgroundColor);
Expand Down Expand Up @@ -359,36 +362,43 @@ private View createItemView(int index, final MenuItem menuItem) {

// TextView
final TextView label = itemView.findViewById(R.id.text);
if (label != null) {
label.setText(menuItem.getTitle());
label.setEnabled(menuItem.isEnabled());
label.setText(menuItem.getTitle());
label.setEnabled(menuItem.isEnabled());

if (miniFabTextColor != null) {
label.setTextColor(miniFabTextColor);
}
if (miniFabTextColorList != null) {
label.setTextColor(miniFabTextColorList.get(index));
if (miniFabTextColor != null) {
label.setTextColor(miniFabTextColor);
}
if (miniFabTextColorList != null) {
label.setTextColor(miniFabTextColorList.get(index));
}

if (miniFabTextBackground != null) {
Drawable.ConstantState cs = miniFabTextBackground.mutate().getConstantState();
if (cs != null) {
label.setBackground(cs.newDrawable());
}
}
if (miniFabTextBackgroundList != null) {
label.setBackground(miniFabTextBackgroundList.get(index));
}

if (miniFabTextBackground != null) {
Drawable.ConstantState cs = miniFabTextBackground.mutate().getConstantState();
if (cs != null) {
label.setBackground(cs.newDrawable());
label.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
for (OnMenuItemClickListener listener : menuClickListeners) {
listener.onMenuItemClick(miniFab, label, menuItem.getItemId());
}
closeMenu();
}
if (miniFabTextBackgroundList != null) {
label.setBackground(miniFabTextBackgroundList.get(index));
}
});

label.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
for (OnMenuItemClickListener listener : menuClickListeners) {
listener.onMenuItemClick(miniFab, label, menuItem.getItemId());
}
closeMenu();
}
});
if (miniFab.getVisibility() == GONE) {
label.setVisibility(VISIBLE);
float scale = getResources().getDisplayMetrics().density;
int padding = (int) (28 * scale + 0.5f);
MarginLayoutParams labelParams = (MarginLayoutParams) miniFab.getLayoutParams();
params.setMargins(labelParams.leftMargin, labelParams.topMargin + padding + extraMarginPixel, labelParams.rightMargin, labelParams.bottomMargin + padding + extraMarginPixel);
label.setLayoutParams(labelParams);
}

// Listener
Expand Down
4 changes: 3 additions & 1 deletion library/src/main/java/io/github/kobakei/materialfabspeeddial/FabSpeedDialMenuItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ public MenuItem setIcon(Drawable icon) {

@Override
public MenuItem setIcon(@DrawableRes int iconRes) {
this.icon = AppCompatResources.getDrawable(context, iconRes);
if (iconRes > 0) {
this.icon = AppCompatResources.getDrawable(context, iconRes);
}
return this;
}

Expand Down
11 changes: 11 additions & 0 deletions library/src/main/res/layout-land/fab_speed_dial_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@
android:layout_height="wrap_content"
android:gravity="center_vertical|end">

<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:padding="8dp"
tools:text="Menu Title"
android:textSize="14sp"
android:textColor="@android:color/black"
android:visibility="gone"/>

<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_mini"
android:layout_width="wrap_content"
Expand Down