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

move fragments to root directory

Browse source
This commit is contained in:
dkanada 2020-12-13 22:12:59 +09:00
commit e0a184daa3
30 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
View file

@ -26,7 +26,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.QueryUtil;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;

10
app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -19,11 +19,11 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.databinding.SlidingMusicPanelLayoutBinding;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.activities.SplashActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
import com.dkanada.gramophone.ui.fragments.player.card.CardPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerFragment;
import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.fragments.player.MiniPlayerFragment;
import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
import com.dkanada.gramophone.fragments.player.card.CardPlayerFragment;
import com.dkanada.gramophone.fragments.player.flat.FlatPlayerFragment;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.ViewUtil;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;

10
app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java
View file

@ -11,11 +11,11 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import com.dkanada.gramophone.model.CategoryInfo;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.GenresFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.GenresFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.PlaylistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.SongsFragment;
import com.dkanada.gramophone.util.PreferenceUtil;
import java.lang.ref.WeakReference;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/AbsMusicServiceFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments;
package com.dkanada.gramophone.fragments;
import android.content.Context;
import android.os.Bundle;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity;
package com.dkanada.gramophone.fragments.mainactivity;
import android.os.Bundle;

14
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library;
package com.dkanada.gramophone.fragments.mainactivity.library;
import android.app.Activity;
import android.content.Intent;
@ -33,12 +33,12 @@ import com.dkanada.gramophone.helper.sort.SortOrder;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.activities.SearchActivity;
import com.dkanada.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
import com.dkanada.gramophone.fragments.mainactivity.AbsMainActivityFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.PlaylistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.SongsFragment;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PreferenceUtil;

6
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
View file

@ -1,9 +1,9 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment;
public class AbsLibraryPagerFragment extends AbsMusicServiceFragment {
public LibraryFragment getLibraryFragment() {

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;
import android.view.View;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;
import android.view.LayoutInflater;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
package com.dkanada.gramophone.fragments.mainactivity.library.pager;
import android.os.Bundle;

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player;
package com.dkanada.gramophone.fragments.player;
import android.content.Context;
import android.view.MenuItem;
@ -18,7 +18,7 @@ import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil;

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player;
package com.dkanada.gramophone.fragments.player;
import android.annotation.SuppressLint;
import android.content.Context;
@ -21,7 +21,7 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.views.PlayPauseDrawable;
public class MiniPlayerFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/NowPlayingScreen.java → app/src/main/java/com/dkanada/gramophone/fragments/player/NowPlayingScreen.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player;
package com.dkanada.gramophone.fragments.player;
import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player;
package com.dkanada.gramophone.fragments.player;
import android.animation.Animator;
import android.annotation.SuppressLint;
@ -18,7 +18,7 @@ import com.dkanada.gramophone.adapter.AlbumCoverPagerAdapter;
import com.dkanada.gramophone.databinding.FragmentPlayerAlbumCoverBinding;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.misc.SimpleAnimatorListener;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.util.ViewUtil;
public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements ViewPager.OnPageChangeListener {

6
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player.card;
package com.dkanada.gramophone.fragments.player.card;
import android.animation.Animator;
import android.animation.AnimatorSet;
@ -38,8 +38,8 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.SongMenuHelper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.util.ImageUtil;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.Util;

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player.card;
package com.dkanada.gramophone.fragments.player.card;
import android.graphics.Color;
import android.graphics.PorterDuff;
@ -21,7 +21,7 @@ import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.views.PlayPauseDrawable;

6
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player.flat;
package com.dkanada.gramophone.fragments.player.flat;
import android.animation.Animator;
import android.animation.AnimatorSet;
@ -36,8 +36,8 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.SongMenuHelper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.util.ImageUtil;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.Util;

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java → app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.fragments.player.flat;
package com.dkanada.gramophone.fragments.player.flat;
import android.animation.Animator;
import android.animation.AnimatorSet;
@ -23,7 +23,7 @@ import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper;
import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler;
import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.views.PlayPauseDrawable;

2
app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
View file

@ -19,7 +19,7 @@ import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.heinrichreimersoftware.materialintro.view.InkPageIndicator;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.ViewUtil;

2
app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
View file

@ -15,7 +15,7 @@ import com.dkanada.gramophone.helper.sort.SortMethod;
import com.dkanada.gramophone.helper.sort.SortOrder;
import com.dkanada.gramophone.model.CategoryInfo;
import com.dkanada.gramophone.model.DirectPlayCodec;
import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
import java.lang.reflect.Type;
import java.util.ArrayList;

4
app/src/main/res/layout-land/fragment_card_player.xml
View file

@ -30,7 +30,7 @@
<fragment
android:id="@+id/player_album_cover_fragment"
class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@ -61,7 +61,7 @@
<fragment
android:id="@+id/playback_controls_fragment"
class="com.dkanada.gramophone.ui.fragments.player.card.CardPlayerPlaybackControlsFragment"
class="com.dkanada.gramophone.fragments.player.card.CardPlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
app/src/main/res/layout-land/fragment_flat_player.xml
View file

@ -39,7 +39,7 @@
<fragment
android:id="@+id/player_album_cover_fragment"
class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@ -53,7 +53,7 @@
<fragment
android:id="@+id/playback_controls_fragment"
class="com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
class="com.dkanada.gramophone.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
app/src/main/res/layout/fragment_card_player.xml
View file

@ -41,7 +41,7 @@
<fragment
android:id="@+id/player_album_cover_fragment"
class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -49,7 +49,7 @@
<fragment
android:id="@+id/playback_controls_fragment"
class="com.dkanada.gramophone.ui.fragments.player.card.CardPlayerPlaybackControlsFragment"
class="com.dkanada.gramophone.fragments.player.card.CardPlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/album_cover_container" />

4
app/src/main/res/layout/fragment_flat_player.xml
View file

@ -48,7 +48,7 @@
<fragment
android:id="@+id/player_album_cover_fragment"
class="com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
class="com.dkanada.gramophone.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -79,7 +79,7 @@
<fragment
android:id="@+id/playback_controls_fragment"
class="com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
class="com.dkanada.gramophone.fragments.player.flat.FlatPlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_library.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.fragments.mainactivity.library.LibraryFragment">
tools:context=".fragments.mainactivity.library.LibraryFragment">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"

2
app/src/main/res/layout/sliding_music_panel_layout.xml
View file

@ -27,7 +27,7 @@
<fragment
android:id="@+id/mini_player_fragment"
class="com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment"
class="com.dkanada.gramophone.fragments.player.MiniPlayerFragment"
android:layout_width="match_parent"
android:layout_height="@dimen/mini_player_height" />