diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java index b61f7f24..52d53c45 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java @@ -11,7 +11,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import android.widget.Toast; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.helper.AddToPlaylistDialogHelper; @@ -34,6 +33,7 @@ import java.util.List; */ public class AlbumSongAdapter extends RecyclerView.Adapter { public static final String TAG = AlbumSongAdapter.class.getSimpleName(); + protected Activity activity; protected List dataSet; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index b41ee3cc..c86ab624 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -1,6 +1,7 @@ package com.kabouzeid.gramophone.ui.activities; import android.annotation.SuppressLint; +import android.annotation.TargetApi; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; @@ -97,17 +98,18 @@ public class AlbumDetailActivity extends AbsFabActivity { } }; - @SuppressLint("NewApi") + @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { app = (App) getApplicationContext(); setTheme(app.getAppTheme()); - setUpTranslucence(); + setUpTranslucence(true, false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_album_detail); if (Util.hasLollipopSDK()) postponeEnterTransition(); + if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(getResources().getColor(R.color.materialmusic_default_bar_color)); Bundle intentExtras = getIntent().getExtras(); int albumId = -1; @@ -178,6 +180,7 @@ public class AlbumDetailActivity extends AbsFabActivity { private void applyPalette(Bitmap bitmap) { Palette.generateAsync(bitmap, new Palette.PaletteAsyncListener() { + @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override public void onGenerated(Palette palette) { Palette.Swatch swatch = palette.getVibrantSwatch(); @@ -185,6 +188,7 @@ public class AlbumDetailActivity extends AbsFabActivity { toolbarColor = swatch.getRgb(); albumTitleView.setBackgroundColor(swatch.getRgb()); albumTitleView.setTextColor(swatch.getTitleTextColor()); + if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(swatch.getRgb()); } } }); @@ -192,7 +196,7 @@ public class AlbumDetailActivity extends AbsFabActivity { private void setUpListView() { recyclerView.setScrollViewCallbacks(observableScrollViewCallbacks); - setListViewPadding(); + recyclerView.setPadding(0, albumArtViewHeight + titleViewHeight, 0, 0); final View contentView = getWindow().getDecorView().findViewById(android.R.id.content); contentView.post(new Runnable() { @Override @@ -203,29 +207,12 @@ public class AlbumDetailActivity extends AbsFabActivity { }); } - private void setListViewPadding() { - if (Util.isInPortraitMode(this) || Util.isTablet(this)) { - recyclerView.setPadding(0, albumArtViewHeight + titleViewHeight, 0, Util.getNavigationBarHeight(this)); - } else { - recyclerView.setPadding(0, albumArtViewHeight + titleViewHeight, 0, 0); - } - } - private void setUpToolBar() { setSupportActionBar(toolbar); getSupportActionBar().setTitle(null); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - private void setUpTranslucence() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - Util.setStatusBarTranslucent(getWindow(), true); - if (Util.isInPortraitMode(this) || Util.isTablet(this)) { - Util.setNavBarTranslucent(getWindow(), true); - } - } - } - private void setUpSongsAdapter() { final List songs = AlbumSongLoader.getAlbumSongList(this, album.id, new SongTrackNumberComparator()); final AlbumSongAdapter albumSongAdapter = new AlbumSongAdapter(this, songs); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 07f38032..ab1d6454 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -113,14 +113,15 @@ public class ArtistDetailActivity extends AbsFabActivity { }; - @SuppressLint("NewApi") + @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(true, true); + setUpTranslucence(true, false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_artist_detail); if (Util.hasLollipopSDK()) postponeEnterTransition(); + if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(getResources().getColor(R.color.materialmusic_default_bar_color)); getIntentExtras(); initViews(); @@ -174,9 +175,7 @@ public class ArtistDetailActivity extends AbsFabActivity { private void setUpSongListView() { songListView.setScrollViewCallbacks(observableScrollViewCallbacks); - - setListViewPadding(); - + songListView.setPadding(0, artistImageViewHeight + titleViewHeight, 0, 0); songListView.addHeaderView(songListHeader); final List songs = ArtistSongLoader.getArtistSongList(this, artist.id); @@ -231,14 +230,6 @@ public class ArtistDetailActivity extends AbsFabActivity { .build(); } - private void setListViewPadding() { - if (Util.isInPortraitMode(this) || Util.isTablet(this)) { - songListView.setPadding(0, artistImageViewHeight + titleViewHeight, 0, Util.getNavigationBarHeight(this)); - } else { - songListView.setPadding(0, artistImageViewHeight + titleViewHeight, 0, 0); - } - } - private void setUpArtistImageAndApplyPalette(final boolean forceDownload) { LastFMArtistImageUrlLoader.loadArtistImageUrl(this, artist.name, forceDownload, new LastFMArtistImageUrlLoader.ArtistImageUrlLoaderCallback() { @Override @@ -252,7 +243,6 @@ public class ArtistDetailActivity extends AbsFabActivity { super.onSuccess(); final Bitmap bitmap = ((BitmapDrawable) artistIv.getDrawable()).getBitmap(); if (bitmap != null) applyPalette(bitmap); - } }); } @@ -261,6 +251,7 @@ public class ArtistDetailActivity extends AbsFabActivity { private void applyPalette(Bitmap bitmap) { Palette.generateAsync(bitmap, new Palette.PaletteAsyncListener() { + @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override public void onGenerated(Palette palette) { Palette.Swatch swatch = palette.getVibrantSwatch(); @@ -268,6 +259,7 @@ public class ArtistDetailActivity extends AbsFabActivity { toolbarColor = swatch.getRgb(); artistNameTv.setBackgroundColor(swatch.getRgb()); artistNameTv.setTextColor(swatch.getTitleTextColor()); + if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(swatch.getRgb()); } else { setStandardColors(); } @@ -275,6 +267,7 @@ public class ArtistDetailActivity extends AbsFabActivity { }); } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void setStandardColors() { int titleTextColor = Util.resolveColor(this, R.attr.title_text_color); int defaultBarColor = getResources().getColor(R.color.materialmusic_default_bar_color); @@ -282,6 +275,8 @@ public class ArtistDetailActivity extends AbsFabActivity { toolbarColor = defaultBarColor; artistNameTv.setBackgroundColor(defaultBarColor); artistNameTv.setTextColor(titleTextColor); + + if (Util.hasLollipopSDK()) getWindow().setNavigationBarColor(getResources().getColor(R.color.materialmusic_default_bar_color)); } private void setUpToolBar() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java index 7bf0faf3..54a50f7a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java @@ -59,6 +59,8 @@ public abstract class AbsBaseActivity extends ActionBarActivity implements KabVi Util.setStatusBarTranslucent(getWindow(), statusBarTranslucent); if (Util.isInPortraitMode(this) || Util.isTablet(this)) { Util.setNavBarTranslucent(getWindow(), navigationBarTranslucent); + } else { + Util.setNavBarTranslucent(getWindow(), false); } } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java index d1ee630b..529a3d0f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java @@ -15,7 +15,7 @@ public abstract class AbsMainActivityFragment extends Fragment implements KabVie private boolean areViewsEnabled; protected int getTopPadding() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (Util.hasKitKatSDK()) { if (Util.isInPortraitMode(getActivity()) || Util.isTablet(getActivity())) { return Util.getActionBarSize(getActivity()) + getResources().getDimensionPixelSize(R.dimen.tab_height) + Util.getStatusBarHeight(getActivity()); } diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml index fc337928..421a9844 100644 --- a/app/src/main/res/layout/activity_album_detail.xml +++ b/app/src/main/res/layout/activity_album_detail.xml @@ -21,8 +21,8 @@ android:id="@+id/list" android:layout_width="match_parent" android:layout_height="match_parent" - android:clipToPadding="false" android:divider="@null" + android:clipToPadding="false" android:dividerHeight="0dp" android:scrollbars="none"/> diff --git a/app/src/main/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml index 45a6ecb4..6cb1fa23 100644 --- a/app/src/main/res/layout/artist_detail_header.xml +++ b/app/src/main/res/layout/artist_detail_header.xml @@ -3,35 +3,17 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_list_album_song.xml b/app/src/main/res/layout/item_list_album_song.xml index 98af5b16..475cab81 100644 --- a/app/src/main/res/layout/item_list_album_song.xml +++ b/app/src/main/res/layout/item_list_album_song.xml @@ -2,7 +2,7 @@