Skip to content
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

Giving user a chance to use the original color of the icon, instead of always use a color filter #358

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

Giving user a chance to use the original color of the icon, instead of always use a color filter #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c059f5
give us a chance to use the original image as the icon, instead of al…
KyleXie Jul 14, 2016
bfa12fe
fixed typo
KyleXie Jul 14, 2016
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
29 changes: 26 additions & 3 deletions bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class BottomBar extends RelativeLayout implements View.OnClickListener, V

private Integer mPrimaryColor;
private Integer mInActiveColor;
private Integer mInActiveTextColor;
private Integer mDarkBackgroundColor;
private Integer mWhiteColor;
private float mTabAlpha = 0.6f;
Expand Down Expand Up @@ -690,6 +691,23 @@ public void setFixedInactiveIconColor(int iconColor) {
}
}

/**
* Set a custom color for inactive text in fixed mode.
* <p/>
* NOTE: This value is ignored if not in fixed mode.
*
* @param textColor a hex color used for icons, such as 0xFF00FF00.
*/
public void setFixedInactiveTextColor(int textColor) {
mInActiveTextColor = textColor;

if (mItems != null && mItems.length > 0) {
throw new UnsupportedOperationException("This BottomBar " +
"already has items! You must call setFixedInactiveTextColor() " +
"before setting any items.");
}
}

/**
* Set a custom color for icons in shifting mode.
* <p/>
Expand Down Expand Up @@ -1552,11 +1570,16 @@ private void unselectTab(View tab, boolean animate) {
TextView title = (TextView) tab.findViewById(R.id.bb_bottom_bar_title);

if (!mIsShiftingMode || mIsTabletMode) {
int inActiveColor = mIsDarkTheme ? mWhiteColor : mInActiveColor;
icon.setColorFilter(inActiveColor);
Integer inActiveColor = mIsDarkTheme ? mWhiteColor : mInActiveColor;
if (inActiveColor == null) {
icon.clearColorFilter();
} else {
icon.setColorFilter(inActiveColor);
}

if (title != null) {
title.setTextColor(inActiveColor);
int inActiveTextColor = mInActiveTextColor == null ? inActiveColor : mInActiveTextColor;
title.setTextColor(inActiveTextColor);
}
}

Expand Down