Fixed tablayout colors.
This commit is contained in:
parent
78c0ea1114
commit
8a48983dc0
3 changed files with 8 additions and 3 deletions
|
|
@ -115,7 +115,7 @@ dependencies {
|
|||
transitive = true
|
||||
}
|
||||
|
||||
compile('com.github.kabouzeid:app-theme-helper:0.7.11kmod@aar'){
|
||||
compile('com.github.kabouzeid:app-theme-helper:0.7.12kmod@aar') {
|
||||
transitive = true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -161,7 +161,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
|||
|
||||
tabs.setupWithViewPager(pager);
|
||||
|
||||
TabLayoutUtil.setTabLayoutColors(tabs, ToolbarContentTintHelper.toolbarTitleColor(this, ThemeStore.primaryColor(this)), ThemeStore.accentColor(this));
|
||||
int primaryColor = ThemeStore.primaryColor(this);
|
||||
int normalColor = ToolbarContentTintHelper.toolbarSubtitleColor(this, primaryColor);
|
||||
int selectedColor = ToolbarContentTintHelper.toolbarTitleColor(this, primaryColor);
|
||||
TabLayoutUtil.setTabIconColors(tabs, normalColor, selectedColor);
|
||||
tabs.setTabTextColors(normalColor, selectedColor);
|
||||
tabs.setSelectedTabIndicatorColor(ThemeStore.accentColor(this));
|
||||
|
||||
int startPosition = PreferenceUtil.getInstance(this).getDefaultStartPage();
|
||||
startPosition = startPosition == -1 ? PreferenceUtil.getInstance(this).getLastStartPage() : startPosition;
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
|
|||
boolean isFavorite = MusicUtil.isFavorite(getActivity(), MusicPlayerRemote.getCurrentSong());
|
||||
int res = isFavorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_outline_white_24dp;
|
||||
|
||||
Drawable favoriteIcon = TintHelper.tintDrawable(ContextCompat.getDrawable(getActivity(), res), ToolbarContentTintHelper.toolbarContentColor(getActivity(), Color.TRANSPARENT));
|
||||
Drawable favoriteIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(getActivity(), res), ToolbarContentTintHelper.toolbarContentColor(getActivity(), Color.TRANSPARENT));
|
||||
toolbar.getMenu().findItem(R.id.action_toggle_favorite)
|
||||
.setIcon(favoriteIcon)
|
||||
.setTitle(isFavorite ? getString(R.string.action_remove_from_favorites) : getString(R.string.action_add_to_favorites));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue