From fe8d6e14aa3c6738c7862fa7c5abc1c988ece52d Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 20 Feb 2016 15:08:04 +0100 Subject: [PATCH] Added EdgeGlows. --- .../kabouzeid/gramophone/ui/activities/AboutActivity.java | 6 ++++++ .../gramophone/ui/activities/AlbumDetailActivity.java | 3 +++ .../gramophone/ui/activities/ArtistDetailActivity.java | 5 +++++ .../kabouzeid/gramophone/ui/activities/MainActivity.java | 2 ++ .../gramophone/ui/activities/PlaylistDetailActivity.java | 2 ++ .../kabouzeid/gramophone/ui/activities/SearchActivity.java | 2 ++ .../gramophone/ui/activities/SettingsActivity.java | 2 ++ .../AbsMainActivityRecyclerViewFragment.java | 2 ++ app/src/main/res/layout/activity_about.xml | 1 + 9 files changed, 25 insertions(+) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java index 98bb454c..4b19cf68 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java @@ -12,11 +12,13 @@ import android.view.MenuItem; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.ScrollView; import android.widget.TextView; import com.afollestad.materialdialogs.internal.ThemeSingleton; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.dialogs.ChangelogDialog; import com.kabouzeid.gramophone.dialogs.DonationDialog; @@ -52,6 +54,9 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen private static String ALEKSANDAR_TESIC_GOOGLE_PLUS = "https://google.com/+aleksandartešić"; + @Bind(R.id.scroll_view) + ScrollView scrollView; + @Bind(R.id.toolbar) Toolbar toolbar; @Bind(R.id.app_version) @@ -141,6 +146,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen setUpAppVersion(); setUpIconTint(); setUpOnClickListeners(); + EdgeGlowUtil.setEdgeGlowColor(scrollView, ThemeStore.primaryColor(this)); } private void setUpToolbar() { 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 ff7b98eb..0660c777 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 @@ -20,6 +20,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView; import com.kabouzeid.appthemehelper.util.ColorUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.song.AlbumSongAdapter; @@ -180,6 +181,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements setNavigationbarColor(color); setTaskDescriptionColor(color); + + EdgeGlowUtil.setEdgeGlowColor(recyclerView, color, null); } @Override 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 b0bdcf2b..33e3325f 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 @@ -27,6 +27,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.github.ksoichiro.android.observablescrollview.ObservableListView; import com.kabouzeid.appthemehelper.util.ColorUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.album.HorizontalAlbumAdapter; @@ -304,8 +305,12 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement toolbarColor = color; artistName.setBackgroundColor(color); artistName.setTextColor(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(color))); + setNavigationbarColor(color); setTaskDescriptionColor(color); + + EdgeGlowUtil.setEdgeGlowColor(songListView, color); + EdgeGlowUtil.setEdgeGlowColor(albumRecyclerView, color, null); } private void getArtistFromIntentExtras() { 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 edaa0dbf..8794c6de 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 @@ -34,6 +34,7 @@ import com.afollestad.materialcab.MaterialCab; import com.bumptech.glide.Glide; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.appthemehelper.util.NavigationViewUtil; import com.kabouzeid.appthemehelper.util.TabLayoutUtil; import com.kabouzeid.appthemehelper.util.ToolbarContentTintHelper; @@ -155,6 +156,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity } private void setUpViewPager() { + EdgeGlowUtil.setEdgeGlowColor(pager, ThemeStore.primaryColor(this)); pagerAdapter = new PagerAdapter(this, getSupportFragmentManager()); pager.setAdapter(pagerAdapter); pager.setOffscreenPageLimit(pagerAdapter.getCount() - 1); // => all diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index d0ca8ef7..0fce510b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -18,6 +18,7 @@ import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemA import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager; import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils; import com.kabouzeid.appthemehelper.ThemeStore; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.song.PlaylistSongAdapter; import com.kabouzeid.gramophone.adapter.song.SmartPlaylistSongAdapter; @@ -91,6 +92,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme } private void setUpRecyclerView() { + EdgeGlowUtil.setEdgeGlowColor(recyclerView, ThemeStore.primaryColor(this), null); recyclerView.setLayoutManager(new LinearLayoutManager(this)); if (playlist instanceof AbsSmartPlaylist) { adapter = new SmartPlaylistSongAdapter(this, loadSmartPlaylistDataSet(), R.layout.item_list, false, this); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index df10a4a9..ab4f8557 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -19,6 +19,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.kabouzeid.appthemehelper.ThemeStore; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.appthemehelper.util.ToolbarContentTintHelper; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.SearchAdapter; @@ -57,6 +58,7 @@ public class SearchActivity extends AbsMusicServiceActivity { setNavigationbarColorAuto(); setTaskDescriptionColorAuto(); + EdgeGlowUtil.setEdgeGlowColor(recyclerView, ThemeStore.primaryColor(this), null); recyclerView.setLayoutManager(new LinearLayoutManager(this)); searchAdapter = new SearchAdapter(this); recyclerView.setAdapter(searchAdapter); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index 968be106..f5d50248 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -22,6 +22,7 @@ import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference; import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat; import com.kabouzeid.appthemehelper.util.ColorUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; import com.kabouzeid.gramophone.util.NavigationUtil; @@ -123,6 +124,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); getListView().setPadding(0, 0, 0, 0); + EdgeGlowUtil.setEdgeGlowColor(getListView(), ThemeStore.primaryColor(getActivity()), null); invalidateSettings(); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java index 2e80b6ec..d728d31c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java @@ -16,6 +16,7 @@ import android.widget.TextView; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.appthemehelper.util.ColorUtil; +import com.kabouzeid.appthemehelper.util.EdgeGlowUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener; @@ -62,6 +63,7 @@ public abstract class AbsMainActivityRecyclerViewFragment