From 5bde02dc8b5a0b3a65f1ecd9b02c12bd0b2ba542 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 6 May 2021 18:22:28 +0900 Subject: [PATCH] reduce number of packages in root directory --- .../gramophone/activities/SettingsActivity.java | 8 ++++---- .../gramophone/adapter/AlbumCoverPagerAdapter.java | 1 - .../CustomFragmentStatePagerAdapter.java | 2 +- .../preferences/CategoryPreferenceDialog.java | 2 +- .../preferences/DirectPlayPreferenceDialog.java | 2 +- .../preferences/NowPlayingPreferenceDialog.java} | 10 +++++----- .../fragments/player/PlayerAlbumCoverFragment.java | 2 +- .../card/CardPlayerPlaybackControlsFragment.java | 2 +- .../flat/FlatPlayerPlaybackControlsFragment.java | 2 +- .../base}/SimpleAnimatorListener.java | 2 +- .../base}/SimpleOnSeekbarChangeListener.java | 2 +- 11 files changed, 17 insertions(+), 18 deletions(-) rename app/src/main/java/com/dkanada/gramophone/{misc => adapter}/CustomFragmentStatePagerAdapter.java (99%) rename app/src/main/java/com/dkanada/gramophone/{ => dialogs}/preferences/CategoryPreferenceDialog.java (98%) rename app/src/main/java/com/dkanada/gramophone/{ => dialogs}/preferences/DirectPlayPreferenceDialog.java (97%) rename app/src/main/java/com/dkanada/gramophone/{preferences/NowPlayingScreenPreferenceDialog.java => dialogs/preferences/NowPlayingPreferenceDialog.java} (91%) rename app/src/main/java/com/dkanada/gramophone/{misc => interfaces/base}/SimpleAnimatorListener.java (89%) rename app/src/main/java/com/dkanada/gramophone/{misc => interfaces/base}/SimpleOnSeekbarChangeListener.java (89%) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java index 6c4c03ad..39a4da37 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java @@ -17,14 +17,14 @@ import androidx.preference.TwoStatePreference; import com.afollestad.materialdialogs.color.ColorChooserDialog; import com.dkanada.gramophone.databinding.ActivitySettingsBinding; -import com.dkanada.gramophone.preferences.DirectPlayPreferenceDialog; +import com.dkanada.gramophone.dialogs.preferences.DirectPlayPreferenceDialog; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference; import com.kabouzeid.appthemehelper.util.ColorUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.views.shortcuts.DynamicShortcutManager; -import com.dkanada.gramophone.preferences.CategoryPreferenceDialog; -import com.dkanada.gramophone.preferences.NowPlayingScreenPreferenceDialog; +import com.dkanada.gramophone.dialogs.preferences.CategoryPreferenceDialog; +import com.dkanada.gramophone.dialogs.preferences.NowPlayingPreferenceDialog; import com.dkanada.gramophone.activities.base.AbsBaseActivity; import com.dkanada.gramophone.util.PreferenceUtil; @@ -228,7 +228,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia final Preference nowPlayingPreference = findPreference(PreferenceUtil.NOW_PLAYING_SCREEN); nowPlayingPreference.setOnPreferenceClickListener(preference -> { - NowPlayingScreenPreferenceDialog.newInstance().show(getParentFragmentManager(), NowPlayingScreenPreferenceDialog.TAG); + NowPlayingPreferenceDialog.newInstance().show(getParentFragmentManager(), NowPlayingPreferenceDialog.TAG); return false; }); diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java index 185d2827..43db60df 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java @@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentManager; import com.dkanada.gramophone.databinding.FragmentAlbumCoverBinding; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.CustomPaletteTarget; -import com.dkanada.gramophone.misc.CustomFragmentStatePagerAdapter; import com.dkanada.gramophone.model.Song; import java.util.List; diff --git a/app/src/main/java/com/dkanada/gramophone/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/CustomFragmentStatePagerAdapter.java similarity index 99% rename from app/src/main/java/com/dkanada/gramophone/misc/CustomFragmentStatePagerAdapter.java rename to app/src/main/java/com/dkanada/gramophone/adapter/CustomFragmentStatePagerAdapter.java index 4def9034..e7bfd3be 100644 --- a/app/src/main/java/com/dkanada/gramophone/misc/CustomFragmentStatePagerAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/CustomFragmentStatePagerAdapter.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.misc; +package com.dkanada.gramophone.adapter; /* * Copyright (C) 2011 The Android Open Source Project diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java similarity index 98% rename from app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java rename to app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java index 6fb27762..94fb39b3 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.preferences; +package com.dkanada.gramophone.dialogs.preferences; import android.app.Dialog; import android.os.Bundle; diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java similarity index 97% rename from app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java rename to app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java index 0043e93f..9189cba6 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.preferences; +package com.dkanada.gramophone.dialogs.preferences; import android.app.Dialog; import android.os.Bundle; diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java similarity index 91% rename from app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java rename to app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java index f2d08363..ecb3a0ee 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.preferences; +package com.dkanada.gramophone.dialogs.preferences; import android.app.Dialog; import android.content.Context; @@ -22,14 +22,14 @@ import com.dkanada.gramophone.fragments.player.NowPlayingScreen; import com.dkanada.gramophone.util.PreferenceUtil; import com.pixelcan.inkpageindicator.InkPageIndicator; -public class NowPlayingScreenPreferenceDialog extends DialogFragment implements MaterialDialog.SingleButtonCallback, ViewPager.OnPageChangeListener { - public static final String TAG = NowPlayingScreenPreferenceDialog.class.getSimpleName(); +public class NowPlayingPreferenceDialog extends DialogFragment implements MaterialDialog.SingleButtonCallback, ViewPager.OnPageChangeListener { + public static final String TAG = NowPlayingPreferenceDialog.class.getSimpleName(); private DialogAction whichButtonClicked; private int viewPagerPosition; - public static NowPlayingScreenPreferenceDialog newInstance() { - return new NowPlayingScreenPreferenceDialog(); + public static NowPlayingPreferenceDialog newInstance() { + return new NowPlayingPreferenceDialog(); } @NonNull diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java index dbab02f0..dbd2e862 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java @@ -17,7 +17,7 @@ import androidx.viewpager.widget.ViewPager; 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.interfaces.base.SimpleAnimatorListener; import com.dkanada.gramophone.fragments.AbsMusicServiceFragment; import com.dkanada.gramophone.util.ViewUtil; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java index a0a8e408..d992c567 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java @@ -20,7 +20,7 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.databinding.FragmentCardPlayerPlaybackControlsBinding; import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper; import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler; -import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener; +import com.dkanada.gramophone.interfaces.base.SimpleOnSeekbarChangeListener; import com.dkanada.gramophone.service.MusicService; import com.dkanada.gramophone.fragments.AbsMusicServiceFragment; import com.dkanada.gramophone.util.MusicUtil; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java index 317b6004..4937aa61 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java @@ -22,7 +22,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.misc.SimpleOnSeekbarChangeListener; +import com.dkanada.gramophone.interfaces.base.SimpleOnSeekbarChangeListener; import com.dkanada.gramophone.service.MusicService; import com.dkanada.gramophone.fragments.AbsMusicServiceFragment; import com.dkanada.gramophone.util.MusicUtil; diff --git a/app/src/main/java/com/dkanada/gramophone/misc/SimpleAnimatorListener.java b/app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleAnimatorListener.java similarity index 89% rename from app/src/main/java/com/dkanada/gramophone/misc/SimpleAnimatorListener.java rename to app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleAnimatorListener.java index ad268841..cd350f43 100644 --- a/app/src/main/java/com/dkanada/gramophone/misc/SimpleAnimatorListener.java +++ b/app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleAnimatorListener.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.misc; +package com.dkanada.gramophone.interfaces.base; import android.animation.Animator; diff --git a/app/src/main/java/com/dkanada/gramophone/misc/SimpleOnSeekbarChangeListener.java b/app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleOnSeekbarChangeListener.java similarity index 89% rename from app/src/main/java/com/dkanada/gramophone/misc/SimpleOnSeekbarChangeListener.java rename to app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleOnSeekbarChangeListener.java index c5caee55..813596c8 100644 --- a/app/src/main/java/com/dkanada/gramophone/misc/SimpleOnSeekbarChangeListener.java +++ b/app/src/main/java/com/dkanada/gramophone/interfaces/base/SimpleOnSeekbarChangeListener.java @@ -1,4 +1,4 @@ -package com.dkanada.gramophone.misc; +package com.dkanada.gramophone.interfaces.base; import android.widget.SeekBar;