From 8a48983dc0c4ca1cd701f92a87ae21fa30a1cc86 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 30 Jan 2016 17:45:38 +0100 Subject: [PATCH] Fixed tablayout colors. --- app/build.gradle | 2 +- .../kabouzeid/gramophone/ui/activities/MainActivity.java | 7 ++++++- .../gramophone/ui/fragments/player/PlayerFragment.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6cc429b7..3420b172 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 0621e555..edaa0dbf 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java index 4a7df108..b58cac7e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java @@ -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));