diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java index c391018e..5ab49294 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java @@ -16,7 +16,7 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.PlaylistEditorDialog; +import com.cappielloantonio.play.ui.dialog.PlaylistEditorDialog; import com.cappielloantonio.play.util.MusicUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java index b6f16f65..1161ee06 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java @@ -19,7 +19,7 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.PlaylistEditorDialog; +import com.cappielloantonio.play.ui.dialog.PlaylistEditorDialog; import com.cappielloantonio.play.util.MusicUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java index e7ec4df1..c0376188 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.model.Playlist; -import com.cappielloantonio.play.ui.fragment.dialog.PlaylistChooserDialog; +import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.PlaylistChooserViewModel; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java index 76e62231..91d77282 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ServerAdapter.java @@ -17,7 +17,7 @@ import com.cappielloantonio.play.interfaces.SystemCallback; import com.cappielloantonio.play.model.Server; import com.cappielloantonio.play.repository.SystemRepository; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.ServerSignupDialog; +import com.cappielloantonio.play.ui.dialog.ServerSignupDialog; import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java index eb0ae678..cdefd410 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java @@ -22,8 +22,8 @@ import com.cappielloantonio.play.repository.QueueRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.base.BaseActivity; import com.cappielloantonio.play.ui.fragment.PlayerBottomSheetFragment; -import com.cappielloantonio.play.ui.fragment.dialog.ConnectionAlertDialog; -import com.cappielloantonio.play.ui.fragment.dialog.ServerUnreachableDialog; +import com.cappielloantonio.play.ui.dialog.ConnectionAlertDialog; +import com.cappielloantonio.play.ui.dialog.ServerUnreachableDialog; import com.cappielloantonio.play.util.PreferenceUtil; import com.cappielloantonio.play.viewmodel.MainViewModel; import com.google.android.material.bottomnavigation.BottomNavigationView; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ConnectionAlertDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java similarity index 97% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ConnectionAlertDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java index 45496caf..c4fa836d 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ConnectionAlertDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java similarity index 98% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java index b2376213..74f38e66 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java similarity index 99% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java index 5a5e71d4..7c559178 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java similarity index 98% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java index 633963af..073f3f18 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java similarity index 99% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java index 11589d0b..729694c9 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerUnreachableDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java similarity index 94% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerUnreachableDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java index 67a66e54..52365caa 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerUnreachableDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java @@ -1,4 +1,4 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -7,8 +7,6 @@ import android.view.LayoutInflater; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -import androidx.navigation.NavOptions; -import androidx.navigation.fragment.NavHostFragment; import com.cappielloantonio.play.R; import com.cappielloantonio.play.databinding.DialogServerUnreachableBinding; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/StarredSyncDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java similarity index 92% rename from app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/StarredSyncDialog.java rename to app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java index be3bc774..4f33a432 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/StarredSyncDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java @@ -1,23 +1,19 @@ -package com.cappielloantonio.play.ui.fragment.dialog; +package com.cappielloantonio.play.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; -import android.view.View; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.GridLayoutManager; import com.cappielloantonio.play.R; import com.cappielloantonio.play.databinding.DialogConnectionAlertBinding; import com.cappielloantonio.play.util.DownloadUtil; import com.cappielloantonio.play.util.PreferenceUtil; -import com.cappielloantonio.play.util.UIUtil; -import com.cappielloantonio.play.viewmodel.HomeViewModel; import com.cappielloantonio.play.viewmodel.StarredSyncViewModel; import java.util.Objects; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java index f159de27..0dd12823 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java @@ -19,7 +19,7 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.ServerAdapter; import com.cappielloantonio.play.databinding.FragmentLoginBinding; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.ServerSignupDialog; +import com.cappielloantonio.play.ui.dialog.ServerSignupDialog; import com.cappielloantonio.play.viewmodel.LoginViewModel; public class LoginFragment extends Fragment { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java index c4e79b09..33fa76a2 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java @@ -30,7 +30,7 @@ import com.cappielloantonio.play.interfaces.MusicServiceEventListener; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.RatingDialog; +import com.cappielloantonio.play.ui.dialog.RatingDialog; import com.cappielloantonio.play.util.MappingUtil; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.util.PreferenceUtil; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java index ae89cfa4..8d1f8de5 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java @@ -19,7 +19,7 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.helper.ThemeHelper; import com.cappielloantonio.play.interfaces.ScanCallback; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.StarredSyncDialog; +import com.cappielloantonio.play.ui.dialog.StarredSyncDialog; import com.cappielloantonio.play.util.PreferenceUtil; import com.cappielloantonio.play.viewmodel.SettingViewModel; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java index 9ca392b2..53b78f50 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java @@ -24,8 +24,8 @@ import com.cappielloantonio.play.repository.QueueRepository; import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.ui.fragment.dialog.PlaylistChooserDialog; -import com.cappielloantonio.play.ui.fragment.dialog.RatingDialog; +import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog; +import com.cappielloantonio.play.ui.dialog.RatingDialog; import com.cappielloantonio.play.util.DownloadUtil; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.SongBottomSheetViewModel;