Skip to content

[Catalog][ButtonGroup] Make overflow icons easier to see #5081

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
manabu-nakamura wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

[Catalog][ButtonGroup] Make overflow icons easier to see #5081

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
10 changes: 9 additions & 1 deletion catalog/java/io/material/catalog/button/ButtonGroupRuntimeDemoFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
Expand All @@ -32,6 +33,7 @@
import android.widget.LinearLayout.LayoutParams;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.button.MaterialButtonGroup;
import com.google.android.material.materialswitch.MaterialSwitch;
Expand All @@ -44,6 +46,7 @@ public class ButtonGroupRuntimeDemoFragment extends DemoFragment {
private static final int MAX_COUNT = 10;
private final String[] labels = new String[MAX_COUNT];
private final Drawable[] icons = new Drawable[MAX_COUNT];
private final Drawable[] overflowIcons = new Drawable[MAX_COUNT];
private MaterialButtonGroup buttonGroup;
private int buttonCount;
private Button addButton;
Expand Down Expand Up @@ -138,7 +141,7 @@ private void addButton(@NonNull Context context) {
MaterialButtonGroup.LayoutParams lp =
(MaterialButtonGroup.LayoutParams) button.getLayoutParams();
lp.overflowText = labels[buttonCount];
lp.overflowIcon = icons[buttonCount];
lp.overflowIcon = overflowIcons[buttonCount];
}

private void loadResources() {
Expand All @@ -148,10 +151,15 @@ private void loadResources() {
}
labelsRes.recycle();
TypedArray iconsRes = getResources().obtainTypedArray(R.array.cat_button_group_dynamic_icons);
TypedValue typedValue = new TypedValue();
getContext().getTheme().resolveAttribute(android.R.attr.colorControlNormal, typedValue, true);
int tintColor = ContextCompat.getColor(getContext(), typedValue.resourceId);
for (int i = 0; i < MAX_COUNT; i++) {
int iconId = iconsRes.getResourceId(i % iconsRes.length(), 0);
if (iconId != 0) {
icons[i] = getResources().getDrawable(iconId);
overflowIcons[i] = getResources().getDrawable(iconId);
overflowIcons[i].mutate().setTint(tintColor);
}
}
iconsRes.recycle();
Expand Down