From 63df26cdfd3a3f652d0e3d2343a498bdbd21ed82 Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sun, 23 May 2021 14:49:37 -0400 Subject: [PATCH] Optimize imports --- .../net/nullsum/audinaut/activity/SubsonicActivity.java | 4 ---- .../audinaut/activity/SubsonicFragmentActivity.java | 1 - .../java/net/nullsum/audinaut/adapter/SectionAdapter.java | 5 ----- .../net/nullsum/audinaut/fragments/NowPlayingFragment.java | 4 ---- .../net/nullsum/audinaut/service/CachedMusicService.java | 1 - .../java/net/nullsum/audinaut/service/MusicService.java | 1 - .../net/nullsum/audinaut/service/OfflineMusicService.java | 2 -- .../net/nullsum/audinaut/service/RESTMusicService.java | 2 -- .../main/java/net/nullsum/audinaut/util/BlurBuilder.java | 1 - .../main/java/net/nullsum/audinaut/util/Notifications.java | 4 ++-- app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java | 3 --- app/src/main/java/net/nullsum/audinaut/util/UserUtil.java | 6 ------ app/src/main/java/net/nullsum/audinaut/util/Util.java | 7 ++----- 13 files changed, 4 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java index f687a68..8834095 100644 --- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java +++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java @@ -21,12 +21,10 @@ package net.nullsum.audinaut.activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.media.AudioManager; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; import android.util.Log; import android.view.LayoutInflater; @@ -69,8 +67,6 @@ import net.nullsum.audinaut.util.UserUtil; import net.nullsum.audinaut.util.Util; import net.nullsum.audinaut.view.UpdateView; -import java.io.File; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java index 2f61de0..d1356bb 100644 --- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java +++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java @@ -56,7 +56,6 @@ import net.nullsum.audinaut.updates.Updater; import net.nullsum.audinaut.util.Constants; import net.nullsum.audinaut.util.FileUtil; import net.nullsum.audinaut.util.SilentBackgroundTask; -import net.nullsum.audinaut.util.UserUtil; import net.nullsum.audinaut.util.Util; import java.io.File; diff --git a/app/src/main/java/net/nullsum/audinaut/adapter/SectionAdapter.java b/app/src/main/java/net/nullsum/audinaut/adapter/SectionAdapter.java index 33997f4..b33d22a 100644 --- a/app/src/main/java/net/nullsum/audinaut/adapter/SectionAdapter.java +++ b/app/src/main/java/net/nullsum/audinaut/adapter/SectionAdapter.java @@ -17,17 +17,12 @@ package net.nullsum.audinaut.adapter; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.Resources; -import android.os.Build; import android.util.Log; -import android.util.TypedValue; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; import android.widget.PopupMenu; import androidx.appcompat.view.ActionMode; diff --git a/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java b/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java index 878bae2..33cfe2a 100644 --- a/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java +++ b/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java @@ -17,7 +17,6 @@ package net.nullsum.audinaut.fragments; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.os.Handler; import android.util.DisplayMetrics; import android.view.GestureDetector; import android.view.GestureDetector.OnGestureListener; @@ -57,15 +56,12 @@ import net.nullsum.audinaut.util.MenuUtil; import net.nullsum.audinaut.util.SilentBackgroundTask; import net.nullsum.audinaut.util.Util; import net.nullsum.audinaut.view.AutoRepeatButton; -import net.nullsum.audinaut.view.FadeOutAnimation; import net.nullsum.audinaut.view.FastScroller; import net.nullsum.audinaut.view.UpdateView; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import static net.nullsum.audinaut.domain.MusicDirectory.Entry; import static net.nullsum.audinaut.domain.PlayerState.COMPLETED; diff --git a/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java index bd4968e..22a398e 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java @@ -30,7 +30,6 @@ import net.nullsum.audinaut.domain.MusicFolder; import net.nullsum.audinaut.domain.Playlist; import net.nullsum.audinaut.domain.SearchCritera; import net.nullsum.audinaut.domain.SearchResult; -import net.nullsum.audinaut.domain.User; import net.nullsum.audinaut.util.FileUtil; import net.nullsum.audinaut.util.ProgressListener; import net.nullsum.audinaut.util.SilentBackgroundTask; diff --git a/app/src/main/java/net/nullsum/audinaut/service/MusicService.java b/app/src/main/java/net/nullsum/audinaut/service/MusicService.java index fbb5bb9..6547f65 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/MusicService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/MusicService.java @@ -28,7 +28,6 @@ import net.nullsum.audinaut.domain.MusicFolder; import net.nullsum.audinaut.domain.Playlist; import net.nullsum.audinaut.domain.SearchCritera; import net.nullsum.audinaut.domain.SearchResult; -import net.nullsum.audinaut.domain.User; import net.nullsum.audinaut.util.ProgressListener; import net.nullsum.audinaut.util.SilentBackgroundTask; diff --git a/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java index e1231e4..583b367 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java @@ -31,7 +31,6 @@ import net.nullsum.audinaut.domain.MusicFolder; import net.nullsum.audinaut.domain.Playlist; import net.nullsum.audinaut.domain.SearchCritera; import net.nullsum.audinaut.domain.SearchResult; -import net.nullsum.audinaut.domain.User; import net.nullsum.audinaut.util.Constants; import net.nullsum.audinaut.util.FileUtil; import net.nullsum.audinaut.util.ProgressListener; @@ -44,7 +43,6 @@ import java.io.FileReader; import java.io.Reader; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java index 45ad9c3..8200cf2 100644 --- a/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java +++ b/app/src/main/java/net/nullsum/audinaut/service/RESTMusicService.java @@ -33,7 +33,6 @@ import net.nullsum.audinaut.domain.MusicFolder; import net.nullsum.audinaut.domain.Playlist; import net.nullsum.audinaut.domain.SearchCritera; import net.nullsum.audinaut.domain.SearchResult; -import net.nullsum.audinaut.domain.User; import net.nullsum.audinaut.fragments.MainFragment; import net.nullsum.audinaut.service.parser.EntryListParser; import net.nullsum.audinaut.service.parser.ErrorParser; @@ -45,7 +44,6 @@ import net.nullsum.audinaut.service.parser.PlaylistParser; import net.nullsum.audinaut.service.parser.PlaylistsParser; import net.nullsum.audinaut.service.parser.RandomSongsParser; import net.nullsum.audinaut.service.parser.SearchResult2Parser; -import net.nullsum.audinaut.service.parser.UserParser; import net.nullsum.audinaut.util.Constants; import net.nullsum.audinaut.util.FileUtil; import net.nullsum.audinaut.util.Pair; diff --git a/app/src/main/java/net/nullsum/audinaut/util/BlurBuilder.java b/app/src/main/java/net/nullsum/audinaut/util/BlurBuilder.java index 9fa9f0e..bc0b7b5 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/BlurBuilder.java +++ b/app/src/main/java/net/nullsum/audinaut/util/BlurBuilder.java @@ -3,7 +3,6 @@ package net.nullsum.audinaut.util; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; diff --git a/app/src/main/java/net/nullsum/audinaut/util/Notifications.java b/app/src/main/java/net/nullsum/audinaut/util/Notifications.java index bce6708..1a872e0 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/Notifications.java +++ b/app/src/main/java/net/nullsum/audinaut/util/Notifications.java @@ -26,13 +26,13 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Build; import android.os.Handler; +import android.support.v4.media.MediaMetadataCompat; +import android.support.v4.media.session.MediaSessionCompat; import android.util.Log; import android.view.KeyEvent; import androidx.core.app.NotificationCompat; import androidx.media.app.NotificationCompat.MediaStyle; -import android.support.v4.media.session.MediaSessionCompat; -import android.support.v4.media.MediaMetadataCompat; import net.nullsum.audinaut.R; import net.nullsum.audinaut.activity.SubsonicActivity; diff --git a/app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java b/app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java index 7df24d7..977ccc9 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java +++ b/app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java @@ -19,11 +19,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Build; -import android.util.Log; import net.nullsum.audinaut.R; -import net.nullsum.audinaut.activity.SettingsActivity; -import net.nullsum.audinaut.activity.SubsonicFragmentActivity; public final class ThemeUtil { private static final String THEME_DARK = "dark"; diff --git a/app/src/main/java/net/nullsum/audinaut/util/UserUtil.java b/app/src/main/java/net/nullsum/audinaut/util/UserUtil.java index e3881b4..00496ab 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/UserUtil.java +++ b/app/src/main/java/net/nullsum/audinaut/util/UserUtil.java @@ -17,12 +17,6 @@ package net.nullsum.audinaut.util; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; - -import androidx.appcompat.app.AppCompatActivity; - -import net.nullsum.audinaut.domain.User; -import net.nullsum.audinaut.service.MusicServiceFactory; public final class UserUtil { private static String getCurrentUsername(Context context, int instance) { diff --git a/app/src/main/java/net/nullsum/audinaut/util/Util.java b/app/src/main/java/net/nullsum/audinaut/util/Util.java index 2028a97..beb47a2 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/Util.java +++ b/app/src/main/java/net/nullsum/audinaut/util/Util.java @@ -17,6 +17,7 @@ */ package net.nullsum.audinaut.util; +import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; import android.content.ComponentName; @@ -41,12 +42,11 @@ import android.text.util.Linkify; import android.util.Log; import android.util.SparseArray; import android.view.Gravity; +import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import android.app.Activity; -import android.view.View; import androidx.annotation.Nullable; import androidx.annotation.StringRes; @@ -72,9 +72,6 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.SecureRandom; import java.text.DecimalFormat; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.List;