code cleanup

nuclearfog · Aug 26, 2023 · f543267 · f543267
1 parent 185b2f7
commit f543267
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 25 deletions.
diff --git a/app/src/main/java/org/nuclearfog/apollo/NotificationHelper.java b/app/src/main/java/org/nuclearfog/apollo/NotificationHelper.java
@@ -148,8 +148,9 @@ private Notification buildNotification() {
 	}
 
 	/**
+	 * post/cancel notification
 	 *
-	 * @param notification
+	 * @param notification notification to post or null to remove existing notification
 	 */
 	private void postNotification(@Nullable Notification notification) {
 		try {

diff --git a/app/src/main/java/org/nuclearfog/apollo/cache/ImageFetcher.java b/app/src/main/java/org/nuclearfog/apollo/cache/ImageFetcher.java
@@ -23,12 +23,12 @@
 import androidx.core.content.res.ResourcesCompat;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.lastfm.Album;
 import org.nuclearfog.apollo.lastfm.Artist;
 import org.nuclearfog.apollo.lastfm.ImageSize;
 import org.nuclearfog.apollo.lastfm.MusicEntry;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.utils.MusicUtils;
 import org.nuclearfog.apollo.utils.PreferenceUtils;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/service/MediaButtonCallback.java b/app/src/main/java/org/nuclearfog/apollo/service/MediaButtonCallback.java
@@ -4,8 +4,6 @@
 import android.os.Bundle;
 import android.support.v4.media.session.MediaSessionCompat;
 
-import org.nuclearfog.apollo.service.MusicPlaybackService;
-
 /**
  * callback class used by media buttons to control playback
  * todo add more button methods

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/activities/ActivityBase.java b/app/src/main/java/org/nuclearfog/apollo/ui/activities/ActivityBase.java
@@ -34,10 +34,10 @@
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.SearchView.OnQueryTextListener;
 
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.receiver.PlaybackStatus;
 import org.nuclearfog.apollo.receiver.PlaybackStatus.PlayStatusListener;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.views.PlayPauseButton;
 import org.nuclearfog.apollo.ui.views.RepeatButton;
 import org.nuclearfog.apollo.ui.views.ShuffleButton;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/activities/AudioPlayerActivity.java b/app/src/main/java/org/nuclearfog/apollo/ui/activities/AudioPlayerActivity.java
@@ -54,12 +54,12 @@
 import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.adapters.PagerAdapter;
 import org.nuclearfog.apollo.cache.ImageFetcher;
 import org.nuclearfog.apollo.receiver.PlaybackStatus;
 import org.nuclearfog.apollo.receiver.PlaybackStatus.PlayStatusListener;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.dialogs.DeleteDialog.DeleteDialogCallback;
 import org.nuclearfog.apollo.ui.fragments.FragmentCallback;
 import org.nuclearfog.apollo.ui.fragments.QueueFragment;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/activities/SettingsActivity.java b/app/src/main/java/org/nuclearfog/apollo/ui/activities/SettingsActivity.java
@@ -12,7 +12,6 @@
 package org.nuclearfog.apollo.ui.activities;
 
 import android.annotation.SuppressLint;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/fragments/ThemeFragment.java b/app/src/main/java/org/nuclearfog/apollo/ui/fragments/ThemeFragment.java
@@ -30,13 +30,12 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
 
-import org.nuclearfog.apollo.ui.appmsg.AppMsg;
-
 import org.nuclearfog.apollo.BuildConfig;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.adapters.ThemesAdapter;
 import org.nuclearfog.apollo.adapters.ThemesAdapter.ThemeHolder;
 import org.nuclearfog.apollo.adapters.recycler.RecycleHolder;
+import org.nuclearfog.apollo.ui.appmsg.AppMsg;
 import org.nuclearfog.apollo.utils.ThemeUtils;
 
 /**

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java b/app/src/main/java/org/nuclearfog/apollo/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -25,9 +25,6 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import org.nuclearfog.apollo.ui.views.TitlePageIndicator;
-import org.nuclearfog.apollo.ui.views.TitlePageIndicator.OnCenterItemClickListener;
-
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.adapters.PagerAdapter;
 import org.nuclearfog.apollo.ui.fragments.AlbumFragment;
@@ -38,6 +35,8 @@
 import org.nuclearfog.apollo.ui.fragments.PlaylistFragment;
 import org.nuclearfog.apollo.ui.fragments.RecentFragment;
 import org.nuclearfog.apollo.ui.fragments.SongFragment;
+import org.nuclearfog.apollo.ui.views.TitlePageIndicator;
+import org.nuclearfog.apollo.ui.views.TitlePageIndicator.OnCenterItemClickListener;
 import org.nuclearfog.apollo.utils.MusicUtils;
 import org.nuclearfog.apollo.utils.PreferenceUtils;
 import org.nuclearfog.apollo.utils.SortOrder;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/views/RepeatButton.java b/app/src/main/java/org/nuclearfog/apollo/ui/views/RepeatButton.java
@@ -27,8 +27,8 @@
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.content.ContextCompat;
 
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.views.theme.HoloSelector;
 import org.nuclearfog.apollo.utils.ApolloUtils;
 import org.nuclearfog.apollo.utils.MusicUtils;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/views/ShuffleButton.java b/app/src/main/java/org/nuclearfog/apollo/ui/views/ShuffleButton.java
@@ -26,8 +26,8 @@
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.content.ContextCompat;
 
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.views.theme.HoloSelector;
 import org.nuclearfog.apollo.utils.ApolloUtils;
 import org.nuclearfog.apollo.utils.MusicUtils;

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetLarge.java b/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetLarge.java
@@ -20,8 +20,8 @@
 import android.widget.RemoteViews;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.activities.AudioPlayerActivity;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetLargeAlternate.java b/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetLargeAlternate.java
@@ -20,8 +20,8 @@
 import android.widget.RemoteViews;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.activities.AudioPlayerActivity;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetSmall.java b/app/src/main/java/org/nuclearfog/apollo/ui/widgets/AppWidgetSmall.java
@@ -22,8 +22,8 @@
 import android.widget.RemoteViews;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.activities.AudioPlayerActivity;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/ui/widgets/RecentWidgetProvider.java b/app/src/main/java/org/nuclearfog/apollo/ui/widgets/RecentWidgetProvider.java
@@ -26,8 +26,8 @@
 
 import org.nuclearfog.apollo.BuildConfig;
 import org.nuclearfog.apollo.Config;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.service.RecentWidgetService;
 import org.nuclearfog.apollo.ui.activities.AudioPlayerActivity;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/ApolloUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/ApolloUtils.java
@@ -41,14 +41,13 @@
 import androidx.fragment.app.FragmentActivity;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.ui.appmsg.AppMsg;
-
 import org.nuclearfog.apollo.Config;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.cache.ImageCache;
 import org.nuclearfog.apollo.cache.ImageFetcher;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;
 import org.nuclearfog.apollo.ui.activities.ShortcutActivity;
+import org.nuclearfog.apollo.ui.appmsg.AppMsg;
 import org.nuclearfog.apollo.ui.dialogs.ColorSchemeDialog;
 import org.nuclearfog.apollo.ui.views.ColorPickerView;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/MusicUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/MusicUtils.java
@@ -44,17 +44,17 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.andrew.apollo.IApolloService;
-import org.nuclearfog.apollo.ui.appmsg.AppMsg;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.loaders.NowPlayingCursor;
 import org.nuclearfog.apollo.model.Song;
 import org.nuclearfog.apollo.player.AudioEffects;
 import org.nuclearfog.apollo.provider.FavoritesStore;
 import org.nuclearfog.apollo.provider.PopularStore;
 import org.nuclearfog.apollo.provider.RecentStore;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
+import org.nuclearfog.apollo.ui.appmsg.AppMsg;
 import org.nuclearfog.apollo.ui.dialogs.DeleteDialog;
 import org.nuclearfog.apollo.ui.dialogs.PlaylistCreateDialog;
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/NavUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/NavUtils.java
@@ -21,14 +21,13 @@
 import android.provider.MediaStore;
 
 import org.nuclearfog.apollo.BuildConfig;
-import org.nuclearfog.apollo.ui.appmsg.AppMsg;
-
 import org.nuclearfog.apollo.Config;
 import org.nuclearfog.apollo.R;
 import org.nuclearfog.apollo.ui.activities.HomeActivity;
 import org.nuclearfog.apollo.ui.activities.ProfileActivity;
 import org.nuclearfog.apollo.ui.activities.SearchActivity;
 import org.nuclearfog.apollo.ui.activities.SettingsActivity;
+import org.nuclearfog.apollo.ui.appmsg.AppMsg;
 
 /**
  * Various navigation helpers.

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/PreferenceUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/PreferenceUtils.java
@@ -18,8 +18,8 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.R;
+import org.nuclearfog.apollo.service.MusicPlaybackService;
 import org.nuclearfog.apollo.ui.fragments.AlbumFragment;
 import org.nuclearfog.apollo.ui.fragments.ArtistFragment;
 import org.nuclearfog.apollo.ui.fragments.SongFragment;