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

simplify fragments directory structure

Browse source
This commit is contained in:
dkanada 2021-05-30 13:54:05 +09:00
commit e87c6ad85e
14 changed files with 24 additions and 26 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

@ -27,7 +27,7 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.model.Song; 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.MusicUtil;
import com.dkanada.gramophone.util.QueryUtil; import com.dkanada.gramophone.util.QueryUtil;
import com.sothree.slidinguppanel.SlidingUpPanelLayout; import com.sothree.slidinguppanel.SlidingUpPanelLayout;

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

@ -10,13 +10,13 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter; 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.model.Category;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment; import com.dkanada.gramophone.fragments.library.AlbumsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment; import com.dkanada.gramophone.fragments.library.ArtistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.GenresFragment; import com.dkanada.gramophone.fragments.library.GenresFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.PlaylistsFragment; import com.dkanada.gramophone.fragments.library.PlaylistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.SongsFragment; import com.dkanada.gramophone.fragments.library.SongsFragment;
import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.PreferenceUtil;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;

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

@ -1,9 +1,9 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import android.os.Bundle; import android.os.Bundle;
import com.dkanada.gramophone.fragments.AbsMusicServiceFragment; 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 class AbsLibraryPagerFragment extends AbsMusicServiceFragment {
public LibraryFragment getLibraryFragment() { public LibraryFragment getLibraryFragment() {

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

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

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

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

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;

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

@ -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.LayoutRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.jellyfin.apiclient.model.querying.ItemFilter; import org.jellyfin.apiclient.model.querying.ItemFilter;

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library.pager; package com.dkanada.gramophone.fragments.library;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;

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

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

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

@ -1,4 +1,4 @@
package com.dkanada.gramophone.fragments.mainactivity.library; package com.dkanada.gramophone.fragments.main;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -34,12 +34,10 @@ import com.dkanada.gramophone.model.SortOrder;
import com.dkanada.gramophone.interfaces.CabHolder; import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.activities.MainActivity; import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.activities.SearchActivity; import com.dkanada.gramophone.activities.SearchActivity;
import com.dkanada.gramophone.fragments.mainactivity.AbsMainActivityFragment; import com.dkanada.gramophone.fragments.library.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment; import com.dkanada.gramophone.fragments.library.AlbumsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.AlbumsFragment; import com.dkanada.gramophone.fragments.library.PlaylistsFragment;
import com.dkanada.gramophone.fragments.mainactivity.library.pager.ArtistsFragment; import com.dkanada.gramophone.fragments.library.SongsFragment;
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.ThemeUtil;
import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.PreferenceUtil;

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

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