diff --git a/app/app.iml b/app/app.iml index be879509e..6fb4f8010 100644 --- a/app/app.iml +++ b/app/app.iml @@ -133,6 +133,7 @@ + @@ -141,18 +142,14 @@ + - - - - - diff --git a/app/build.gradle b/app/build.gradle index bc3183e40..1c6751b7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 207 - versionName '1.7.10' + versionCode 209 + versionName '1.7.100' multiDexEnabled true @@ -86,7 +86,7 @@ static def getProperty(Properties properties, String name) { } static def getDate() { - new Date().format('yyyyMMdd') + new Date().format('MMdd') } ext { diff --git a/app/src/main/assets/fonts/product_sans_bold.ttf b/app/src/main/assets/fonts/product_sans_bold.ttf deleted file mode 100755 index d847195c7..000000000 Binary files a/app/src/main/assets/fonts/product_sans_bold.ttf and /dev/null differ diff --git a/app/src/main/assets/fonts/product_sans_regular.ttf b/app/src/main/assets/fonts/product_sans_regular.ttf deleted file mode 100755 index c0442ee29..000000000 Binary files a/app/src/main/assets/fonts/product_sans_regular.ttf and /dev/null differ diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 115106cb5..93fb4aa62 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -26,7 +26,7 @@ - +

Phonograph by Karim Abou Zeid

RxAndroid by RxAndroid authors

RxJava by RxJava authors

diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index a60837141..d39786976 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

You can view the changelog dialog again at any time from the about section.

Version 1.7.50

  1. Fix: Playlist renaming
  2. Improvement: Version naming
  3. Added: Changelog dialog
  4. Added: Home banner toggle.
  5. Improvement: Grammatical mistakes
\ No newline at end of file +

You can view the changelog dialog again at any time from the about section.

Version 1.7.100

  1. Fix: same theme follows entire app
  2. Added: Volume toggle for lock screen to support small screen
  3. Added: Volume toggle for lock screen to support small screen

Version 1.7.50

  1. Fix: Playlist renaming
  2. Improvement: Version naming
  3. Added: Changelog dialog
  4. Added: Home banner toggle.
  5. Improvement: Grammatical mistakes
\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java index 771e68a7a..da17354ee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java @@ -110,7 +110,8 @@ public class HomeOptionDialog extends RoundedBottomSheetDialogFragment { if (mainActivity == null) { return; } - mainActivity.setCurrentFragment(FoldersFragment.newInstance(getContext()), true); + mainActivity.setCurrentFragment(FoldersFragment.newInstance(getContext()), true, + FoldersFragment.TAG); break; case R.id.action_settings: NavigationUtil.goToSettings(getActivity()); diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java index 783f39ad7..790f73360 100644 --- a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java +++ b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java @@ -1,60 +1,63 @@ package code.name.monkey.retromusic.loaders; + import android.content.Context; import android.support.annotation.NonNull; + +import java.util.ArrayList; + import code.name.monkey.retromusic.model.Playlist; import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist; import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist; import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist; import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist; import io.reactivex.Observable; -import java.util.ArrayList; public class HomeLoader { - public static Observable> getRecentAndTopThings( - @NonNull Context context) { - ArrayList objects = new ArrayList<>(); - return Observable.create(e -> { + public static Observable> getRecentAndTopThings( + @NonNull Context context) { + ArrayList objects = new ArrayList<>(); + return Observable.create(e -> { - new HistoryPlaylist(context).getSongs(context).subscribe(songs -> { - if (!songs.isEmpty()) { - objects.add(new HistoryPlaylist(context)); - } - }); - new LastAddedPlaylist(context).getSongs(context).subscribe(songs -> { - if (!songs.isEmpty()) { - objects.add(new LastAddedPlaylist(context)); - } - }); - new MyTopTracksPlaylist(context).getSongs(context).subscribe(songs -> { - if (!songs.isEmpty()) { - objects.add(new MyTopTracksPlaylist(context)); - } - }); + new HistoryPlaylist(context).getSongs(context).subscribe(songs -> { + if (!songs.isEmpty()) { + objects.add(new HistoryPlaylist(context)); + } + }); + new LastAddedPlaylist(context).getSongs(context).subscribe(songs -> { + if (!songs.isEmpty()) { + objects.add(new LastAddedPlaylist(context)); + } + }); + new MyTopTracksPlaylist(context).getSongs(context).subscribe(songs -> { + if (!songs.isEmpty()) { + objects.add(new MyTopTracksPlaylist(context)); + } + }); - e.onNext(objects); - e.onComplete(); - }); - } - - public static Observable> getHomeLoader(@NonNull Context context) { - ArrayList playlists = new ArrayList<>(); - PlaylistLoader.getAllPlaylists(context) - .subscribe(playlists1 -> { - if (playlists1.size() > 0) { - for (Playlist playlist : playlists1) { - PlaylistSongsLoader.getPlaylistSongList(context, playlist) - .subscribe(songs -> { - if (songs.size() > 0) { - playlists.add(playlist); - } - }); - } - } + e.onNext(objects); + e.onComplete(); }); - return Observable.just(playlists); - } + } + + public static Observable> getHomeLoader(@NonNull Context context) { + ArrayList playlists = new ArrayList<>(); + PlaylistLoader.getAllPlaylists(context) + .subscribe(playlists1 -> { + if (playlists1.size() > 0) { + for (Playlist playlist : playlists1) { + PlaylistSongsLoader.getPlaylistSongList(context, playlist) + .subscribe(songs -> { + if (songs.size() > 0) { + playlists.add(playlist); + } + }); + } + } + }); + return Observable.just(playlists); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.java b/app/src/main/java/code/name/monkey/retromusic/model/Home.java index 0004c32d5..5f3ff6311 100755 --- a/app/src/main/java/code/name/monkey/retromusic/model/Home.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/Home.java @@ -1,6 +1,6 @@ package code.name.monkey.retromusic.model; -import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist; +import android.support.annotation.StringRes; import java.util.ArrayList; @@ -10,41 +10,20 @@ import java.util.ArrayList; */ public class Home { - public String sectionTitle; - public ArrayList list; - public AbsSmartPlaylist playlist; - public Home(String sectionTitle, AbsSmartPlaylist playlist) { - this.sectionTitle = sectionTitle; - this.playlist = playlist; - } + private int sectionTitle; + private ArrayList list; - public Home(String sectionTitle, ArrayList list) { + public Home(@StringRes int sectionTitle, ArrayList list) { this.sectionTitle = sectionTitle; this.list = list; } - public Home(AbsSmartPlaylist playlist) { - this.playlist = playlist; - } - - public AbsSmartPlaylist getPlaylist() { - return playlist; - } - - @Override - public String toString() { - return "Home{" + - "sectionTitle='" + sectionTitle + '\'' + - ", songs=" + list + - '}'; - } - - public String getSectionTitle() { + public int getSectionTitle() { return sectionTitle; } - public ArrayList getList() { + public ArrayList getList() { return list; } } diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/contract/HomeContract.java b/app/src/main/java/code/name/monkey/retromusic/mvp/contract/HomeContract.java index 892b0d578..59686c6bb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/contract/HomeContract.java +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/contract/HomeContract.java @@ -1,15 +1,14 @@ package code.name.monkey.retromusic.mvp.contract; +import java.util.ArrayList; + import code.name.monkey.retromusic.model.Album; import code.name.monkey.retromusic.model.Artist; import code.name.monkey.retromusic.model.Genre; import code.name.monkey.retromusic.model.Playlist; -import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist; import code.name.monkey.retromusic.mvp.BasePresenter; import code.name.monkey.retromusic.mvp.BaseView; -import java.util.ArrayList; - public interface HomeContract { interface HomeView extends BaseView> { @@ -41,4 +40,4 @@ public interface HomeContract { void loadGenres(); } -} +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java index 1baa7247c..8f6692dfb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java @@ -2,12 +2,11 @@ package code.name.monkey.retromusic.providers; import android.content.Context; -import code.name.monkey.retromusic.RetroApplication; -import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist; import java.io.File; import java.util.ArrayList; import code.name.monkey.retromusic.Injection; +import code.name.monkey.retromusic.RetroApplication; import code.name.monkey.retromusic.loaders.AlbumLoader; import code.name.monkey.retromusic.loaders.ArtistLoader; import code.name.monkey.retromusic.loaders.GenreLoader; @@ -23,6 +22,7 @@ import code.name.monkey.retromusic.model.Artist; import code.name.monkey.retromusic.model.Genre; import code.name.monkey.retromusic.model.Playlist; import code.name.monkey.retromusic.model.Song; +import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist; import code.name.monkey.retromusic.providers.interfaces.Repository; import code.name.monkey.retromusic.rest.model.KuGouRawLyric; import code.name.monkey.retromusic.rest.model.KuGouSearchLyricResult; @@ -39,7 +39,7 @@ public class RepositoryImpl implements Repository { this.context = context; } - public static synchronized RepositoryImpl getInstance( ) { + public static synchronized RepositoryImpl getInstance() { if (INSTANCE == null) { INSTANCE = new RepositoryImpl(RetroApplication.getInstance()); } diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.java b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.java index 11d3d7d40..0c15edd0e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.java @@ -16,45 +16,45 @@ import java.util.ArrayList; public interface Repository { - Observable> getAllSongs(); + Observable> getAllSongs(); - Observable> getSuggestionSongs(); + Observable> getSuggestionSongs(); - Observable getSong(int id); + Observable getSong(int id); - Observable> getAllAlbums(); + Observable> getAllAlbums(); - Observable> getRecentAlbums(); + Observable> getRecentAlbums(); - Observable> getTopAlbums(); + Observable> getTopAlbums(); - Observable getAlbum(int albumId); + Observable getAlbum(int albumId); - Observable> getAllArtists(); + Observable> getAllArtists(); - Observable> getRecentArtists(); + Observable> getRecentArtists(); - Observable> getTopArtists(); + Observable> getTopArtists(); - Observable getArtistById(long artistId); + Observable getArtistById(long artistId); - Observable> getAllPlaylists(); + Observable> getAllPlaylists(); - Observable> getFavoriteSongs(); + Observable> getFavoriteSongs(); - Observable> search(String query); + Observable> search(String query); - Observable> getPlaylistSongs(Playlist playlist); + Observable> getPlaylistSongs(Playlist playlist); - Observable> getHomeList(); + Observable> getHomeList(); - Observable> getAllThings(); + Observable> getAllThings(); - Observable> getAllGenres(); + Observable> getAllGenres(); - Observable> getGenre(int genreId); + Observable> getGenre(int genreId); - Observable downloadLrcFile(final String title, final String artist, final long duration); + Observable downloadLrcFile(final String title, final String artist, final long duration); -} +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java index b276b2b99..06433dca6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java @@ -5,7 +5,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.v4.app.ShareCompat; import android.support.v7.widget.Toolbar; import android.view.MenuItem; @@ -40,11 +39,16 @@ public class AboutActivity extends AbsBaseActivity { @BindView(R.id.toolbar) Toolbar toolbar; + @BindView(R.id.app_bar) View background; + @BindView(R.id.app_version) TextView appVersion; + @BindView(R.id.title) + TextView title; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -62,7 +66,7 @@ public class AboutActivity extends AbsBaseActivity { } @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == android.R.id.home) { onBackPressed(); return true; @@ -71,13 +75,13 @@ public class AboutActivity extends AbsBaseActivity { } private void setUpToolbar() { - + title.setTextColor(ThemeStore.textColorPrimary(this)); int primaryColor = ThemeStore.primaryColor(this); toolbar.setBackgroundColor(primaryColor); + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + toolbar.setNavigationOnClickListener(v -> onBackPressed()); setTitle(null); setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @@ -91,7 +95,7 @@ public class AboutActivity extends AbsBaseActivity { @OnClick({R.id.app_github, R.id.faq_link, R.id.app_google_plus, R.id.app_translation, R.id.app_rate, R.id.app_share, R.id.instagram_link, R.id.twitter_link, R.id.changelog, - R.id.open_source, R.id.discord_link, R.id.telegram_link}) + R.id.open_source, R.id.discord_link, R.id.telegram_link, R.id.donate_link}) public void onViewClicked(View view) { switch (view.getId()) { case R.id.faq_link: diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java index 58b57d373..63beec867 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java @@ -86,9 +86,6 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement @BindView(R.id.app_bar) @Nullable AppBarLayout appBarLayout; - @BindView(R.id.image_container) - @Nullable - View imageContainer; @BindView(R.id.content) View contentContainer; @BindView(R.id.toolbar) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java index fed141f63..f57d5fa1c 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java @@ -25,6 +25,12 @@ import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + +import com.bumptech.glide.Glide; + +import java.util.ArrayList; +import java.util.Locale; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -54,372 +60,370 @@ import code.name.monkey.retromusic.util.DensityUtil; import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroUtil; -import com.bumptech.glide.Glide; -import java.util.ArrayList; -import java.util.Locale; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements - ArtistDetailContract.ArtistsDetailsView { + ArtistDetailContract.ArtistsDetailsView { - public static final String EXTRA_ARTIST_ID = "extra_artist_id"; - private static final int REQUEST_CODE_SELECT_IMAGE = 9003; - @BindView(R.id.image) - ImageView image; - @BindView(R.id.biography) - TextView biographyTextView; - @BindView(R.id.recycler_view) - RecyclerView recyclerView; - @BindView(R.id.album_recycler_view) - RecyclerView albumRecyclerView; - @BindView(R.id.album_title) - AppCompatTextView albumTitle; - @BindView(R.id.song_title) - AppCompatTextView songTitle; - @BindView(R.id.biography_title) - AppCompatTextView biographyTitle; - @BindView(R.id.title) - TextView title; - @BindView(R.id.text) - TextView text; - @BindView(R.id.action_shuffle_all) - FloatingActionButton shuffleButton; - @BindView(R.id.collapsing_toolbar) - @Nullable - CollapsingToolbarLayout collapsingToolbarLayout; - @BindView(R.id.app_bar) - @Nullable - AppBarLayout appBarLayout; - @BindView(R.id.gradient_background) - @Nullable - View background; - @BindView(R.id.image_container) - @Nullable - View imageContainer; - @BindView(R.id.content) - View contentContainer; - @BindView(R.id.toolbar) - Toolbar toolbar; - @Nullable - private Spanned biography; - private Artist artist; - private LastFMRestClient lastFMRestClient; - private ArtistDetailsPresenter artistDetailsPresenter; - private SimpleSongAdapter songAdapter; - private AlbumAdapter albumAdapter; - private boolean forceDownload; + public static final String EXTRA_ARTIST_ID = "extra_artist_id"; + private static final int REQUEST_CODE_SELECT_IMAGE = 9003; + @BindView(R.id.app_bar) + @Nullable + AppBarLayout appBarLayout; + @BindView(R.id.collapsing_toolbar) + @Nullable + CollapsingToolbarLayout collapsingToolbarLayout; - @Override - protected View createContentView() { - return wrapSlidingMusicPanel(R.layout.activity_artist_details); - } + @BindView(R.id.image) + ImageView image; + @BindView(R.id.biography) + TextView biographyTextView; + @BindView(R.id.recycler_view) + RecyclerView recyclerView; + @BindView(R.id.album_recycler_view) + RecyclerView albumRecyclerView; + @BindView(R.id.album_title) + AppCompatTextView albumTitle; + @BindView(R.id.song_title) + AppCompatTextView songTitle; + @BindView(R.id.biography_title) + AppCompatTextView biographyTitle; + @BindView(R.id.title) + TextView title; + @BindView(R.id.text) + TextView text; + @BindView(R.id.action_shuffle_all) + FloatingActionButton shuffleButton; + @BindView(R.id.gradient_background) + @Nullable + View background; + @BindView(R.id.image_container) + @Nullable + View imageContainer; + @BindView(R.id.content) + View contentContainer; + @BindView(R.id.toolbar) + Toolbar toolbar; + @Nullable + private Spanned biography; + private Artist artist; + private LastFMRestClient lastFMRestClient; + private ArtistDetailsPresenter artistDetailsPresenter; + private SimpleSongAdapter songAdapter; + private AlbumAdapter albumAdapter; + private boolean forceDownload; - @Override - protected void onCreate(Bundle bundle) { - setDrawUnderStatusBar(true); - super.onCreate(bundle); - ButterKnife.bind(this); - - supportPostponeEnterTransition(); - setBottomBarVisibility(View.GONE); - setNavigationbarColorAuto(); - setLightNavigationBar(true); - - lastFMRestClient = new LastFMRestClient(this); - - setUpViews(); - - int artistID = getIntent().getIntExtra(EXTRA_ARTIST_ID, -1); - artistDetailsPresenter = new ArtistDetailsPresenter(this, artistID); - } - - private void setUpViews() { - setupRecyclerView(); - setupToolbar(); - setupContainerHeight(); - } - - private void setupContainerHeight() { - if (imageContainer != null) { - LayoutParams params = imageContainer.getLayoutParams(); - params.width = DensityUtil.getScreenHeight(this) / 2; - imageContainer.setLayoutParams(params); - } - } - - private void setupToolbar() { - toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); - setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setTitle(null); - - if (toolbar != null && !PreferenceUtil.getInstance(this).getFullScreenMode()) { - ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar - .getLayoutParams(); - params.topMargin = RetroUtil.getStatusBarHeight(this); - toolbar.setLayoutParams(params); + @Override + protected View createContentView() { + return wrapSlidingMusicPanel(R.layout.activity_artist_details); } - int primaryColor = ThemeStore.primaryColor(this); - TintHelper.setTintAuto(contentContainer, primaryColor, true); + @Override + protected void onCreate(Bundle bundle) { + setDrawUnderStatusBar(true); + super.onCreate(bundle); + ButterKnife.bind(this); - if (appBarLayout != null) { - appBarLayout.setBackgroundColor(primaryColor); - appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() { - @Override - public void onStateChanged(AppBarLayout appBarLayout, - AppBarStateChangeListener.State state) { - int color; - switch (state) { - case COLLAPSED: - setLightStatusbar(!ATHUtil.isWindowBackgroundDark(ArtistDetailActivity.this)); - color = ATHUtil.resolveColor(ArtistDetailActivity.this, R.attr.iconColor); - break; + supportPostponeEnterTransition(); + setBottomBarVisibility(View.GONE); + setNavigationbarColorAuto(); + setLightNavigationBar(true); + + lastFMRestClient = new LastFMRestClient(this); + + setUpViews(); + + int artistID = getIntent().getIntExtra(EXTRA_ARTIST_ID, -1); + artistDetailsPresenter = new ArtistDetailsPresenter(this, artistID); + } + + private void setUpViews() { + setupRecyclerView(); + setupToolbar(); + setupContainerHeight(); + } + + private void setupContainerHeight() { + if (imageContainer != null) { + LayoutParams params = imageContainer.getLayoutParams(); + params.width = DensityUtil.getScreenHeight(this) / 2; + imageContainer.setLayoutParams(params); + } + } + + private void setupToolbar() { + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + setSupportActionBar(toolbar); + //noinspection ConstantConditions + getSupportActionBar().setTitle(null); + + if (toolbar != null && !PreferenceUtil.getInstance(this).getFullScreenMode()) { + ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar + .getLayoutParams(); + params.topMargin = RetroUtil.getStatusBarHeight(this); + toolbar.setLayoutParams(params); + } + + int primaryColor = ThemeStore.primaryColor(this); + TintHelper.setTintAuto(contentContainer, primaryColor, true); + + if (appBarLayout != null) { + appBarLayout.setBackgroundColor(primaryColor); + appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() { + @Override + public void onStateChanged(AppBarLayout appBarLayout, + AppBarStateChangeListener.State state) { + int color; + switch (state) { + case COLLAPSED: + setLightStatusbar(!ATHUtil.isWindowBackgroundDark(ArtistDetailActivity.this)); + color = ATHUtil.resolveColor(ArtistDetailActivity.this, R.attr.iconColor); + break; + default: + case EXPANDED: + case IDLE: + setLightStatusbar(false); + color = ContextCompat.getColor(ArtistDetailActivity.this, R.color.md_white_1000); + break; + } + ToolbarContentTintHelper.colorizeToolbar(toolbar, color, ArtistDetailActivity.this); + } + }); + } + if (collapsingToolbarLayout != null) { + collapsingToolbarLayout.setContentScrimColor(primaryColor); + collapsingToolbarLayout.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor)); + } + } + + private void setupRecyclerView() { + albumAdapter = new HorizontalAlbumAdapter(this, new ArrayList<>(), false, null); + albumRecyclerView.setItemAnimator(new DefaultItemAnimator()); + albumRecyclerView + .setLayoutManager(new GridLayoutManager(this, 1, GridLayoutManager.HORIZONTAL, false)); + albumRecyclerView.setAdapter(albumAdapter); + + songAdapter = new SimpleSongAdapter(this, new ArrayList<>(), R.layout.item_song); + recyclerView.setItemAnimator(new DefaultItemAnimator()); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + recyclerView.setAdapter(songAdapter); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + switch (requestCode) { + case REQUEST_CODE_SELECT_IMAGE: + if (resultCode == RESULT_OK) { + CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, data.getData()); + } + break; default: - case EXPANDED: - case IDLE: - setLightStatusbar(false); - color = ContextCompat.getColor(ArtistDetailActivity.this, R.color.md_white_1000); - break; - } - ToolbarContentTintHelper.colorizeToolbar(toolbar, color, ArtistDetailActivity.this); + if (resultCode == RESULT_OK) { + reload(); + } + break; } - }); } - if (collapsingToolbarLayout != null) { - collapsingToolbarLayout.setContentScrimColor(primaryColor); - collapsingToolbarLayout.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor)); + + @Override + protected void onResume() { + super.onResume(); + artistDetailsPresenter.subscribe(); } - } - private void setupRecyclerView() { - albumAdapter = new HorizontalAlbumAdapter(this, new ArrayList<>(), false, null); - albumRecyclerView.setItemAnimator(new DefaultItemAnimator()); - albumRecyclerView - .setLayoutManager(new GridLayoutManager(this, 1, GridLayoutManager.HORIZONTAL, false)); - albumRecyclerView.setAdapter(albumAdapter); + @Override + protected void onPause() { + super.onPause(); + artistDetailsPresenter.unsubscribe(); + } - songAdapter = new SimpleSongAdapter(this, new ArrayList<>(), R.layout.item_song); - recyclerView.setItemAnimator(new DefaultItemAnimator()); - recyclerView.setLayoutManager(new LinearLayoutManager(this)); - recyclerView.setAdapter(songAdapter); - } + @Override + public void loading() { + } + @Override + public void showEmptyView() { - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - switch (requestCode) { - case REQUEST_CODE_SELECT_IMAGE: - if (resultCode == RESULT_OK) { - CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, data.getData()); + } + + @Override + public void completed() { + supportStartPostponedEnterTransition(); + } + + @Override + public void showData(Artist artist) { + setArtist(artist); + } + + private Artist getArtist() { + if (artist == null) { + artist = new Artist(); } - break; - default: - if (resultCode == RESULT_OK) { - reload(); + return artist; + } + + private void setArtist(Artist artist) { + if (artist.getSongCount() <= 0) { + finish(); } - break; + this.artist = artist; + loadArtistImage(); + + if (RetroUtil.isAllowedToDownloadMetadata(this)) { + loadBiography(); + } + title.setText(artist.getName()); + text.setText(String.format("%s • %s", MusicUtil.getArtistInfoString(this, artist), MusicUtil + .getReadableDurationString(MusicUtil.getTotalDuration(this, artist.getSongs())))); + + songAdapter.swapDataSet(artist.getSongs()); + albumAdapter.swapDataSet(artist.albums); } - } - @Override - protected void onResume() { - super.onResume(); - artistDetailsPresenter.subscribe(); - } - - @Override - protected void onPause() { - super.onPause(); - artistDetailsPresenter.unsubscribe(); - } - - @Override - public void loading() { - } - - @Override - public void showEmptyView() { - - } - - @Override - public void completed() { - supportStartPostponedEnterTransition(); - } - - @Override - public void showData(Artist artist) { - setArtist(artist); - } - - private Artist getArtist() { - if (artist == null) { - artist = new Artist(); + private void loadBiography() { + loadBiography(Locale.getDefault().getLanguage()); } - return artist; - } - private void setArtist(Artist artist) { - if (artist.getSongCount() <= 0) { - finish(); + private void loadBiography(@Nullable final String lang) { + biography = null; + + lastFMRestClient.getApiService() + .getArtistInfo(getArtist().getName(), lang, null) + .enqueue(new Callback() { + @Override + public void onResponse(@NonNull Call call, + @NonNull Response response) { + final LastFmArtist lastFmArtist = response.body(); + if (lastFmArtist != null && lastFmArtist.getArtist() != null) { + final String bioContent = lastFmArtist.getArtist().getBio().getContent(); + if (bioContent != null && !bioContent.trim().isEmpty()) { + //TransitionManager.beginDelayedTransition(titleContainer); + biographyTextView.setVisibility(View.VISIBLE); + biographyTitle.setVisibility(View.VISIBLE); + biography = Html.fromHtml(bioContent); + biographyTextView.setText(biography); + } + } + + // If the "lang" parameter is set and no biography is given, retry with default language + if (biography == null && lang != null) { + loadBiography(null); + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + t.printStackTrace(); + biography = null; + } + }); } - this.artist = artist; - loadArtistImage(); - if (RetroUtil.isAllowedToDownloadMetadata(this)) { - loadBiography(); + @OnClick(R.id.biography) + void toggleArtistBiography() { + if (biographyTextView.getMaxLines() == 4) { + biographyTextView.setMaxLines(Integer.MAX_VALUE); + } else { + biographyTextView.setMaxLines(4); + } } - title.setText(artist.getName()); - text.setText(String.format("%s • %s", MusicUtil.getArtistInfoString(this, artist), MusicUtil - .getReadableDurationString(MusicUtil.getTotalDuration(this, artist.getSongs())))); - songAdapter.swapDataSet(artist.getSongs()); - albumAdapter.swapDataSet(artist.albums); - } - - private void loadBiography() { - loadBiography(Locale.getDefault().getLanguage()); - } - - private void loadBiography(@Nullable final String lang) { - biography = null; - - lastFMRestClient.getApiService() - .getArtistInfo(getArtist().getName(), lang, null) - .enqueue(new Callback() { - @Override - public void onResponse(@NonNull Call call, - @NonNull Response response) { - final LastFmArtist lastFmArtist = response.body(); - if (lastFmArtist != null && lastFmArtist.getArtist() != null) { - final String bioContent = lastFmArtist.getArtist().getBio().getContent(); - if (bioContent != null && !bioContent.trim().isEmpty()) { - //TransitionManager.beginDelayedTransition(titleContainer); - biographyTextView.setVisibility(View.VISIBLE); - biographyTitle.setVisibility(View.VISIBLE); - biography = Html.fromHtml(bioContent); - biographyTextView.setText(biography); - } - } - - // If the "lang" parameter is set and no biography is given, retry with default language - if (biography == null && lang != null) { - loadBiography(null); - } - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { - t.printStackTrace(); - biography = null; - } - }); - } - - @OnClick(R.id.biography) - void toggleArtistBiography() { - if (biographyTextView.getMaxLines() == 4) { - biographyTextView.setMaxLines(Integer.MAX_VALUE); - } else { - biographyTextView.setMaxLines(4); + private void loadArtistImage() { + ArtistGlideRequest.Builder.from(Glide.with(this), artist) + .forceDownload(forceDownload) + .generatePalette(this).build() + .dontAnimate() + .into(new RetroMusicColoredTarget(image) { + @Override + public void onColorReady(int color) { + setColors(color); + } + }); + forceDownload = false; } - } - private void loadArtistImage() { - ArtistGlideRequest.Builder.from(Glide.with(this), artist) - .forceDownload(forceDownload) - .generatePalette(this).build() - .dontAnimate() - .into(new RetroMusicColoredTarget(image) { - @Override - public void onColorReady(int color) { - setColors(color); - } - }); - forceDownload = false; - } + private void setColors(int color) { - private void setColors(int color) { + int textColor = + PreferenceUtil.getInstance(this).getAdaptiveColor() ? color : ThemeStore.accentColor(this); - int textColor = - PreferenceUtil.getInstance(this).getAdaptiveColor() ? color : ThemeStore.accentColor(this); + albumTitle.setTextColor(textColor); + songTitle.setTextColor(textColor); + biographyTitle.setTextColor(textColor); - albumTitle.setTextColor(textColor); - songTitle.setTextColor(textColor); - biographyTitle.setTextColor(textColor); + TintHelper.setTintAuto(shuffleButton, textColor, true); - TintHelper.setTintAuto(shuffleButton, textColor, true); - - if (background != null) { - background.setBackgroundTintList(ColorStateList.valueOf(color)); + if (background != null) { + background.setBackgroundTintList(ColorStateList.valueOf(color)); + } + findViewById(R.id.root).setBackgroundColor(ThemeStore.primaryColor(this)); } - findViewById(R.id.root).setBackgroundColor(ThemeStore.primaryColor(this)); - } - @OnClick({R.id.action_shuffle_all}) - public void onViewClicked(View view) { - switch (view.getId()) { - case R.id.action_shuffle_all: - MusicPlayerRemote.openAndShuffleQueue(getArtist().getSongs(), true); - break; + @OnClick({R.id.action_shuffle_all}) + public void onViewClicked(View view) { + switch (view.getId()) { + case R.id.action_shuffle_all: + MusicPlayerRemote.openAndShuffleQueue(getArtist().getSongs(), true); + break; + } } - } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - return handleSortOrderMenuItem(item); - } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + return handleSortOrderMenuItem(item); + } - private boolean handleSortOrderMenuItem(@NonNull MenuItem item) { - final ArrayList songs = getArtist().getSongs(); - switch (item.getItemId()) { - case android.R.id.home: - super.onBackPressed(); - return true; - case R.id.action_play_next: - MusicPlayerRemote.playNext(songs); - return true; - case R.id.action_add_to_current_playing: - MusicPlayerRemote.enqueue(songs); - return true; - case R.id.action_add_to_playlist: - AddToPlaylistDialog.create(songs).show(getSupportFragmentManager(), "ADD_PLAYLIST"); - return true; - case R.id.action_set_artist_image: - Intent intent = new Intent(Intent.ACTION_GET_CONTENT); - intent.setType("image/*"); - startActivityForResult( - Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), - REQUEST_CODE_SELECT_IMAGE); - return true; - case R.id.action_reset_artist_image: - Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), - Toast.LENGTH_SHORT).show(); - CustomArtistImageUtil.getInstance(ArtistDetailActivity.this).resetCustomArtistImage(artist); - forceDownload = true; + private boolean handleSortOrderMenuItem(@NonNull MenuItem item) { + final ArrayList songs = getArtist().getSongs(); + switch (item.getItemId()) { + case android.R.id.home: + super.onBackPressed(); + return true; + case R.id.action_play_next: + MusicPlayerRemote.playNext(songs); + return true; + case R.id.action_add_to_current_playing: + MusicPlayerRemote.enqueue(songs); + return true; + case R.id.action_add_to_playlist: + AddToPlaylistDialog.create(songs).show(getSupportFragmentManager(), "ADD_PLAYLIST"); + return true; + case R.id.action_set_artist_image: + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType("image/*"); + startActivityForResult( + Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), + REQUEST_CODE_SELECT_IMAGE); + return true; + case R.id.action_reset_artist_image: + Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), + Toast.LENGTH_SHORT).show(); + CustomArtistImageUtil.getInstance(ArtistDetailActivity.this).resetCustomArtistImage(artist); + forceDownload = true; + return true; + } return true; } - return true; - } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_artist_detail, menu); - return super.onCreateOptionsMenu(menu); - } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_artist_detail, menu); + return super.onCreateOptionsMenu(menu); + } - @Override - public void onMediaStoreChanged() { - super.onMediaStoreChanged(); - reload(); - } + @Override + public void onMediaStoreChanged() { + super.onMediaStoreChanged(); + reload(); + } - private void reload() { - artistDetailsPresenter.unsubscribe(); - artistDetailsPresenter.subscribe(); - } + private void reload() { + artistDetailsPresenter.unsubscribe(); + artistDetailsPresenter.subscribe(); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java index 83e1d19dc..9a26b8df5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java @@ -15,6 +15,7 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.Spinner; import android.widget.TextView; + import butterknife.BindView; import butterknife.ButterKnife; import code.name.monkey.appthemehelper.ThemeStore; @@ -27,197 +28,205 @@ import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity; */ public class EqualizerActivity extends AbsMusicServiceActivity implements - AdapterView.OnItemSelectedListener { + AdapterView.OnItemSelectedListener { - @BindView(R.id.equalizer) - SwitchCompat mEnable; - @BindView(R.id.content) - LinearLayout mContent; - @BindView(R.id.bands) - LinearLayout mLinearLayout; + @BindView(R.id.equalizer) + SwitchCompat mEnable; - @BindView(R.id.bass_boost_strength) - SeekBar mBassBoostStrength; - @BindView(R.id.virtualizer_strength) - SeekBar mVirtualizerStrength; + @BindView(R.id.content) + LinearLayout mContent; - @BindView(R.id.bass_boost) - TextView mBassBoost; - @BindView(R.id.virtualizer) - TextView mVirtualizer; + @BindView(R.id.bands) + LinearLayout mLinearLayout; - @BindView(R.id.toolbar) - Toolbar mToolbar; - @BindView(R.id.app_bar) - AppBarLayout mAppBar; - @BindView(R.id.presets) - Spinner mPresets; + @BindView(R.id.bass_boost_strength) + SeekBar mBassBoostStrength; - private CompoundButton.OnCheckedChangeListener mListener = (buttonView, isChecked) -> { - switch (buttonView.getId()) { - case R.id.equalizer: - EqualizerHelper.getInstance().getEqualizer().setEnabled(isChecked); - TransitionManager.beginDelayedTransition(mContent); - mContent.setVisibility(isChecked ? View.VISIBLE : View.GONE); - break; - } - }; - private SeekBar.OnSeekBarChangeListener mSeekBarChangeListener = new SeekBar.OnSeekBarChangeListener() { - @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - if (fromUser) { - if (seekBar == mBassBoostStrength) { - mBassBoost.setEnabled(progress > 0); - EqualizerHelper.getInstance().setBassBoostStrength(progress); - EqualizerHelper.getInstance().setBassBoostEnabled(progress > 0); - } else if (seekBar == mVirtualizerStrength) { - mVirtualizer.setEnabled(progress > 0); - EqualizerHelper.getInstance().setVirtualizerEnabled(progress > 0); - EqualizerHelper.getInstance().setVirtualizerStrength(progress); + @BindView(R.id.virtualizer_strength) + SeekBar mVirtualizerStrength; + + @BindView(R.id.bass_boost) + TextView mBassBoost; + + @BindView(R.id.virtualizer) + TextView mVirtualizer; + + @BindView(R.id.toolbar) + Toolbar mToolbar; + + @BindView(R.id.app_bar) + AppBarLayout mAppBar; + + @BindView(R.id.presets) + Spinner mPresets; + + @BindView(R.id.title) + TextView mTitle; + + private CompoundButton.OnCheckedChangeListener mListener = (buttonView, isChecked) -> { + switch (buttonView.getId()) { + case R.id.equalizer: + EqualizerHelper.getInstance().getEqualizer().setEnabled(isChecked); + TransitionManager.beginDelayedTransition(mContent); + mContent.setVisibility(isChecked ? View.VISIBLE : View.GONE); + break; } - } - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) { - - } - - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - - } - }; - private ArrayAdapter mPresetsNamesAdapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_equalizer); - ButterKnife.bind(this); - - setStatusbarColorAuto(); - setNavigationbarColorAuto(); - setTaskDescriptionColorAuto(); - setLightNavigationBar(true); - - int primaryColor = ThemeStore.primaryColor(this); - mToolbar.setBackgroundColor(primaryColor); - mAppBar.setBackgroundColor(primaryColor); - mToolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - onBackPressed(); - } - }); - mToolbar.setTitle(R.string.equalizer); - setSupportActionBar(mToolbar); - //noinspection ConstantConditions - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - mEnable.setChecked(EqualizerHelper.getInstance().getEqualizer().getEnabled()); - mEnable.setOnCheckedChangeListener(mListener); - - mPresetsNamesAdapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1); - mPresets.setAdapter(mPresetsNamesAdapter); - mPresets.setOnItemSelectedListener(this); - - mBassBoostStrength.setProgress(EqualizerHelper.getInstance().getBassBoostStrength()); - mBassBoostStrength.setOnSeekBarChangeListener(mSeekBarChangeListener); - - mVirtualizerStrength.setProgress(EqualizerHelper.getInstance().getVirtualizerStrength()); - mVirtualizerStrength.setOnSeekBarChangeListener(mSeekBarChangeListener); - - setupUI(); - addPresets(); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - } - return super.onOptionsItemSelected(item); - - } - - private void addPresets() { - mPresetsNamesAdapter.clear(); - mPresetsNamesAdapter.add("Custom"); - for (int j = 0; j < EqualizerHelper.getInstance().getEqualizer().getNumberOfPresets(); j++) { - mPresetsNamesAdapter - .add(EqualizerHelper.getInstance().getEqualizer().getPresetName((short) j)); - mPresetsNamesAdapter.notifyDataSetChanged(); - } - mPresets - .setSelection((int) EqualizerHelper.getInstance().getEqualizer().getCurrentPreset() + 1); - } - - private void setupUI() { - mLinearLayout.removeAllViews(); - short bands; - try { - // get number of supported bands - bands = (short) EqualizerHelper.getInstance().getNumberOfBands(); - - // for each of the supported bands, we will set up a slider from -10dB to 10dB boost/attenuation, - // as well as text labels to assist the user - for (short i = 0; i < bands; i++) { - final short band = i; - - View view = LayoutInflater.from(this).inflate(R.layout.retro_seekbar, mLinearLayout, false); - TextView freqTextView = view.findViewById(R.id.hurtz); - freqTextView.setText( - String.format("%d Hz", EqualizerHelper.getInstance().getCenterFreq((int) band) / 1000)); - - TextView minDbTextView = view.findViewById(R.id.minus_db); - minDbTextView - .setText(String.format("%d dB", EqualizerHelper.getInstance().getBandLevelLow() / 100)); - - TextView maxDbTextView = view.findViewById(R.id.plus_db); - maxDbTextView.setText( - String.format("%d dB", EqualizerHelper.getInstance().getBandLevelHigh() / 100)); - - SeekBar bar = view.findViewById(R.id.seekbar); - bar.setMax(EqualizerHelper.getInstance().getBandLevelHigh() - EqualizerHelper.getInstance() - .getBandLevelLow()); - bar.setProgress( - EqualizerHelper.getInstance().getBandLevel((int) band) - EqualizerHelper.getInstance() - .getBandLevelLow()); - bar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - EqualizerHelper.getInstance().setBandLevel((int) band, - (int) (progress + EqualizerHelper.getInstance().getBandLevelLow())); + }; + private SeekBar.OnSeekBarChangeListener mSeekBarChangeListener = new SeekBar.OnSeekBarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { if (fromUser) { - mPresets.setSelection(0); + if (seekBar == mBassBoostStrength) { + mBassBoost.setEnabled(progress > 0); + EqualizerHelper.getInstance().setBassBoostStrength(progress); + EqualizerHelper.getInstance().setBassBoostEnabled(progress > 0); + } else if (seekBar == mVirtualizerStrength) { + mVirtualizer.setEnabled(progress > 0); + EqualizerHelper.getInstance().setVirtualizerEnabled(progress > 0); + EqualizerHelper.getInstance().setVirtualizerStrength(progress); + } } - } + } - public void onStartTrackingTouch(SeekBar seekBar) { - } + @Override + public void onStartTrackingTouch(SeekBar seekBar) { - public void onStopTrackingTouch(SeekBar seekBar) { - } - }); + } - mLinearLayout.addView(view); - } - } catch (Exception e) { - e.printStackTrace(); + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + + } + }; + private ArrayAdapter mPresetsNamesAdapter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_equalizer); + ButterKnife.bind(this); + + setStatusbarColorAuto(); + setNavigationbarColorAuto(); + setTaskDescriptionColorAuto(); + setLightNavigationBar(true); + + setupToolbar(); + + mEnable.setChecked(EqualizerHelper.getInstance().getEqualizer().getEnabled()); + mEnable.setOnCheckedChangeListener(mListener); + + mPresetsNamesAdapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1); + mPresets.setAdapter(mPresetsNamesAdapter); + mPresets.setOnItemSelectedListener(this); + + mBassBoostStrength.setProgress(EqualizerHelper.getInstance().getBassBoostStrength()); + mBassBoostStrength.setOnSeekBarChangeListener(mSeekBarChangeListener); + + mVirtualizerStrength.setProgress(EqualizerHelper.getInstance().getVirtualizerStrength()); + mVirtualizerStrength.setOnSeekBarChangeListener(mSeekBarChangeListener); + + setupUI(); + addPresets(); } - } - @Override - public void onItemSelected(AdapterView parent, View view, int position, long id) { - if (position == 0) { - return; + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); } - EqualizerHelper.getInstance().getEqualizer().usePreset((short) (position - 1)); - setupUI(); - } - @Override - public void onNothingSelected(AdapterView parent) { + private void setupToolbar() { + mTitle.setTextColor(ThemeStore.textColorPrimary(this)); + int primaryColor = ThemeStore.primaryColor(this); + mToolbar.setBackgroundColor(primaryColor); + mAppBar.setBackgroundColor(primaryColor); + mToolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + mToolbar.setNavigationOnClickListener(v -> onBackPressed()); + setSupportActionBar(mToolbar); + setTitle(null); + } - } + private void addPresets() { + mPresetsNamesAdapter.clear(); + mPresetsNamesAdapter.add("Custom"); + for (int j = 0; j < EqualizerHelper.getInstance().getEqualizer().getNumberOfPresets(); j++) { + mPresetsNamesAdapter + .add(EqualizerHelper.getInstance().getEqualizer().getPresetName((short) j)); + mPresetsNamesAdapter.notifyDataSetChanged(); + } + mPresets + .setSelection((int) EqualizerHelper.getInstance().getEqualizer().getCurrentPreset() + 1); + } + + private void setupUI() { + mLinearLayout.removeAllViews(); + short bands; + try { + // get number of supported bands + bands = (short) EqualizerHelper.getInstance().getNumberOfBands(); + + // for each of the supported bands, we will set up a slider from -10dB to 10dB boost/attenuation, + // as well as text labels to assist the user + for (short i = 0; i < bands; i++) { + final short band = i; + + View view = LayoutInflater.from(this).inflate(R.layout.retro_seekbar, mLinearLayout, false); + TextView freqTextView = view.findViewById(R.id.hurtz); + freqTextView.setText( + String.format("%d Hz", EqualizerHelper.getInstance().getCenterFreq((int) band) / 1000)); + + TextView minDbTextView = view.findViewById(R.id.minus_db); + minDbTextView + .setText(String.format("%d dB", EqualizerHelper.getInstance().getBandLevelLow() / 100)); + + TextView maxDbTextView = view.findViewById(R.id.plus_db); + maxDbTextView.setText( + String.format("%d dB", EqualizerHelper.getInstance().getBandLevelHigh() / 100)); + + SeekBar bar = view.findViewById(R.id.seekbar); + bar.setMax(EqualizerHelper.getInstance().getBandLevelHigh() - EqualizerHelper.getInstance() + .getBandLevelLow()); + bar.setProgress( + EqualizerHelper.getInstance().getBandLevel((int) band) - EqualizerHelper.getInstance() + .getBandLevelLow()); + bar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + EqualizerHelper.getInstance().setBandLevel((int) band, + (int) (progress + EqualizerHelper.getInstance().getBandLevelLow())); + if (fromUser) { + mPresets.setSelection(0); + } + } + + public void onStartTrackingTouch(SeekBar seekBar) { + } + + public void onStopTrackingTouch(SeekBar seekBar) { + } + }); + + mLinearLayout.addView(view); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if (position == 0) { + return; + } + EqualizerHelper.getInstance().getEqualizer().usePreset((short) (position - 1)); + setupUI(); + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java index b72bfc56f..e246bf65a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java @@ -3,7 +3,6 @@ package code.name.monkey.retromusic.ui.activities; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; import android.support.design.widget.FloatingActionButton; import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; @@ -18,7 +17,6 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.afollestad.materialcab.MaterialCab; -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.ArrayList; @@ -39,6 +37,7 @@ import code.name.monkey.retromusic.model.Genre; import code.name.monkey.retromusic.model.Song; import code.name.monkey.retromusic.mvp.contract.GenreDetailsContract; import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter; +import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity; import code.name.monkey.retromusic.ui.adapter.song.SongAdapter; import code.name.monkey.retromusic.util.RetroColorUtil; import code.name.monkey.retromusic.util.RetroUtil; @@ -72,8 +71,8 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement @BindView(R.id.app_bar) AppBarLayout appBarLayout; - @BindView(R.id.collapsing_toolbar) - CollapsingToolbarLayout toolbarLayout; + @BindView(R.id.title) + TextView title; private Genre genre; private GenreDetailsPresenter presenter; @@ -99,8 +98,7 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement setBottomBarVisibility(View.GONE); - RetroUtil.statusBarHeight(statusBar); - + RetroUtil.statusBarHeight(statusBar); genre = getIntent().getParcelableExtra(EXTRA_GENRE_ID); presenter = new GenreDetailsPresenter(this, genre.id); @@ -119,14 +117,14 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement } private void setUpToolBar() { + title.setText(genre.name); + title.setTextColor(ThemeStore.textColorPrimary(this)); int primaryColor = ThemeStore.primaryColor(this); toolbar.setBackgroundColor(primaryColor); appBarLayout.setBackgroundColor(primaryColor); toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + setTitle(null); setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setTitle(genre.name); - setTitle(R.string.app_name); appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() { @Override @@ -140,7 +138,6 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement color = ATHUtil.resolveColor(GenreDetailsActivity.this, android.R.attr.textColorPrimary); break; } - toolbarLayout.setExpandedTitleColor(color); ToolbarContentTintHelper.colorizeToolbar(toolbar, color, GenreDetailsActivity.this); } }); @@ -267,6 +264,4 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement super.onMediaStoreChanged(); presenter.subscribe(); } - - } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java index 0efcfac5e..dd6da1236 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java @@ -6,6 +6,8 @@ import android.support.design.widget.AppBarLayout; import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.webkit.WebView; +import android.widget.TextView; + import butterknife.BindView; import butterknife.ButterKnife; import code.name.monkey.appthemehelper.ThemeStore; @@ -13,40 +15,46 @@ import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity; public class LicenseActivity extends AbsBaseActivity { - @BindView(R.id.license) - WebView mLicense; - @BindView(R.id.toolbar) - Toolbar mToolbar; - @BindView(R.id.appbar) - AppBarLayout mAppbar; + @BindView(R.id.license) + WebView mLicense; - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; + @BindView(R.id.toolbar) + Toolbar mToolbar; + + @BindView(R.id.app_bar) + AppBarLayout mAppbar; + + @BindView(R.id.title) + TextView title; + + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); } - return super.onOptionsItemSelected(item); - } - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_license); - ButterKnife.bind(this); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_license); + ButterKnife.bind(this); - setStatusbarColorAuto(); - setNavigationbarColorAuto(); - setTaskDescriptionColorAuto(); - setLightNavigationBar(true); + setStatusbarColorAuto(); + setNavigationbarColorAuto(); + setTaskDescriptionColorAuto(); + setLightNavigationBar(true); - mLicense.loadUrl("file:///android_asset/index.html"); + mLicense.loadUrl("file:///android_asset/index.html"); - mToolbar.setTitle(R.string.licenses); - mToolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); - mToolbar.setNavigationOnClickListener(view -> onBackPressed()); - mToolbar.setBackgroundColor(ThemeStore.primaryColor(this)); - mAppbar.setBackgroundColor(ThemeStore.primaryColor(this)); - setSupportActionBar(mToolbar); - } + title.setTextColor(ThemeStore.textColorPrimary(this)); + mToolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + mToolbar.setNavigationOnClickListener(view -> onBackPressed()); + mToolbar.setBackgroundColor(ThemeStore.primaryColor(this)); + mAppbar.setBackgroundColor(ThemeStore.primaryColor(this)); + setTitle(null); + setSupportActionBar(mToolbar); + } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java index 7c7499a6c..2b94f423e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java @@ -155,14 +155,16 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this); } - public void setCurrentFragment(@Nullable Fragment fragment, boolean isStackAdd) { + public void setCurrentFragment(@Nullable Fragment fragment, boolean isStackAdd, String tag) { + FragmentManager fragmentManager = getSupportFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - fragmentTransaction.replace(R.id.fragment_container, fragment, TAG); + fragmentTransaction.replace(R.id.fragment_container, fragment, tag); if (isStackAdd) { - fragmentTransaction.addToBackStack(TAG); + fragmentTransaction.addToBackStack(tag); } fragmentTransaction.commit(); + currentFragment = (MainActivityFragmentCallbacks) fragment; } @@ -186,13 +188,13 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements case R.id.action_album: case R.id.action_artist: case R.id.action_playlist: - setCurrentFragment(LibraryFragment.newInstance(menuItem), false); + setCurrentFragment(LibraryFragment.newInstance(menuItem), false, LibraryFragment.TAG); break; default: case R.id.action_home: - setCurrentFragment(PreferenceUtil.getInstance(this).toggleHomeBanner() ? BannerHomeFragment - .newInstance() : HomeFragment.newInstance(), - false); + setCurrentFragment(PreferenceUtil.getInstance(this).toggleHomeBanner() ? + BannerHomeFragment.newInstance() : HomeFragment.newInstance(), false, + HomeFragment.TAG); break; } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java index f29967a97..e6adf5dfe 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.design.widget.AppBarLayout; import android.support.v7.widget.Toolbar; import android.widget.TextView; + import butterknife.BindDrawable; import butterknife.BindString; import butterknife.BindView; @@ -19,50 +20,56 @@ import code.name.monkey.retromusic.util.MusicUtil; public class PlayingQueueActivity extends AbsMusicServiceActivity { - @BindView(R.id.toolbar) - Toolbar mToolbar; - @BindDrawable(R.drawable.ic_close_white_24dp) - Drawable mClose; - @BindView(R.id.player_queue_sub_header) - TextView mPlayerQueueSubHeader; - @BindString(R.string.queue) - String queue; - @BindView(R.id.app_bar) - AppBarLayout mAppBarLayout; + @BindView(R.id.toolbar) + Toolbar mToolbar; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_playing_queue); - ButterKnife.bind(this); + @BindDrawable(R.drawable.ic_keyboard_backspace_black_24dp) + Drawable mClose; - setStatusbarColorAuto(); - setNavigationbarColorAuto(); - setTaskDescriptionColorAuto(); - setLightNavigationBar(true); + @BindView(R.id.player_queue_sub_header) + TextView mPlayerQueueSubHeader; - setupToolbar(); - if (savedInstanceState == null) { - getSupportFragmentManager().beginTransaction() - .replace(R.id.fragment_container, new PlayingQueueFragment()) - .commit(); + @BindString(R.string.queue) + String queue; + + @BindView(R.id.app_bar) + AppBarLayout mAppBarLayout; + + @BindView(R.id.title) + TextView title; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_playing_queue); + ButterKnife.bind(this); + + setStatusbarColorAuto(); + setNavigationbarColorAuto(); + setTaskDescriptionColorAuto(); + setLightNavigationBar(true); + + setupToolbar(); + if (savedInstanceState == null) { + getSupportFragmentManager().beginTransaction() + .replace(R.id.fragment_container, new PlayingQueueFragment()) + .commit(); + } } - } - protected String getUpNextAndQueueTime() { - return getResources().getString(R.string.up_next) + " • " + MusicUtil - .getReadableDurationString( - MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())); - } + protected String getUpNextAndQueueTime() { + return getResources().getString(R.string.up_next) + " • " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())); + } - private void setupToolbar() { - mPlayerQueueSubHeader.setText(getUpNextAndQueueTime()); - mPlayerQueueSubHeader.setTextColor(ThemeStore.accentColor(this)); - mAppBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)); - mToolbar.setBackgroundColor(ThemeStore.primaryColor(this)); - mToolbar.setNavigationIcon(mClose); - setSupportActionBar(mToolbar); - setTitle(queue); - mToolbar.setNavigationOnClickListener(v -> onBackPressed()); - } + private void setupToolbar() { + title.setTextColor(ThemeStore.textColorPrimary(this)); + mPlayerQueueSubHeader.setText(getUpNextAndQueueTime()); + mPlayerQueueSubHeader.setTextColor(ThemeStore.accentColor(this)); + mAppBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)); + mToolbar.setBackgroundColor(ThemeStore.primaryColor(this)); + mToolbar.setNavigationIcon(mClose); + setSupportActionBar(mToolbar); + setTitle(null); + mToolbar.setNavigationOnClickListener(v -> onBackPressed()); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java index 60f34e44b..1805bcdda 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java @@ -3,7 +3,6 @@ package code.name.monkey.retromusic.ui.activities; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; import android.support.design.widget.FloatingActionButton; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -29,13 +28,11 @@ import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.TintHelper; -import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper; import code.name.monkey.retromusic.interfaces.CabHolder; import code.name.monkey.retromusic.loaders.PlaylistLoader; -import code.name.monkey.retromusic.misc.AppBarStateChangeListener; import code.name.monkey.retromusic.model.AbsCustomPlaylist; import code.name.monkey.retromusic.model.Playlist; import code.name.monkey.retromusic.model.PlaylistSong; @@ -72,8 +69,8 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme @BindView(R.id.app_bar) AppBarLayout appBarLayout; - @BindView(R.id.collapsing_toolbar) - CollapsingToolbarLayout toolbarLayout; + @BindView(R.id.title) + TextView title; @BindView(R.id.status_bar) View statusBar; @@ -182,33 +179,17 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme } private void setUpToolBar() { + title.setTextColor(ThemeStore.textColorPrimary(this)); + TintHelper.setTintAuto(shuffleButton, ThemeStore.accentColor(this), true); + int primaryColor = ThemeStore.primaryColor(this); toolbar.setBackgroundColor(primaryColor); appBarLayout.setBackgroundColor(primaryColor); - toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + title.setText(playlist.name); + setTitle(null); setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setTitle(playlist.name); - - appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() { - @Override - public void onStateChanged(AppBarLayout appBarLayout, AppBarStateChangeListener.State state) { - int color; - switch (state) { - default: - case COLLAPSED: - case EXPANDED: - case IDLE: - color = ThemeStore.textColorPrimary(PlaylistDetailActivity.this); - break; - } - toolbarLayout.setExpandedTitleColor(color); - ToolbarContentTintHelper.colorizeToolbar(toolbar, color, PlaylistDetailActivity.this); - } - }); - TintHelper.setTintAuto(shuffleButton, ThemeStore.accentColor(this), true); } @Override diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java index 7733e1907..be1d41ec8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java @@ -44,28 +44,38 @@ public class SearchActivity extends AbsMusicServiceActivity implements OnQueryTe public static final String TAG = SearchActivity.class.getSimpleName(); public static final String QUERY = "query"; private static final int REQ_CODE_SPEECH_INPUT = 9002; + @BindView(R.id.voice_search) View micIcon; + @BindView(R.id.recycler_view) RecyclerView recyclerView; + @BindView(R.id.toolbar) Toolbar toolbar; + @BindView(android.R.id.empty) TextView empty; + + @BindView(R.id.title) + TextView title; + @BindView(R.id.search_view) EditText searchView; + @BindView(R.id.root) CoordinatorLayout container; - @BindView(R.id.appbar) + + @BindView(R.id.app_bar) AppBarLayout appbar; + @BindView(R.id.status_bar) View statusBar; + private SearchPresenter searchPresenter; private SearchAdapter adapter; private String query; - private boolean isMicSearch = false; - @Override protected void onCreate(Bundle savedInstanceState) { setDrawUnderStatusBar(true); @@ -94,7 +104,7 @@ public class SearchActivity extends AbsMusicServiceActivity implements OnQueryTe if (getIntent().getBooleanExtra("mic_search", false)) { startMicSearch(); - isMicSearch = true; + boolean isMicSearch = true; } } @@ -145,12 +155,13 @@ public class SearchActivity extends AbsMusicServiceActivity implements OnQueryTe } private void setUpToolBar() { + title.setTextColor(ThemeStore.textColorPrimary(this)); int primaryColor = ThemeStore.primaryColor(this); toolbar.setBackgroundColor(primaryColor); + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); appbar.setBackgroundColor(primaryColor); setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + setTitle(null); } @Override diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java index fba85c6a2..7e7fa9d65 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.annotation.StringRes; import android.support.design.widget.AppBarLayout; import android.support.transition.TransitionManager; import android.support.v4.app.Fragment; @@ -12,142 +13,131 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import android.view.View; import android.widget.FrameLayout; import android.widget.TextView; + +import com.afollestad.materialdialogs.color.ColorChooserDialog; + import butterknife.BindView; import butterknife.ButterKnife; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ColorUtil; -import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager; import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.ui.fragments.settings.MainSettingsFragment; import code.name.monkey.retromusic.util.PreferenceUtil; -import com.afollestad.materialdialogs.color.ColorChooserDialog; public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback { - @BindView(R.id.toolbar) - Toolbar toolbar; - @BindView(R.id.app_bar) - AppBarLayout appBarLayout; - @BindView(R.id.detail_content_frame) - @Nullable - FrameLayout detailsFrame; - private FragmentManager fragmentManager = getSupportFragmentManager(); + @BindView(R.id.toolbar) + Toolbar toolbar; + @BindView(R.id.app_bar) + AppBarLayout appBarLayout; + @BindView(R.id.title) + TextView title; + @BindView(R.id.detail_content_frame) + @Nullable + FrameLayout detailsFrame; + private FragmentManager fragmentManager = getSupportFragmentManager(); - @Override - public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) { - switch (dialog.getTitle()) { - case R.string.primary_color: - int theme = ColorUtil.isColorLight(selectedColor) ? - PreferenceUtil.getThemeResFromPrefValue("light") : - PreferenceUtil.getThemeResFromPrefValue("dark"); + @Override + public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) { + switch (dialog.getTitle()) { + case R.string.primary_color: + int theme = ColorUtil.isColorLight(selectedColor) ? + PreferenceUtil.getThemeResFromPrefValue("light") : + PreferenceUtil.getThemeResFromPrefValue("dark"); - ThemeStore.editTheme(this).activityTheme(theme).primaryColor(selectedColor).commit(); - break; - case R.string.accent_color: - ThemeStore.editTheme(this).accentColor(selectedColor).commit(); - break; + ThemeStore.editTheme(this).activityTheme(theme).primaryColor(selectedColor).commit(); + break; + case R.string.accent_color: + ThemeStore.editTheme(this).accentColor(selectedColor).commit(); + break; + } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + new DynamicShortcutManager(this).updateDynamicShortcuts(); + } + recreate(); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { - new DynamicShortcutManager(this).updateDynamicShortcuts(); - } - recreate(); - } + @Override + public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) { - @Override - public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) { - - } - - @Override - protected void onCreate(@Nullable Bundle bundle) { - super.onCreate(bundle); - setContentView(R.layout.activity_settings); - ButterKnife.bind(this); - - setStatusbarColorAuto(); - setNavigationbarColorAuto(); - setTaskDescriptionColorAuto(); - setLightNavigationBar(true); - - setupToolbar(); - - if (bundle == null) { - fragmentManager.beginTransaction().replace(R.id.content_frame, new MainSettingsFragment()) - .commit(); - } else { - restoreFragment(); - } - } - - private void setupToolbar() { - int primaryColor = ThemeStore.primaryColor(this); - appBarLayout.setBackgroundColor(primaryColor); - toolbar.setBackgroundColor(primaryColor); - toolbar.setNavigationOnClickListener(v -> onBackPressed()); - setTitle(R.string.app_name); - setSupportActionBar(toolbar); - } - - private void restoreFragment() { - toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); - if (fragmentManager.getBackStackEntryCount() > 0) { - appBarLayout.setExpanded(false, true); - } else { - appBarLayout.setExpanded(true, true); - } - setupToolbar(); - } - - public void setupFragment(Fragment fragment) { - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction() - .setCustomAnimations(R.animator.slide_up, 0, 0, R.animator.slide_down); - - if (detailsFrame == null) { - fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getTag()); - fragmentTransaction.addToBackStack(null); - fragmentTransaction.commit(); - } else { - fragmentTransaction.replace(R.id.detail_content_frame, fragment, fragment.getTag()); - fragmentTransaction.commit(); } - fragmentManager.addOnBackStackChangedListener(() -> { - if (fragmentManager.getBackStackEntryCount() > 0) { - appBarLayout.setExpanded(false, true); - } else { - appBarLayout.setExpanded(true, true); - } - setupToolbar(); - }); - } + @Override + protected void onCreate(@Nullable Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.activity_settings); + ButterKnife.bind(this); + setStatusbarColorAuto(); + setNavigationbarColorAuto(); + setTaskDescriptionColorAuto(); + setLightNavigationBar(true); - @Override - public void onBackPressed() { - if (fragmentManager.getBackStackEntryCount() == 0) { - super.onBackPressed(); - } else { - fragmentManager.popBackStack(); + setupToolbar(); + + if (bundle == null) { + fragmentManager.beginTransaction().replace(R.id.content_frame, new MainSettingsFragment()) + .commit(); + } } - } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; + private void setupToolbar() { + title.setTextColor(ThemeStore.textColorPrimary(this)); + int primaryColor = ThemeStore.primaryColor(this); + appBarLayout.setBackgroundColor(primaryColor); + toolbar.setBackgroundColor(primaryColor); + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + toolbar.setNavigationOnClickListener(v -> onBackPressed()); + setTitle(null); + setSupportActionBar(toolbar); } - return super.onOptionsItemSelected(item); - } - public void addAppbarLayoutElevation(float v) { - TransitionManager.beginDelayedTransition(appBarLayout); - appBarLayout.setElevation(v); - } + + public void setupFragment(Fragment fragment, @StringRes int titleName) { + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction() + .setCustomAnimations(R.animator.slide_up, 0, 0, R.animator.slide_down); + + title.setText(titleName); + + if (detailsFrame == null) { + fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getTag()); + fragmentTransaction.addToBackStack(null); + fragmentTransaction.commit(); + } else { + fragmentTransaction.replace(R.id.detail_content_frame, fragment, fragment.getTag()); + fragmentTransaction.commit(); + } + + + } + + + @Override + public void onBackPressed() { + if (fragmentManager.getBackStackEntryCount() == 0) { + super.onBackPressed(); + } else { + title.setText(R.string.action_settings); + fragmentManager.popBackStack(); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + + public void addAppbarLayoutElevation(float v) { + TransitionManager.beginDelayedTransition(appBarLayout); + appBarLayout.setElevation(v); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java index 604a09983..fb6956a88 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java @@ -14,6 +14,7 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; @@ -53,18 +54,27 @@ import static code.name.monkey.retromusic.Constants.PAYPAL_ME_URL; public class SupportDevelopmentActivity extends AbsBaseActivity implements BillingProcessor.IBillingHandler { public static final String TAG = SupportDevelopmentActivity.class.getSimpleName(); private static final int DONATION_PRODUCT_IDS = R.array.donation_ids; + @BindView(R.id.progress) ProgressBar mProgressBar; + @BindView(R.id.progress_container) View mProgressContainer; + @BindView(R.id.list) RecyclerView mListView; + @BindView(R.id.toolbar) Toolbar mToolbar; + @BindView(R.id.app_bar) AppBarLayout mAppBarLayout; + @BindView(R.id.root) ViewGroup mViewGroup; + + @BindView(R.id.title) + TextView title; private BillingProcessor mBillingProcessor; private AsyncTask skuDetailsLoadAsyncTask; @@ -86,6 +96,15 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi return skuDetails; } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void donate(int i) { final String[] ids = getResources().getStringArray(DONATION_PRODUCT_IDS); mBillingProcessor.purchase(this, ids[i]); @@ -107,13 +126,8 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi setTaskDescriptionColorAuto(); setLightNavigationBar(true); - int primaryColor = ThemeStore.primaryColor(this); - mAppBarLayout.setBackgroundColor(primaryColor); - mToolbar.setBackgroundColor(primaryColor); - setSupportActionBar(mToolbar); - //noinspection ConstantConditions - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - mToolbar.setNavigationOnClickListener(view -> onBackPressed()); + + setupToolbar(); mBillingProcessor = new BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSE_KEY, this); @@ -122,6 +136,17 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi ((TextView) findViewById(R.id.donation)).setTextColor(ThemeStore.accentColor(this)); } + private void setupToolbar() { + title.setTextColor(ThemeStore.textColorPrimary(this)); + int primaryColor = ThemeStore.primaryColor(this); + mAppBarLayout.setBackgroundColor(primaryColor); + mToolbar.setBackgroundColor(primaryColor); + mToolbar.setNavigationOnClickListener(view -> onBackPressed()); + mToolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + setSupportActionBar(mToolbar); + setTitle(null); + } + @Override public void onBillingInitialized() { loadSkuDetails(); @@ -173,7 +198,7 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi private static class SkuDetailsLoadAsyncTask extends AsyncTask> { private final WeakReference donationDialogWeakReference; - public SkuDetailsLoadAsyncTask(SupportDevelopmentActivity donationsDialog) { + SkuDetailsLoadAsyncTask(SupportDevelopmentActivity donationsDialog) { this.donationDialogWeakReference = new WeakReference<>(donationsDialog); } @@ -205,8 +230,6 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi if (dialog == null) return; if (skuDetails == null || skuDetails.isEmpty()) { - //Toast.makeText(dialog, "Error loading items", Toast.LENGTH_SHORT).show(); - //dialog.finish(); dialog.mProgressContainer.setVisibility(View.GONE); return; } @@ -229,7 +252,7 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi SupportDevelopmentActivity donationsDialog; List skuDetailsList = new ArrayList<>(); - public SkuDetailsAdapter(@NonNull SupportDevelopmentActivity donationsDialog, @NonNull List objects) { + SkuDetailsAdapter(@NonNull SupportDevelopmentActivity donationsDialog, @NonNull List objects) { this.donationsDialog = donationsDialog; skuDetailsList = objects; } @@ -260,14 +283,15 @@ public class SupportDevelopmentActivity extends AbsBaseActivity implements Billi } } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { return new ViewHolder(LayoutInflater.from(donationsDialog) .inflate(LAYOUT_RES_ID, viewGroup, false)); } @Override - public void onBindViewHolder(ViewHolder viewHolder, int i) { + public void onBindViewHolder(@NonNull ViewHolder viewHolder, int i) { SkuDetails skuDetails = skuDetailsList.get(i); if (skuDetails != null) { viewHolder.title.setText(skuDetails.title.replace("(Retro Music Player)", "").trim()); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java index aa574b108..fdee5b6ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java @@ -1,96 +1,92 @@ package code.name.monkey.retromusic.ui.adapter; +import android.app.Activity; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; + +import com.bumptech.glide.Glide; + +import java.util.ArrayList; +import java.util.List; + import butterknife.BindViews; import butterknife.ButterKnife; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.glide.SongGlideRequest; -import code.name.monkey.retromusic.model.Album; +import code.name.monkey.retromusic.model.Song; import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter.CollageSongViewHolder; import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder; -import code.name.monkey.retromusic.util.NavigationUtil; -import com.bumptech.glide.Glide; -import java.util.ArrayList; -import java.util.List; /** * @author Hemanth S (h4h13). */ public class CollageSongAdapter extends RecyclerView.Adapter { - private AppCompatActivity activity; - private ArrayList dataSet; - private int itemLayoutRes; + private Activity activity; + private ArrayList dataSet; - public CollageSongAdapter(AppCompatActivity activity, ArrayList dataSet, - int itemLayoutRes) { - this.activity = activity; - this.dataSet = dataSet; - this.itemLayoutRes = itemLayoutRes; - } - - @Override - public void onBindViewHolder(@NonNull CollageSongViewHolder holder, int position) { - ArrayList albums = dataSet; - - holder.bindSongs(albums); - - if (albums.size() > 9) { - for (int i = 0; i < albums.subList(0, 9).size(); i++) { - if (holder.imageViews != null) { - SongGlideRequest.Builder.from(Glide.with(activity), albums.get(i).safeGetFirstSong()) - .checkIgnoreMediaStore(activity).build().into(holder.imageViews.get(i)); - } - } - } - } - - @Override - public int getItemCount() { - return 1; - } - - @NonNull - @Override - public CollageSongViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - return new CollageSongViewHolder( - LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)); - } - - class CollageSongViewHolder extends MediaEntryViewHolder { - - @BindViews({R.id.image_1, R.id.image_2, R.id.image_3, R.id.image_4, R.id.image_5, R.id.image_6, - R.id.image_7, R.id.image_8, R.id.image_9}) - @Nullable - List imageViews; - - CollageSongViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); + public CollageSongAdapter(Activity activity, ArrayList dataSet) { + this.activity = activity; + this.dataSet = dataSet; } @Override - public void onClick(View v) { - super.onClick(v); - NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition() + 1).getId()); + public void onBindViewHolder(@NonNull CollageSongViewHolder holder, int position) { + + + holder.bindSongs(); + + if (dataSet.size() > 9) { + for (int i = 0; i < dataSet.subList(0, 9).size(); i++) { + if (holder.imageViews != null) { + SongGlideRequest.Builder.from(Glide.with(activity), dataSet.get(i)) + .checkIgnoreMediaStore(activity) + .build() + .into(holder.imageViews.get(i)); + } + } + } } - void bindSongs(ArrayList albums) { - if (imageViews != null) { - for (int i = 0; i < imageViews.size(); i++) { - final int startPosition = i; - ImageView imageView = imageViews.get(i); - imageView.setOnClickListener( - v -> NavigationUtil.goToAlbum(activity, albums.get(startPosition).getId())); - } - } + @Override + public int getItemCount() { + return 1; + } + + @NonNull + @Override + public CollageSongViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new CollageSongViewHolder( + LayoutInflater.from(activity).inflate(R.layout.item_collage, parent, false)); + } + + class CollageSongViewHolder extends MediaEntryViewHolder { + + @BindViews({R.id.image_1, R.id.image_2, R.id.image_3, R.id.image_4, R.id.image_5, R.id.image_6, + R.id.image_7, R.id.image_8, R.id.image_9}) + @Nullable + List imageViews; + + CollageSongViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this, itemView); + } + + void bindSongs() { + if (imageViews != null) { + for (int i = 0; i < imageViews.size(); i++) { + final int startPosition = i; + ImageView imageView = imageViews.get(i); + imageView.setOnClickListener(view -> { + + }); + } + } + } } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java index eb0eff062..e0c08a7d9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java @@ -60,8 +60,11 @@ public class AlbumAdapter extends AbsMultiSelectAdapter dataSet, + @LayoutRes int itemLayoutRes) { + this(activity, dataSet, itemLayoutRes, false, null); } public void useItemLayout(int itemLayoutRes) { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java index 57d2b2a10..3748514a4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java @@ -25,6 +25,12 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + +import com.bumptech.glide.Glide; + +import java.util.ArrayList; +import java.util.List; + import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.glide.RetroMusicColoredTarget; import code.name.monkey.retromusic.glide.SongGlideRequest; @@ -32,116 +38,114 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.model.Album; import code.name.monkey.retromusic.util.NavigationUtil; import code.name.monkey.retromusic.views.MetalRecyclerViewPager; -import com.bumptech.glide.Glide; -import java.util.ArrayList; -import java.util.List; public class AlbumFullWithAdapter extends - MetalRecyclerViewPager.MetalAdapter { + MetalRecyclerViewPager.MetalAdapter { - private Activity activity; - private List dataSet = new ArrayList<>(); + private Activity activity; + private List dataSet = new ArrayList<>(); - public AlbumFullWithAdapter(@NonNull Activity activity, - @NonNull DisplayMetrics metrics) { - super(metrics); - this.activity = activity; - } - - public void swapData(ArrayList list) { - dataSet = list; - notifyDataSetChanged(); - } - - @Override - public FullMetalViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View viewItem = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.pager_item, parent, false); - return new FullMetalViewHolder(viewItem); - } - - private Bitmap combineImageIntoOne(ArrayList bitmap) { - int w = 0, h = 0; - for (int i = 0; i < bitmap.size(); i++) { - if (i < bitmap.size() - 1) { - h = bitmap.get(i).getWidth() > bitmap.get(i + 1).getWidth() ? bitmap.get(i).getWidth() - : bitmap.get(i + 1).getWidth(); - } - w += bitmap.get(i).getHeight(); + public AlbumFullWithAdapter(@NonNull Activity activity, + @NonNull DisplayMetrics metrics) { + super(metrics); + this.activity = activity; } - Bitmap temp = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(temp); - int top = 0, left = 0; - for (int i = 0; i < bitmap.size(); i++) { - Log.d("HTML", "Combine: " + i + "/" + bitmap.size() + 1); - - top = (i == 0 ? 0 : top + bitmap.get(i).getHeight()); - left = (i == 0 ? 0 : top + bitmap.get(i).getWidth()); - canvas.drawBitmap(bitmap.get(i), left, 0f, null); - } - return temp; - } - - @Override - public void onBindViewHolder(FullMetalViewHolder holder, int position) { - // don't forget about calling supper.onBindViewHolder! - super.onBindViewHolder(holder, position); - - final Album album = dataSet.get(position); - - if (holder.title != null) { - holder.title.setText(getAlbumTitle(album)); - } - if (holder.text != null) { - holder.text.setText(getAlbumText(album)); - } - if (holder.playSongs != null) { - holder.playSongs.setOnClickListener(v -> MusicPlayerRemote.openQueue(album.songs, 0, true)); - } - loadAlbumCover(album, holder); - } - - private String getAlbumTitle(Album album) { - return album.getTitle(); - } - - private String getAlbumText(Album album) { - return album.getArtistName(); - } - - private void loadAlbumCover(Album album, FullMetalViewHolder holder) { - if (holder.image == null) { - return; + public void swapData(ArrayList list) { + dataSet = list; + notifyDataSetChanged(); } - SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong()) - .checkIgnoreMediaStore(activity) - .generatePalette(activity).build() - .into(new RetroMusicColoredTarget(holder.image) { - @Override - public void onColorReady(int color) { + @NonNull + @Override + public FullMetalViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View viewItem = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.pager_item, parent, false); + return new FullMetalViewHolder(viewItem); + } - } - }); - } + private Bitmap combineImageIntoOne(ArrayList bitmap) { + int w = 0, h = 0; + for (int i = 0; i < bitmap.size(); i++) { + if (i < bitmap.size() - 1) { + h = bitmap.get(i).getWidth() > bitmap.get(i + 1).getWidth() ? bitmap.get(i).getWidth() + : bitmap.get(i + 1).getWidth(); + } + w += bitmap.get(i).getHeight(); + } - @Override - public int getItemCount() { - return dataSet.size(); - } + Bitmap temp = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(temp); + int top = 0, left = 0; + for (int i = 0; i < bitmap.size(); i++) { + Log.d("HTML", "Combine: " + i + "/" + bitmap.size() + 1); - class FullMetalViewHolder extends MetalRecyclerViewPager.MetalViewHolder { - - FullMetalViewHolder(View itemView) { - super(itemView); + top = (i == 0 ? 0 : top + bitmap.get(i).getHeight()); + left = (i == 0 ? 0 : top + bitmap.get(i).getWidth()); + canvas.drawBitmap(bitmap.get(i), left, 0f, null); + } + return temp; } @Override - public void onClick(View v) { - Pair[] albumPairs = new Pair[]{ - Pair.create(image, activity.getResources().getString(R.string.transition_album_art))}; - NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition()).getId(), albumPairs); + public void onBindViewHolder(@NonNull FullMetalViewHolder holder, int position) { + // don't forget about calling supper.onBindViewHolder! + super.onBindViewHolder(holder, position); + + final Album album = dataSet.get(position); + + if (holder.title != null) { + holder.title.setText(getAlbumTitle(album)); + } + if (holder.text != null) { + holder.text.setText(getAlbumText(album)); + } + if (holder.playSongs != null) { + holder.playSongs.setOnClickListener(v -> MusicPlayerRemote.openQueue(album.songs, 0, true)); + } + loadAlbumCover(album, holder); + } + + private String getAlbumTitle(Album album) { + return album.getTitle(); + } + + private String getAlbumText(Album album) { + return album.getArtistName(); + } + + private void loadAlbumCover(Album album, FullMetalViewHolder holder) { + if (holder.image == null) { + return; + } + + SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong()) + .checkIgnoreMediaStore(activity) + .generatePalette(activity).build() + .into(new RetroMusicColoredTarget(holder.image) { + @Override + public void onColorReady(int color) { + + } + }); + } + + @Override + public int getItemCount() { + return dataSet.size(); + } + + class FullMetalViewHolder extends MetalRecyclerViewPager.MetalViewHolder { + + FullMetalViewHolder(View itemView) { + super(itemView); + } + + @Override + public void onClick(View v) { + Pair[] albumPairs = new Pair[]{ + Pair.create(image, activity.getResources().getString(R.string.transition_album_art))}; + NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition()).getId(), albumPairs); + } } - } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java index 58f921e7e..5fb24a1af 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java @@ -9,6 +9,13 @@ import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; + +import com.bumptech.glide.Glide; +import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; + +import java.util.ArrayList; +import java.util.List; + import code.name.monkey.appthemehelper.util.ColorUtil; import code.name.monkey.appthemehelper.util.MaterialValueHelper; import code.name.monkey.retromusic.R; @@ -22,167 +29,171 @@ import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter; import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder; import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.NavigationUtil; -import com.bumptech.glide.Glide; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; -import java.util.ArrayList; -import java.util.List; public class ArtistAdapter extends - AbsMultiSelectAdapter implements - FastScrollRecyclerView.SectionedAdapter { + AbsMultiSelectAdapter implements + FastScrollRecyclerView.SectionedAdapter { - protected final AppCompatActivity activity; - protected ArrayList dataSet; + protected final AppCompatActivity activity; + protected ArrayList dataSet; - protected int itemLayoutRes; + protected int itemLayoutRes; - protected boolean usePalette = false; + protected boolean usePalette = false; - public ArtistAdapter(@NonNull AppCompatActivity activity, ArrayList dataSet, - @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { - super(activity, cabHolder, R.menu.menu_media_selection); - this.activity = activity; - this.dataSet = dataSet; - this.itemLayoutRes = itemLayoutRes; - this.usePalette = usePalette; - //setHasStableIds(true); - } - - public void swapDataSet(ArrayList dataSet) { - this.dataSet = dataSet; - notifyDataSetChanged(); - } - - public ArrayList getDataSet() { - return dataSet; - } - - public void usePalette(boolean usePalette) { - this.usePalette = usePalette; - notifyDataSetChanged(); - } - - @Override - public long getItemId(int position) { - return dataSet.get(position).getId(); - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false); - return createViewHolder(view); - } - - protected ViewHolder createViewHolder(View view) { - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { - final Artist artist = dataSet.get(position); - - boolean isChecked = isChecked(artist); - holder.itemView.setActivated(isChecked); - - if (holder.title != null) { - holder.title.setText(artist.getName()); + public ArtistAdapter(@NonNull AppCompatActivity activity, ArrayList dataSet, + @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { + super(activity, cabHolder, R.menu.menu_media_selection); + this.activity = activity; + this.dataSet = dataSet; + this.itemLayoutRes = itemLayoutRes; + this.usePalette = usePalette; + //setHasStableIds(true); } - if (holder.text != null) { - holder.text.setVisibility(View.GONE); + + public ArtistAdapter(@NonNull AppCompatActivity activity, ArrayList dataSet, + @LayoutRes int itemLayoutRes ) { + super(activity, null, R.menu.menu_media_selection); + this.activity = activity; + this.dataSet = dataSet; + this.itemLayoutRes = itemLayoutRes; } - if (holder.shortSeparator != null) { - holder.shortSeparator.setVisibility(View.VISIBLE); + + public void swapDataSet(ArrayList dataSet) { + this.dataSet = dataSet; + notifyDataSetChanged(); } - loadArtistImage(artist, holder); - } - protected void setColors(int color, ViewHolder holder) { - if (holder.paletteColorContainer != null) { - holder.paletteColorContainer.setBackgroundColor(color); - if (holder.title != null) { - holder.title.setTextColor( - MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color))); - } + public ArrayList getDataSet() { + return dataSet; } - } - private void loadArtistImage(Artist artist, final ViewHolder holder) { - if (holder.image == null) { - return; - } - ArtistGlideRequest.Builder.from(Glide.with(activity), artist) - .generatePalette(activity).build() - .into(new RetroMusicColoredTarget(holder.image) { - @Override - public void onColorReady(int color) { - setColors(color, holder); - } - }); - } - - @Override - public int getItemCount() { - return dataSet.size(); - } - - @Override - protected Artist getIdentifier(int position) { - return dataSet.get(position); - } - - @Override - protected String getName(Artist artist) { - return artist.getName(); - } - - @Override - protected void onMultipleItemAction(@NonNull MenuItem menuItem, - @NonNull ArrayList selection) { - SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.getItemId()); - } - - @NonNull - private ArrayList getSongList(@NonNull List artists) { - final ArrayList songs = new ArrayList<>(); - for (Artist artist : artists) { - songs.addAll(artist.getSongs()); // maybe async in future? - } - return songs; - } - - @NonNull - @Override - public String getSectionName(int position) { - return MusicUtil.getSectionName(dataSet.get(position).getName()); - } - - public class ViewHolder extends MediaEntryViewHolder { - - public ViewHolder(@NonNull View itemView) { - super(itemView); - setImageTransitionName(activity.getString(R.string.transition_artist_image)); - if (menu != null) { - menu.setVisibility(View.GONE); - } + public void usePalette(boolean usePalette) { + this.usePalette = usePalette; + notifyDataSetChanged(); } @Override - public void onClick(View v) { - if (isInQuickSelectMode()) { - toggleChecked(getAdapterPosition()); - } else { - Pair[] artistPairs = new Pair[]{Pair.create(image, - activity.getResources().getString(R.string.transition_artist_image))}; - NavigationUtil.goToArtist(activity, dataSet.get(getAdapterPosition()).getId(), artistPairs); - } + public long getItemId(int position) { + return dataSet.get(position).getId(); } @Override - public boolean onLongClick(View view) { - toggleChecked(getAdapterPosition()); - return true; + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false); + return createViewHolder(view); + } + + protected ViewHolder createViewHolder(View view) { + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { + final Artist artist = dataSet.get(position); + + boolean isChecked = isChecked(artist); + holder.itemView.setActivated(isChecked); + + if (holder.title != null) { + holder.title.setText(artist.getName()); + } + if (holder.text != null) { + holder.text.setVisibility(View.GONE); + } + if (holder.shortSeparator != null) { + holder.shortSeparator.setVisibility(View.VISIBLE); + } + loadArtistImage(artist, holder); + } + + protected void setColors(int color, ViewHolder holder) { + if (holder.paletteColorContainer != null) { + holder.paletteColorContainer.setBackgroundColor(color); + if (holder.title != null) { + holder.title.setTextColor( + MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color))); + } + } + } + + private void loadArtistImage(Artist artist, final ViewHolder holder) { + if (holder.image == null) { + return; + } + ArtistGlideRequest.Builder.from(Glide.with(activity), artist) + .generatePalette(activity).build() + .into(new RetroMusicColoredTarget(holder.image) { + @Override + public void onColorReady(int color) { + setColors(color, holder); + } + }); + } + + @Override + public int getItemCount() { + return dataSet.size(); + } + + @Override + protected Artist getIdentifier(int position) { + return dataSet.get(position); + } + + @Override + protected String getName(Artist artist) { + return artist.getName(); + } + + @Override + protected void onMultipleItemAction(@NonNull MenuItem menuItem, + @NonNull ArrayList selection) { + SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.getItemId()); + } + + @NonNull + private ArrayList getSongList(@NonNull List artists) { + final ArrayList songs = new ArrayList<>(); + for (Artist artist : artists) { + songs.addAll(artist.getSongs()); // maybe async in future? + } + return songs; + } + + @NonNull + @Override + public String getSectionName(int position) { + return MusicUtil.getSectionName(dataSet.get(position).getName()); + } + + public class ViewHolder extends MediaEntryViewHolder { + + public ViewHolder(@NonNull View itemView) { + super(itemView); + setImageTransitionName(activity.getString(R.string.transition_artist_image)); + if (menu != null) { + menu.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View v) { + if (isInQuickSelectMode()) { + toggleChecked(getAdapterPosition()); + } else { + Pair[] artistPairs = new Pair[]{Pair.create(image, + activity.getResources().getString(R.string.transition_artist_image))}; + NavigationUtil.goToArtist(activity, dataSet.get(getAdapterPosition()).getId(), artistPairs); + } + } + + @Override + public boolean onLongClick(View view) { + toggleChecked(getAdapterPosition()); + return true; + } } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java index 5659aac78..de3967948 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java @@ -10,6 +10,7 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; + import butterknife.BindView; import butterknife.ButterKnife; import code.name.monkey.appthemehelper.ThemeStore; @@ -17,82 +18,82 @@ import code.name.monkey.retromusic.R; public class MediaEntryViewHolder extends RecyclerView.ViewHolder - implements View.OnClickListener, View.OnLongClickListener { + implements View.OnClickListener, View.OnLongClickListener { - @Nullable - @BindView(R.id.image) - public ImageView image; - @Nullable - @BindView(R.id.image_text) - public TextView imageText; - @Nullable - @BindView(R.id.title) - public TextView title; - @Nullable - @BindView(R.id.text) - public TextView text; - @Nullable - @BindView(R.id.image_container) - public ViewGroup imageContainer; - @Nullable - @BindView(R.id.image_container_card) - public CardView imageContainerCard; - @Nullable - @BindView(R.id.menu) - public View menu; - @Nullable - @BindView(R.id.separator) - public View separator; - @Nullable - @BindView(R.id.short_separator) - public View shortSeparator; - @Nullable - @BindView(R.id.drag_view) - public View dragView; - @Nullable - @BindView(R.id.palette_color_container) - public View paletteColorContainer; - @BindView(R.id.time) - @Nullable - public TextView time; - @BindView(R.id.recycler_view) - @Nullable - public RecyclerView recyclerView; - @BindView(R.id.play_songs) - @Nullable - public ImageButton playSongs; - @BindView(R.id.image_text_container) - @Nullable - public CardView imageTextContainer; + @Nullable + @BindView(R.id.image) + public ImageView image; + @Nullable + @BindView(R.id.image_text) + public TextView imageText; + @Nullable + @BindView(R.id.title) + public TextView title; + @Nullable + @BindView(R.id.text) + public TextView text; + @Nullable + @BindView(R.id.image_container) + public ViewGroup imageContainer; + @Nullable + @BindView(R.id.image_container_card) + public CardView imageContainerCard; + @Nullable + @BindView(R.id.menu) + public View menu; + @Nullable + @BindView(R.id.separator) + public View separator; + @Nullable + @BindView(R.id.short_separator) + public View shortSeparator; + @Nullable + @BindView(R.id.drag_view) + public View dragView; + @Nullable + @BindView(R.id.palette_color_container) + public View paletteColorContainer; + @BindView(R.id.time) + @Nullable + public TextView time; + @BindView(R.id.recycler_view) + @Nullable + public RecyclerView recyclerView; + @BindView(R.id.play_songs) + @Nullable + public ImageButton playSongs; + @BindView(R.id.image_text_container) + @Nullable + public CardView imageTextContainer; - public MediaEntryViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); + public MediaEntryViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this, itemView); - itemView.setOnClickListener(this); - itemView.setOnLongClickListener(this); + itemView.setOnClickListener(this); + itemView.setOnLongClickListener(this); - if (imageTextContainer != null) { - imageTextContainer.setCardBackgroundColor(ThemeStore.primaryColor(itemView.getContext())); + if (imageTextContainer != null) { + imageTextContainer.setCardBackgroundColor(ThemeStore.primaryColor(itemView.getContext())); + } + if (imageContainerCard != null) { + imageContainerCard.setCardBackgroundColor(ThemeStore.primaryColor(itemView.getContext())); + } } - if (imageContainerCard != null) { - imageContainerCard.setCardBackgroundColor(ThemeStore.primaryColor(itemView.getContext())); + + protected void setImageTransitionName(@NonNull String transitionName) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && image != null) { + image.setTransitionName(transitionName); + } } - } - protected void setImageTransitionName(@NonNull String transitionName) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && image != null) { - image.setTransitionName(transitionName); + @Override + public boolean onLongClick(View v) { + return false; } - } - @Override - public boolean onLongClick(View v) { - return false; - } - - @Override - public void onClick(View v) { - } + @Override + public void onClick(View v) { + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java index d8ac7f7eb..393e909c9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java @@ -1,169 +1,128 @@ package code.name.monkey.retromusic.ui.adapter.home; +import android.app.Activity; +import android.content.Context; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.util.DisplayMetrics; +import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import butterknife.BindView; + +import java.util.ArrayList; + import code.name.monkey.retromusic.R; -import code.name.monkey.retromusic.helper.MusicPlayerRemote; -import code.name.monkey.retromusic.loaders.SongLoader; import code.name.monkey.retromusic.model.Album; import code.name.monkey.retromusic.model.Artist; +import code.name.monkey.retromusic.model.Genre; +import code.name.monkey.retromusic.model.Home; import code.name.monkey.retromusic.model.Song; -import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist; -import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist; -import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist; +import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter; +import code.name.monkey.retromusic.ui.adapter.GenreAdapter; import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter; import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter; import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder; -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter; -import code.name.monkey.retromusic.util.NavigationUtil; -import java.util.ArrayList; -public class HomeAdapter extends RecyclerView.Adapter { +public class HomeAdapter extends RecyclerView.Adapter { - private static final int SUB_HEADER = 0; - private static final int ABS_PLAYLITS = 1; - private static final int DATA = 2; - private ArrayList dataSet = new ArrayList<>(); - private AppCompatActivity activity; + private static final int ALBUMS = 0; + private static final int ARTISTS = 1; + private static final int GENERS = 2; + private static final int SUGGESTIONS = 3; + private Activity activity; + private ArrayList sections = new ArrayList<>(); - public HomeAdapter(@NonNull AppCompatActivity activity) { - this.activity = activity; - } - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { - switch (i) { - - case ABS_PLAYLITS: - return new ViewHolder(LayoutInflater.from(activity) - .inflate(R.layout.abs_playlists, viewGroup, false)); - default: - case DATA: - return new ViewHolder(LayoutInflater.from(activity) - .inflate(R.layout.recycler_view_sec, viewGroup, false)); - case SUB_HEADER: - return new ViewHolder(LayoutInflater.from(activity) - .inflate(R.layout.sub_header, viewGroup, false)); + public HomeAdapter(Activity activity) { + this.activity = activity; } - } - @Override - public int getItemViewType(int position) { - if (dataSet.get(position) instanceof String) { - return SUB_HEADER; - } else if (dataSet.get(position) instanceof Integer) { - return ABS_PLAYLITS; - } else if (dataSet.get(position) instanceof ArrayList) { - return DATA; + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + Context context = parent.getContext(); + return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.home_section_recycler_view, + parent, false)); } - return super.getItemViewType(position); - } - @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int i) { - ViewHolder viewholder = (ViewHolder) holder; - switch (getItemViewType(i)) { - case ABS_PLAYLITS: - bindAbsActions(viewholder); - break; - case SUB_HEADER: - String title = (String) dataSet.get(i); - if (viewholder.title != null) { - viewholder.title.setText(title); + @Override + public int getItemViewType(int position) { + Home home = sections.get(position); + ArrayList arrayList = home.getList(); + if (arrayList.get(0) instanceof Album) { + return ALBUMS; + } else if (arrayList.get(0) instanceof Artist) { + return ARTISTS; + } else if (arrayList.get(0) instanceof Genre) { + return GENERS; + } else { + return SUGGESTIONS; } - break; - case DATA: - parseAllSections(i, viewholder); - break; } - } - private void bindAbsActions(ViewHolder viewholder) { - - - if (viewholder.shuffle != null) { - viewholder.shuffle.setOnClickListener(view -> MusicPlayerRemote - .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true)); + private DisplayMetrics getDisplayMetrics() { + Display display = activity.getWindowManager().getDefaultDisplay(); + DisplayMetrics metrics = new DisplayMetrics(); + display.getMetrics(metrics); + return metrics; } - /*if (viewholder.search != null) { - viewholder.search.setBackgroundTintList(ColorStateList.valueOf(ColorUtil.withAlpha(ThemeStore.textColorPrimary(activity), 0.2f))); - viewholder.search.setOnClickListener(view -> { - activity.startActivity(new Intent(activity, SearchActivity.class)); - }); - }*/ - } - @SuppressWarnings("unchecked") - private void parseAllSections(int i, ViewHolder viewholder) { - if (viewholder.recyclerView != null) { - ArrayList arrayList = (ArrayList) dataSet.get(i); - if (arrayList.isEmpty()) { - return; - } - Object something = arrayList.get(0); - if (something instanceof Artist) { - layoutManager(viewholder); - viewholder.recyclerView.setAdapter( - new ArtistAdapter(activity, (ArrayList) arrayList, R.layout.item_artist, false, - null)); - } else if (something instanceof Album) { - layoutManager(viewholder); - viewholder.recyclerView.setItemAnimator(new DefaultItemAnimator()); - viewholder.recyclerView.setAdapter( - new AlbumAdapter(activity, (ArrayList) arrayList, R.layout.item_image, false, - null)); - } else if (something instanceof Song) { - GridLayoutManager layoutManager = new GridLayoutManager(activity, 1, - LinearLayoutManager.HORIZONTAL, false); - viewholder.recyclerView.setLayoutManager(layoutManager); - viewholder.recyclerView.setAdapter( - new SongAdapter(activity, (ArrayList) arrayList, R.layout.item_image, false, - null)); - } + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + Home home = sections.get(position); + + if (holder.title != null) { + holder.title.setText(home.getSectionTitle()); + } + ArrayList arrayList = home.getList(); + if (arrayList.get(0) instanceof Album) { + AlbumAdapter albumAdapter = new AlbumAdapter((AppCompatActivity) activity, + (ArrayList) arrayList, R.layout.item_image); + if (holder.recyclerView != null) { + holder.recyclerView.setLayoutManager(new GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)); + holder.recyclerView.setAdapter(albumAdapter); + } + } else if (arrayList.get(0) instanceof Artist) { + ArtistAdapter artistAdapter = new ArtistAdapter((AppCompatActivity) activity, (ArrayList) arrayList, R.layout.item_artist); + GridLayoutManager layoutManager = new GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false); + if (holder.recyclerView != null) { + holder.recyclerView.setLayoutManager(layoutManager); + holder.recyclerView.setAdapter(artistAdapter); + } + } else if (arrayList.get(0) instanceof Genre) { + GenreAdapter genreAdapter = new GenreAdapter(activity, (ArrayList) arrayList, R.layout.item_list); + if (holder.recyclerView != null) { + holder.recyclerView.setLayoutManager(new LinearLayoutManager(activity)); + holder.recyclerView.setAdapter(genreAdapter); + } + } else if (arrayList.get(0) instanceof Song) { + CollageSongAdapter collageSongAdapter = new CollageSongAdapter(activity, (ArrayList) arrayList); + if (holder.recyclerView != null) { + holder.recyclerView.setLayoutManager(new LinearLayoutManager(activity)); + holder.recyclerView.setAdapter(collageSongAdapter); + } + } } - } - private void layoutManager(ViewHolder viewholder) { - if (viewholder.recyclerView != null) { - viewholder.recyclerView.setLayoutManager( - new GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)); - viewholder.recyclerView.setItemAnimator(new DefaultItemAnimator()); + @Override + public int getItemCount() { + return sections.size(); } - } - - @Override - public int getItemCount() { - return dataSet.size(); - } - - public void swapDataSet(@NonNull ArrayList data) { - dataSet = data; - notifyDataSetChanged(); - } - - public ArrayList getDataset() { - return dataSet; - } - - public class ViewHolder extends MediaEntryViewHolder { - - - @BindView(R.id.action_shuffle) - @Nullable - View shuffle; - - public ViewHolder(View itemView) { - super(itemView); + public void swapData(ArrayList sections) { + this.sections = sections; + notifyDataSetChanged(); + } + + public class ViewHolder extends MediaEntryViewHolder { + + + public ViewHolder(View itemView) { + super(itemView); + } } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java index 8d82a7153..3b49c0864 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java @@ -35,11 +35,11 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment { final View statusBar = view.findViewById(R.id.status_bar); if (statusBar != null) { RetroUtil.statusBarHeight(statusBar); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - statusBar.setBackgroundColor(ColorUtil.darkenColor(color)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + statusBar.setBackgroundColor(color); getMainActivity().setLightStatusbarAuto(color); } else { - statusBar.setBackgroundColor(color); + statusBar.setBackgroundColor(ColorUtil.darkenColor(color)); } } } @@ -47,6 +47,7 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment { public void setStatusbarColorAuto(View view) { // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat + //noinspection ConstantConditions setStatusbarColor(view, ThemeStore.primaryColor(getContext())); } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java index 46f6fbc8e..fdc4e7dd3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java @@ -4,6 +4,9 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.GridLayoutManager; + +import java.util.ArrayList; + import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.model.Album; import code.name.monkey.retromusic.mvp.contract.AlbumContract; @@ -11,156 +14,166 @@ import code.name.monkey.retromusic.mvp.presenter.AlbumPresenter; import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter; import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment; import code.name.monkey.retromusic.util.PreferenceUtil; -import java.util.ArrayList; public class AlbumsFragment extends - AbsLibraryPagerRecyclerViewCustomGridSizeFragment implements - AlbumContract.AlbumView { + AbsLibraryPagerRecyclerViewCustomGridSizeFragment implements + AlbumContract.AlbumView { - public static final String TAG = AlbumsFragment.class.getSimpleName(); + public static final String TAG = AlbumsFragment.class.getSimpleName(); - private AlbumPresenter presenter; + private AlbumPresenter presenter; - public static AlbumsFragment newInstance() { - Bundle args = new Bundle(); - AlbumsFragment fragment = new AlbumsFragment(); - fragment.setArguments(args); - return fragment; - } - - @Override - protected GridLayoutManager createLayoutManager() { - return new GridLayoutManager(getActivity(), getGridSize()); - } - - @NonNull - @Override - protected AlbumAdapter createAdapter() { - int itemLayoutRes = getItemLayoutRes(); - notifyLayoutResChanged(itemLayoutRes); - if (itemLayoutRes != R.layout.item_list) { - itemLayoutRes = PreferenceUtil.getInstance(getContext()).getAlbumGridStyle(getContext()); + public static AlbumsFragment newInstance() { + Bundle args = new Bundle(); + AlbumsFragment fragment = new AlbumsFragment(); + fragment.setArguments(args); + return fragment; } - ArrayList dataSet = - getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); - return new AlbumAdapter(getLibraryFragment().getMainActivity(), dataSet, itemLayoutRes, - loadUsePalette(), getLibraryFragment()); - } - @Override - protected int getEmptyMessage() { - return R.string.no_albums; - } - - @Override - public boolean loadUsePalette() { - return PreferenceUtil.getInstance(getActivity()).albumColoredFooters(); - } - - @Override - protected void setUsePalette(boolean usePalette) { - getAdapter().usePalette(usePalette); - } - - @Override - protected void setGridSize(int gridSize) { - getLayoutManager().setSpanCount(gridSize); - getAdapter().notifyDataSetChanged(); - } - - @Override - protected void setSortOrder(String sortOrder) { - presenter.loadAlbums(); - } - - @Override - protected String loadSortOrder() { - return PreferenceUtil.getInstance(getActivity()).getAlbumSortOrder(); - } - - @Override - protected void saveSortOrder(String sortOrder) { - PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder); - } - - @Override - protected int loadGridSize() { - return PreferenceUtil.getInstance(getActivity()).getAlbumGridSize(getActivity()); - } - - @Override - protected void saveGridSize(int gridSize) { - PreferenceUtil.getInstance(getActivity()).setAlbumGridSize(gridSize); - } - - @Override - protected int loadGridSizeLand() { - return PreferenceUtil.getInstance(getActivity()).getAlbumGridSizeLand(getActivity()); - } - - @Override - protected void saveGridSizeLand(int gridSize) { - PreferenceUtil.getInstance(getActivity()).setAlbumGridSizeLand(gridSize); - } - - @Override - protected void saveUsePalette(boolean usePalette) { - PreferenceUtil.getInstance(getActivity()).setAlbumColoredFooters(usePalette); - } - - @Override - public void onMediaStoreChanged() { - presenter.loadAlbums(); - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - presenter = new AlbumPresenter(this); - } - - @Override - public void setMenuVisibility(boolean menuVisible) { - super.setMenuVisibility(menuVisible); - if (menuVisible) { - getLibraryFragment().setTitle( - PreferenceUtil.getInstance(getContext()).tabTitles() ? R.string.library - : R.string.albums); + @Override + protected GridLayoutManager createLayoutManager() { + return new GridLayoutManager(getActivity(), getGridSize()); } - } - @Override - public void onResume() { - super.onResume(); - getLibraryFragment().setTitle( - PreferenceUtil.getInstance(getContext()).tabTitles() ? R.string.library : R.string.albums); - if (getAdapter().getDataSet().isEmpty()) { - presenter.subscribe(); + @NonNull + @Override + protected AlbumAdapter createAdapter() { + int itemLayoutRes = getItemLayoutRes(); + notifyLayoutResChanged(itemLayoutRes); + if (itemLayoutRes != R.layout.item_list) { + //noinspection ConstantConditions + itemLayoutRes = PreferenceUtil.getInstance(getContext()).getAlbumGridStyle(getContext()); + } + ArrayList dataSet = + getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet(); + return new AlbumAdapter(getLibraryFragment().getMainActivity(), dataSet, itemLayoutRes, + loadUsePalette(), getLibraryFragment()); } - } - @Override - public void onDestroy() { - super.onDestroy(); - presenter.unsubscribe(); - } + @Override + protected int getEmptyMessage() { + return R.string.no_albums; + } - @Override - public void loading() { - } + @Override + public boolean loadUsePalette() { + //noinspection ConstantConditions + return PreferenceUtil.getInstance(getActivity()).albumColoredFooters(); + } - @Override - public void showEmptyView() { - getAdapter().swapDataSet(new ArrayList<>()); - } + @Override + protected void setUsePalette(boolean usePalette) { + getAdapter().usePalette(usePalette); + } - @Override - public void completed() { - } + @Override + protected void setGridSize(int gridSize) { + getLayoutManager().setSpanCount(gridSize); + getAdapter().notifyDataSetChanged(); + } - @Override - public void showData(ArrayList albums) { - getAdapter().swapDataSet(albums); - } + @Override + protected void setSortOrder(String sortOrder) { + presenter.loadAlbums(); + } + + @Override + protected String loadSortOrder() { + //noinspection ConstantConditions + return PreferenceUtil.getInstance(getActivity()).getAlbumSortOrder(); + } + + @Override + protected void saveSortOrder(String sortOrder) { + //noinspection ConstantConditions + PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder); + } + + @Override + protected int loadGridSize() { + //noinspection ConstantConditions + return PreferenceUtil.getInstance(getActivity()).getAlbumGridSize(getActivity()); + } + + @Override + protected void saveGridSize(int gridSize) { + //noinspection ConstantConditions + PreferenceUtil.getInstance(getActivity()).setAlbumGridSize(gridSize); + } + + @Override + protected int loadGridSizeLand() { + //noinspection ConstantConditions + return PreferenceUtil.getInstance(getActivity()).getAlbumGridSizeLand(getActivity()); + } + + @Override + protected void saveGridSizeLand(int gridSize) { + //noinspection ConstantConditions + PreferenceUtil.getInstance(getActivity()).setAlbumGridSizeLand(gridSize); + } + + @Override + protected void saveUsePalette(boolean usePalette) { + //noinspection ConstantConditions + PreferenceUtil.getInstance(getActivity()).setAlbumColoredFooters(usePalette); + } + + @Override + public void onMediaStoreChanged() { + presenter.loadAlbums(); + } + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + presenter = new AlbumPresenter(this); + } + + @Override + public void setMenuVisibility(boolean menuVisible) { + super.setMenuVisibility(menuVisible); + if (menuVisible) { + //noinspection ConstantConditions + getLibraryFragment().setTitle( + PreferenceUtil.getInstance(getContext()).tabTitles() ? R.string.library + : R.string.albums); + } + } + + @Override + public void onResume() { + super.onResume(); + //noinspection ConstantConditions + getLibraryFragment().setTitle( + PreferenceUtil.getInstance(getContext()).tabTitles() ? R.string.library : R.string.albums); + if (getAdapter().getDataSet().isEmpty()) { + presenter.subscribe(); + } + } + + @Override + public void onDestroy() { + super.onDestroy(); + presenter.unsubscribe(); + } + + @Override + public void loading() { + } + + @Override + public void showEmptyView() { + getAdapter().swapDataSet(new ArrayList<>()); + } + + @Override + public void completed() { + } + + @Override + public void showData(ArrayList albums) { + getAdapter().swapDataSet(albums); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java index 92553498f..28209a635 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java @@ -7,7 +7,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; @@ -19,12 +18,18 @@ import android.view.MenuItem; import android.view.SubMenu; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; + +import com.afollestad.materialcab.MaterialCab; + import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; import butterknife.Unbinder; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.common.ATHToolbarActivity; import code.name.monkey.appthemehelper.util.ATHUtil; +import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog; @@ -40,416 +45,424 @@ import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment; import code.name.monkey.retromusic.util.NavigationUtil; import code.name.monkey.retromusic.util.RetroColorUtil; import code.name.monkey.retromusic.util.RetroUtil; -import com.afollestad.materialcab.MaterialCab; +import code.name.monkey.retromusic.views.IconImageView; public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, - MainActivityFragmentCallbacks { + MainActivityFragmentCallbacks { - private static final String TAG = "LibraryFragment"; - private static final String CURRENT_TAB_ID = "current_tab_id"; - @BindView(R.id.toolbar) - Toolbar toolbar; - @BindView(R.id.app_bar) - AppBarLayout appbar; - @BindView(R.id.collapsing_toolbar) - CollapsingToolbarLayout collapsingToolbarLayout; + public static final String TAG = "LibraryFragment"; + private static final String CURRENT_TAB_ID = "current_tab_id"; + @BindView(R.id.toolbar) + Toolbar toolbar; + @BindView(R.id.app_bar) + AppBarLayout appbar; + @BindView(R.id.title) + TextView title; + @BindView(R.id.search) + IconImageView search; - private Unbinder unBinder; - private MaterialCab cab; - private FragmentManager fragmentManager; + private Unbinder unBinder; + private MaterialCab cab; + private FragmentManager fragmentManager; - public static Fragment newInstance(int tab) { - Bundle args = new Bundle(); - args.putInt(CURRENT_TAB_ID, tab); - LibraryFragment fragment = new LibraryFragment(); - fragment.setArguments(args); - return fragment; - } - - public void setTitle(@StringRes int name) { - collapsingToolbarLayout.setTitle(getString(name)); - } - - public void addOnAppBarOffsetChangedListener( - AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) { - appbar.addOnOffsetChangedListener(onOffsetChangedListener); - } - - public void removeOnAppBarOffsetChangedListener( - AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) { - appbar.removeOnOffsetChangedListener(onOffsetChangedListener); - } - - public int getTotalAppBarScrollingRange() { - return appbar.getTotalScrollRange(); - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_library, container, false); - unBinder = ButterKnife.bind(this, view); - return view; - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - setStatusbarColorAuto(view); - getMainActivity().setBottomBarVisibility(View.VISIBLE); - setupToolbar(); - - inflateFragment(); - } - - private void inflateFragment() { - if (getArguments() == null) { - selectedFragment(SongsFragment.newInstance()); - return; - } - switch (getArguments().getInt(CURRENT_TAB_ID)) { - default: - case R.id.action_song: - selectedFragment(SongsFragment.newInstance()); - break; - case R.id.action_album: - selectedFragment(AlbumsFragment.newInstance()); - break; - case R.id.action_artist: - selectedFragment(ArtistsFragment.newInstance()); - break; - case R.id.action_playlist: - selectedFragment(PlaylistsFragment.newInstance()); - break; - } - } - - @SuppressWarnings("ConstantConditions") - private void setupToolbar() { - int primaryColor = ThemeStore.primaryColor(getContext()); - appbar.setBackgroundColor(primaryColor); - toolbar.setBackgroundColor(primaryColor); - appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> - getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); - getMainActivity().setTitle(R.string.app_name); - getMainActivity().setSupportActionBar(toolbar); - } - - public Fragment getCurrentFragment() { - if (fragmentManager == null) { - return SongsFragment.newInstance(); - } - return fragmentManager.findFragmentByTag(LibraryFragment.TAG); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - unBinder.unbind(); - } - - @Override - public boolean handleBackPress() { - if (cab != null && cab.isActive()) { - cab.finish(); - return true; - } - return false; - } - - public void selectedFragment(Fragment fragment) { - fragmentManager = getChildFragmentManager(); - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - - fragmentTransaction - .replace(R.id.fragment_container, fragment, TAG) - .commit(); - } - - @NonNull - @Override - public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) { - if (cab != null && cab.isActive()) { - cab.finish(); - } - //noinspection ConstantConditions - cab = new MaterialCab(getMainActivity(), R.id.cab_stub) - .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor( - RetroColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(getActivity()))) - .start(callback); - return cab; - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - inflater.inflate(R.menu.menu_main, menu); - - Fragment currentFragment = getCurrentFragment(); - if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment - && currentFragment.isAdded()) { - AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment; - - MenuItem gridSizeItem = menu.findItem(R.id.action_grid_size); - if (RetroUtil.isLandscape(getResources())) { - gridSizeItem.setTitle(R.string.action_grid_size_land); - } - setUpGridSizeMenu(fragment, gridSizeItem.getSubMenu()); - - setUpSortOrderMenu(fragment, menu.findItem(R.id.action_sort_order).getSubMenu()); - - } else { - menu.add(0, R.id.action_new_playlist, 0, R.string.new_playlist_title); - menu.removeItem(R.id.action_grid_size); - } - Activity activity = getActivity(); - if (activity == null) { - return; - } - ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu, - ATHToolbarActivity.getToolbarBackgroundColor(toolbar)); - } - - private void setUpSortOrderMenu( - @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, - @NonNull SubMenu sortOrderMenu) { - String currentSortOrder = fragment.getSortOrder(); - sortOrderMenu.clear(); - - if (fragment instanceof AlbumsFragment) { - sortOrderMenu.add(0, R.id.action_album_sort_order_asc, 0, R.string.sort_order_a_z) - .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z)); - sortOrderMenu.add(0, R.id.action_album_sort_order_desc, 1, R.string.sort_order_z_a) - .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A)); - sortOrderMenu.add(0, R.id.action_album_sort_order_artist, 2, R.string.sort_order_artist) - .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST)); - sortOrderMenu.add(0, R.id.action_album_sort_order_year, 3, R.string.sort_order_year) - .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR)); - } else if (fragment instanceof ArtistsFragment) { - sortOrderMenu.add(0, R.id.action_artist_sort_order_asc, 0, R.string.sort_order_a_z) - .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z)); - sortOrderMenu.add(0, R.id.action_artist_sort_order_desc, 1, R.string.sort_order_z_a) - .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A)); - } else if (fragment instanceof SongsFragment) { - sortOrderMenu.add(0, R.id.action_song_sort_order_asc, 0, R.string.sort_order_a_z) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z)); - sortOrderMenu.add(0, R.id.action_song_sort_order_desc, 1, R.string.sort_order_z_a) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A)); - sortOrderMenu.add(0, R.id.action_song_sort_order_artist, 2, R.string.sort_order_artist) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST)); - sortOrderMenu.add(0, R.id.action_song_sort_order_album, 3, R.string.sort_order_album) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM)); - sortOrderMenu.add(0, R.id.action_song_sort_order_year, 4, R.string.sort_order_year) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR)); - sortOrderMenu.add(0, R.id.action_song_sort_order_date, 4, R.string.sort_order_date) - .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_DATE)); + public static Fragment newInstance(int tab) { + Bundle args = new Bundle(); + args.putInt(CURRENT_TAB_ID, tab); + LibraryFragment fragment = new LibraryFragment(); + fragment.setArguments(args); + return fragment; } - sortOrderMenu.setGroupCheckable(0, true, true); - } - - private boolean handleSortOrderMenuItem( - @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) { - String sortOrder = null; - if (fragment instanceof AlbumsFragment) { - switch (item.getItemId()) { - case R.id.action_album_sort_order_asc: - sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z; - break; - case R.id.action_album_sort_order_desc: - sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A; - break; - case R.id.action_album_sort_order_artist: - sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST; - break; - case R.id.action_album_sort_order_year: - sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR; - break; - } - } else if (fragment instanceof ArtistsFragment) { - switch (item.getItemId()) { - case R.id.action_artist_sort_order_asc: - sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z; - break; - case R.id.action_artist_sort_order_desc: - sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A; - break; - } - } else if (fragment instanceof SongsFragment) { - switch (item.getItemId()) { - case R.id.action_song_sort_order_asc: - sortOrder = SortOrder.SongSortOrder.SONG_A_Z; - break; - case R.id.action_song_sort_order_desc: - sortOrder = SortOrder.SongSortOrder.SONG_Z_A; - break; - case R.id.action_song_sort_order_artist: - sortOrder = SortOrder.SongSortOrder.SONG_ARTIST; - break; - case R.id.action_song_sort_order_album: - sortOrder = SortOrder.SongSortOrder.SONG_ALBUM; - break; - case R.id.action_song_sort_order_year: - sortOrder = SortOrder.SongSortOrder.SONG_YEAR; - break; - case R.id.action_song_sort_order_date: - sortOrder = SortOrder.SongSortOrder.SONG_DATE; - break; - } + public void setTitle(@StringRes int name) { + title.setText(getString(name)); } - if (sortOrder != null) { - item.setChecked(true); - fragment.setAndSaveSortOrder(sortOrder); - return true; + public void addOnAppBarOffsetChangedListener( + AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) { + appbar.addOnOffsetChangedListener(onOffsetChangedListener); } - return false; - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - super.onPrepareOptionsMenu(menu); - Activity activity = getActivity(); - if (activity == null) { - return; + public void removeOnAppBarOffsetChangedListener( + AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) { + appbar.removeOnOffsetChangedListener(onOffsetChangedListener); } - ToolbarContentTintHelper.handleOnPrepareOptionsMenu(activity, toolbar); - } - @SuppressWarnings("ConstantConditions") - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - //if (pager == null) return false; - Fragment currentFragment = getCurrentFragment(); - if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment) { - AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment; - if (handleGridSizeMenuItem(fragment, item)) { - return true; - } - if (handleSortOrderMenuItem(fragment, item)) { - return true; - } + public int getTotalAppBarScrollingRange() { + return appbar.getTotalScrollRange(); } - int id = item.getItemId(); - switch (id) { - case R.id.action_new_playlist: - CreatePlaylistDialog.create().show(getChildFragmentManager(), "CREATE_PLAYLIST"); - return true; - case R.id.action_shuffle_all: - MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(getContext()) - .blockingFirst(), true); - return true; - case R.id.action_search: - NavigationUtil.goToSearch(getMainActivity()); - break; - case R.id.action_equalizer: - NavigationUtil.openEqualizer(getActivity()); - return true; - case R.id.action_sleep_timer: - if (getFragmentManager() != null) { - new SleepTimerDialog().show(getFragmentManager(), TAG); + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_library, container, false); + unBinder = ButterKnife.bind(this, view); + return view; + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + setStatusbarColorAuto(view); + getMainActivity().setBottomBarVisibility(View.VISIBLE); + setupToolbar(); + inflateFragment(); + } + + private void inflateFragment() { + if (getArguments() == null) { + selectedFragment(SongsFragment.newInstance()); + return; + } + switch (getArguments().getInt(CURRENT_TAB_ID)) { + default: + case R.id.action_song: + selectedFragment(SongsFragment.newInstance()); + break; + case R.id.action_album: + selectedFragment(AlbumsFragment.newInstance()); + break; + case R.id.action_artist: + selectedFragment(ArtistsFragment.newInstance()); + break; + case R.id.action_playlist: + selectedFragment(PlaylistsFragment.newInstance()); + break; } - return true; - case R.id.action_settings: - startActivity(new Intent(getContext(), SettingsActivity.class)); - break; - } - return super.onOptionsItemSelected(item); - } - - - private void setUpGridSizeMenu( - @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, - @NonNull SubMenu gridSizeMenu) { - switch (fragment.getGridSize()) { - case 1: - gridSizeMenu.findItem(R.id.action_grid_size_1).setChecked(true); - break; - case 2: - gridSizeMenu.findItem(R.id.action_grid_size_2).setChecked(true); - break; - case 3: - gridSizeMenu.findItem(R.id.action_grid_size_3).setChecked(true); - break; - case 4: - gridSizeMenu.findItem(R.id.action_grid_size_4).setChecked(true); - break; - case 5: - gridSizeMenu.findItem(R.id.action_grid_size_5).setChecked(true); - break; - case 6: - gridSizeMenu.findItem(R.id.action_grid_size_6).setChecked(true); - break; - case 7: - gridSizeMenu.findItem(R.id.action_grid_size_7).setChecked(true); - break; - case 8: - gridSizeMenu.findItem(R.id.action_grid_size_8).setChecked(true); - break; - } - int maxGridSize = fragment.getMaxGridSize(); - if (maxGridSize < 8) { - gridSizeMenu.findItem(R.id.action_grid_size_8).setVisible(false); - } - if (maxGridSize < 7) { - gridSizeMenu.findItem(R.id.action_grid_size_7).setVisible(false); - } - if (maxGridSize < 6) { - gridSizeMenu.findItem(R.id.action_grid_size_6).setVisible(false); - } - if (maxGridSize < 5) { - gridSizeMenu.findItem(R.id.action_grid_size_5).setVisible(false); - } - if (maxGridSize < 4) { - gridSizeMenu.findItem(R.id.action_grid_size_4).setVisible(false); - } - if (maxGridSize < 3) { - gridSizeMenu.findItem(R.id.action_grid_size_3).setVisible(false); - } - } - - - private boolean handleGridSizeMenuItem( - @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) { - int gridSize = 0; - switch (item.getItemId()) { - case R.id.action_grid_size_1: - gridSize = 1; - break; - case R.id.action_grid_size_2: - gridSize = 2; - break; - case R.id.action_grid_size_3: - gridSize = 3; - break; - case R.id.action_grid_size_4: - gridSize = 4; - break; - case R.id.action_grid_size_5: - gridSize = 5; - break; - case R.id.action_grid_size_6: - gridSize = 6; - break; - case R.id.action_grid_size_7: - gridSize = 7; - break; - case R.id.action_grid_size_8: - gridSize = 8; - break; } - if (gridSize > 0) { - item.setChecked(true); - fragment.setAndSaveGridSize(gridSize); - return true; + @SuppressWarnings("ConstantConditions") + private void setupToolbar() { + title.setTextColor(ThemeStore.textColorPrimary(getContext())); + TintHelper.setTintAuto(search, ThemeStore.textColorSecondary(getContext()), false); + + int primaryColor = ThemeStore.primaryColor(getContext()); + appbar.setBackgroundColor(primaryColor); + toolbar.setBackgroundColor(primaryColor); + appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> + getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); + getMainActivity().setTitle(null); + getMainActivity().setSupportActionBar(toolbar); + } + + public Fragment getCurrentFragment() { + if (fragmentManager == null) { + return SongsFragment.newInstance(); + } + return fragmentManager.findFragmentByTag(LibraryFragment.TAG); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unBinder.unbind(); + } + + @Override + public boolean handleBackPress() { + if (cab != null && cab.isActive()) { + cab.finish(); + return true; + } + return false; + } + + public void selectedFragment(Fragment fragment) { + fragmentManager = getChildFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + + fragmentTransaction + .replace(R.id.fragment_container, fragment, TAG) + .commit(); + } + + @NonNull + @Override + public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) { + if (cab != null && cab.isActive()) { + cab.finish(); + } + //noinspection ConstantConditions + cab = new MaterialCab(getMainActivity(), R.id.cab_stub) + .setMenu(menuRes) + .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setBackgroundColor( + RetroColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(getActivity()))) + .start(callback); + return cab; + } + + @OnClick(R.id.search) + void search() { + NavigationUtil.goToSearch(getActivity()); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + super.onCreateOptionsMenu(menu, inflater); + inflater.inflate(R.menu.menu_main, menu); + + Fragment currentFragment = getCurrentFragment(); + if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment + && currentFragment.isAdded()) { + AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment; + + MenuItem gridSizeItem = menu.findItem(R.id.action_grid_size); + if (RetroUtil.isLandscape(getResources())) { + gridSizeItem.setTitle(R.string.action_grid_size_land); + } + setUpGridSizeMenu(fragment, gridSizeItem.getSubMenu()); + + setUpSortOrderMenu(fragment, menu.findItem(R.id.action_sort_order).getSubMenu()); + + } else { + menu.add(0, R.id.action_new_playlist, 0, R.string.new_playlist_title); + menu.removeItem(R.id.action_grid_size); + } + Activity activity = getActivity(); + if (activity == null) { + return; + } + ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu, + ATHToolbarActivity.getToolbarBackgroundColor(toolbar)); + } + + private void setUpSortOrderMenu( + @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, + @NonNull SubMenu sortOrderMenu) { + String currentSortOrder = fragment.getSortOrder(); + sortOrderMenu.clear(); + + if (fragment instanceof AlbumsFragment) { + sortOrderMenu.add(0, R.id.action_album_sort_order_asc, 0, R.string.sort_order_a_z) + .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z)); + sortOrderMenu.add(0, R.id.action_album_sort_order_desc, 1, R.string.sort_order_z_a) + .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A)); + sortOrderMenu.add(0, R.id.action_album_sort_order_artist, 2, R.string.sort_order_artist) + .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST)); + sortOrderMenu.add(0, R.id.action_album_sort_order_year, 3, R.string.sort_order_year) + .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR)); + } else if (fragment instanceof ArtistsFragment) { + sortOrderMenu.add(0, R.id.action_artist_sort_order_asc, 0, R.string.sort_order_a_z) + .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z)); + sortOrderMenu.add(0, R.id.action_artist_sort_order_desc, 1, R.string.sort_order_z_a) + .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A)); + } else if (fragment instanceof SongsFragment) { + sortOrderMenu.add(0, R.id.action_song_sort_order_asc, 0, R.string.sort_order_a_z) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z)); + sortOrderMenu.add(0, R.id.action_song_sort_order_desc, 1, R.string.sort_order_z_a) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A)); + sortOrderMenu.add(0, R.id.action_song_sort_order_artist, 2, R.string.sort_order_artist) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST)); + sortOrderMenu.add(0, R.id.action_song_sort_order_album, 3, R.string.sort_order_album) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM)); + sortOrderMenu.add(0, R.id.action_song_sort_order_year, 4, R.string.sort_order_year) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR)); + sortOrderMenu.add(0, R.id.action_song_sort_order_date, 4, R.string.sort_order_date) + .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_DATE)); + } + + sortOrderMenu.setGroupCheckable(0, true, true); + } + + private boolean handleSortOrderMenuItem( + @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) { + String sortOrder = null; + if (fragment instanceof AlbumsFragment) { + switch (item.getItemId()) { + case R.id.action_album_sort_order_asc: + sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z; + break; + case R.id.action_album_sort_order_desc: + sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A; + break; + case R.id.action_album_sort_order_artist: + sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST; + break; + case R.id.action_album_sort_order_year: + sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR; + break; + } + } else if (fragment instanceof ArtistsFragment) { + switch (item.getItemId()) { + case R.id.action_artist_sort_order_asc: + sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z; + break; + case R.id.action_artist_sort_order_desc: + sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A; + break; + } + } else if (fragment instanceof SongsFragment) { + switch (item.getItemId()) { + case R.id.action_song_sort_order_asc: + sortOrder = SortOrder.SongSortOrder.SONG_A_Z; + break; + case R.id.action_song_sort_order_desc: + sortOrder = SortOrder.SongSortOrder.SONG_Z_A; + break; + case R.id.action_song_sort_order_artist: + sortOrder = SortOrder.SongSortOrder.SONG_ARTIST; + break; + case R.id.action_song_sort_order_album: + sortOrder = SortOrder.SongSortOrder.SONG_ALBUM; + break; + case R.id.action_song_sort_order_year: + sortOrder = SortOrder.SongSortOrder.SONG_YEAR; + break; + case R.id.action_song_sort_order_date: + sortOrder = SortOrder.SongSortOrder.SONG_DATE; + break; + } + } + + if (sortOrder != null) { + item.setChecked(true); + fragment.setAndSaveSortOrder(sortOrder); + return true; + } + + return false; + } + + @Override + public void onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + Activity activity = getActivity(); + if (activity == null) { + return; + } + ToolbarContentTintHelper.handleOnPrepareOptionsMenu(activity, toolbar); + } + + @SuppressWarnings("ConstantConditions") + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + //if (pager == null) return false; + Fragment currentFragment = getCurrentFragment(); + if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment) { + AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment; + if (handleGridSizeMenuItem(fragment, item)) { + return true; + } + if (handleSortOrderMenuItem(fragment, item)) { + return true; + } + } + int id = item.getItemId(); + switch (id) { + case R.id.action_new_playlist: + CreatePlaylistDialog.create().show(getChildFragmentManager(), "CREATE_PLAYLIST"); + return true; + case R.id.action_shuffle_all: + MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(getContext()) + .blockingFirst(), true); + return true; + case R.id.action_search: + NavigationUtil.goToSearch(getMainActivity()); + break; + case R.id.action_equalizer: + NavigationUtil.openEqualizer(getActivity()); + return true; + case R.id.action_sleep_timer: + if (getFragmentManager() != null) { + new SleepTimerDialog().show(getFragmentManager(), TAG); + } + return true; + case R.id.action_settings: + startActivity(new Intent(getContext(), SettingsActivity.class)); + break; + } + return super.onOptionsItemSelected(item); + } + + + private void setUpGridSizeMenu( + @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, + @NonNull SubMenu gridSizeMenu) { + switch (fragment.getGridSize()) { + case 1: + gridSizeMenu.findItem(R.id.action_grid_size_1).setChecked(true); + break; + case 2: + gridSizeMenu.findItem(R.id.action_grid_size_2).setChecked(true); + break; + case 3: + gridSizeMenu.findItem(R.id.action_grid_size_3).setChecked(true); + break; + case 4: + gridSizeMenu.findItem(R.id.action_grid_size_4).setChecked(true); + break; + case 5: + gridSizeMenu.findItem(R.id.action_grid_size_5).setChecked(true); + break; + case 6: + gridSizeMenu.findItem(R.id.action_grid_size_6).setChecked(true); + break; + case 7: + gridSizeMenu.findItem(R.id.action_grid_size_7).setChecked(true); + break; + case 8: + gridSizeMenu.findItem(R.id.action_grid_size_8).setChecked(true); + break; + } + int maxGridSize = fragment.getMaxGridSize(); + if (maxGridSize < 8) { + gridSizeMenu.findItem(R.id.action_grid_size_8).setVisible(false); + } + if (maxGridSize < 7) { + gridSizeMenu.findItem(R.id.action_grid_size_7).setVisible(false); + } + if (maxGridSize < 6) { + gridSizeMenu.findItem(R.id.action_grid_size_6).setVisible(false); + } + if (maxGridSize < 5) { + gridSizeMenu.findItem(R.id.action_grid_size_5).setVisible(false); + } + if (maxGridSize < 4) { + gridSizeMenu.findItem(R.id.action_grid_size_4).setVisible(false); + } + if (maxGridSize < 3) { + gridSizeMenu.findItem(R.id.action_grid_size_3).setVisible(false); + } + } + + + private boolean handleGridSizeMenuItem( + @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) { + int gridSize = 0; + switch (item.getItemId()) { + case R.id.action_grid_size_1: + gridSize = 1; + break; + case R.id.action_grid_size_2: + gridSize = 2; + break; + case R.id.action_grid_size_3: + gridSize = 3; + break; + case R.id.action_grid_size_4: + gridSize = 4; + break; + case R.id.action_grid_size_5: + gridSize = 5; + break; + case R.id.action_grid_size_6: + gridSize = 6; + break; + case R.id.action_grid_size_7: + gridSize = 7; + break; + case R.id.action_grid_size_8: + gridSize = 8; + break; + } + + if (gridSize > 0) { + item.setChecked(true); + fragment.setAndSaveGridSize(gridSize); + return true; + } + return false; } - return false; - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java index 19a04fb4d..5db70b856 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java @@ -26,6 +26,21 @@ import android.webkit.MimeTypeMap; import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; + +import com.afollestad.materialcab.MaterialCab; +import com.afollestad.materialdialogs.MaterialDialog; +import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; + +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -53,710 +68,692 @@ import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroColorUtil; import code.name.monkey.retromusic.util.ViewUtil; import code.name.monkey.retromusic.views.BreadCrumbLayout; -import com.afollestad.materialcab.MaterialCab; -import com.afollestad.materialdialogs.MaterialDialog; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; public class FoldersFragment extends AbsMainActivityFragment implements - MainActivityFragmentCallbacks, - CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks, - AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks> { + MainActivityFragmentCallbacks, + CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks, + AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks> { - public static final String TAG = FoldersFragment.class.getSimpleName(); - public static final FileFilter AUDIO_FILE_FILTER = file -> !file.isHidden() && (file.isDirectory() - || - FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) || - FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) || - FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton())); + public static final String TAG = FoldersFragment.class.getSimpleName(); + public static final FileFilter AUDIO_FILE_FILTER = file -> !file.isHidden() && (file.isDirectory() + || + FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) || + FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) || + FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton())); - protected static final String PATH = "path"; - protected static final String CRUMBS = "crumbs"; - private static final int LOADER_ID = LoaderIds.FOLDERS_FRAGMENT; - @BindView(R.id.coordinator_layout) - CoordinatorLayout coordinatorLayout; - @BindView(R.id.container) - View container; - @BindView(R.id.title) - TextView title; - @BindView(android.R.id.empty) - View empty; - @BindView(R.id.toolbar) - Toolbar toolbar; - @BindView(R.id.bread_crumbs) - BreadCrumbLayout breadCrumbs; - @BindView(R.id.appbar) - AppBarLayout appbar; + protected static final String PATH = "path"; + protected static final String CRUMBS = "crumbs"; + private static final int LOADER_ID = LoaderIds.FOLDERS_FRAGMENT; + @BindView(R.id.coordinator_layout) + CoordinatorLayout coordinatorLayout; + @BindView(R.id.container) + View container; + @BindView(R.id.title) + TextView title; + @BindView(android.R.id.empty) + View empty; + @BindView(R.id.toolbar) + Toolbar toolbar; + @BindView(R.id.bread_crumbs) + BreadCrumbLayout breadCrumbs; + @BindView(R.id.appbar) + AppBarLayout appbar; + @BindView(R.id.recycler_view) + FastScrollRecyclerView recyclerView; - @BindView(R.id.recycler_view) - FastScrollRecyclerView recyclerView; + Comparator fileComparator = (lhs, rhs) -> { + if (lhs.isDirectory() && !rhs.isDirectory()) { + return -1; + } else if (!lhs.isDirectory() && rhs.isDirectory()) { + return 1; + } else { + return lhs.getName().compareToIgnoreCase + (rhs.getName()); + } + }; - Comparator fileComparator = (lhs, rhs) -> { - if (lhs.isDirectory() && !rhs.isDirectory()) { - return -1; - } else if (!lhs.isDirectory() && rhs.isDirectory()) { - return 1; - } else { - return lhs.getName().compareToIgnoreCase - (rhs.getName()); + private Unbinder unbinder; + private SongFileAdapter adapter; + private MaterialCab cab; + + public FoldersFragment() { } - }; - private Unbinder unbinder; - private SongFileAdapter adapter; - private MaterialCab cab; - - public FoldersFragment() { - } - - public static FoldersFragment newInstance(Context context) { - return newInstance(PreferenceUtil.getInstance(context).getStartDirectory()); - } - - public static FoldersFragment newInstance(File directory) { - FoldersFragment frag = new FoldersFragment(); - Bundle b = new Bundle(); - b.putSerializable(PATH, directory); - frag.setArguments(b); - return frag; - } - - - public static File getDefaultStartDirectory() { - File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC); - File startFolder; - if (musicDir.exists() && musicDir.isDirectory()) { - startFolder = musicDir; - } else { - File externalStorage = Environment.getExternalStorageDirectory(); - if (externalStorage.exists() && externalStorage.isDirectory()) { - startFolder = externalStorage; - } else { - startFolder = new File("/"); // root - } + public static FoldersFragment newInstance(Context context) { + return newInstance(PreferenceUtil.getInstance(context).getStartDirectory()); } - return startFolder; - } - private static File tryGetCanonicalFile(File file) { - try { - return file.getCanonicalFile(); - } catch (IOException e) { - e.printStackTrace(); - return file; + public static FoldersFragment newInstance(File directory) { + FoldersFragment frag = new FoldersFragment(); + Bundle b = new Bundle(); + b.putSerializable(PATH, directory); + frag.setArguments(b); + return frag; } - } - public void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) { - if (crumb == null) { - return; + + public static File getDefaultStartDirectory() { + File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC); + File startFolder; + if (musicDir.exists() && musicDir.isDirectory()) { + startFolder = musicDir; + } else { + File externalStorage = Environment.getExternalStorageDirectory(); + if (externalStorage.exists() && externalStorage.isDirectory()) { + startFolder = externalStorage; + } else { + startFolder = new File("/"); // root + } + } + return startFolder; } - saveScrollPosition(); - breadCrumbs.setActiveOrAdd(crumb, false); - if (addToHistory) { - breadCrumbs.addHistory(crumb); + + private static File tryGetCanonicalFile(File file) { + try { + return file.getCanonicalFile(); + } catch (IOException e) { + e.printStackTrace(); + return file; + } } - getLoaderManager().restartLoader(LOADER_ID, null, this); - } - private void saveScrollPosition() { - BreadCrumbLayout.Crumb crumb = getActiveCrumb(); - if (crumb != null) { - crumb.setScrollPosition( - ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition()); + public void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) { + if (crumb == null) { + return; + } + saveScrollPosition(); + breadCrumbs.setActiveOrAdd(crumb, false); + if (addToHistory) { + breadCrumbs.addHistory(crumb); + } + getLoaderManager().restartLoader(LOADER_ID, null, this); } - } - @Nullable - private BreadCrumbLayout.Crumb getActiveCrumb() { - return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs - .getCrumb(breadCrumbs.getActiveIndex()) : null; - } - - @Override - public void onSaveInstanceState(@NonNull Bundle outState) { - super.onSaveInstanceState(outState); - outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper()); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - if (savedInstanceState == null) { - //noinspection ConstantConditions - setCrumb(new BreadCrumbLayout.Crumb( - FileUtil.safeGetCanonicalFile((File) getArguments().getSerializable(PATH))), true); - } else { - breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS)); - getLoaderManager().initLoader(LOADER_ID, null, this); - } - } - - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_folder, container, false); - unbinder = ButterKnife.bind(this, view); - return view; - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - setStatusbarColorAuto(view); - getMainActivity().getSlidingUpPanelLayout().setShadowHeight(0); - getMainActivity().setBottomBarVisibility(View.GONE); - - setUpAppbarColor(); - setUpToolbar(); - setUpBreadCrumbs(); - setUpRecyclerView(); - setUpAdapter(); - - } - - private void setUpAppbarColor() { - //noinspection ConstantConditions - int primaryColor = ThemeStore.primaryColor(getActivity()); - TintHelper.setTintAuto(container, primaryColor, true); - appbar.setBackgroundColor(ColorUtil.darkenColor(primaryColor)); - toolbar.setBackgroundColor(ColorUtil.darkenColor(primaryColor)); - //breadCrumbs.setBackgroundColor(primaryColor); - breadCrumbs.setActivatedContentColor( - ToolbarContentTintHelper - .toolbarTitleColor(getActivity(), ColorUtil.darkenColor(primaryColor))); - breadCrumbs.setDeactivatedContentColor( - ToolbarContentTintHelper - .toolbarSubtitleColor(getActivity(), ColorUtil.darkenColor(primaryColor))); - appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity() - .setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); - } - - private void setUpToolbar() { - //noinspection ConstantConditions - title.setTextColor(ThemeStore.textColorPrimary(getContext())); - toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); - //noinspection ConstantConditions - getActivity().setTitle(R.string.folders); - getMainActivity().setSupportActionBar(toolbar); - } - - private void setUpBreadCrumbs() { - breadCrumbs.setCallback(this); - } - - private void setUpRecyclerView() { - //noinspection ConstantConditions - ViewUtil.setUpFastScrollRecyclerViewColor(getActivity(), recyclerView, - ThemeStore.accentColor(getActivity())); - recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - appbar.addOnOffsetChangedListener(this); - } - - private void setUpAdapter() { - adapter = new SongFileAdapter(getMainActivity(), new LinkedList(), R.layout.item_list, - this, this); - adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { - @Override - public void onChanged() { - super.onChanged(); - checkIsEmpty(); - } - }); - recyclerView.setAdapter(adapter); - checkIsEmpty(); - } - - @Override - public void onPause() { - super.onPause(); - saveScrollPosition(); - } - - @Override - public void onDestroyView() { - appbar.removeOnOffsetChangedListener(this); - unbinder.unbind(); - super.onDestroyView(); - } - - @Override - public boolean handleBackPress() { - if (cab != null && cab.isActive()) { - cab.finish(); - return true; - } - if (breadCrumbs != null && breadCrumbs.popHistory()) { - setCrumb(breadCrumbs.lastHistory(), false); - return true; - } - return false; - } - - @NonNull - @Override - public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) { - if (cab != null && cab.isActive()) { - cab.finish(); - } - cab = new MaterialCab(getMainActivity(), R.id.cab_stub) - .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor - (getActivity()))) - .start(callback); - return cab; - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - inflater.inflate(R.menu.menu_folders, menu); - ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu, - ATHToolbarActivity.getToolbarBackgroundColor(toolbar)); - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - super.onPrepareOptionsMenu(menu); - ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar); - } - - @Override - public void onCrumbSelection(BreadCrumbLayout.Crumb crumb, int index) { - setCrumb(crumb, true); - } - - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - //noinspection ConstantConditions - getActivity().onBackPressed(); - break; - case R.id.action_go_to_start_directory: - setCrumb(new BreadCrumbLayout.Crumb( - tryGetCanonicalFile(PreferenceUtil.getInstance(getActivity()).getStartDirectory())), - true); - return true; - case R.id.action_scan: + private void saveScrollPosition() { BreadCrumbLayout.Crumb crumb = getActiveCrumb(); if (crumb != null) { - //noinspection Convert2MethodRef - new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) - .execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(), AUDIO_FILE_FILTER)); + crumb.setScrollPosition( + ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition()); } - return true; } - return super.onOptionsItemSelected(item); - } - @Override - public void onFileSelected(File file) { - file = tryGetCanonicalFile(file); // important as we compare the path value later - if (file.isDirectory()) { - setCrumb(new BreadCrumbLayout.Crumb(file), true); - } else { - FileFilter fileFilter = pathname -> !pathname.isDirectory() && AUDIO_FILE_FILTER - .accept(pathname); - new ListSongsAsyncTask(getActivity(), file, (songs, extra) -> { - File file1 = (File) extra; - int startIndex = -1; - for (int i = 0; i < songs.size(); i++) { - if (file1.getPath().equals(songs.get(i).data)) { // path is already canonical here - startIndex = i; - break; - } - } - if (startIndex > -1) { - MusicPlayerRemote.openQueue(songs, startIndex, true); + @Nullable + private BreadCrumbLayout.Crumb getActiveCrumb() { + return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs + .getCrumb(breadCrumbs.getActiveIndex()) : null; + } + + @Override + public void onSaveInstanceState(@NonNull Bundle outState) { + super.onSaveInstanceState(outState); + outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper()); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + if (savedInstanceState == null) { + //noinspection ConstantConditions + setCrumb(new BreadCrumbLayout.Crumb( + FileUtil.safeGetCanonicalFile((File) getArguments().getSerializable(PATH))), true); } else { - final File finalFile = file1; - Snackbar.make(coordinatorLayout, Html.fromHtml( - String.format(getString(R.string.not_listed_in_media_store), file1.getName())), - Snackbar.LENGTH_LONG) - .setAction(R.string.action_scan, - v -> new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) - .execute(new ListPathsAsyncTask.LoadingInfo(finalFile, AUDIO_FILE_FILTER))) - .setActionTextColor(ThemeStore.accentColor(getActivity())) - .show(); + breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS)); + getLoaderManager().initLoader(LOADER_ID, null, this); } - }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file.getParentFile()), fileFilter, - getFileComparator())); - } - } - - @Override - public void onMultipleItemAction(MenuItem item, ArrayList files) { - final int itemId = item.getItemId(); - new ListSongsAsyncTask(getActivity(), null, - (songs, extra) -> SongsMenuHelper.handleMenuClick(getActivity(), songs, itemId)) - .execute(new ListSongsAsyncTask.LoadingInfo(files, AUDIO_FILE_FILTER, getFileComparator())); - } - - private ArrayList toList(File file) { - ArrayList files = new ArrayList<>(1); - files.add(file); - return files; - } - - private Comparator getFileComparator() { - return fileComparator; - } - - @Override - public void onFileMenuClicked(final File file, View view) { - PopupMenu popupMenu = new PopupMenu(getActivity(), view); - if (file.isDirectory()) { - popupMenu.inflate(R.menu.menu_item_directory); - popupMenu.setOnMenuItemClickListener(item -> { - final int itemId = item.getItemId(); - switch (itemId) { - case R.id.action_play_next: - case R.id.action_add_to_current_playing: - case R.id.action_add_to_playlist: - case R.id.action_delete_from_device: - new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> { - if (!songs.isEmpty()) { - SongsMenuHelper.handleMenuClick(getActivity(), songs, itemId); - } - }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER, - getFileComparator())); - return true; - case R.id.action_set_as_start_directory: - PreferenceUtil.getInstance(getActivity()).setStartDirectory(file); - Toast.makeText(getActivity(), - String.format(getString(R.string.new_start_directory), file.getPath()), - Toast.LENGTH_SHORT).show(); - return true; - case R.id.action_scan: - new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) - .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER)); - return true; - } - return false; - }); - } else { - popupMenu.inflate(R.menu.menu_item_file); - popupMenu.setOnMenuItemClickListener(item -> { - final int itemId = item.getItemId(); - switch (itemId) { - case R.id.action_play_next: - case R.id.action_add_to_current_playing: - case R.id.action_add_to_playlist: - case R.id.action_go_to_album: - case R.id.action_go_to_artist: - case R.id.action_share: - case R.id.action_tag_editor: - case R.id.action_details: - case R.id.action_set_as_ringtone: - case R.id.action_delete_from_device: - new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> SongMenuHelper - .handleMenuClick(getActivity(), songs.get(0), itemId)).execute( - new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER, - getFileComparator())); - return true; - case R.id.action_scan: - new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) - .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER)); - return true; - } - return false; - }); - } - popupMenu.show(); - } - - @Override - public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { - container.setPadding(container.getPaddingLeft(), container.getPaddingTop(), - container.getPaddingRight(), appbar.getTotalScrollRange() + verticalOffset); - } - - private void checkIsEmpty() { - if (empty != null) { - empty - .setVisibility(adapter == null || adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE); - } - } - - private void scanPaths(@Nullable String[] toBeScanned) { - if (getActivity() == null) { - return; - } - if (toBeScanned == null || toBeScanned.length < 1) { - Toast.makeText(getActivity(), R.string.nothing_to_scan, Toast.LENGTH_SHORT).show(); - } else { - MediaScannerConnection.scanFile(getActivity().getApplicationContext(), toBeScanned, null, - new UpdateToastMediaScannerCompletionListener(getActivity(), toBeScanned)); - } - } - - private void updateAdapter(@NonNull List files) { - adapter.swapDataSet(files); - BreadCrumbLayout.Crumb crumb = getActiveCrumb(); - if (crumb != null && recyclerView != null) { - ((LinearLayoutManager) recyclerView.getLayoutManager()) - .scrollToPositionWithOffset(crumb.getScrollPosition(), 0); - } - } - - @NonNull - @Override - public Loader> onCreateLoader(int id, Bundle args) { - return new AsyncFileLoader(this); - } - - @Override - public void onLoadFinished(@NonNull Loader> loader, List data) { - updateAdapter(data); - } - - @Override - public void onLoaderReset(@NonNull Loader> loader) { - updateAdapter(new LinkedList()); - } - - private static class AsyncFileLoader extends WrappedAsyncTaskLoader> { - - private WeakReference fragmentWeakReference; - - public AsyncFileLoader(FoldersFragment foldersFragment) { - super(foldersFragment.getActivity()); - fragmentWeakReference = new WeakReference<>(foldersFragment); } @Override - public List loadInBackground() { - FoldersFragment foldersFragment = fragmentWeakReference.get(); - File directory = null; - if (foldersFragment != null) { - BreadCrumbLayout.Crumb crumb = foldersFragment.getActiveCrumb(); - if (crumb != null) { - directory = crumb.getFile(); - } - } - if (directory != null) { - List files = FileUtil.listFiles(directory, AUDIO_FILE_FILTER); - Collections.sort(files, foldersFragment.getFileComparator()); - return files; - } else { - return new LinkedList<>(); - } - } - } - - private static class ListSongsAsyncTask extends - ListingFilesDialogAsyncTask> { - - private final Object extra; - private WeakReference contextWeakReference; - private WeakReference callbackWeakReference; - - ListSongsAsyncTask(Context context, Object extra, OnSongsListedCallback callback) { - super(context); - this.extra = extra; - contextWeakReference = new WeakReference<>(context); - callbackWeakReference = new WeakReference<>(callback); + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_folder, container, false); + unbinder = ButterKnife.bind(this, view); + return view; } @Override - protected void onPreExecute() { - super.onPreExecute(); - checkCallbackReference(); - checkContextReference(); + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + setStatusbarColorAuto(view); + getMainActivity().getSlidingUpPanelLayout().setShadowHeight(0); + getMainActivity().setBottomBarVisibility(View.GONE); + + setUpAppbarColor(); + setUpToolbar(); + setUpBreadCrumbs(); + setUpRecyclerView(); + setUpAdapter(); + } - @Override - protected ArrayList doInBackground(LoadingInfo... params) { - try { - LoadingInfo info = params[0]; - List files = FileUtil.listFilesDeep(info.files, info.fileFilter); - - if (isCancelled() || checkContextReference() == null - || checkCallbackReference() == null) { - return null; - } - - Collections.sort(files, info.fileComparator); - - Context context = checkContextReference(); - if (isCancelled() || context == null || checkCallbackReference() == null) { - return null; - } - - return FileUtil.matchFilesWithMediaStore(context, files).blockingFirst(); - } catch (Exception e) { - e.printStackTrace(); - cancel(false); - return null; - } + private void setUpAppbarColor() { + //noinspection ConstantConditions + int primaryColor = ThemeStore.primaryColor(getActivity()); + TintHelper.setTintAuto(container, primaryColor, true); + appbar.setBackgroundColor(primaryColor); + toolbar.setBackgroundColor(primaryColor); + //breadCrumbs.setBackgroundColor(primaryColor); + breadCrumbs.setActivatedContentColor(ToolbarContentTintHelper.toolbarTitleColor(getActivity(), ColorUtil.darkenColor(primaryColor))); + breadCrumbs.setDeactivatedContentColor(ToolbarContentTintHelper.toolbarSubtitleColor(getActivity(), ColorUtil.darkenColor(primaryColor))); + appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); } - @Override - protected void onPostExecute(ArrayList songs) { - super.onPostExecute(songs); - OnSongsListedCallback callback = checkCallbackReference(); - if (songs != null && callback != null) { - callback.onSongsListed(songs, extra); - } + private void setUpToolbar() { + //noinspection ConstantConditions + title.setTextColor(ThemeStore.textColorPrimary(getContext())); + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + //noinspection ConstantConditions + getActivity().setTitle(R.string.folders); + getMainActivity().setSupportActionBar(toolbar); } - private Context checkContextReference() { - Context context = contextWeakReference.get(); - if (context == null) { - cancel(false); - } - return context; + private void setUpBreadCrumbs() { + breadCrumbs.setCallback(this); } - private OnSongsListedCallback checkCallbackReference() { - OnSongsListedCallback callback = callbackWeakReference.get(); - if (callback == null) { - cancel(false); - } - return callback; + private void setUpRecyclerView() { + //noinspection ConstantConditions + ViewUtil.setUpFastScrollRecyclerViewColor(getActivity(), recyclerView, + ThemeStore.accentColor(getActivity())); + recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + appbar.addOnOffsetChangedListener(this); } - public interface OnSongsListedCallback { - - void onSongsListed(@NonNull ArrayList songs, Object extra); - } - - static class LoadingInfo { - - final Comparator fileComparator; - final FileFilter fileFilter; - final List files; - - LoadingInfo(@NonNull List files, @NonNull FileFilter fileFilter, - @NonNull Comparator fileComparator) { - this.fileComparator = fileComparator; - this.fileFilter = fileFilter; - this.files = files; - } - } - } - - public static class ListPathsAsyncTask extends - ListingFilesDialogAsyncTask { - - private WeakReference onPathsListedCallbackWeakReference; - - public ListPathsAsyncTask(Context context, OnPathsListedCallback callback) { - super(context); - onPathsListedCallbackWeakReference = new WeakReference<>(callback); - } - - @Override - protected void onPreExecute() { - super.onPreExecute(); - checkCallbackReference(); - } - - @Override - protected String[] doInBackground(LoadingInfo... params) { - try { - if (isCancelled() || checkCallbackReference() == null) { - return null; - } - - LoadingInfo info = params[0]; - - final String[] paths; - - if (info.file.isDirectory()) { - List files = FileUtil.listFilesDeep(info.file, info.fileFilter); - - if (isCancelled() || checkCallbackReference() == null) { - return null; - } - - paths = new String[files.size()]; - for (int i = 0; i < files.size(); i++) { - File f = files.get(i); - paths[i] = FileUtil.safeGetCanonicalPath(f); - - if (isCancelled() || checkCallbackReference() == null) { - return null; + private void setUpAdapter() { + adapter = new SongFileAdapter(getMainActivity(), new LinkedList(), R.layout.item_list, + this, this); + adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { + @Override + public void onChanged() { + super.onChanged(); + checkIsEmpty(); } - } + }); + recyclerView.setAdapter(adapter); + checkIsEmpty(); + } + + @Override + public void onPause() { + super.onPause(); + saveScrollPosition(); + } + + @Override + public void onDestroyView() { + appbar.removeOnOffsetChangedListener(this); + unbinder.unbind(); + super.onDestroyView(); + } + + @Override + public boolean handleBackPress() { + if (cab != null && cab.isActive()) { + cab.finish(); + return true; + } + if (breadCrumbs != null && breadCrumbs.popHistory()) { + setCrumb(breadCrumbs.lastHistory(), false); + return true; + } + return false; + } + + @NonNull + @Override + public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) { + if (cab != null && cab.isActive()) { + cab.finish(); + } + cab = new MaterialCab(getMainActivity(), R.id.cab_stub) + .setMenu(menuRes) + .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor + (getActivity()))) + .start(callback); + return cab; + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + super.onCreateOptionsMenu(menu, inflater); + inflater.inflate(R.menu.menu_folders, menu); + ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu, + ATHToolbarActivity.getToolbarBackgroundColor(toolbar)); + } + + @Override + public void onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar); + } + + @Override + public void onCrumbSelection(BreadCrumbLayout.Crumb crumb, int index) { + setCrumb(crumb, true); + } + + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + //noinspection ConstantConditions + getActivity().onBackPressed(); + break; + case R.id.action_go_to_start_directory: + setCrumb(new BreadCrumbLayout.Crumb( + tryGetCanonicalFile(PreferenceUtil.getInstance(getActivity()).getStartDirectory())), + true); + return true; + case R.id.action_scan: + BreadCrumbLayout.Crumb crumb = getActiveCrumb(); + if (crumb != null) { + //noinspection Convert2MethodRef + new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) + .execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(), AUDIO_FILE_FILTER)); + } + return true; + } + return super.onOptionsItemSelected(item); + } + + @Override + public void onFileSelected(File file) { + file = tryGetCanonicalFile(file); // important as we compare the path value later + if (file.isDirectory()) { + setCrumb(new BreadCrumbLayout.Crumb(file), true); } else { - paths = new String[1]; - paths[0] = info.file.getPath(); + FileFilter fileFilter = pathname -> !pathname.isDirectory() && AUDIO_FILE_FILTER + .accept(pathname); + new ListSongsAsyncTask(getActivity(), file, (songs, extra) -> { + File file1 = (File) extra; + int startIndex = -1; + for (int i = 0; i < songs.size(); i++) { + if (file1.getPath().equals(songs.get(i).data)) { // path is already canonical here + startIndex = i; + break; + } + } + if (startIndex > -1) { + MusicPlayerRemote.openQueue(songs, startIndex, true); + } else { + final File finalFile = file1; + Snackbar.make(coordinatorLayout, Html.fromHtml( + String.format(getString(R.string.not_listed_in_media_store), file1.getName())), + Snackbar.LENGTH_LONG) + .setAction(R.string.action_scan, + v -> new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) + .execute(new ListPathsAsyncTask.LoadingInfo(finalFile, AUDIO_FILE_FILTER))) + .setActionTextColor(ThemeStore.accentColor(getActivity())) + .show(); + } + }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file.getParentFile()), fileFilter, + getFileComparator())); + } + } + + @Override + public void onMultipleItemAction(MenuItem item, ArrayList files) { + final int itemId = item.getItemId(); + new ListSongsAsyncTask(getActivity(), null, + (songs, extra) -> SongsMenuHelper.handleMenuClick(getActivity(), songs, itemId)) + .execute(new ListSongsAsyncTask.LoadingInfo(files, AUDIO_FILE_FILTER, getFileComparator())); + } + + private ArrayList toList(File file) { + ArrayList files = new ArrayList<>(1); + files.add(file); + return files; + } + + private Comparator getFileComparator() { + return fileComparator; + } + + @Override + public void onFileMenuClicked(final File file, View view) { + PopupMenu popupMenu = new PopupMenu(getActivity(), view); + if (file.isDirectory()) { + popupMenu.inflate(R.menu.menu_item_directory); + popupMenu.setOnMenuItemClickListener(item -> { + final int itemId = item.getItemId(); + switch (itemId) { + case R.id.action_play_next: + case R.id.action_add_to_current_playing: + case R.id.action_add_to_playlist: + case R.id.action_delete_from_device: + new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> { + if (!songs.isEmpty()) { + SongsMenuHelper.handleMenuClick(getActivity(), songs, itemId); + } + }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER, + getFileComparator())); + return true; + case R.id.action_set_as_start_directory: + PreferenceUtil.getInstance(getActivity()).setStartDirectory(file); + Toast.makeText(getActivity(), + String.format(getString(R.string.new_start_directory), file.getPath()), + Toast.LENGTH_SHORT).show(); + return true; + case R.id.action_scan: + new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) + .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER)); + return true; + } + return false; + }); + } else { + popupMenu.inflate(R.menu.menu_item_file); + popupMenu.setOnMenuItemClickListener(item -> { + final int itemId = item.getItemId(); + switch (itemId) { + case R.id.action_play_next: + case R.id.action_add_to_current_playing: + case R.id.action_add_to_playlist: + case R.id.action_go_to_album: + case R.id.action_go_to_artist: + case R.id.action_share: + case R.id.action_tag_editor: + case R.id.action_details: + case R.id.action_set_as_ringtone: + case R.id.action_delete_from_device: + new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> SongMenuHelper + .handleMenuClick(getActivity(), songs.get(0), itemId)).execute( + new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER, + getFileComparator())); + return true; + case R.id.action_scan: + new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)) + .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER)); + return true; + } + return false; + }); + } + popupMenu.show(); + } + + @Override + public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { + container.setPadding(container.getPaddingLeft(), container.getPaddingTop(), + container.getPaddingRight(), appbar.getTotalScrollRange() + verticalOffset); + } + + private void checkIsEmpty() { + if (empty != null) { + empty + .setVisibility(adapter == null || adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE); + } + } + + private void scanPaths(@Nullable String[] toBeScanned) { + if (getActivity() == null) { + return; + } + if (toBeScanned == null || toBeScanned.length < 1) { + Toast.makeText(getActivity(), R.string.nothing_to_scan, Toast.LENGTH_SHORT).show(); + } else { + MediaScannerConnection.scanFile(getActivity().getApplicationContext(), toBeScanned, null, + new UpdateToastMediaScannerCompletionListener(getActivity(), toBeScanned)); + } + } + + private void updateAdapter(@NonNull List files) { + adapter.swapDataSet(files); + BreadCrumbLayout.Crumb crumb = getActiveCrumb(); + if (crumb != null && recyclerView != null) { + ((LinearLayoutManager) recyclerView.getLayoutManager()) + .scrollToPositionWithOffset(crumb.getScrollPosition(), 0); + } + } + + @NonNull + @Override + public Loader> onCreateLoader(int id, Bundle args) { + return new AsyncFileLoader(this); + } + + @Override + public void onLoadFinished(@NonNull Loader> loader, List data) { + updateAdapter(data); + } + + @Override + public void onLoaderReset(@NonNull Loader> loader) { + updateAdapter(new LinkedList()); + } + + private static class AsyncFileLoader extends WrappedAsyncTaskLoader> { + + private WeakReference fragmentWeakReference; + + public AsyncFileLoader(FoldersFragment foldersFragment) { + super(foldersFragment.getActivity()); + fragmentWeakReference = new WeakReference<>(foldersFragment); } - return paths; - } catch (Exception e) { - e.printStackTrace(); - cancel(false); - return null; - } + @Override + public List loadInBackground() { + FoldersFragment foldersFragment = fragmentWeakReference.get(); + File directory = null; + if (foldersFragment != null) { + BreadCrumbLayout.Crumb crumb = foldersFragment.getActiveCrumb(); + if (crumb != null) { + directory = crumb.getFile(); + } + } + if (directory != null) { + List files = FileUtil.listFiles(directory, AUDIO_FILE_FILTER); + Collections.sort(files, foldersFragment.getFileComparator()); + return files; + } else { + return new LinkedList<>(); + } + } } - @Override - protected void onPostExecute(String[] paths) { - super.onPostExecute(paths); - OnPathsListedCallback callback = checkCallbackReference(); - if (callback != null && paths != null) { - callback.onPathsListed(paths); - } + private static class ListSongsAsyncTask extends + ListingFilesDialogAsyncTask> { + + private final Object extra; + private WeakReference contextWeakReference; + private WeakReference callbackWeakReference; + + ListSongsAsyncTask(Context context, Object extra, OnSongsListedCallback callback) { + super(context); + this.extra = extra; + contextWeakReference = new WeakReference<>(context); + callbackWeakReference = new WeakReference<>(callback); + } + + @Override + protected void onPreExecute() { + super.onPreExecute(); + checkCallbackReference(); + checkContextReference(); + } + + @Override + protected ArrayList doInBackground(LoadingInfo... params) { + try { + LoadingInfo info = params[0]; + List files = FileUtil.listFilesDeep(info.files, info.fileFilter); + + if (isCancelled() || checkContextReference() == null + || checkCallbackReference() == null) { + return null; + } + + Collections.sort(files, info.fileComparator); + + Context context = checkContextReference(); + if (isCancelled() || context == null || checkCallbackReference() == null) { + return null; + } + + return FileUtil.matchFilesWithMediaStore(context, files).blockingFirst(); + } catch (Exception e) { + e.printStackTrace(); + cancel(false); + return null; + } + } + + @Override + protected void onPostExecute(ArrayList songs) { + super.onPostExecute(songs); + OnSongsListedCallback callback = checkCallbackReference(); + if (songs != null && callback != null) { + callback.onSongsListed(songs, extra); + } + } + + private Context checkContextReference() { + Context context = contextWeakReference.get(); + if (context == null) { + cancel(false); + } + return context; + } + + private OnSongsListedCallback checkCallbackReference() { + OnSongsListedCallback callback = callbackWeakReference.get(); + if (callback == null) { + cancel(false); + } + return callback; + } + + public interface OnSongsListedCallback { + + void onSongsListed(@NonNull ArrayList songs, Object extra); + } + + static class LoadingInfo { + + final Comparator fileComparator; + final FileFilter fileFilter; + final List files; + + LoadingInfo(@NonNull List files, @NonNull FileFilter fileFilter, + @NonNull Comparator fileComparator) { + this.fileComparator = fileComparator; + this.fileFilter = fileFilter; + this.files = files; + } + } } - private OnPathsListedCallback checkCallbackReference() { - OnPathsListedCallback callback = onPathsListedCallbackWeakReference.get(); - if (callback == null) { - cancel(false); - } - return callback; + public static class ListPathsAsyncTask extends + ListingFilesDialogAsyncTask { + + private WeakReference onPathsListedCallbackWeakReference; + + public ListPathsAsyncTask(Context context, OnPathsListedCallback callback) { + super(context); + onPathsListedCallbackWeakReference = new WeakReference<>(callback); + } + + @Override + protected void onPreExecute() { + super.onPreExecute(); + checkCallbackReference(); + } + + @Override + protected String[] doInBackground(LoadingInfo... params) { + try { + if (isCancelled() || checkCallbackReference() == null) { + return null; + } + + LoadingInfo info = params[0]; + + final String[] paths; + + if (info.file.isDirectory()) { + List files = FileUtil.listFilesDeep(info.file, info.fileFilter); + + if (isCancelled() || checkCallbackReference() == null) { + return null; + } + + paths = new String[files.size()]; + for (int i = 0; i < files.size(); i++) { + File f = files.get(i); + paths[i] = FileUtil.safeGetCanonicalPath(f); + + if (isCancelled() || checkCallbackReference() == null) { + return null; + } + } + } else { + paths = new String[1]; + paths[0] = info.file.getPath(); + } + + return paths; + } catch (Exception e) { + e.printStackTrace(); + cancel(false); + return null; + } + } + + @Override + protected void onPostExecute(String[] paths) { + super.onPostExecute(paths); + OnPathsListedCallback callback = checkCallbackReference(); + if (callback != null && paths != null) { + callback.onPathsListed(paths); + } + } + + private OnPathsListedCallback checkCallbackReference() { + OnPathsListedCallback callback = onPathsListedCallbackWeakReference.get(); + if (callback == null) { + cancel(false); + } + return callback; + } + + public interface OnPathsListedCallback { + + void onPathsListed(@NonNull String[] paths); + } + + public static class LoadingInfo { + + public final File file; + final FileFilter fileFilter; + + public LoadingInfo(File file, FileFilter fileFilter) { + this.file = file; + this.fileFilter = fileFilter; + } + } } - public interface OnPathsListedCallback { + private static abstract class ListingFilesDialogAsyncTask extends + DialogAsyncTask { - void onPathsListed(@NonNull String[] paths); + ListingFilesDialogAsyncTask(Context context) { + super(context); + } + + public ListingFilesDialogAsyncTask(Context context, int showDelay) { + super(context, showDelay); + } + + @Override + protected Dialog createDialog(@NonNull Context context) { + return new MaterialDialog.Builder(context) + .title(R.string.listing_files) + .progress(true, 0) + .progressIndeterminateStyle(true) + .cancelListener(dialog -> cancel(false)) + .dismissListener(dialog -> cancel(false)) + .negativeText(android.R.string.cancel) + .onNegative((dialog, which) -> cancel(false)) + .show(); + } } - - public static class LoadingInfo { - - public final File file; - final FileFilter fileFilter; - - public LoadingInfo(File file, FileFilter fileFilter) { - this.file = file; - this.fileFilter = fileFilter; - } - } - } - - private static abstract class ListingFilesDialogAsyncTask extends - DialogAsyncTask { - - ListingFilesDialogAsyncTask(Context context) { - super(context); - } - - public ListingFilesDialogAsyncTask(Context context, int showDelay) { - super(context, showDelay); - } - - @Override - protected Dialog createDialog(@NonNull Context context) { - return new MaterialDialog.Builder(context) - .title(R.string.listing_files) - .progress(true, 0) - .progressIndeterminateStyle(true) - .cancelListener(dialog -> cancel(false)) - .dismissListener(dialog -> cancel(false)) - .negativeText(android.R.string.cancel) - .onNegative((dialog, which) -> cancel(false)) - .show(); - } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java index 644b0d7f5..2c02a35bf 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java @@ -1,14 +1,11 @@ package code.name.monkey.retromusic.ui.fragments.mainactivity.home; -import static code.name.monkey.retromusic.Constants.USER_PROFILE; - import android.app.Activity; import android.graphics.Bitmap; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; import android.support.v4.content.ContextCompat; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; @@ -22,13 +19,16 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + +import java.io.File; +import java.util.ArrayList; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.Unbinder; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ATHUtil; -import code.name.monkey.appthemehelper.util.ColorUtil; import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.dialogs.HomeOptionDialog; @@ -56,276 +56,276 @@ import code.name.monkey.retromusic.views.MetalRecyclerViewPager; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import java.io.File; -import java.util.ArrayList; + +import static code.name.monkey.retromusic.Constants.USER_PROFILE; public class BannerHomeFragment extends AbsMainActivityFragment implements - MainActivityFragmentCallbacks, - HomeContract.HomeView { + MainActivityFragmentCallbacks, + HomeContract.HomeView { - private static final String TAG = "HomeFragment"; - Unbinder unbinder; - @BindView(R.id.home_toolbar) - Toolbar toolbar; - @BindView(R.id.appbar) - AppBarLayout appbar; - @BindView(R.id.user_image) - CircularImageView userImage; - @BindView(R.id.recycler_view) - RecyclerView recentArtistRV; - @BindView(R.id.recent_album) - RecyclerView recentAlbumRV; - @BindView(R.id.top_artist) - RecyclerView topArtistRV; - @BindView(R.id.top_album) - MetalRecyclerViewPager topAlbumRV; - @BindView(R.id.recent_artist_container) - View recentArtistContainer; - @BindView(R.id.recent_albums_container) - View recentAlbumsContainer; - @BindView(R.id.top_artist_container) - View topArtistContainer; - @BindView(R.id.top_albums_container) - View topAlbumContainer; - @BindView(R.id.genres) - RecyclerView genresRecyclerView; - @BindView(R.id.genre_container) - LinearLayout genreContainer; - @BindView(R.id.container) - View container; - @BindView(R.id.title) - TextView title; - @BindView(R.id.search) - ImageView search; + private static final String TAG = "HomeFragment"; + Unbinder unbinder; + @BindView(R.id.home_toolbar) + Toolbar toolbar; + @BindView(R.id.appbar) + AppBarLayout appbar; + @BindView(R.id.user_image) + CircularImageView userImage; + @BindView(R.id.recycler_view) + RecyclerView recentArtistRV; + @BindView(R.id.recent_album) + RecyclerView recentAlbumRV; + @BindView(R.id.top_artist) + RecyclerView topArtistRV; + @BindView(R.id.top_album) + MetalRecyclerViewPager topAlbumRV; + @BindView(R.id.recent_artist_container) + View recentArtistContainer; + @BindView(R.id.recent_albums_container) + View recentAlbumsContainer; + @BindView(R.id.top_artist_container) + View topArtistContainer; + @BindView(R.id.top_albums_container) + View topAlbumContainer; + @BindView(R.id.genres) + RecyclerView genresRecyclerView; + @BindView(R.id.genre_container) + LinearLayout genreContainer; + @BindView(R.id.container) + View container; + @BindView(R.id.title) + TextView title; + @BindView(R.id.search) + ImageView search; - private HomePresenter homePresenter; - private CompositeDisposable disposable; + private HomePresenter homePresenter; + private CompositeDisposable disposable; - public static BannerHomeFragment newInstance() { - Bundle args = new Bundle(); - BannerHomeFragment fragment = new BannerHomeFragment(); - fragment.setArguments(args); - return fragment; - } - - - private void loadImageFromStorage(ImageView imageView) { - //noinspection ConstantConditions - disposable.add(new Compressor(getContext()) - .setMaxHeight(300) - .setMaxWidth(300) - .setQuality(75) - .setCompressFormat(Bitmap.CompressFormat.WEBP) - .compressToBitmapAsFlowable( - new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(imageView::setImageBitmap, - throwable -> imageView.setImageDrawable(ContextCompat - .getDrawable(getContext(), R.drawable.ic_person_flat)))); - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - disposable = new CompositeDisposable(); - //noinspection ConstantConditions - homePresenter = new HomePresenter(this); - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_banner_home, container, false); - unbinder = ButterKnife.bind(this, view); - return view; - } - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - setStatusbarColorAuto(view); - getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8); - getMainActivity().setBottomBarVisibility(View.VISIBLE); - - setupToolbar(); - loadImageFromStorage(userImage); - - homePresenter.subscribe(); - checkPadding(); - } - - @SuppressWarnings("ConstantConditions") - private void setupToolbar() { - //noinspection ConstantConditions - int primaryColor = ThemeStore.primaryColor(getContext()); - appbar.setBackgroundColor(ColorUtil.darkenColor(primaryColor)); - toolbar.setBackgroundColor(ColorUtil.darkenColor(primaryColor)); - appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> - getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); - - getActivity().setTitle(R.string.app_name); - getMainActivity().setSupportActionBar(toolbar); - - title.setTextColor(ThemeStore.textColorPrimary(getContext())); - TintHelper.setTintAuto(search, ThemeStore.textColorPrimary(getContext()), false); - TintHelper.setTintAuto(container, primaryColor, true); - } - - @Override - public boolean handleBackPress() { - return false; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - unbinder.unbind(); - disposable.clear(); - homePresenter.unsubscribe(); - } - - @Override - public void loading() { - - } - - @Override - public void showEmptyView() { - - } - - @Override - public void completed() { - - } - - @Override - public void showData(ArrayList homes) { - //homeAdapter.swapDataSet(homes); - } - - @Override - public void onMediaStoreChanged() { - super.onMediaStoreChanged(); - homePresenter.subscribe(); - } - - @Override - public void onServiceConnected() { - super.onServiceConnected(); - checkPadding(); - } - - @Override - public void onQueueChanged() { - super.onQueueChanged(); - checkPadding(); - } - - private void checkPadding() { - int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height); - container.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0); - } - - @Override - public void recentArtist(ArrayList artists) { - recentArtistContainer.setVisibility(View.VISIBLE); - recentArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), - 1, GridLayoutManager.HORIZONTAL, false)); - ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, - R.layout.item_artist, false, null); - recentArtistRV.setAdapter(artistAdapter); - } - - @Override - public void recentAlbum(ArrayList albums) { - recentAlbumsContainer.setVisibility(View.VISIBLE); - AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), - getDisplayMetrics()); - artistAdapter.swapData(albums); - recentAlbumRV.setAdapter(artistAdapter); - } - - @Override - public void topArtists(ArrayList artists) { - topArtistContainer.setVisibility(View.VISIBLE); - topArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), - 1, GridLayoutManager.HORIZONTAL, false)); - ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, - R.layout.item_artist, false, null); - topArtistRV.setAdapter(artistAdapter); - - } - - @Override - public void topAlbums(ArrayList albums) { - topAlbumContainer.setVisibility(View.VISIBLE); - AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), - getDisplayMetrics()); - artistAdapter.swapData(albums); - topAlbumRV.setAdapter(artistAdapter); - } - - private DisplayMetrics getDisplayMetrics() { - Display display = getMainActivity().getWindowManager().getDefaultDisplay(); - DisplayMetrics metrics = new DisplayMetrics(); - display.getMetrics(metrics); - - return metrics; - } - - @Override - public void suggestions(ArrayList playlists) { - - } - - - @Override - public void geners(ArrayList genres) { - genreContainer.setVisibility(View.VISIBLE); - genresRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - //noinspection ConstantConditions - GenreAdapter genreAdapter = new GenreAdapter(getActivity(), genres, R.layout.item_list); - genresRecyclerView.setAdapter(genreAdapter); - } - - - @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history, - R.id.user_image, R.id.search}) - void startUserInfo(View view) { - Activity activity = getActivity(); - if (activity != null) { - switch (view.getId()) { - case R.id.action_shuffle: - MusicPlayerRemote - .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true); - break; - case R.id.last_added: - NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity)); - break; - case R.id.top_played: - NavigationUtil.goToPlaylistNew(activity, new MyTopTracksPlaylist(activity)); - break; - case R.id.history: - NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity)); - break; - case R.id.search: - NavigationUtil.goToSearch(activity); - break; - case R.id.user_image: - new HomeOptionDialog().show(getFragmentManager(), TAG); - break; - } + public static BannerHomeFragment newInstance() { + Bundle args = new Bundle(); + BannerHomeFragment fragment = new BannerHomeFragment(); + fragment.setArguments(args); + return fragment; } - } - @Override - public void onPlayingMetaChanged() { - super.onPlayingMetaChanged(); - homePresenter.loadRecentArtists(); - homePresenter.loadRecentAlbums(); - } + + private void loadImageFromStorage(ImageView imageView) { + //noinspection ConstantConditions + disposable.add(new Compressor(getContext()) + .setMaxHeight(300) + .setMaxWidth(300) + .setQuality(75) + .setCompressFormat(Bitmap.CompressFormat.WEBP) + .compressToBitmapAsFlowable( + new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(imageView::setImageBitmap, + throwable -> imageView.setImageDrawable(ContextCompat + .getDrawable(getContext(), R.drawable.ic_person_flat)))); + } + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + disposable = new CompositeDisposable(); + //noinspection ConstantConditions + homePresenter = new HomePresenter(this); + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_banner_home, container, false); + unbinder = ButterKnife.bind(this, view); + return view; + } + + @Override + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + setStatusbarColorAuto(view); + getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8); + getMainActivity().setBottomBarVisibility(View.VISIBLE); + + setupToolbar(); + loadImageFromStorage(userImage); + + homePresenter.subscribe(); + checkPadding(); + } + + @SuppressWarnings("ConstantConditions") + private void setupToolbar() { + //noinspection ConstantConditions + int primaryColor = ThemeStore.primaryColor(getContext()); + appbar.setBackgroundColor(primaryColor); + toolbar.setBackgroundColor(primaryColor); + appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> + getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()))); + + getActivity().setTitle(R.string.app_name); + getMainActivity().setSupportActionBar(toolbar); + + title.setTextColor(ThemeStore.textColorPrimary(getContext())); + TintHelper.setTintAuto(search, ThemeStore.textColorPrimary(getContext()), false); + TintHelper.setTintAuto(container, primaryColor, true); + } + + @Override + public boolean handleBackPress() { + return false; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + disposable.clear(); + homePresenter.unsubscribe(); + } + + @Override + public void loading() { + + } + + @Override + public void showEmptyView() { + + } + + @Override + public void completed() { + + } + + @Override + public void showData(ArrayList homes) { + //homeAdapter.swapDataSet(homes); + } + + @Override + public void onMediaStoreChanged() { + super.onMediaStoreChanged(); + homePresenter.subscribe(); + } + + @Override + public void onServiceConnected() { + super.onServiceConnected(); + checkPadding(); + } + + @Override + public void onQueueChanged() { + super.onQueueChanged(); + checkPadding(); + } + + private void checkPadding() { + int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height); + container.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0); + } + + @Override + public void recentArtist(ArrayList artists) { + recentArtistContainer.setVisibility(View.VISIBLE); + recentArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), + 1, GridLayoutManager.HORIZONTAL, false)); + ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, + R.layout.item_artist, false, null); + recentArtistRV.setAdapter(artistAdapter); + } + + @Override + public void recentAlbum(ArrayList albums) { + recentAlbumsContainer.setVisibility(View.VISIBLE); + AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), + getDisplayMetrics()); + artistAdapter.swapData(albums); + recentAlbumRV.setAdapter(artistAdapter); + } + + @Override + public void topArtists(ArrayList artists) { + topArtistContainer.setVisibility(View.VISIBLE); + topArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), + 1, GridLayoutManager.HORIZONTAL, false)); + ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, + R.layout.item_artist, false, null); + topArtistRV.setAdapter(artistAdapter); + + } + + @Override + public void topAlbums(ArrayList albums) { + topAlbumContainer.setVisibility(View.VISIBLE); + AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), + getDisplayMetrics()); + artistAdapter.swapData(albums); + topAlbumRV.setAdapter(artistAdapter); + } + + private DisplayMetrics getDisplayMetrics() { + Display display = getMainActivity().getWindowManager().getDefaultDisplay(); + DisplayMetrics metrics = new DisplayMetrics(); + display.getMetrics(metrics); + + return metrics; + } + + @Override + public void suggestions(ArrayList playlists) { + + } + + + @Override + public void geners(ArrayList genres) { + genreContainer.setVisibility(View.VISIBLE); + genresRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + //noinspection ConstantConditions + GenreAdapter genreAdapter = new GenreAdapter(getActivity(), genres, R.layout.item_list); + genresRecyclerView.setAdapter(genreAdapter); + } + + + @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history, + R.id.user_image, R.id.search}) + void startUserInfo(View view) { + Activity activity = getActivity(); + if (activity != null) { + switch (view.getId()) { + case R.id.action_shuffle: + MusicPlayerRemote + .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true); + break; + case R.id.last_added: + NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity)); + break; + case R.id.top_played: + NavigationUtil.goToPlaylistNew(activity, new MyTopTracksPlaylist(activity)); + break; + case R.id.history: + NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity)); + break; + case R.id.search: + NavigationUtil.goToSearch(activity); + break; + case R.id.user_image: + new HomeOptionDialog().show(getFragmentManager(), TAG); + break; + } + } + } + + @Override + public void onPlayingMetaChanged() { + super.onPlayingMetaChanged(); + homePresenter.loadRecentArtists(); + homePresenter.loadRecentAlbums(); + } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java index 8abe1dd6a..721a625e5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java @@ -71,7 +71,7 @@ import static code.name.monkey.retromusic.Constants.USER_PROFILE; public class HomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks, HomeContract.HomeView { - private static final String TAG = "HomeFragment"; + public static final String TAG = "HomeFragment"; Unbinder unbinder; @BindView(R.id.home_toolbar) Toolbar toolbar; @@ -411,4 +411,413 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit homePresenter.loadRecentArtists(); homePresenter.loadRecentAlbums(); } -} \ No newline at end of file +} +/* +import android.app.Activity; +import android.graphics.Bitmap; +import android.graphics.Color; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.design.widget.AppBarLayout; +import android.support.design.widget.CollapsingToolbarLayout; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.util.DisplayMetrics; +import android.view.Display; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.engine.DiskCacheStrategy; + +import java.io.File; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Random; + +import butterknife.BindView; +import butterknife.BindViews; +import butterknife.ButterKnife; +import butterknife.OnClick; +import butterknife.Unbinder; +import code.name.monkey.appthemehelper.ThemeStore; +import code.name.monkey.appthemehelper.util.ATHUtil; +import code.name.monkey.appthemehelper.util.TintHelper; +import code.name.monkey.retromusic.R; +import code.name.monkey.retromusic.dialogs.HomeOptionDialog; +import code.name.monkey.retromusic.helper.MusicPlayerRemote; +import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks; +import code.name.monkey.retromusic.loaders.SongLoader; +import code.name.monkey.retromusic.misc.AppBarStateChangeListener; +import code.name.monkey.retromusic.model.Album; +import code.name.monkey.retromusic.model.Artist; +import code.name.monkey.retromusic.model.Genre; +import code.name.monkey.retromusic.model.Home; +import code.name.monkey.retromusic.model.Song; +import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist; +import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist; +import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist; +import code.name.monkey.retromusic.mvp.contract.HomeContract; +import code.name.monkey.retromusic.mvp.presenter.HomePresenter; +import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter; +import code.name.monkey.retromusic.ui.adapter.GenreAdapter; +import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWithAdapter; +import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter; +import code.name.monkey.retromusic.ui.adapter.home.HomeAdapter; +import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment; +import code.name.monkey.retromusic.util.Compressor; +import code.name.monkey.retromusic.util.NavigationUtil; +import code.name.monkey.retromusic.util.PreferenceUtil; +import code.name.monkey.retromusic.util.RetroUtil; +import code.name.monkey.retromusic.views.CircularImageView; +import code.name.monkey.retromusic.views.MetalRecyclerViewPager; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.schedulers.Schedulers; + +import static code.name.monkey.retromusic.Constants.USER_BANNER; +import static code.name.monkey.retromusic.Constants.USER_PROFILE; + +public class HomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks, + HomeContract.HomeView { + + public static final String TAG = "HomeFragment"; + Unbinder unbinder; + + @BindView(R.id.home_toolbar) + Toolbar toolbar; + + @BindView(R.id.appbar) + AppBarLayout appbar; + + @BindView(R.id.image) + ImageView imageView; + + @BindView(R.id.user_image) + CircularImageView userImage; + + @BindView(R.id.collapsing_toolbar) + CollapsingToolbarLayout toolbarLayout; + + @BindView(R.id.container) + View container; + + @BindView(R.id.title) + TextView title; + + @BindView(R.id.search) + ImageView search; + + @BindViews({R.id.recent_artist_container, R.id.recent_albums_container, + R.id.top_artist_container, R.id.top_albums_container, + R.id.genre_container}) + List sectionContainers; + + @BindViews({R.id.recent_artist_recycler_view, R.id.top_artist_recycler_view, + R.id.genres_recycler_view}) + List sectionRecyclerViews; + + @BindViews({R.id.recent_albums_recycler_view, R.id.top_album_recycler_view}) + List metalRecyclerViewPagers; + + private HomePresenter homePresenter; + private CompositeDisposable disposable; + + public static HomeFragment newInstance() { + Bundle args = new Bundle(); + HomeFragment fragment = new HomeFragment(); + fragment.setArguments(args); + return fragment; + } + + private void getTimeOfTheDay() { + Calendar c = Calendar.getInstance(); + int timeOfDay = c.get(Calendar.HOUR_OF_DAY); + + String[] images = new String[]{}; + if (timeOfDay >= 0 && timeOfDay < 6) { + images = getResources().getStringArray(R.array.night); + } else if (timeOfDay >= 6 && timeOfDay < 12) { + images = getResources().getStringArray(R.array.morning); + } else if (timeOfDay >= 12 && timeOfDay < 16) { + images = getResources().getStringArray(R.array.after_noon); + } else if (timeOfDay >= 16 && timeOfDay < 20) { + images = getResources().getStringArray(R.array.evening); + } else if (timeOfDay >= 20 && timeOfDay < 24) { + images = getResources().getStringArray(R.array.night); + } + String day = images[new Random().nextInt(images.length)]; + loadTimeImage(day); + } + + private void loadTimeImage(String day) { + //noinspection ConstantConditions + if (PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) { + if (imageView != null) { + Glide.with(getActivity()).load(day) + .asBitmap() + .placeholder(R.drawable.material_design_default) + .diskCacheStrategy(DiskCacheStrategy.SOURCE) + .into(imageView); + } + } else { + loadBannerFromStorage(); + } + } + + private void loadBannerFromStorage() { + //noinspection ConstantConditions + disposable.add(new Compressor(getContext()) + .setQuality(100) + .setCompressFormat(Bitmap.CompressFormat.WEBP) + .compressToBitmapAsFlowable( + new File(PreferenceUtil.getInstance(getContext()).getBannerImage(), USER_BANNER)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(imageView::setImageBitmap)); + } + + private void loadImageFromStorage(ImageView imageView) { + //noinspection ConstantConditions + disposable.add(new Compressor(getContext()) + .setMaxHeight(300) + .setMaxWidth(300) + .setQuality(75) + .setCompressFormat(Bitmap.CompressFormat.WEBP) + .compressToBitmapAsFlowable( + new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(imageView::setImageBitmap, + throwable -> imageView.setImageDrawable(ContextCompat + .getDrawable(getContext(), R.drawable.ic_person_flat)))); + } + + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + disposable = new CompositeDisposable(); + homePresenter = new HomePresenter(this); + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_home, container, false); + unbinder = ButterKnife.bind(this, view); + setRetainInstance(true); + return view; + } + + @Override + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8); + getMainActivity().setBottomBarVisibility(View.VISIBLE); + + setupToolbar(); + loadImageFromStorage(userImage); + + homePresenter.subscribe(); + checkPadding(); + getTimeOfTheDay(); + } + + @SuppressWarnings("ConstantConditions") + private void setupToolbar() { + if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) { + ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar + .getLayoutParams(); + params.topMargin = RetroUtil.getStatusBarHeight(getContext()); + toolbar.setLayoutParams(params); + } + + appbar.addOnOffsetChangedListener(new AppBarStateChangeListener() { + @Override + public void onStateChanged(AppBarLayout appBarLayout, State state) { + int color; + switch (state) { + case COLLAPSED: + getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())); + color = ThemeStore.textColorPrimary(getContext()); + break; + default: + case EXPANDED: + case IDLE: + getMainActivity().setLightStatusbar(false); + color = Color.WHITE; + break; + } + TintHelper.setTintAuto(search, color, false); + title.setTextColor(color); + } + }); + + int primaryColor = ThemeStore.primaryColor(getContext()); + + TintHelper.setTintAuto(container, primaryColor, true); + toolbarLayout.setStatusBarScrimColor(primaryColor); + toolbarLayout.setContentScrimColor(primaryColor); + + toolbar.setTitle(R.string.home); + getMainActivity().setSupportActionBar(toolbar); + + } + + @Override + public boolean handleBackPress() { + return false; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + disposable.clear(); + homePresenter.unsubscribe(); + } + + @Override + public void loading() { + + } + + @Override + public void showEmptyView() { + + } + + @Override + public void completed() { + + } + + @Override + public void showData(ArrayList homes) { + HomeAdapter homeAdapter = new HomeAdapter(getMainActivity()); + homeAdapter.swapData(homes); + } + + @Override + public void onServiceConnected() { + super.onServiceConnected(); + checkPadding(); + } + + @Override + public void onQueueChanged() { + super.onQueueChanged(); + checkPadding(); + } + + private void checkPadding() { + int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height); + container.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0); + } + + private DisplayMetrics getDisplayMetrics() { + Display display = getMainActivity().getWindowManager().getDefaultDisplay(); + DisplayMetrics metrics = new DisplayMetrics(); + display.getMetrics(metrics); + return metrics; + } + + @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, + R.id.history, R.id.user_image, R.id.search}) + void startUserInfo(View view) { + Activity activity = getActivity(); + if (activity != null) { + switch (view.getId()) { + case R.id.action_shuffle: + MusicPlayerRemote + .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true); + break; + case R.id.last_added: + NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity)); + break; + case R.id.top_played: + NavigationUtil.goToPlaylistNew(activity, new MyTopTracksPlaylist(activity)); + break; + case R.id.history: + NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity)); + break; + case R.id.search: + NavigationUtil.goToSearch(activity); + break; + case R.id.user_image: + //noinspection ConstantConditions + new HomeOptionDialog().show(getFragmentManager(), TAG); + break; + } + } + } + + @Override + public void showRecentAlbums(ArrayList albums) { + sectionContainers.get(1).setVisibility(View.VISIBLE); + AlbumFullWithAdapter albumFullWithAdapter = new AlbumFullWithAdapter(getMainActivity(), + getDisplayMetrics()); + albumFullWithAdapter.swapData(albums); + + MetalRecyclerViewPager recyclerView = metalRecyclerViewPagers.get(0); + recyclerView.setAdapter(albumFullWithAdapter); + } + + @Override + public void showTopAlbums(ArrayList albums) { + sectionContainers.get(3).setVisibility(View.VISIBLE); + AlbumFullWithAdapter albumFullWithAdapter = new AlbumFullWithAdapter(getMainActivity(), + getDisplayMetrics()); + albumFullWithAdapter.swapData(albums); + + MetalRecyclerViewPager recyclerView = metalRecyclerViewPagers.get(1); + recyclerView.setAdapter(albumFullWithAdapter); + } + + @Override + public void showRecentArtist(ArrayList artists) { + sectionContainers.get(0).setVisibility(View.VISIBLE); + GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 1, + GridLayoutManager.HORIZONTAL, false); + ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist); + + RecyclerView recyclerView = sectionRecyclerViews.get(0); + recyclerView.setLayoutManager(layoutManager); + recyclerView.setItemAnimator(new DefaultItemAnimator()); + recyclerView.setAdapter(artistAdapter); + } + + @Override + public void showTopArtist(ArrayList artists) { + sectionContainers.get(2).setVisibility(View.VISIBLE); + GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 1, + GridLayoutManager.HORIZONTAL, false); + ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist); + + RecyclerView recyclerView = sectionRecyclerViews.get(1); + recyclerView.setLayoutManager(layoutManager); + recyclerView.setItemAnimator(new DefaultItemAnimator()); + recyclerView.setAdapter(artistAdapter); + } + + @Override + public void showGenres(ArrayList genres) { + sectionContainers.get(4).setVisibility(View.VISIBLE); + RecyclerView recyclerView = sectionRecyclerViews.get(2); + recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext())); + recyclerView.setItemAnimator(new DefaultItemAnimator()); + recyclerView.setAdapter(new GenreAdapter(getMainActivity(), genres, R.layout.item_list)); + } +}*/ diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java index 8acfdd470..0bb5b57a8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java @@ -31,9 +31,9 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper; import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener; import code.name.monkey.retromusic.model.Song; -import code.name.monkey.retromusic.ui.fragments.VolumeFragment; import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment; import code.name.monkey.retromusic.util.MusicUtil; +import code.name.monkey.retromusic.util.PreferenceUtil; /** * @author Hemanth S (h4h13). @@ -41,21 +41,31 @@ import code.name.monkey.retromusic.util.MusicUtil; public class LockScreenPlayerControlsFragment extends AbsPlayerControlsFragment { @BindView(R.id.player_play_pause_button) AppCompatImageButton playPauseFab; + @BindView(R.id.player_prev_button) ImageButton prevButton; + @BindView(R.id.player_next_button) ImageButton nextButton; + @BindView(R.id.player_progress_slider) AppCompatSeekBar progressSlider; + @BindView(R.id.player_song_total_time) TextView songTotalTime; + @BindView(R.id.player_song_current_progress) TextView songCurrentProgress; + @BindView(R.id.title) AppCompatTextView title; + @BindView(R.id.text) AppCompatTextView text; + @BindView(R.id.volume_fragment_container) + View volumeContainer; + private Unbinder unbinder; private MusicProgressViewUpdateHelper progressViewUpdateHelper; private int lastPlaybackControlsColor; @@ -82,7 +92,9 @@ public class LockScreenPlayerControlsFragment extends AbsPlayerControlsFragment super.onViewCreated(view, savedInstanceState); setUpMusicControllers(); - VolumeFragment volumeFragment = (VolumeFragment) getChildFragmentManager().findFragmentById(R.id.volume_fragment); + //noinspection ConstantConditions + volumeContainer.setVisibility(PreferenceUtil.getInstance(getContext()).getVolumeToggle() + ? View.VISIBLE : View.GONE); } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java index e7a3841ff..19ccb6a7c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java @@ -2,8 +2,6 @@ package code.name.monkey.retromusic.ui.fragments.player.plain; import android.animation.ObjectAnimator; import android.graphics.PorterDuff; -import android.graphics.drawable.ClipDrawable; -import android.graphics.drawable.LayerDrawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -16,6 +14,7 @@ import android.view.animation.LinearInterpolator; import android.widget.ImageButton; import android.widget.SeekBar; import android.widget.TextView; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -41,296 +40,288 @@ import code.name.monkey.retromusic.views.PlayPauseDrawable; public class PlainPlaybackControlsFragment extends AbsPlayerControlsFragment { - @BindView(R.id.player_play_pause_button) - ImageButton playPauseFab; - @BindView(R.id.player_prev_button) - ImageButton prevButton; - @BindView(R.id.player_next_button) - ImageButton nextButton; - @BindView(R.id.player_repeat_button) - ImageButton repeatButton; - @BindView(R.id.player_shuffle_button) - ImageButton shuffleButton; - @BindView(R.id.player_progress_slider) - SeekBar progressSlider; - @BindView(R.id.player_song_total_time) - TextView songTotalTime; - @BindView(R.id.player_song_current_progress) - TextView songCurrentProgress; - @BindView(R.id.volume_fragment_container) - View volumeContainer; - private Unbinder unbinder; - private PlayPauseDrawable playerFabPlayPauseDrawable; - private int lastPlaybackControlsColor; - private int lastDisabledPlaybackControlsColor; - private MusicProgressViewUpdateHelper progressViewUpdateHelper; + @BindView(R.id.player_play_pause_button) + ImageButton playPauseFab; + @BindView(R.id.player_prev_button) + ImageButton prevButton; + @BindView(R.id.player_next_button) + ImageButton nextButton; + @BindView(R.id.player_repeat_button) + ImageButton repeatButton; + @BindView(R.id.player_shuffle_button) + ImageButton shuffleButton; + @BindView(R.id.player_progress_slider) + SeekBar progressSlider; + @BindView(R.id.player_song_total_time) + TextView songTotalTime; + @BindView(R.id.player_song_current_progress) + TextView songCurrentProgress; + @BindView(R.id.volume_fragment_container) + View volumeContainer; - @Override - public void onPlayStateChanged() { - updatePlayPauseDrawableState(true); - } + private Unbinder unbinder; + private PlayPauseDrawable playerFabPlayPauseDrawable; + private int lastPlaybackControlsColor; + private int lastDisabledPlaybackControlsColor; + private MusicProgressViewUpdateHelper progressViewUpdateHelper; - @Override - public void onRepeatModeChanged() { - updateRepeatState(); - } - - @Override - public void onShuffleModeChanged() { - updateShuffleState(); - } - - @Override - public void onServiceConnected() { - updatePlayPauseDrawableState(false); - updateRepeatState(); - updateShuffleState(); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - progressViewUpdateHelper = new MusicProgressViewUpdateHelper(this); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - unbinder.unbind(); - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, - @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_plain_controls_fragment, container, false); - unbinder = ButterKnife.bind(this, view); - return view; - } - - - @Override - public void onResume() { - super.onResume(); - progressViewUpdateHelper.start(); - } - - @Override - public void onPause() { - super.onPause(); - progressViewUpdateHelper.stop(); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - setUpMusicControllers(); - if (PreferenceUtil.getInstance(getContext()).getVolumeToggle()) { - volumeContainer.setVisibility(View.VISIBLE); - } else { - volumeContainer.setVisibility(View.GONE); + @Override + public void onPlayStateChanged() { + updatePlayPauseDrawableState(true); } - } - private void setUpMusicControllers() { - setUpPlayPauseFab(); - setUpPrevNext(); - setUpRepeatButton(); - setUpShuffleButton(); - setUpProgressSlider(); - } - - private void setUpPrevNext() { - updatePrevNextColor(); - nextButton.setOnClickListener(v -> MusicPlayerRemote.playNextSong()); - prevButton.setOnClickListener(v -> MusicPlayerRemote.back()); - } - - private void updatePrevNextColor() { - nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - prevButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - } - - private void setUpShuffleButton() { - shuffleButton.setOnClickListener(v -> MusicPlayerRemote.toggleShuffleMode()); - } - - @Override - protected void updateShuffleState() { - switch (MusicPlayerRemote.getShuffleMode()) { - case MusicService.SHUFFLE_MODE_SHUFFLE: - shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - break; - default: - shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - break; + @Override + public void onRepeatModeChanged() { + updateRepeatState(); } - } - private void setUpRepeatButton() { - repeatButton.setOnClickListener(v -> MusicPlayerRemote.cycleRepeatMode()); - } - - @Override - protected void updateRepeatState() { - switch (MusicPlayerRemote.getRepeatMode()) { - case MusicService.REPEAT_MODE_NONE: - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp); - repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - break; - case MusicService.REPEAT_MODE_ALL: - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp); - repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - break; - case MusicService.REPEAT_MODE_THIS: - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp); - repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); - break; + @Override + public void onShuffleModeChanged() { + updateShuffleState(); } - } - - @Override - protected void show() { - playPauseFab.animate() - .scaleX(1f) - .scaleY(1f) - .rotation(360f) - .setInterpolator(new DecelerateInterpolator()) - .start(); - } - - @Override - protected void hide() { - if (playPauseFab != null) { - playPauseFab.setScaleX(0f); - playPauseFab.setScaleY(0f); - playPauseFab.setRotation(0f); + @Override + public void onServiceConnected() { + updatePlayPauseDrawableState(false); + updateRepeatState(); + updateShuffleState(); } - } - @Override - protected void setUpProgressSlider() { - progressSlider.setOnSeekBarChangeListener(new SimpleOnSeekbarChangeListener() { - @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - if (fromUser) { - MusicPlayerRemote.seekTo(progress); - onUpdateProgressViews(MusicPlayerRemote.getSongProgressMillis(), - MusicPlayerRemote.getSongDurationMillis()); + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + progressViewUpdateHelper = new MusicProgressViewUpdateHelper(this); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, + @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_plain_controls_fragment, container, false); + unbinder = ButterKnife.bind(this, view); + return view; + } + + + @Override + public void onResume() { + super.onResume(); + progressViewUpdateHelper.start(); + } + + @Override + public void onPause() { + super.onPause(); + progressViewUpdateHelper.stop(); + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + setUpMusicControllers(); + if (PreferenceUtil.getInstance(getContext()).getVolumeToggle()) { + volumeContainer.setVisibility(View.VISIBLE); + } else { + volumeContainer.setVisibility(View.GONE); } - } - }); - } - - public void showBouceAnimation() { - playPauseFab.clearAnimation(); - - playPauseFab.setScaleX(0.9f); - playPauseFab.setScaleY(0.9f); - playPauseFab.setVisibility(View.VISIBLE); - playPauseFab.setPivotX(playPauseFab.getWidth() / 2); - playPauseFab.setPivotY(playPauseFab.getHeight() / 2); - - playPauseFab.animate() - .setDuration(200) - .setInterpolator(new DecelerateInterpolator()) - .scaleX(1.1f) - .scaleY(1.1f) - .withEndAction(() -> playPauseFab.animate() - .setDuration(200) - .setInterpolator(new AccelerateInterpolator()) - .scaleX(1f) - .scaleY(1f) - .alpha(1f) - .start()) - .start(); - } - - @OnClick(R.id.player_play_pause_button) - void showAnimation() { - if (MusicPlayerRemote.isPlaying()) { - MusicPlayerRemote.pauseSong(); - } else { - MusicPlayerRemote.resumePlaying(); - } - showBouceAnimation(); - } - - @Override - public void onUpdateProgressViews(int progress, int total) { - progressSlider.setMax(total); - - ObjectAnimator animator = ObjectAnimator.ofInt(progressSlider, "progress", progress); - animator.setDuration(1500); - animator.setInterpolator(new LinearInterpolator()); - animator.start(); - - songTotalTime.setText(MusicUtil.getReadableDurationString(total)); - songCurrentProgress.setText(MusicUtil.getReadableDurationString(progress)); - } - - @Override - public void setDark(int dark) { - int color = ATHUtil.resolveColor(getActivity(), android.R.attr.colorBackground); - if (ColorUtil.isColorLight(color)) { - lastPlaybackControlsColor = - MaterialValueHelper.getSecondaryTextColor(getActivity(), true); - lastDisabledPlaybackControlsColor = - MaterialValueHelper.getSecondaryDisabledTextColor(getActivity(), true); - } else { - lastPlaybackControlsColor = - MaterialValueHelper.getPrimaryTextColor(getActivity(), false); - lastDisabledPlaybackControlsColor = - MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false); } - if (PreferenceUtil.getInstance(getContext()).getAdaptiveColor()) { - TintHelper.setTintAuto(playPauseFab, - MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(dark)), - false); - TintHelper.setTintAuto(playPauseFab, dark, true); - setProgressBarColor(dark); - } else { - int accentColor = ThemeStore.accentColor(getContext()); - setProgressBarColor(accentColor); - TintHelper.setTintAuto(playPauseFab, - MaterialValueHelper - .getPrimaryTextColor(getContext(), ColorUtil.isColorLight(accentColor)), - false); - TintHelper.setTintAuto(playPauseFab, accentColor, true); + private void setUpMusicControllers() { + setUpPlayPauseFab(); + setUpPrevNext(); + setUpRepeatButton(); + setUpShuffleButton(); + setUpProgressSlider(); } - updateRepeatState(); - updateShuffleState(); - updatePrevNextColor(); - } - public void setProgressBarColor(int newColor) { - LayerDrawable ld = (LayerDrawable) progressSlider.getProgressDrawable(); - ClipDrawable clipDrawable = (ClipDrawable) ld.findDrawableByLayerId(android.R.id.progress); - clipDrawable.setColorFilter(newColor, PorterDuff.Mode.SRC_IN); - } + private void setUpPrevNext() { + updatePrevNextColor(); + nextButton.setOnClickListener(v -> MusicPlayerRemote.playNextSong()); + prevButton.setOnClickListener(v -> MusicPlayerRemote.back()); + } - private void setUpPlayPauseFab() { - playerFabPlayPauseDrawable = new PlayPauseDrawable(getActivity()); + private void updatePrevNextColor() { + nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + prevButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + } - playPauseFab.setImageDrawable( - playerFabPlayPauseDrawable); // Note: set the drawable AFTER TintHelper.setTintAuto() was called - //playPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN); - //playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler()); - playPauseFab.post(() -> { - if (playPauseFab != null) { + private void setUpShuffleButton() { + shuffleButton.setOnClickListener(v -> MusicPlayerRemote.toggleShuffleMode()); + } + + @Override + protected void updateShuffleState() { + switch (MusicPlayerRemote.getShuffleMode()) { + case MusicService.SHUFFLE_MODE_SHUFFLE: + shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + break; + default: + shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + break; + } + } + + private void setUpRepeatButton() { + repeatButton.setOnClickListener(v -> MusicPlayerRemote.cycleRepeatMode()); + } + + @Override + protected void updateRepeatState() { + switch (MusicPlayerRemote.getRepeatMode()) { + case MusicService.REPEAT_MODE_NONE: + repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp); + repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + break; + case MusicService.REPEAT_MODE_ALL: + repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp); + repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + break; + case MusicService.REPEAT_MODE_THIS: + repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp); + repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN); + break; + } + } + + + @Override + protected void show() { + playPauseFab.animate() + .scaleX(1f) + .scaleY(1f) + .rotation(360f) + .setInterpolator(new DecelerateInterpolator()) + .start(); + } + + @Override + protected void hide() { + if (playPauseFab != null) { + playPauseFab.setScaleX(0f); + playPauseFab.setScaleY(0f); + playPauseFab.setRotation(0f); + } + } + + @Override + protected void setUpProgressSlider() { + progressSlider.setOnSeekBarChangeListener(new SimpleOnSeekbarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + if (fromUser) { + MusicPlayerRemote.seekTo(progress); + onUpdateProgressViews(MusicPlayerRemote.getSongProgressMillis(), + MusicPlayerRemote.getSongDurationMillis()); + } + } + }); + } + + public void showBouceAnimation() { + playPauseFab.clearAnimation(); + + playPauseFab.setScaleX(0.9f); + playPauseFab.setScaleY(0.9f); + playPauseFab.setVisibility(View.VISIBLE); playPauseFab.setPivotX(playPauseFab.getWidth() / 2); playPauseFab.setPivotY(playPauseFab.getHeight() / 2); - } - }); - } - protected void updatePlayPauseDrawableState(boolean animate) { - if (MusicPlayerRemote.isPlaying()) { - playerFabPlayPauseDrawable.setPause(animate); - } else { - playerFabPlayPauseDrawable.setPlay(animate); + playPauseFab.animate() + .setDuration(200) + .setInterpolator(new DecelerateInterpolator()) + .scaleX(1.1f) + .scaleY(1.1f) + .withEndAction(() -> playPauseFab.animate() + .setDuration(200) + .setInterpolator(new AccelerateInterpolator()) + .scaleX(1f) + .scaleY(1f) + .alpha(1f) + .start()) + .start(); + } + + @OnClick(R.id.player_play_pause_button) + void showAnimation() { + if (MusicPlayerRemote.isPlaying()) { + MusicPlayerRemote.pauseSong(); + } else { + MusicPlayerRemote.resumePlaying(); + } + showBouceAnimation(); + } + + @Override + public void onUpdateProgressViews(int progress, int total) { + progressSlider.setMax(total); + + ObjectAnimator animator = ObjectAnimator.ofInt(progressSlider, "progress", progress); + animator.setDuration(1500); + animator.setInterpolator(new LinearInterpolator()); + animator.start(); + + songTotalTime.setText(MusicUtil.getReadableDurationString(total)); + songCurrentProgress.setText(MusicUtil.getReadableDurationString(progress)); + } + + @Override + public void setDark(int dark) { + int color = ATHUtil.resolveColor(getActivity(), android.R.attr.colorBackground); + if (ColorUtil.isColorLight(color)) { + lastPlaybackControlsColor = + MaterialValueHelper.getSecondaryTextColor(getActivity(), true); + lastDisabledPlaybackControlsColor = + MaterialValueHelper.getSecondaryDisabledTextColor(getActivity(), true); + } else { + lastPlaybackControlsColor = + MaterialValueHelper.getPrimaryTextColor(getActivity(), false); + lastDisabledPlaybackControlsColor = + MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false); + } + + int finalColor = PreferenceUtil.getInstance(getContext()).getAdaptiveColor() + ? dark : ThemeStore.accentColor(getContext()); + + + setProgressBarColor(dark); + TintHelper.setTintAuto(playPauseFab, MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(finalColor)), false); + TintHelper.setTintAuto(playPauseFab, finalColor, true); + + updateRepeatState(); + updateShuffleState(); + updatePrevNextColor(); + } + + public void setProgressBarColor(int newColor) { + TintHelper.setTintAuto(progressSlider, newColor, false); + } + + private void setUpPlayPauseFab() { + playerFabPlayPauseDrawable = new PlayPauseDrawable(getActivity()); + + playPauseFab.setImageDrawable( + playerFabPlayPauseDrawable); // Note: set the drawable AFTER TintHelper.setTintAuto() was called + //playPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN); + //playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler()); + playPauseFab.post(() -> { + if (playPauseFab != null) { + playPauseFab.setPivotX(playPauseFab.getWidth() / 2); + playPauseFab.setPivotY(playPauseFab.getHeight() / 2); + } + }); + } + + protected void updatePlayPauseDrawableState(boolean animate) { + if (MusicPlayerRemote.isPlaying()) { + playerFabPlayPauseDrawable.setPause(animate); + } else { + playerFabPlayPauseDrawable.setPlay(animate); + } } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java index a42528a11..d004c321a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java @@ -59,18 +59,17 @@ public abstract class AbsSettingsFragment extends ATEPreferenceFragmentCompat { setDividerHeight(0); setDivider(new ColorDrawable(Color.TRANSPARENT)); + //noinspection ConstantConditions getListView().setPadding(DensityUtil.dip2px(getContext(), 0), 0, 0, 0); getListView().addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(RecyclerView recyclerView, int dx, int dy) { super.onScrolled(recyclerView, dx, dy); if (getActivity() != null) { - ((SettingsActivity) getActivity()) - .addAppbarLayoutElevation(recyclerView.canScrollVertically(RecyclerView.NO_POSITION) ? 8f : 0f); + ((SettingsActivity) getActivity()).addAppbarLayoutElevation(recyclerView.canScrollVertically(RecyclerView.NO_POSITION) ? 8f : 0f); } } }); - //noinspection ConstantConditions getListView().setBackgroundColor(ThemeStore.primaryColor(getContext())); getListView().setOverScrollMode(View.OVER_SCROLL_NEVER); invalidateSettings(); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java index 9c5051664..0101f0924 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java @@ -4,6 +4,7 @@ import android.graphics.PorterDuff; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.annotation.StringRes; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -57,29 +58,29 @@ public class MainSettingsFragment extends Fragment { public void onViewClicked(View view) { switch (view.getId()) { case R.id.general_settings: - inflateFragment(new ThemeSettingsFragment()); + inflateFragment(new ThemeSettingsFragment(), R.string.general_settings_title); break; case R.id.audio_settings: - inflateFragment(new AudioSettings()); + inflateFragment(new AudioSettings(), R.string.pref_header_audio); break; case R.id.now_playing_settings: - inflateFragment(new NowPlayingSettingsFragment()); + inflateFragment(new NowPlayingSettingsFragment(), R.string.personalize); break; case R.id.image_settings: - inflateFragment(new ImageSettingFragment()); + inflateFragment(new ImageSettingFragment(), R.string.pref_header_images); break; case R.id.notification_settings: - inflateFragment(new NotificationSettingsFragment()); + inflateFragment(new NotificationSettingsFragment(), R.string.notification); break; case R.id.other_settings: - inflateFragment(new OtherSettingsFragment()); + inflateFragment(new OtherSettingsFragment(), R.string.others); break; } } - private void inflateFragment(Fragment fragment) { + private void inflateFragment(Fragment fragment, @StringRes int title) { if (getActivity() != null) { - ((SettingsActivity) getActivity()).setupFragment(fragment); + ((SettingsActivity) getActivity()).setupFragment(fragment, title); } } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java index d3d554fbf..4fb9d0234 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java @@ -1,7 +1,5 @@ package code.name.monkey.retromusic.util; -import static code.name.monkey.retromusic.ui.activities.GenreDetailsActivity.EXTRA_GENRE_ID; - import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -12,6 +10,7 @@ import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.util.Pair; import android.widget.Toast; + import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.model.Genre; @@ -31,100 +30,108 @@ import code.name.monkey.retromusic.ui.activities.SettingsActivity; import code.name.monkey.retromusic.ui.activities.SupportDevelopmentActivity; import code.name.monkey.retromusic.ui.activities.UserInfoActivity; +import static code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY; +import static code.name.monkey.retromusic.ui.activities.GenreDetailsActivity.EXTRA_GENRE_ID; +import static code.name.monkey.retromusic.util.RetroUtil.openUrl; + + public class NavigationUtil { - public static void goToAlbum(@NonNull Activity activity, int i, - @Nullable Pair... sharedElements) { - Intent intent = new Intent(activity, AlbumDetailsActivity.class); - intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, i); - //noinspection unchecked - ActivityCompat.startActivity(activity, intent, - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); - } - - public static void goToArtist(@NonNull Activity activity, int i, - @Nullable Pair... sharedElements) { - Intent intent = new Intent(activity, ArtistDetailActivity.class); - intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i); - //noinspection unchecked - ActivityCompat.startActivity(activity, intent, - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); - } - - public static void goToPlaylistNew(@NonNull Activity activity, Playlist playlist) { - Intent intent = new Intent(activity, PlaylistDetailActivity.class); - intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); - ActivityCompat.startActivity(activity, intent, null); - } - - public static void openEqualizer(@NonNull final Activity activity) { - if (PreferenceUtil.getInstance(activity).getSelectedEqualizer().equals("system")) { - stockEqalizer(activity); - } else { - ActivityCompat.startActivity(activity, new Intent(activity, EqualizerActivity.class), null); + public static void goToAlbum(@NonNull Activity activity, int i, + @Nullable Pair... sharedElements) { + Intent intent = new Intent(activity, AlbumDetailsActivity.class); + intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, i); + //noinspection unchecked + ActivityCompat.startActivity(activity, intent, + ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); } - } - private static void stockEqalizer(@NonNull Activity activity) { - final int sessionId = MusicPlayerRemote.getAudioSessionId(); - if (sessionId == AudioEffect.ERROR_BAD_VALUE) { - Toast.makeText(activity, activity.getResources().getString(R.string.no_audio_ID), - Toast.LENGTH_LONG).show(); - } else { - try { - final Intent effects = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL); - effects.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, sessionId); - effects.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC); - activity.startActivityForResult(effects, 0); - } catch (@NonNull final ActivityNotFoundException notFound) { - Toast.makeText(activity, activity.getResources().getString(R.string.no_equalizer), - Toast.LENGTH_SHORT).show(); - } + public static void goToArtist(@NonNull Activity activity, int i, + @Nullable Pair... sharedElements) { + Intent intent = new Intent(activity, ArtistDetailActivity.class); + intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i); + //noinspection unchecked + ActivityCompat.startActivity(activity, intent, + ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); } - } - public static void goToPlayingQueue(@NonNull Activity activity) { - Intent intent = new Intent(activity, PlayingQueueActivity.class); - ActivityCompat.startActivity(activity, intent, null); - } + public static void goToPlaylistNew(@NonNull Activity activity, Playlist playlist) { + Intent intent = new Intent(activity, PlaylistDetailActivity.class); + intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); + ActivityCompat.startActivity(activity, intent, null); + } - public static void goToLyrics(@NonNull Activity activity) { - Intent intent = new Intent(activity, LyricsActivity.class); - ActivityCompat.startActivity(activity, intent, null); - } + public static void openEqualizer(@NonNull final Activity activity) { + if (PreferenceUtil.getInstance(activity).getSelectedEqualizer().equals("system")) { + stockEqalizer(activity); + } else { + ActivityCompat.startActivity(activity, new Intent(activity, EqualizerActivity.class), null); + } + } - public static void goToGenre(@NonNull Activity activity, @NonNull Genre genre) { - Intent intent = new Intent(activity, GenreDetailsActivity.class); - intent.putExtra(EXTRA_GENRE_ID, genre); - ActivityCompat.startActivity(activity, intent, null); - } + private static void stockEqalizer(@NonNull Activity activity) { + final int sessionId = MusicPlayerRemote.getAudioSessionId(); + if (sessionId == AudioEffect.ERROR_BAD_VALUE) { + Toast.makeText(activity, activity.getResources().getString(R.string.no_audio_ID), + Toast.LENGTH_LONG).show(); + } else { + try { + final Intent effects = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL); + effects.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, sessionId); + effects.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC); + activity.startActivityForResult(effects, 0); + } catch (@NonNull final ActivityNotFoundException notFound) { + Toast.makeText(activity, activity.getResources().getString(R.string.no_equalizer), + Toast.LENGTH_SHORT).show(); + } + } + } - public static void goToProVersion(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, ProVersionActivity.class), null); - } + public static void goToPlayingQueue(@NonNull Activity activity) { + Intent intent = new Intent(activity, PlayingQueueActivity.class); + ActivityCompat.startActivity(activity, intent, null); + } - public static void goToSettings(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, SettingsActivity.class), null); - } + public static void goToLyrics(@NonNull Activity activity) { + Intent intent = new Intent(activity, LyricsActivity.class); + ActivityCompat.startActivity(activity, intent, null); + } - public static void goToAbout(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, AboutActivity.class), null); - } + public static void goToGenre(@NonNull Activity activity, @NonNull Genre genre) { + Intent intent = new Intent(activity, GenreDetailsActivity.class); + intent.putExtra(EXTRA_GENRE_ID, genre); + ActivityCompat.startActivity(activity, intent, null); + } - public static void goToUserInfo(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, UserInfoActivity.class), null); - } + public static void goToProVersion(@NonNull Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, ProVersionActivity.class), null); + } - public static void goToOpenSource(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, LicenseActivity.class), null); - } + public static void goToSettings(@NonNull Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, SettingsActivity.class), null); + } - public static void goToSearch(Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class), null); - } + public static void goToAbout(@NonNull Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, AboutActivity.class), null); + } - public static void goToSupportDevelopment(Activity activity) { - ActivityCompat - .startActivity(activity, new Intent(activity, SupportDevelopmentActivity.class), null); - } + public static void goToUserInfo(@NonNull Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, UserInfoActivity.class), null); + } + + public static void goToOpenSource(@NonNull Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, LicenseActivity.class), null); + } + + public static void goToSearch(Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class), null); + } + + public static void goToSupportDevelopment(Activity activity) { + ActivityCompat.startActivity(activity, new Intent(activity, SupportDevelopmentActivity.class), null); + } + + public static void goToPlayStore(Activity activity) { + openUrl(activity, RATE_ON_GOOGLE_PLAY); + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java index e66e5627f..614b2ab3d 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java @@ -137,7 +137,7 @@ public class RetroUtil { } - public static void openUrl(AppCompatActivity context, String str) { + public static void openUrl(Activity context, String str) { Intent intent = new Intent("android.intent.action.VIEW"); intent.setData(Uri.parse(str)); intent.setFlags(268435456); diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java index c6319bc3f..91caed134 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java @@ -92,7 +92,7 @@ public class MetalRecyclerViewPager extends RecyclerView { } @Override - public void onBindViewHolder(VH holder, int position) { + public void onBindViewHolder(@NonNull VH holder, int position) { int currentItemWidth = itemWidth; if (position == 0) { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundCornerFrameLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundCornerFrameLayout.java deleted file mode 100644 index a4654663e..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/views/RoundCornerFrameLayout.java +++ /dev/null @@ -1,70 +0,0 @@ -package code.name.monkey.retromusic.views; - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Path; -import android.graphics.RectF; -import android.graphics.Region; -import android.util.AttributeSet; -import android.widget.FrameLayout; -import code.name.monkey.retromusic.R; - -/** - * Frame layout that has rounded corners (it clips content too). - * - * @author Anton Chekulaev - */ -public class RoundCornerFrameLayout extends FrameLayout { - - private final Path stencilPath = new Path(); - private float cornerRadius = 0; - - public RoundCornerFrameLayout(Context context) { - this(context, null); - } - - public RoundCornerFrameLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public RoundCornerFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - - TypedArray attrArray = context - .obtainStyledAttributes(attrs, R.styleable.RoundCornerFrameLayout, 0, 0); - try { - cornerRadius = attrArray.getDimension(R.styleable.RoundCornerFrameLayout_corner_radius, 0f); - } finally { - attrArray.recycle(); - } - } - - /*@Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - - // compute the path - stencilPath.reset(); - stencilPath.addRoundRect(0, 0, w, h, cornerRadius, cornerRadius, Path.Direction.CW); - stencilPath.close(); - - } -*/ - @Override - protected void dispatchDraw(Canvas canvas) { - final int count = canvas.save(); - final Path path = new Path(); - final RectF rect = new RectF(0, 0, canvas.getWidth(), canvas.getHeight()); - final float[] arrayRadius = {cornerRadius, cornerRadius, cornerRadius, cornerRadius, - cornerRadius, cornerRadius, cornerRadius, cornerRadius}; - - path.addRoundRect(rect, arrayRadius, Path.Direction.CW); - canvas.clipPath(path, Region.Op.REPLACE); - canvas.clipPath(path); - - super.dispatchDraw(canvas); - - canvas.restoreToCount(count); - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java index bdebc530e..7f47b5016 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java @@ -6,6 +6,9 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.BottomSheetDialog; import android.support.design.widget.BottomSheetDialogFragment; + +import code.name.monkey.appthemehelper.ThemeStore; +import code.name.monkey.appthemehelper.util.ColorUtil; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.ui.activities.base.AbsThemeActivity; import code.name.monkey.retromusic.util.PreferenceUtil; @@ -16,24 +19,31 @@ import code.name.monkey.retromusic.util.PreferenceUtil; @SuppressLint("RestrictedApi") public class RoundedBottomSheetDialogFragment extends BottomSheetDialogFragment { - @Override - public int getTheme() { - //noinspection ConstantConditions - return - PreferenceUtil.getInstance(getContext()).getGeneralTheme() == R.style.Theme_RetroMusic_Light - ? R.style.BottomSheetDialogTheme : R.style.BottomSheetDialogThemeDark; - } - - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AbsThemeActivity absThemeActivity = (AbsThemeActivity) getActivity(); - if (absThemeActivity != null) { - absThemeActivity.setLightNavigationBar(true); - Dialog dialog = new BottomSheetDialog(getContext(), getTheme()); - + @Override + public int getTheme() { + //noinspection ConstantConditions + if (PreferenceUtil.getInstance(getContext()).getGeneralTheme() == R.style.Theme_RetroMusic_Light) { + return R.style.BottomSheetDialogTheme; + } else if (PreferenceUtil.getInstance(getContext()).getGeneralTheme() == R.style.Theme_RetroMusic_Color) { + int color = ThemeStore.primaryColor(getContext()); + if (ColorUtil.isColorLight(color)) { + return R.style.BottomSheetDialogTheme; + } else { + return R.style.BottomSheetDialogThemeDark; + } + } else { + return R.style.BottomSheetDialogTheme; + } + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + AbsThemeActivity absThemeActivity = (AbsThemeActivity) getActivity(); + if (absThemeActivity != null) { + absThemeActivity.setLightNavigationBar(true); + } + //noinspection ConstantConditions + return new BottomSheetDialog(getContext(), getTheme()); } - //noinspection ConstantConditions - return new BottomSheetDialog(getContext(), getTheme()); - } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java index 8c64add37..031022293 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java @@ -29,7 +29,7 @@ public class SansFontCollapsingToolbarLayout extends CollapsingToolbarLayout { } private void init(Context context) { - Typeface typefaceBold = TypefaceHelper.get(context, getResources().getString(R.string.sans_bold)); + Typeface typefaceBold = TypefaceHelper.get(context, getResources().getString(R.string.circular_std_black)); setExpandedTitleTypeface(typefaceBold); setCollapsedTitleTypeface(typefaceBold); diff --git a/app/src/main/res/drawable/bg_card_line.xml b/app/src/main/res/drawable/bg_card_line.xml new file mode 100644 index 000000000..8bf1506b9 --- /dev/null +++ b/app/src/main/res/drawable/bg_card_line.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_circular_top_corners.xml b/app/src/main/res/drawable/bg_circular_top_corners.xml index 299df8282..38b8f58b0 100644 --- a/app/src/main/res/drawable/bg_circular_top_corners.xml +++ b/app/src/main/res/drawable/bg_circular_top_corners.xml @@ -1,8 +1,9 @@ - - + android:shape="rectangle"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml index 5c671f60e..9559b7fbd 100644 --- a/app/src/main/res/layout-land/activity_settings.xml +++ b/app/src/main/res/layout-land/activity_settings.xml @@ -1,56 +1,63 @@ - - - - - - - - - - - - - + xmlns:tools="http://schemas.android.com/tools"> - + - - + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml index afb53ac3c..272f6df47 100644 --- a/app/src/main/res/layout-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-land/fragment_banner_home.xml @@ -1,116 +1,113 @@ - - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tools:ignore="UnusedAttribute"> - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml index 576f2864b..3790019aa 100644 --- a/app/src/main/res/layout-land/fragment_home.xml +++ b/app/src/main/res/layout-land/fragment_home.xml @@ -82,21 +82,20 @@ diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index ec8627cb9..41ad33c90 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -49,10 +49,10 @@ android:layout_height="wrap_content" android:layout_weight="0" android:orientation="vertical" - android:paddingBottom="16dp" - android:paddingEnd="16dp" android:paddingStart="16dp" - android:paddingTop="8dp"> + android:paddingTop="8dp" + android:paddingEnd="16dp" + android:paddingBottom="16dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml index 3cd54c39d..d54e05e0c 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml @@ -79,20 +79,19 @@ + android:layout_height="wrap_content" + android:elevation="0dp" + app:elevation="0dp"> - - - + android:layout_height="wrap_content" + app:layout_scrollFlags="scroll|enterAlwaysCollapsed" + app:titleEnabled="false"> - + app:title="" + tools:ignore="UnusedAttribute"> + + + + + + diff --git a/app/src/main/res/layout-xlarge/fragment_library.xml b/app/src/main/res/layout-xlarge/fragment_library.xml index 4b1c039d3..6c153a9d8 100644 --- a/app/src/main/res/layout-xlarge/fragment_library.xml +++ b/app/src/main/res/layout-xlarge/fragment_library.xml @@ -1,69 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:elevation="0dp" + tools:ignore="UnusedAttribute"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index e62ea1cab..3ffce59aa 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,45 +1,53 @@ - - + android:layout_height="match_parent"> - - - + android:layout_height="wrap_content" + android:elevation="0dp" + app:elevation="0dp"> - + - - - + - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index aaca94245..c8b8c7e1b 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -1,170 +1,167 @@ - - + android:layout_height="match_parent"> - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + android:background="@drawable/bg_circular_top_corners" + app:behavior_overlapTop="24dp" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + android:layout_gravity="bottom|end" + android:layout_margin="16dp" + app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior" + app:srcCompat="@drawable/ic_shuffle_white_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index 80f043d76..7fb84d541 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -1,178 +1,177 @@ - - + android:layout_height="match_parent"> - + - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + android:background="@drawable/bg_circular_top_corners" + android:overScrollMode="never" + app:behavior_overlapTop="24dp" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index f2fa427c9..4c3170b6d 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -9,31 +9,41 @@ + android:layout_height="wrap_content" + android:elevation="0dp" + app:elevation="0dp"> - - - + android:layout_height="wrap_content" + app:titleEnabled="false"> + app:title="" + tools:ignore="UnusedAttribute"> - + + + + + + + android:paddingBottom="@dimen/md_content_padding_top"> diff --git a/app/src/main/res/layout/activity_equalizer.xml b/app/src/main/res/layout/activity_equalizer.xml index 9f374f86e..25bfda514 100644 --- a/app/src/main/res/layout/activity_equalizer.xml +++ b/app/src/main/res/layout/activity_equalizer.xml @@ -1,151 +1,160 @@ - - + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - + android:elevation="0dp" + app:elevation="0dp"> - + - - + - + + + + + + + + + + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + - - + - + - + + - - + - + - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 5c8d1bb9f..95760a6a5 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -7,31 +7,43 @@ android:layout_height="match_parent"> + android:elevation="0dp" + app:elevation="0dp"> - + android:layout_height="wrap_content" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false"> + - + app:layout_collapseMode="pin" + app:title="" + tools:ignore="UnusedAttribute"> + + + + + - - - - + android:layout_height="match_parent" + android:orientation="vertical"> - - - + android:layout_height="wrap_content" + android:elevation="0dp" + app:elevation="0dp"> - - + - - + - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index ff532b9ac..287b03e20 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -23,31 +23,51 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:focusable="true" - tools:ignore="UnusedAttribute"> + android:elevation="0dp" + app:elevation="0dp"> - + android:layout_height="wrap_content" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false"> - - + - + + + + + + + + + + - + android:layout_height="1dp" + android:background="?dividerColor" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - - + android:layout_height="wrap_content"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index fcb7bd500..08662ec0f 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,37 +1,43 @@ - - - + android:layout_height="wrap_content" + app:titleEnabled="false"> + app:title="" + tools:ignore="UnusedAttribute"> - + + + + diff --git a/app/src/main/res/layout/dialog_changelog.xml b/app/src/main/res/layout/dialog_changelog.xml new file mode 100644 index 000000000..65162132d --- /dev/null +++ b/app/src/main/res/layout/dialog_changelog.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml index 2945006ec..be09ec235 100644 --- a/app/src/main/res/layout/fragment_banner_home.xml +++ b/app/src/main/res/layout/fragment_banner_home.xml @@ -1,107 +1,106 @@ - - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tools:ignore="UnusedAttribute"> - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index d4bc2db22..7be297fdc 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -1,120 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - - - - + android:elevation="0dp" + tools:ignore="UnusedAttribute"> + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index c8f505994..404c63b4b 100755 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -15,13 +15,8 @@ @@ -50,7 +45,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - android:padding="16dp" + android:background="?roundSelector" + android:padding="12dp" android:src="@drawable/ic_search_white_24dp" /> - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:ignore="UnusedAttribute"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/home_section_recycler_view.xml b/app/src/main/res/layout/home_section_recycler_view.xml new file mode 100644 index 000000000..7a6100f9e --- /dev/null +++ b/app/src/main/res/layout/home_section_recycler_view.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/item_collage.xml b/app/src/main/res/layout/item_collage.xml index 2fdb9aab1..b9d0f2a03 100644 --- a/app/src/main/res/layout/item_collage.xml +++ b/app/src/main/res/layout/item_collage.xml @@ -1,209 +1,211 @@ - - - - - - - - - - - - - - + android:orientation="vertical"> - - - + android:layout_height="wrap_content" + android:orientation="horizontal"> - + + + + + + + + + + + - - + android:layout_weight="2.68" + android:gravity="center" + android:orientation="vertical"> - + - + - + + + + + + + + + + + + + - - + android:layout_height="wrap_content" + android:layout_weight="2" + android:minHeight="100dp"> + + + + + + + + + - - - - + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - - - + android:layout_height="wrap_content" + android:layout_weight="1"> - + - + + + - + - - - + - + + + - + - - - - + - + + + - - - + - + - + - + + + - - - + - + - - - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml index b2f53fa86..4630f4cda 100644 --- a/app/src/main/res/layout/item_donation_option.xml +++ b/app/src/main/res/layout/item_donation_option.xml @@ -8,8 +8,9 @@ + app:cardCornerRadius="8dp" + app:cardUseCompatPadding="true" + app:contentPadding="12dp"> + android:layout_width="36dp" + android:layout_height="36dp"> - - - - - - - - + android:layout_height="wrap_content" + android:background="?rectSelector" + tools:ignore="MissingPrefix"> - - + android:orientation="vertical" + tools:ignore="UnusedAttribute,UselessParent"> - + + + + + + + + + + + + - diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml index 9bf53ceef..8a7145115 100644 --- a/app/src/main/res/layout/item_image.xml +++ b/app/src/main/res/layout/item_image.xml @@ -1,40 +1,38 @@ - - - + - + + + + + + + - - - - - + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:padding="12dp" + android:textColor="?android:attr/textColorPrimary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml index 79c834b71..e6a0c370f 100644 --- a/app/src/main/res/layout/pager_item.xml +++ b/app/src/main/res/layout/pager_item.xml @@ -11,8 +11,7 @@ android:id="@+id/image_container" android:layout_width="match_parent" android:layout_height="182dp" - app:cardCornerRadius="8dp" - app:cardElevation="6dp" + app:cardCornerRadius="12dp" app:cardUseCompatPadding="true"> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 723db8562..cb9fa8a4d 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,78 +1,71 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".DrawerActivity"> - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + - - - - + - + - - - + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 81c845f37..dc0dc1cac 100755 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -5,6 +5,7 @@ @string/only_on_wifi @string/never + @string/light_theme_name @string/dark_theme_name @@ -16,19 +17,23 @@ @string/normal_style @string/card_style @string/card_color_style + @string/card_circular_style 0 1 2 + 3 @layout/item_grid @layout/item_card @layout/item_card_color + @layout/item_grid_circle + light dark diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 0d4ca1cc3..c3383dae0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -12,9 +12,6 @@ - - - @@ -26,6 +23,7 @@ + diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 3e4afcefb..e7299f6b3 100755 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -36,8 +36,6 @@ Hosur, India fonts/circular_std_black.otf fonts/circular_std_book.otf - fonts/product_sans_regular.ttf - fonts/product_sans_bold.ttf Marko Ivanović Contributor Gaming Inc diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a716169b0..c296d156a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,681 +1,682 @@ - Accent color - The accent theme color, defaults to teal + Accent color + The accent theme color, defaults to teal - About - Add to favorites - Add to playing queue - Add to playlist… - Clear playing queue - Clear playlist - Cycle repeat mode - Delete - Delete from device - Details - Go to album - Go to artist - Go to genre - Go to start directory - Grant - Grid size - Grid size (land) - New playlist… - Next - Play - Play next - Play/Pause - Previous - Update artist image - Remove from favorites - Remove from playing queue - Remove from playlist - Rename - Save playing queue - Scan - Scan directory - Search - Set - Set as ringtone - Set as start directory - "Settings" - Share - Show lyrics - Shuffle album - Shuffle all - Shuffle artist - Shuffle playlist - Sleep timer - Sort order - Tag editor - Toggle favorite - Toggle shuffle mode + About + Add to favorites + Add to playing queue + Add to playlist… + Clear playing queue + Clear playlist + Cycle repeat mode + Delete + Delete from device + Details + Go to album + Go to artist + Go to genre + Go to start directory + Grant + Grid size + Grid size (land) + New playlist… + Next + Play + Play next + Play/Pause + Previous + Update artist image + Remove from favorites + Remove from playing queue + Remove from playlist + Rename + Save playing queue + Scan + Scan directory + Search + Set + Set as ringtone + Set as start directory + "Settings" + Share + Show lyrics + Shuffle album + Shuffle all + Shuffle artist + Shuffle playlist + Sleep timer + Sort order + Tag editor + Toggle favorite + Toggle shuffle mode - Adaptive + Adaptive - Add - Add \nphoto - "Add to playlist" + Add + Add \nphoto + "Add to playlist" - "Added 1 title to the playing queue." - Added %1$d titles to the playing queue. + "Added 1 title to the playing queue." + Added %1$d titles to the playing queue. - Album - Album artist - Album desc. - The title or artist is empty. + Album + Album artist + Album desc. + The title or artist is empty. - Albums - - Albums + Albums + + Albums - Always + Always - Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s - - @string/last_added - @string/last_added - @string/action_shuffle_all - Shuffle - @string/my_top_tracks - Top Tracks - A Hybrid application between Material design and iOS in mind. - Retro music - Big - Retro music - Big2 - Retro music - Card - Retro music - Classic - Retro music - Small + Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s + + @string/last_added + @string/last_added + @string/action_shuffle_all + Shuffle + @string/my_top_tracks + Top Tracks + A Hybrid application between Material design and iOS in mind. + Retro music - Big + Retro music - Big2 + Retro music - Card + Retro music - Classic + Retro music - Small - Artist - Artist desc. + Artist + Artist desc. - Artists + Artists - At least one category must be enabled. + At least one category must be enabled. - Audio focus denied. - Change the sound settings and adjust the equalizer controls + Audio focus denied. + Change the sound settings and adjust the equalizer controls - Bass Boost - Bass Boost Strength + Bass Boost + Bass Boost Strength - Biography - Couldn\u2019t find the artists biography. + Biography + Couldn\u2019t find the artists biography. - Just Black + Just Black - Blacklist + Blacklist - Blur - Blur Card - Keep the screen on - Keep in mind that enabling this feature may affect battery life - Blur amount - Amount of blur applied for blur themes, lower is faster + Blur + Blur Card + Keep the screen on + Keep in mind that enabling this feature may affect battery life + Blur amount + Amount of blur applied for blur themes, lower is faster - Buy RetroMusic Pro + Buy RetroMusic Pro - Cancel current timer + Cancel current timer - Card - Colored Card - Card + Card + Colored Card + Circular + Card - Cast + Cast - Changelog - Changelog maintained on the Telegram channel + Changelog + Changelog maintained on the Telegram channel - Clear - Clear blacklist - Clear playlist - %1$s? This can\u2019t be undone!]]> + Clear + Clear blacklist + Clear playlist + %1$s? This can\u2019t be undone!]]> - Close + Close - Color - Color - Color style + Color + Color + Color style - Colored footers + Colored footers - Colors + Colors - Couldn\u2019t create playlist. - "Couldn\u2019t download a matching album cover." - Could not restore purchase. - Could not scan %d files. + Couldn\u2019t create playlist. + "Couldn\u2019t download a matching album cover." + Could not restore purchase. + Could not scan %d files. - Create + Create - Created playlist %1$s. + Created playlist %1$s. - Members and contributors + Members and contributors - Currently listening to %1$s by %2$s. + Currently listening to %1$s by %2$s. - Custom + Custom - Kinda Dark + Kinda Dark - Date + Date - No Lyrics + No Lyrics - Delete - Delete playlist - %1$s?]]> - Delete playlists - Delete song - %1$s?]]> - Delete songs - %1$d playlists?]]> - %1$d songs?]]> + Delete + Delete playlist + %1$s?]]> + Delete playlists + Delete song + %1$s?]]> + Delete songs + %1$d playlists?]]> + %1$d songs?]]> - Deleted %1$d songs. + Deleted %1$d songs. - Deleting songs + Deleting songs - Discord - Join the Discord server to keep up with the latest news + Discord + Join the Discord server to keep up with the latest news - Do you want to clear the blacklist? - %1$s from the blacklist?]]> + Do you want to clear the blacklist? + %1$s from the blacklist?]]> - Donate - If my development deserve to get paid, you can leave some + Donate + If my development deserve to get paid, you can leave some dollars here - Buy me a + Buy me a - Download from Last.fm + Download from Last.fm - Duration + Duration - Edit - Edit categories - Edit cover - Edit tags + Edit + Edit categories + Edit cover + Edit tags - Empty + Empty - Equalizer + Equalizer - Error loading from network + Error loading from network - Experimental + Experimental - Facebook Page - Help us to grove faster by sharing facebook page + Facebook Page + Help us to grove faster by sharing facebook page - Failed to save playlist (%s). + Failed to save playlist (%s). - FAQ + FAQ - Favorites + Favorites - Flat + Flat - Folders + Folders - For you + For you - Full + Full - Change the theme and colors of the app - Look and feel + Change the theme and colors of the app + Look and feel - Genre + Genre - Genres + Genres - Fork the project on GitHub + Fork the project on GitHub - Join the Google Plus community where you can ask for help or follow Retro Music updates + Join the Google Plus community where you can ask for help or follow Retro Music updates - Gradient + Gradient - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 - History - History + History + History - Holiday + Holiday - Home + Home - Change artist image download settings + Change artist image download settings - Inserted %1$d songs into the playlist %2$s. + Inserted %1$d songs into the playlist %2$s. - Inspired designs by + Inspired designs by - Instagram - Share your Retro Music setup to showcase on Instagram + Instagram + Share your Retro Music setup to showcase on Instagram - Join the Google Plus community - If you need help or have questions, the Retro Music community on Google Plus is a good place to go. + Join the Google Plus community + If you need help or have questions, the Retro Music community on Google Plus is a good place to go. - Bitrate - Details - Format - File name - File path - Size - Sampling rate - Length + Bitrate + Details + Format + File name + File path + Size + Sampling rate + Length - Language translators + Language translators - Last added + Last added - Let\'s play some music + Let\'s play some music - Library - Library categories + Library + Library categories - Licenses + Licenses - Clearly White + Clearly White - List style + List style - Listing files + Listing files - Loading... - Loading products… + Loading... + Loading products… - Lyrics + Lyrics - Material + Material - Cast device + Cast device - More + More - My Name - My playlist - Top played + My Name + My playlist + Top played - Never + Never - New banner photo - New Music Mix - New playlist - New profile photo - %s is the new start directory. + New banner photo + New Music Mix + New playlist + New profile photo + %s is the new start directory. - No albums - No artists - "Play a song first, then try again." - No equalizer found - No files - No genres - No lyrics found - No playlists - No purchase found. - No results - No songs + No albums + No artists + "Play a song first, then try again." + No equalizer found + No files + No genres + No lyrics found + No playlists + No purchase found. + No results + No songs - Normal - Normal lyrics - Normal + Normal + Normal lyrics + Normal - %s is not listed in the media store.]]> + %s is not listed in the media store.]]> - Nothing to scan. + Nothing to scan. - Notification - Customize the notification style + Notification + Customize the notification style - Now playing - Now playing queue + Now playing + Now playing queue - Only on Wi-Fi + Only on Wi-Fi - Other + Other - Past 3 months + Past 3 months - Patreon page - Support us from patreon + Patreon page + Support us from patreon - PayPal.me - PayPal.me is an easy way to donate us money. In case you only linked a debit or credit card the fee in the U.S. is 2.9% of the donation plus $0.30 USD, otherwise there is no fee.more + PayPal.me + PayPal.me is an easy way to donate us money. In case you only linked a debit or credit card the fee in the U.S. is 2.9% of the donation plus $0.30 USD, otherwise there is no fee.more - Permission to access external storage denied. - - Permissions denied. - - Personalize - Customize your now playing and UI controls - - Pick from local storage - - Plain - - Play - Play all - - The playing notification provides actions for play/pause etc. - Playing notification - - Empty playlist - Playlist is empty - Playlist name - - Playlists - Playlists - - Audio - Theme - Images - Lockscreen - Now playing - Playlists - "Only available on Lollipop." - "Only available on Nougat 7.1." - People who helped on the project - Use the currently playing song album cover as the lockscreen wallpaper - Lower the volume when a system sound is played or a notification is received - Blur the album cover on the lockscreen. Can cause problems with third party apps and widgets - Carousel effect for the album art in the now playing screen. Note that Card and Blur Card themes won\'t work - Show a circular album cover in the now playing screen. Note that only a few themes work with this feature - Use the classic notification design - The background and control button colors change according to the album art from the now playing screen - Colors the app shortcuts in the accent color. Every time you change the color please toggle this to take effect - Colors the navigation bar in the primary color - "Colors the notification in the album cover\u2019s vibrant color" - Shows song details on dream when music is playing - Most dominant color will be picked from the album or artist cover - Exclude songs that are less than 30 secs. - "Can cause playback issues on some devices." - Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks - Change app language forcefully to english(this is testing for multiple language option) - Configure visibility and order of library categories. - Use Retro Music\'s custom lockscreen controls - Show full controls from the lock screen - License details for open source software - Round the app\'s edges - Toggle titles for the bottom navigation bar tabs - Animations makes some device run slow, load images slow - Disable titles from bottom navigation bar - Immersive mode - Show genres on the home screen - Start playing immediately after headphones are connected - Hide only navigation bar - Toggle view of separate line in list of items - Shuffle mode will turn off when playing a new list of songs - Hide only status bar - If enough space is available, show volume controls in the now playing screen - Show album cover - Album grid - Colored app shortcuts - Artist grid - Reduce volume on focus loss - Auto-download artist images - Blur album cover - Choose equalizer - Classic notification design - Adaptive color - Colored notification - Day dream - Exclude songs - Give access to external storage - Gapless playback - App theme - Choose color - Ignore Media Store covers - Last added playlist interval - Fullscreen controls - Retro lock screen - Lyrics options - Colored navigation bar - Now playing theme - Open source licences - Corner edges - Animations - Disable titles - Carousel effect - Circular album - Dominant color - Fullscreen app - Show genre - English language - Navigation bar - Separate line - Status bar - Tab titles - Auto-play - Shuffle mode - Volume controls - User info - - Primary color - The primary theme color, defaults to blue grey, for now works with dark colors - - Purchase - *Think before buying, don\'t ask for refund. - - Queue - Queue - - Rate the app - Love this app? Let us know in the Google Play Store how we can make it even better - - Recent activity - Recent albums - Recent artists - - Remove - Remove banner photo - Remove cover - Remove from blacklist - Remove profile photo - Remove song from playlist - %1$s from the playlist?]]> - Remove songs from playlist - %1$d songs from the playlist?]]> - - Rename - Rename playlist - - Reset - Reset artist image - - Restore - - Restored previous purchase. Please restart the app to make use of all features. - Restored previous purchases. - - Restoring purchase… - - Retro - Retro Music Equalizer - - File delete failed: %s - - Can\'t get SAF URI - Open navigation drawer - Enable \'Show SD card\' in overflow menu - - %s needs SD card access - You need to select your SD card root directory - Select your SD card in navigation drawer - Do not open any subfolders - Tap \'select\' button at the bottom of the screen - File access required. Pick %s - SD card access required. Please pick root directory of SD card - File write failed: %s - - Save as file - Save as files - - Saved playlist to %s. - - Saving changes - Saving tags - Saving to file… - - Scan media - - Scanned %1$d of %2$d files. + Permission to access external storage denied. + + Permissions denied. + + Personalize + Customize your now playing and UI controls + + Pick from local storage + + Plain + + Play + Play all + + The playing notification provides actions for play/pause etc. + Playing notification + + Empty playlist + Playlist is empty + Playlist name + + Playlists + Playlists + + Audio + Theme + Images + Lockscreen + Now playing + Playlists + "Only available on Lollipop." + "Only available on Nougat 7.1." + People who helped on the project + Use the currently playing song album cover as the lockscreen wallpaper + Lower the volume when a system sound is played or a notification is received + Blur the album cover on the lockscreen. Can cause problems with third party apps and widgets + Carousel effect for the album art in the now playing screen. Note that Card and Blur Card themes won\'t work + Show a circular album cover in the now playing screen. Note that only a few themes work with this feature + Use the classic notification design + The background and control button colors change according to the album art from the now playing screen + Colors the app shortcuts in the accent color. Every time you change the color please toggle this to take effect + Colors the navigation bar in the primary color + "Colors the notification in the album cover\u2019s vibrant color" + Shows song details on dream when music is playing + Most dominant color will be picked from the album or artist cover + Exclude songs that are less than 30 secs. + "Can cause playback issues on some devices." + Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks + Change app language forcefully to english(this is testing for multiple language option) + Configure visibility and order of library categories. + Use Retro Music\'s custom lockscreen controls + Show full controls from the lock screen + License details for open source software + Round the app\'s edges + Toggle titles for the bottom navigation bar tabs + Animations makes some device run slow, load images slow + Disable titles from bottom navigation bar + Immersive mode + Show genres on the home screen + Start playing immediately after headphones are connected + Hide only navigation bar + Toggle view of separate line in list of items + Shuffle mode will turn off when playing a new list of songs + Hide only status bar + If enough space is available, show volume controls in the now playing screen + Show album cover + Album grid + Colored app shortcuts + Artist grid + Reduce volume on focus loss + Auto-download artist images + Blur album cover + Choose equalizer + Classic notification design + Adaptive color + Colored notification + Day dream + Exclude songs + Give access to external storage + Gapless playback + App theme + Choose color + Ignore Media Store covers + Last added playlist interval + Fullscreen controls + Retro lock screen + Lyrics options + Colored navigation bar + Now playing theme + Open source licences + Corner edges + Animations + Disable titles + Carousel effect + Circular album + Dominant color + Fullscreen app + Show genre + English language + Navigation bar + Separate line + Status bar + Tab titles + Auto-play + Shuffle mode + Volume controls + User info + + Primary color + The primary theme color, defaults to blue grey, for now works with dark colors + + Purchase + *Think before buying, don\'t ask for refund. + + Queue + Queue + + Rate the app + Love this app? Let us know in the Google Play Store how we can make it even better + + Recent activity + Recent albums + Recent artists + + Remove + Remove banner photo + Remove cover + Remove from blacklist + Remove profile photo + Remove song from playlist + %1$s from the playlist?]]> + Remove songs from playlist + %1$d songs from the playlist?]]> + + Rename + Rename playlist + + Reset + Reset artist image + + Restore + + Restored previous purchase. Please restart the app to make use of all features. + Restored previous purchases. + + Restoring purchase… + + Retro + Retro Music Equalizer + + File delete failed: %s + + Can\'t get SAF URI + Open navigation drawer + Enable \'Show SD card\' in overflow menu + + %s needs SD card access + You need to select your SD card root directory + Select your SD card in navigation drawer + Do not open any subfolders + Tap \'select\' button at the bottom of the screen + File access required. Pick %s + SD card access required. Please pick root directory of SD card + File write failed: %s + + Save as file + Save as files + + Saved playlist to %s. + + Saving changes + Saving tags + Saving to file… + + Scan media + + Scanned %1$d of %2$d files. - Search your library… + Search your library… - See all + See all - Select all - Select banner photo - Select Preset - Set a profile photo + Select all + Select banner photo + Select Preset + Set a profile photo - Set artist image + Set artist image - Shuffle + Shuffle - Simple + Simple - Sleep timer canceled. - Sleep timer set for %d minutes from now. + Sleep timer canceled. + Sleep timer set for %d minutes from now. - Swipe to unlock + Swipe to unlock - Smart playlists + Smart playlists - Social + Social - Solid + Solid - Some files are not listed in the media store. + Some files are not listed in the media store. - Song - Song duration + Song + Song duration - Songs + Songs - Sort order - Ascending - Album - Artist - Date - Year - Descending + Sort order + Ascending + Album + Artist + Date + Year + Descending - Sorry! Your device doesn\'t support speech input - Search your library + Sorry! Your device doesn\'t support speech input + Search your library - Suggestions + Suggestions - Material design city wallpapers from www.techjuice.pk website - For all icons we used from this websites www.flaticon.com or www.materialdesignicons.com - Just show your name on home screen + Material design city wallpapers from www.techjuice.pk website + For all icons we used from this websites www.flaticon.com or www.materialdesignicons.com + Just show your name on home screen - Support development - If you enjoy using Retro Music Player consider donation as support to my work. + Support development + If you enjoy using Retro Music Player consider donation as support to my work. - Synced lyrics + Synced lyrics - System Equalizer + System Equalizer - - An error occurred editing tags. - Checking for permissions - Select the external storage directory - It seems that we don\'t have permission to edit the files. Double check the directory in the file picker. - An error occurred editing tags. Is the file stored on an SD Card? If so, Google have made tag editing impossible for this file. - An error occurred editing tags. If the file is stored on an SD Card, Retro Music might not have permission to access it. - An error occurred retrieving tags. + + An error occurred editing tags. + Checking for permissions + Select the external storage directory + It seems that we don\'t have permission to edit the files. Double check the directory in the file picker. + An error occurred editing tags. Is the file stored on an SD Card? If so, Google have made tag editing impossible for this file. + An error occurred editing tags. If the file is stored on an SD Card, Retro Music might not have permission to access it. + An error occurred retrieving tags. - Telegram - Join the Telegram group to discuss bugs, make suggestions, show off and more + Telegram + Join the Telegram group to discuss bugs, make suggestions, show off and more - Text + Text - Thank you! + Thank you! - The audio file + The audio file - This month - This week - This year + This month + This week + This year - Tiny + Tiny - Title - Dashboard - Title desc. - Good afternoon - Good day - Good evening - Good morning - Good night - Home - City wallpaper - Icons - Notifications - What\'s Your Name + Title + Dashboard + Title desc. + Good afternoon + Good day + Good evening + Good morning + Good night + Home + City wallpaper + Icons + Notifications + What\'s Your Name - Today + Today - Toggle lyrics size + Toggle lyrics size - See all songs + See all songs - Top albums - Top artists - Top tracks - Top Tracks + Top albums + Top artists + Top tracks + Top Tracks - "Track (2 for track 2 or 3004 for CD3 track 4)" - Track number + "Track (2 for track 2 or 3004 for CD3 track 4)" + Track number - Translate - Help us translate the app to your language + Translate + Help us translate the app to your language - Twitter - Share your design with Retro Music + Twitter + Share your design with Retro Music - Couldn\u2019t play this song. + Couldn\u2019t play this song. - Up next + Up next - Update - Update image + Update + Update image - Artist image updated. + Artist image updated. - Updating… + Updating… - Change profile and banner image + Change profile and banner image - Version + Version - Virtualizer - Virtualizer Strength + Virtualizer + Virtualizer Strength - Volume control + Volume control - Web search + Web search - What do you want to share? + What do you want to share? - Window + Window - Set %1$s as your ringtone. - %1$d selected + Set %1$s as your ringtone. + %1$d selected - Year + Year - You have to select at least one category - Made with ❤️ in India + You have to select at least one category + Made with ❤️ in India diff --git a/app/src/test/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaliseSettingsFragmentTest.java b/app/src/test/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaliseSettingsFragmentTest.java deleted file mode 100644 index c914b8ecb..000000000 --- a/app/src/test/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaliseSettingsFragmentTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package code.name.monkey.retromusic.ui.fragments.settings; - -import junit.framework.TestCase; - -/** - * @author Hemanth S (h4h13). - */ -public class PersonaliseSettingsFragmentTest extends TestCase { - -} \ No newline at end of file