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

Palette color passed to song tag editor where applicable

Browse source
This commit is contained in:
Aidan Follestad 2015-04-16 22:28:25 -05:00
commit 774d1f7076
6 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -23,6 +23,7 @@ import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.songadapter.AlbumSongAdapter;
import com.kabouzeid.gramophone.comparator.SongTrackNumberComparator;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.loader.AlbumSongLoader;
import com.kabouzeid.gramophone.misc.AppKeys;
@ -49,7 +50,7 @@ import java.util.ArrayList;
* <p/>
* Should be kinda stable ONLY AS IT IS!!!
*/
public class AlbumDetailActivity extends AbsFabActivity {
public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorHolder {
public static final String TAG = AlbumDetailActivity.class.getSimpleName();
private Album album;
@ -209,6 +210,11 @@ public class AlbumDetailActivity extends AbsFabActivity {
});
}
@Override
public int getPaletteColor() {
return toolbarColor;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void setNavigationBarColored(boolean colored) {
if (colored) {

8
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -29,6 +29,7 @@ import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.ArtistAlbumAdapter;
import com.kabouzeid.gramophone.adapter.songadapter.ArtistSongAdapter;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistBiographyLoader;
import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistImageUrlLoader;
import com.kabouzeid.gramophone.loader.ArtistAlbumLoader;
@ -58,7 +59,7 @@ import java.util.List;
* <p/>
* Should be kinda stable ONLY AS IT IS!!!
*/
public class ArtistDetailActivity extends AbsFabActivity {
public class ArtistDetailActivity extends AbsFabActivity implements PaletteColorHolder {
public static final String TAG = ArtistDetailActivity.class.getSimpleName();
private Artist artist;
@ -303,6 +304,11 @@ public class ArtistDetailActivity extends AbsFabActivity {
});
}
@Override
public int getPaletteColor() {
return toolbarColor;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void resetColors() {
int titleTextColor = DialogUtils.resolveColor(this, R.attr.title_text_color);

13
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -1,5 +1,6 @@
package com.kabouzeid.gramophone.ui.activities.tageditor;
import android.annotation.TargetApi;
import android.app.SearchManager;
import android.content.Intent;
import android.graphics.Bitmap;
@ -27,6 +28,7 @@ import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.koushikdutta.ion.Ion;
@ -240,12 +242,23 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
return super.onOptionsItemSelected(item);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
protected void setNoImageMode() {
isInNoImageMode = true;
image.setVisibility(View.GONE);
image.setEnabled(false);
scrollView.setPadding(0, Util.getActionBarSize(this), 0, 0);
observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
int primary = getIntent().getIntExtra(AppKeys.E_PALETTE,
PreferenceUtils.getInstance(this).getThemeColorPrimary());
toolBar.setBackgroundColor(primary);
header.setBackgroundColor(primary);
if (Util.hasLollipopSDK()) {
int primaryDark = ColorChooserDialog.shiftColorDown(primary);
getWindow().setStatusBarColor(primaryDark);
getWindow().setNavigationBarColor(primaryDark);
}
}
protected void dataChanged() {