From e87c6ad85ede1b03b87fb308b804a2cce4297e75 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 30 May 2021 13:54:05 +0900 Subject: [PATCH] simplify fragments directory structure --- .../dkanada/gramophone/activities/MainActivity.java | 2 +- .../gramophone/adapter/MusicLibraryPagerAdapter.java | 12 ++++++------ .../pager => library}/AbsLibraryPagerFragment.java | 4 ++-- ...braryPagerRecyclerViewCustomGridSizeFragment.java | 2 +- .../AbsLibraryPagerRecyclerViewFragment.java | 2 +- .../library/pager => library}/AlbumsFragment.java | 2 +- .../library/pager => library}/ArtistsFragment.java | 2 +- .../library/pager => library}/FavoritesFragment.java | 2 +- .../library/pager => library}/GenresFragment.java | 2 +- .../library/pager => library}/PlaylistsFragment.java | 2 +- .../library/pager => library}/SongsFragment.java | 2 +- .../AbsMainActivityFragment.java | 2 +- .../library => main}/LibraryFragment.java | 12 +++++------- app/src/main/res/layout/fragment_library.xml | 2 +- 14 files changed, 24 insertions(+), 26 deletions(-) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/AbsLibraryPagerFragment.java (74%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java (98%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/AbsLibraryPagerRecyclerViewFragment.java (98%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/AlbumsFragment.java (98%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/ArtistsFragment.java (98%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/FavoritesFragment.java (87%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/GenresFragment.java (97%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/PlaylistsFragment.java (97%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library/pager => library}/SongsFragment.java (98%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity => main}/AbsMainActivityFragment.java (88%) rename app/src/main/java/com/dkanada/gramophone/fragments/{mainactivity/library => main}/LibraryFragment.java (96%) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java index 663c8525..d93341d0 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java @@ -27,7 +27,7 @@ import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.model.Song; -import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment; +import com.dkanada.gramophone.fragments.main.LibraryFragment; import com.dkanada.gramophone.util.MusicUtil; import com.dkanada.gramophone.util.QueryUtil; import com.sothree.slidinguppanel.SlidingUpPanelLayout; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java index 8b1bf314..0e5ee8c5 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java @@ -10,13 +10,13 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; -import com.dkanada.gramophone.fragments.mainactivity.library.pager.FavoritesFragment; +import com.dkanada.gramophone.fragments.library.FavoritesFragment; import com.dkanada.gramophone.model.Category; -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.fragments.library.AlbumsFragment; +import com.dkanada.gramophone.fragments.library.ArtistsFragment; +import com.dkanada.gramophone.fragments.library.GenresFragment; +import com.dkanada.gramophone.fragments.library.PlaylistsFragment; +import com.dkanada.gramophone.fragments.library.SongsFragment; import com.dkanada.gramophone.util.PreferenceUtil; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerFragment.java similarity index 74% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerFragment.java index 964be3a3..3a23b4fd 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerFragment.java @@ -1,9 +1,9 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import android.os.Bundle; import com.dkanada.gramophone.fragments.AbsMusicServiceFragment; -import com.dkanada.gramophone.fragments.mainactivity.library.LibraryFragment; +import com.dkanada.gramophone.fragments.main.LibraryFragment; public class AbsLibraryPagerFragment extends AbsMusicServiceFragment { public LibraryFragment getLibraryFragment() { diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java index b12aec00..a3a1e9a0 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewFragment.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewFragment.java index 4e9b8af1..d75c7095 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/AbsLibraryPagerRecyclerViewFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/AlbumsFragment.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/AlbumsFragment.java index 884a0e7d..def0bead 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/AlbumsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/AlbumsFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.NonNull; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/ArtistsFragment.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/ArtistsFragment.java index 3af5121b..abcecbfe 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/ArtistsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/ArtistsFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/FavoritesFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/FavoritesFragment.java similarity index 87% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/FavoritesFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/FavoritesFragment.java index b89c6632..ec057477 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/FavoritesFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/FavoritesFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.NonNull; import org.jellyfin.apiclient.model.querying.ItemFilter; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/GenresFragment.java similarity index 97% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/GenresFragment.java index 579b32a6..ee23229c 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/GenresFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/GenresFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/PlaylistsFragment.java similarity index 97% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/PlaylistsFragment.java index f1e721fd..3b85d639 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/PlaylistsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/PlaylistsFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/library/SongsFragment.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/library/SongsFragment.java index 5f3b306a..28f8a29b 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/pager/SongsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/library/SongsFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library.pager; +package com.dkanada.gramophone.fragments.library; import androidx.annotation.NonNull; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/main/AbsMainActivityFragment.java similarity index 88% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/main/AbsMainActivityFragment.java index f68c034a..0210be87 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/AbsMainActivityFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/main/AbsMainActivityFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity; +package com.dkanada.gramophone.fragments.main; import android.os.Bundle; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/main/LibraryFragment.java similarity index 96% rename from app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java rename to app/src/main/java/com/dkanada/gramophone/fragments/main/LibraryFragment.java index 09bae8b5..e8795129 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/main/LibraryFragment.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.fragments.mainactivity.library; +package com.dkanada.gramophone.fragments.main; import android.app.Activity; import android.content.Intent; @@ -34,12 +34,10 @@ import com.dkanada.gramophone.model.SortOrder; import com.dkanada.gramophone.interfaces.CabHolder; import com.dkanada.gramophone.activities.MainActivity; import com.dkanada.gramophone.activities.SearchActivity; -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.fragments.library.AbsLibraryPagerRecyclerViewCustomGridSizeFragment; +import com.dkanada.gramophone.fragments.library.AlbumsFragment; +import com.dkanada.gramophone.fragments.library.PlaylistsFragment; +import com.dkanada.gramophone.fragments.library.SongsFragment; import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.util.PreferenceUtil; diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index a36db8e9..a3cdb59c 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".fragments.mainactivity.library.LibraryFragment"> + tools:context=".fragments.main.LibraryFragment">