tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a color when using the dark theme

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-24 01:08:38 +01:00
commit 3cbd938f26
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
View file

@ -18,6 +18,7 @@ import android.view.ViewTreeObserver;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.internal.ThemeSingleton;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder; import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder;
import com.kabouzeid.gramophone.adapter.song.PlayingQueueAdapter; import com.kabouzeid.gramophone.adapter.song.PlayingQueueAdapter;
@ -322,13 +323,23 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
backgroundAnimator = ViewUtil.createBackgroundColorTransition(fragment.colorBackground, fragment.lastColor, newColor); backgroundAnimator = ViewUtil.createBackgroundColorTransition(fragment.colorBackground, fragment.lastColor, newColor);
} }
Animator subHeaderAnimator = ViewUtil.createTextColorTransition(fragment.playerQueueSubHeader, fragment.lastColor, newColor);
AnimatorSet animatorSet = new AnimatorSet(); AnimatorSet animatorSet = new AnimatorSet();
animatorSet.playTogether(backgroundAnimator, subHeaderAnimator); animatorSet.play(backgroundAnimator);
if (!ThemeSingleton.get().darkTheme) {
animatorSet.play(ViewUtil.createTextColorTransition(fragment.playerQueueSubHeader, fragment.lastColor, newColor));
}
animatorSet.setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME); animatorSet.setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME);
return animatorSet; return animatorSet;
} }
@Override
public void animateColorChange(PlayerFragment fragment, int newColor) {
if (ThemeSingleton.get().darkTheme) {
fragment.playerQueueSubHeader.setTextColor(ColorUtil.getSecondaryTextColor(fragment.getActivity(), false));
}
}
} }
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
@ -369,6 +380,8 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
@Override @Override
public void animateColorChange(PlayerFragment fragment, int newColor) { public void animateColorChange(PlayerFragment fragment, int newColor) {
super.animateColorChange(fragment, newColor);
fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor); fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor);
createDefaultColorChangeAnimatorSet(fragment, newColor).start(); createDefaultColorChangeAnimatorSet(fragment, newColor).start();
@ -399,6 +412,8 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
@Override @Override
public void animateColorChange(PlayerFragment fragment, int newColor) { public void animateColorChange(PlayerFragment fragment, int newColor) {
super.animateColorChange(fragment, newColor);
fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor); fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor);
AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(fragment, newColor); AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(fragment, newColor);
@ -421,6 +436,8 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
@Override @Override
public void animateColorChange(PlayerFragment fragment, int newColor) { public void animateColorChange(PlayerFragment fragment, int newColor) {
super.animateColorChange(fragment, newColor);
fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor); fragment.slidingUpPanelLayout.setBackgroundColor(fragment.lastColor);
AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(fragment, newColor); AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(fragment, newColor);