Optimize imports

app/src/main/java/net/nullsum/audinaut/activity/SettingsActivity.java

@@ -19,6 +19,7 @@
 package net.nullsum.audinaut.activity;
 
 import android.os.Bundle;
+
 import androidx.appcompat.widget.Toolbar;
 
 import net.nullsum.audinaut.R;

app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java

@@ -27,16 +27,6 @@ import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import com.google.android.material.navigation.NavigationView;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.core.content.ContextCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -53,6 +43,18 @@ import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.google.android.material.navigation.NavigationView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.fragments.SubsonicFragment;
 import net.nullsum.audinaut.service.DownloadService;

app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java

@@ -27,15 +27,16 @@ import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelState;
 

app/src/main/java/net/nullsum/audinaut/adapter/ArtistAdapter.java

@@ -16,12 +16,13 @@
 package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
-import androidx.appcompat.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.PopupMenu;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.domain.Artist;
 import net.nullsum.audinaut.domain.MusicDirectory.Entry;

app/src/main/java/net/nullsum/audinaut/adapter/SectionAdapter.java

@@ -19,8 +19,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Build;
-import androidx.appcompat.view.ActionMode;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
@@ -32,6 +30,9 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.PopupMenu;
 
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
 import net.nullsum.audinaut.util.Constants;

app/src/main/java/net/nullsum/audinaut/fragments/DownloadFragment.java

@@ -17,7 +17,6 @@ package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -25,6 +24,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.ItemTouchHelper;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.adapter.DownloadFileAdapter;
 import net.nullsum.audinaut.adapter.SectionAdapter;

app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java

@@ -18,9 +18,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.DisplayMetrics;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
@@ -38,6 +35,10 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
 
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
 import net.nullsum.audinaut.adapter.DownloadFileAdapter;

app/src/main/java/net/nullsum/audinaut/fragments/SelectDirectoryFragment.java

@@ -1,9 +1,6 @@
 package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,6 +8,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.adapter.AlphabeticalAlbumAdapter;
 import net.nullsum.audinaut.adapter.EntryGridAdapter;

app/src/main/java/net/nullsum/audinaut/fragments/SelectPlaylistFragment.java

@@ -1,7 +1,6 @@
 package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -9,6 +8,8 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 
+import androidx.appcompat.app.AlertDialog;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.adapter.PlaylistAdapter;
 import net.nullsum.audinaut.adapter.SectionAdapter;

app/src/main/java/net/nullsum/audinaut/fragments/SelectRecyclerFragment.java

@@ -16,8 +16,6 @@
 package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -25,6 +23,9 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.adapter.SectionAdapter;
 import net.nullsum.audinaut.service.MusicService;

app/src/main/java/net/nullsum/audinaut/service/DownloadService.java

@@ -32,9 +32,10 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.PowerManager;
-import androidx.collection.LruCache;
 import android.util.Log;
 
+import androidx.collection.LruCache;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.activity.SubsonicActivity;
 import net.nullsum.audinaut.audiofx.AudioEffectsController;

app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java

@@ -21,9 +21,10 @@ package net.nullsum.audinaut.service;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
-import androidx.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import net.nullsum.audinaut.domain.Genre;
 import net.nullsum.audinaut.domain.Indexes;
 import net.nullsum.audinaut.domain.MusicDirectory;

app/src/main/java/net/nullsum/audinaut/util/DownloadFileItemHelperCallback.java

@@ -1,7 +1,7 @@
 package net.nullsum.audinaut.util;
 
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.nullsum.audinaut.adapter.SectionAdapter;
 import net.nullsum.audinaut.fragments.SubsonicFragment;

app/src/main/java/net/nullsum/audinaut/util/DrawableTint.java

@@ -20,11 +20,12 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.AttrRes;
-import androidx.annotation.DrawableRes;
 import android.util.SparseArray;
 import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+
 import net.nullsum.audinaut.R;
 
 import java.util.WeakHashMap;

app/src/main/java/net/nullsum/audinaut/util/FileUtil.java

@@ -23,9 +23,10 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Environment;
-import androidx.core.content.ContextCompat;
 import android.util.Log;
 
+import androidx.core.content.ContextCompat;
+
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;

app/src/main/java/net/nullsum/audinaut/util/ImageLoader.java

@@ -30,13 +30,14 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.collection.LruCache;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.collection.LruCache;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.domain.MusicDirectory;
 import net.nullsum.audinaut.domain.Playlist;

app/src/main/java/net/nullsum/audinaut/util/Notifications.java

@@ -25,12 +25,13 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Handler;
-import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import androidx.core.app.NotificationCompat;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.activity.SubsonicActivity;
 import net.nullsum.audinaut.activity.SubsonicFragmentActivity;

app/src/main/java/net/nullsum/audinaut/util/UserUtil.java

@@ -17,9 +17,10 @@ package net.nullsum.audinaut.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import net.nullsum.audinaut.domain.User;
 import net.nullsum.audinaut.service.MusicServiceFactory;
 

app/src/main/java/net/nullsum/audinaut/view/AutoRepeatButton.java

@@ -1,10 +1,11 @@
 package net.nullsum.audinaut.view;
 
 import android.content.Context;
-import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.appcompat.widget.AppCompatImageButton;
+
 public class AutoRepeatButton extends AppCompatImageButton {
 
     private static final long initialRepeatDelay = 1000;

app/src/main/java/net/nullsum/audinaut/view/CacheLocationPreference.java

@@ -18,7 +18,6 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Environment;
 import android.preference.EditTextPreference;
-import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -28,6 +27,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
+import androidx.core.content.ContextCompat;
+
 import net.nullsum.audinaut.R;
 
 import java.io.File;

app/src/main/java/net/nullsum/audinaut/view/FastScroller.java

@@ -19,10 +19,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -32,6 +28,11 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+
 import net.nullsum.audinaut.R;
 
 import static androidx.recyclerview.widget.RecyclerView.OnScrollListener;

app/src/main/java/net/nullsum/audinaut/view/GridSpacingDecoration.java

@@ -16,14 +16,15 @@
 package net.nullsum.audinaut.view;
 
 import android.graphics.Rect;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class GridSpacingDecoration extends RecyclerView.ItemDecoration {
     public static final int SPACING = 10;
 

app/src/main/java/net/nullsum/audinaut/view/RecyclingImageView.java

@@ -20,9 +20,10 @@ import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 public class RecyclingImageView extends AppCompatImageView {
     private boolean invalidated = false;
 

app/src/main/java/net/nullsum/audinaut/view/UpdateView.java

@@ -22,7 +22,6 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +29,8 @@ import android.widget.AbsListView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.domain.MusicDirectory;
 import net.nullsum.audinaut.util.DrawableTint;