diff options
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util')
14 files changed, 31 insertions, 43 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java b/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java index 0e80295a..dd7706bb 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java +++ b/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java @@ -1,8 +1,7 @@ package github.daneren2005.dsub.util; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.util.Log; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import java.util.Queue; diff --git a/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java b/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java index f03906a8..8f7e645c 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java +++ b/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java @@ -20,9 +20,9 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; import android.util.TypedValue; import java.util.HashMap; diff --git a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java index 85786b12..f9e25d68 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java +++ b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java @@ -43,7 +43,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Build; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import github.daneren2005.dsub.domain.Artist; import github.daneren2005.dsub.domain.Genre; diff --git a/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java b/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java index 00858f9c..b0a7d174 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java +++ b/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java @@ -34,13 +34,11 @@ import android.os.Handler; import android.os.Looper; import android.util.DisplayMetrics; import android.util.Log; -import android.support.v4.util.LruCache; +import androidx.collection.LruCache; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import java.lang.ref.WeakReference; - import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.ArtistInfo; import github.daneren2005.dsub.domain.InternetRadioStation; diff --git a/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java b/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java index 8ff9ec69..b392bb57 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java +++ b/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java @@ -3,7 +3,7 @@ package github.daneren2005.dsub.util; import android.annotation.TargetApi; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import android.util.Log; diff --git a/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java b/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java index 00e02dab..cf180eac 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java +++ b/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java @@ -16,9 +16,9 @@ package github.daneren2005.dsub.util; import android.os.Build; -import android.support.v7.media.MediaRouteProvider; -import android.support.v7.media.MediaRouteSelector; -import android.support.v7.media.MediaRouter; +import androidx.mediarouter.media.MediaRouteProvider; +import androidx.mediarouter.media.MediaRouteSelector; +import androidx.mediarouter.media.MediaRouter; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ import github.daneren2005.dsub.service.DownloadService; import github.daneren2005.dsub.service.RemoteController; import github.daneren2005.dsub.util.compat.GoogleCompat; -import static android.support.v7.media.MediaRouter.RouteInfo; +import static androidx.mediarouter.media.MediaRouter.RouteInfo; /** * Created by owner on 2/8/14. diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java index 88bc8138..4467477b 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java @@ -26,14 +26,13 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Build; import android.os.Handler; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; +import androidx.media.app.NotificationCompat.MediaStyle; + import android.util.Log; import android.view.KeyEvent; import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; import android.widget.RemoteViews; -import android.widget.TextView; import github.daneren2005.dsub.R; import github.daneren2005.dsub.activity.SubsonicActivity; @@ -82,7 +81,7 @@ public final class Notifications { if (usingMediaStyleNotification) { RemoteControlClientLP remoteControlClient = (RemoteControlClientLP) downloadService.getRemoteControlClient(); - android.support.v4.media.app.NotificationCompat.MediaStyle mediaStyle = new android.support.v4.media.app.NotificationCompat.MediaStyle() + MediaStyle mediaStyle = new MediaStyle() .setMediaSession(remoteControlClient.getMediaSession().getSessionToken()); if (isSingle) { @@ -99,7 +98,7 @@ public final class Notifications { .setSmallIcon(R.drawable.stat_notify_playing) .setContentTitle(title) .setContentText(artist + " - " + album) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setStyle(mediaStyle); // Set the album art. diff --git a/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java b/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java index a369715f..60ff603f 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java +++ b/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java @@ -1,19 +1,14 @@ package github.daneren2005.dsub.util; -import android.app.NotificationManager; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; -import android.support.v4.app.NotificationCompat; + +import androidx.core.app.NotificationCompat; import java.io.File; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import github.daneren2005.dsub.R; -import github.daneren2005.dsub.activity.SubsonicFragmentActivity; - /** * Created by Scott on 11/24/13. */ diff --git a/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java b/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java index 4cf25b30..b335b54b 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java +++ b/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java @@ -22,7 +22,7 @@ package github.daneren2005.dsub.util; import android.app.Activity; import android.content.Context; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.view.View; import android.widget.RatingBar; @@ -33,9 +33,7 @@ import java.util.List; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.Artist; -import github.daneren2005.dsub.domain.MusicDirectory; import github.daneren2005.dsub.domain.MusicDirectory.Entry; -import github.daneren2005.dsub.fragments.SubsonicFragment; import github.daneren2005.dsub.service.DownloadFile; import github.daneren2005.dsub.service.DownloadService; import github.daneren2005.dsub.service.MusicService; diff --git a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java index 0775c956..d5003f49 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java +++ b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java @@ -16,13 +16,13 @@ package github.daneren2005.dsub.util; import android.app.Activity; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java index 7989e8c9..7fc3a593 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Util.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java @@ -21,9 +21,9 @@ import android.annotation.TargetApi; import android.app.Activity; import android.media.AudioAttributes; import android.media.AudioFocusRequest; -import android.support.annotation.RequiresApi; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.RequiresApi; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import android.content.ClipboardManager; import android.content.ClipData; import android.content.ComponentName; @@ -39,7 +39,6 @@ import android.graphics.drawable.Drawable; import android.media.AudioManager; import android.media.AudioManager.OnAudioFocusChangeListener; import android.net.ConnectivityManager; -import android.net.Network; import android.net.NetworkInfo; import android.net.wifi.WifiManager; import android.os.Build; diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java index 4f9a27f0..3e57e185 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java +++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java @@ -6,7 +6,7 @@ import github.daneren2005.dsub.service.DownloadFile; import android.content.ComponentName; import android.content.Context; import android.graphics.Bitmap; -import android.support.v7.media.MediaRouter; +import androidx.mediarouter.media.MediaRouter; import android.os.Build; import java.util.List; diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java index 74076afb..7585f971 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java +++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java @@ -13,7 +13,7 @@ import android.graphics.Bitmap; import android.media.AudioManager; import android.media.MediaMetadataRetriever; import android.media.RemoteControlClient; -import android.support.v7.media.MediaRouter; +import androidx.mediarouter.media.MediaRouter; import java.util.List; diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java index a42b4832..52afb81c 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java +++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java @@ -30,12 +30,12 @@ import android.media.RemoteControlClient; import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.support.v4.media.MediaDescriptionCompat; import android.support.v4.media.MediaMetadataCompat; import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; -import android.support.v7.media.MediaRouter; +import androidx.mediarouter.media.MediaRouter; import android.util.Log; import android.view.KeyEvent; |