From 4ffe6df137ff515d565d5c6303566e64c84a80cf Mon Sep 17 00:00:00 2001 From: dwi336 Date: Fri, 6 Dec 2019 17:59:08 +0100 Subject: [PATCH] Moved to lineage-17.0 branch --- .classpath | 2 +- README.md | 4 +-- app/build.gradle | 3 +- .../eleven/MediaButtonIntentReceiver.java | 1 + .../eleven/MusicPlaybackService.java | 1 + .../eleven/adapters/AlbumArtPagerAdapter.java | 1 + .../adapters/AlbumDetailSongAdapter.java | 3 +- .../eleven/adapters/ArtistAdapter.java | 1 + .../adapters/ArtistDetailAlbumAdapter.java | 7 ++-- .../adapters/ArtistDetailSongAdapter.java | 3 +- .../eleven/adapters/DetailSongAdapter.java | 9 ++--- .../eleven/adapters/PagerAdapter.java | 1 + .../eleven/cache/BlurBitmapWorkerTask.java | 1 + .../lineageos/eleven/cache/ImageWorker.java | 1 + .../eleven/dragdrop/DragSortListView.java | 1 + .../loaders/WrappedAsyncTaskLoader.java | 1 + .../lineageos/eleven/locale/LocaleSet.java | 1 + .../eleven/locale/LocaleSetManager.java | 1 + .../lineageos/eleven/locale/LocaleUtils.java | 1 + .../eleven/menu/BasePlaylistDialog.java | 5 +-- .../lineageos/eleven/menu/ConfirmDialog.java | 7 ++-- .../lineageos/eleven/menu/DeleteDialog.java | 5 +-- .../eleven/menu/PhotoSelectionDialog.java | 5 +-- .../org/lineageos/eleven/model/Playlist.java | 1 + .../slidinguppanel/SlidingUpPanelLayout.java | 2 ++ .../eleven/slidinguppanel/ViewDragHelper.java | 1 + .../org/lineageos/eleven/ui/HeaderBar.java | 1 + .../eleven/ui/activities/BaseActivity.java | 5 +-- .../eleven/ui/activities/HomeActivity.java | 2 ++ .../eleven/ui/activities/SearchActivity.java | 10 +++--- .../ui/activities/SettingsActivity.java | 4 +-- .../ui/activities/SlidingPanelActivity.java | 1 + .../ui/fragments/AlbumDetailFragment.java | 2 ++ .../eleven/ui/fragments/AlbumFragment.java | 5 +-- .../ui/fragments/ArtistDetailFragment.java | 2 ++ .../eleven/ui/fragments/ArtistFragment.java | 5 +-- .../ui/fragments/AudioPlayerFragment.java | 1 + .../eleven/ui/fragments/BaseFragment.java | 1 + .../ui/fragments/PlaylistDetailFragment.java | 5 +-- .../eleven/ui/fragments/PlaylistFragment.java | 7 ++-- .../eleven/ui/fragments/QueueFragment.java | 5 +-- .../eleven/ui/fragments/RecentFragment.java | 1 + .../eleven/ui/fragments/SongFragment.java | 1 + .../fragments/phone/MusicBrowserFragment.java | 36 ++++++++++--------- .../phone/MusicBrowserPhoneFragment.java | 1 + .../fragments/profile/BasicSongFragment.java | 5 +-- .../fragments/profile/LastAddedFragment.java | 1 + .../fragments/profile/TopTracksFragment.java | 1 + .../eleven/utils/AlbumPopupMenuHelper.java | 3 ++ .../eleven/utils/ArtistPopupMenuHelper.java | 5 ++- .../lineageos/eleven/utils/BitmapUtils.java | 1 + .../eleven/utils/BitmapWithColors.java | 1 + .../lineageos/eleven/utils/ElevenUtils.java | 35 ++++++++++-------- .../lineageos/eleven/utils/GenreFetcher.java | 6 ++-- .../lineageos/eleven/utils/MusicUtils.java | 3 +- .../eleven/utils/PlaylistPopupMenuHelper.java | 1 + .../eleven/utils/PopupMenuHelper.java | 1 + .../eleven/utils/PreferenceUtils.java | 3 +- .../eleven/utils/SongPopupMenuHelper.java | 2 ++ .../eleven/widgets/AudioActivityButton.java | 4 ++- .../eleven/widgets/LetterTileDrawable.java | 1 + .../eleven/widgets/LoadingEmptyContainer.java | 1 + .../eleven/widgets/SquareViewPager.java | 1 + build.gradle | 2 +- 64 files changed, 155 insertions(+), 86 deletions(-) diff --git a/.classpath b/.classpath index c117472..893a6fa 100644 --- a/.classpath +++ b/.classpath @@ -7,7 +7,7 @@ - + diff --git a/README.md b/README.md index fa8e884..7964228 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Eleven music player (CyanogenMod/LineageOS) - compatible with Android version >1 Copied from https://github.com/LineageOS/android_packages_apps_Eleven/archive/cm-14.1.zip (03.08.2017) -Moved to lineage-15.1 branch. -Merged with upstream project on 07.04.2019 +Moved to lineage-17.0 branch. +Merged with upstream project on 30.11.2019 Made compatibility changes for android version >14 using as much material design as possible diff --git a/app/build.gradle b/app/build.gradle index 5d5383b..ffafc1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { applicationId "org.lineageos.eleven" @@ -17,7 +16,7 @@ android { signingConfigs { release { - storeFile file("/home/didi/eclipse/DevStore") + storeFile file("${System.properties['user.home']}/eclipse/DevStore") storePassword "test123" keyAlias "TestKey" keyPassword "1234567890" diff --git a/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java b/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java index 2182d2a..f3370f6 100644 --- a/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java +++ b/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java @@ -17,6 +17,7 @@ import android.os.Build; import android.util.Log; import android.view.KeyEvent; + import androidx.core.content.ContextCompat; import androidx.legacy.content.WakefulBroadcastReceiver; diff --git a/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java b/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java index 2f53cb0..2ddda7b 100644 --- a/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java +++ b/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java @@ -61,6 +61,7 @@ import android.util.Log; import android.util.LongSparseArray; import android.view.KeyEvent; + import androidx.annotation.NonNull; import androidx.core.app.NotificationCompat; import androidx.core.content.ContextCompat; diff --git a/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java index 6396656..e1394d5 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java @@ -23,6 +23,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; diff --git a/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java index 529df6f..71e928f 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.view.View; import android.widget.TextView; + import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -78,4 +79,4 @@ protected void update(Song song) { duration.setText(MusicUtils.makeShortTimeString(context, song.mDuration)); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java index 66623a3..d01e83e 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java @@ -19,6 +19,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; + import androidx.core.content.ContextCompat; import org.lineageos.eleven.R; diff --git a/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java index c138eb3..fc142e5 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java @@ -22,7 +22,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.loader.app.LoaderManager.LoaderCallbacks; + +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.recyclerview.widget.RecyclerView; @@ -41,7 +42,7 @@ public class ArtistDetailAlbumAdapter extends RecyclerView.Adapter -implements LoaderCallbacks>, IPopupMenuCallback { +implements LoaderManager.LoaderCallbacks>, IPopupMenuCallback { private static final int TYPE_FIRST = 1; private static final int TYPE_MIDDLE = 2; private static final int TYPE_LAST = 3; @@ -146,4 +147,4 @@ public void onLoaderReset(Loader> loader) { notifyDataSetChanged(); mImageFetcher.flush(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java index 90c8273..6939dff 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java @@ -21,6 +21,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; + import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -73,4 +74,4 @@ protected void update(Song song) { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java index e6b3d64..4a03aa1 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java @@ -9,7 +9,8 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import androidx.loader.app.LoaderManager.LoaderCallbacks; + +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -25,8 +26,8 @@ import java.util.Collections; import java.util.List; -public abstract class DetailSongAdapter extends BaseAdapter - implements LoaderCallbacks>, OnItemClickListener, IPopupMenuCallback { +public abstract class DetailSongAdapter extends BaseAdapter implements + LoaderManager.LoaderCallbacks>, OnItemClickListener, IPopupMenuCallback { protected final Activity mActivity; private final ImageFetcher mImageFetcher; private final LayoutInflater mInflater; @@ -148,4 +149,4 @@ protected Holder(View root, ImageFetcher fetcher) { protected abstract void update(Song song); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java index 48d4dc8..d4e9092 100644 --- a/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java +++ b/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java @@ -17,6 +17,7 @@ import android.os.Bundle; import android.util.SparseArray; import android.view.ViewGroup; + import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; diff --git a/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java b/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java index 582f86e..07267d7 100644 --- a/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java +++ b/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java @@ -21,6 +21,7 @@ import android.graphics.drawable.TransitionDrawable; import android.util.Log; import android.widget.ImageView; + // Because of androidx.renderscript issue https://issuetracker.google.com/u/0/issues/119582492 // Using android.support.v8.Renderscript-Libraries instead of androidx.renderscript import android.support.v8.renderscript.Allocation; diff --git a/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java b/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java index 16d838d..4b534e7 100644 --- a/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java +++ b/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java @@ -23,6 +23,7 @@ import android.graphics.drawable.TransitionDrawable; import android.view.View; import android.widget.ImageView; + // Because of androidx.renderscript issue https://issuetracker.google.com/u/0/issues/119582492 // Using android.support.v8.Renderscript-Libraries instead of androidx.renderscript import android.support.v8.renderscript.RenderScript; diff --git a/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java b/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java index ea862fc..2722bc8 100644 --- a/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java +++ b/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java @@ -29,6 +29,7 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.RelativeLayout; + import androidx.core.content.ContextCompat; import org.lineageos.eleven.R; diff --git a/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java index 250fb98..b378b7a 100644 --- a/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java +++ b/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java @@ -2,6 +2,7 @@ package org.lineageos.eleven.loaders; import android.content.Context; + import androidx.loader.content.AsyncTaskLoader; /** diff --git a/app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java index 0922de2..e0737ed 100644 --- a/app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java +++ b/app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java @@ -18,6 +18,7 @@ import android.os.Build; import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import java.lang.reflect.Method; diff --git a/app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java index 7d92ea9..8213296 100644 --- a/app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java +++ b/app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java @@ -20,6 +20,7 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; + import androidx.annotation.VisibleForTesting; import org.lineageos.eleven.provider.PropertiesStore; diff --git a/app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java index f55d022..f128439 100644 --- a/app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java +++ b/app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java @@ -17,6 +17,7 @@ package org.lineageos.eleven.locale; import android.util.Log; + import androidx.annotation.VisibleForTesting; import java.util.ArrayList; diff --git a/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java b/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java index 3c4def1..25c960a 100644 --- a/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java +++ b/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java @@ -24,8 +24,9 @@ import android.view.WindowManager; import android.widget.Button; import android.widget.EditText; + import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.DialogFragment; import org.lineageos.eleven.R; import org.lineageos.eleven.utils.MusicUtils; @@ -35,7 +36,7 @@ * * @author Andrew Neal (andrewdneal@gmail.com) */ -public abstract class BasePlaylistDialog extends AppCompatDialogFragment { +public abstract class BasePlaylistDialog extends DialogFragment { /* The actual dialog */ protected AlertDialog mPlaylistDialog; diff --git a/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java b/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java index 44f7262..5069133 100644 --- a/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java +++ b/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java @@ -21,14 +21,15 @@ import android.content.DialogInterface.OnClickListener; import android.os.Bundle; import android.view.ViewGroup; + import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import org.lineageos.eleven.R; /** Dialog to confirm a non-reversible action */ -public class ConfirmDialog extends AppCompatDialogFragment { +public class ConfirmDialog extends DialogFragment { private static final String TITLE_ID = "titleId"; private static final String OK_ID = "okId"; @@ -74,4 +75,4 @@ public void onClick(final DialogInterface dialog, final int which) { dialog.getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); return dialog; } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java b/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java index 3587cb3..15cec6e 100644 --- a/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java +++ b/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java @@ -18,8 +18,9 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; + import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.DialogFragment; import org.lineageos.eleven.Config; import org.lineageos.eleven.R; @@ -34,7 +35,7 @@ * * @author Andrew Neal (andrewdneal@gmail.com) */ -public class DeleteDialog extends AppCompatDialogFragment { +public class DeleteDialog extends DialogFragment { public interface DeleteDialogCallback { public void onDelete(long[] id); diff --git a/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java index fcd81f4..dfec623 100644 --- a/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java +++ b/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java @@ -19,8 +19,9 @@ import android.os.Bundle; import android.widget.ArrayAdapter; import android.widget.ListAdapter; + import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.DialogFragment; import org.lineageos.eleven.Config; import org.lineageos.eleven.R; @@ -37,7 +38,7 @@ * * @author Andrew Neal (andrewdneal@gmail.com) */ -public class PhotoSelectionDialog extends AppCompatDialogFragment { +public class PhotoSelectionDialog extends DialogFragment { private static final int NEW_PHOTO = 0; diff --git a/app/src/main/java/org/lineageos/eleven/model/Playlist.java b/app/src/main/java/org/lineageos/eleven/model/Playlist.java index 72e4c35..a8507db 100644 --- a/app/src/main/java/org/lineageos/eleven/model/Playlist.java +++ b/app/src/main/java/org/lineageos/eleven/model/Playlist.java @@ -19,6 +19,7 @@ package org.lineageos.eleven.model; import android.text.TextUtils; + import androidx.annotation.NonNull; import java.util.Comparator; diff --git a/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java b/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java index 4f9b94b..8821263 100644 --- a/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java +++ b/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java @@ -16,9 +16,11 @@ import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; + import androidx.core.content.ContextCompat; import androidx.core.view.MotionEventCompat; import androidx.core.view.ViewCompat; + import org.lineageos.eleven.R; public class SlidingUpPanelLayout extends ViewGroup { diff --git a/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java b/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java index 7182a7b..36e628f 100644 --- a/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java +++ b/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java @@ -26,6 +26,7 @@ import android.view.ViewConfiguration; import android.view.ViewGroup; import android.view.animation.Interpolator; + import androidx.core.view.MotionEventCompat; import androidx.core.view.VelocityTrackerCompat; import androidx.core.view.ViewCompat; diff --git a/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java b/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java index 6ff250d..e46e611 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java +++ b/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java @@ -25,6 +25,7 @@ import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.TextView; + import androidx.fragment.app.Fragment; import org.lineageos.eleven.R; diff --git a/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java index fc05242..03475c9 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java +++ b/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java @@ -13,8 +13,6 @@ package org.lineageos.eleven.ui.activities; -import static org.lineageos.eleven.utils.MusicUtils.mService; - import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -34,6 +32,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; @@ -55,6 +54,8 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; +import static org.lineageos.eleven.utils.MusicUtils.mService; + /** * A base {@link AppCompatActivity} used to update the bottom bar and * bind to Eleven's service. diff --git a/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java index 5679db2..311cd0b 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java +++ b/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java @@ -32,6 +32,7 @@ import android.util.Log; import android.view.MenuItem; import android.view.Window; + import androidx.appcompat.app.AppCompatDelegate; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -129,6 +130,7 @@ private void init() { getSupportFragmentManager().addOnBackStackChangedListener(this); + // if we are resuming from a saved instance state if (mSavedInstanceState != null) { // track which fragments are loaded and if this is the top level activity diff --git a/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java index 60768af..fe4c44c 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java +++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java @@ -20,11 +20,9 @@ import android.content.ServiceConnection; import android.database.Cursor; import android.media.AudioManager; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; -import android.os.PowerManager; import android.provider.BaseColumns; import android.provider.MediaStore; import android.text.TextUtils; @@ -41,13 +39,13 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListView; + import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SearchView.OnQueryTextListener; -import androidx.core.content.ContextCompat; import androidx.core.view.MenuItemCompat; -import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -91,7 +89,7 @@ * @author Andrew Neal (andrewdneal@gmail.com) */ public class SearchActivity extends AppCompatActivity implements - LoaderCallbacks>, + LoaderManager.LoaderCallbacks>, OnScrollListener, OnQueryTextListener, OnItemClickListener, ServiceConnection, OnTouchListener { /** @@ -954,7 +952,7 @@ public ArrayAdapter loadInBackground() { /** * This handles the Loader callbacks for the search history */ - public class SearchHistoryCallback implements LoaderCallbacks> { + public class SearchHistoryCallback implements LoaderManager.LoaderCallbacks> { @Override public Loader> onCreateLoader(int i, Bundle bundle) { // prep the loader in case the query takes a long time diff --git a/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java index eff559e..f884642 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -35,12 +35,12 @@ * * @author Andrew Neal (andrewdneal@gmail.com) */ +@SuppressWarnings("deprecation") public class SettingsActivity extends AppCompatActivity implements OnSharedPreferenceChangeListener{ /** * {@inheritDoc} */ - @SuppressWarnings("deprecation") @Override protected void onCreate(final Bundle savedInstanceState) { getDelegate().installViewFactory(); @@ -111,7 +111,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, if (key.equals(PreferenceUtils.SHOW_VISUALIZER) && sharedPreferences.getBoolean(key, false) && !PreferenceUtils.canRecordAudio(this)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - PreferenceUtils.requestRecordAudio(this); + PreferenceUtils.requestRecordAudio(this); } } else if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) { MusicUtils.setShakeToPlayEnabled(sharedPreferences.getBoolean(key, false)); diff --git a/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java index 1d5f725..efa5b4a 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java +++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java @@ -17,6 +17,7 @@ import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; + import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java index 94fb735..f81aed8 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java @@ -20,7 +20,9 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; + import androidx.loader.app.LoaderManager; + import org.lineageos.eleven.Config; import org.lineageos.eleven.R; import org.lineageos.eleven.adapters.AlbumDetailSongAdapter; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java index 7ebcf6e..2601fb7 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java @@ -23,7 +23,8 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; -import androidx.loader.app.LoaderManager.LoaderCallbacks; + +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.MusicStateListener; @@ -51,7 +52,7 @@ * @author Andrew Neal (andrewdneal@gmail.com) */ public class AlbumFragment extends MusicBrowserFragment implements - LoaderCallbacks>, OnScrollListener, + LoaderManager.LoaderCallbacks>, OnScrollListener, OnItemClickListener, MusicStateListener { /** diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java index 0425a94..4f19620 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java @@ -23,9 +23,11 @@ import android.view.ViewTreeObserver; import android.widget.ImageView; import android.widget.ListView; + import androidx.loader.app.LoaderManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import org.lineageos.eleven.Config; import org.lineageos.eleven.R; import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java index c6183fb..ca5b144 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java @@ -24,8 +24,9 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; + import androidx.fragment.app.Fragment; -import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.MusicStateListener; @@ -55,7 +56,7 @@ * @author Andrew Neal (andrewdneal@gmail.com) */ public class ArtistFragment extends MusicBrowserFragment implements - LoaderCallbacks>, + LoaderManager.LoaderCallbacks>, OnScrollListener, OnItemClickListener, MusicStateListener { /** diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java index c70c8ad..be81e24 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java @@ -44,6 +44,7 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; + import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java index 6925b20..9b62e3d 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java @@ -21,6 +21,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.core.content.ContextCompat; + import androidx.fragment.app.Fragment; import org.lineageos.eleven.MusicStateListener; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java index 986c9e2..cf160dc 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java @@ -25,9 +25,10 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ImageView; import android.widget.TextView; + import androidx.loader.app.LoaderManager; -import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.Loader; + import org.lineageos.eleven.Config; import org.lineageos.eleven.R; import org.lineageos.eleven.adapters.PagerAdapter; @@ -55,7 +56,7 @@ import java.util.TreeSet; public class PlaylistDetailFragment extends FadingBarFragment implements - LoaderCallbacks>, OnItemClickListener, DropListener, + LoaderManager.LoaderCallbacks>, OnItemClickListener, DropListener, RemoveListener, DragScrollProfile, IChildFragment { /** diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java index 18bcf27..0d29bf6 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java @@ -25,9 +25,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.Config.SmartPlaylistType; @@ -56,7 +57,7 @@ * @author Andrew Neal (andrewdneal@gmail.com) */ public class PlaylistFragment extends MusicBrowserFragment implements - LoaderCallbacks>, + LoaderManager.LoaderCallbacks>, OnItemClickListener, MusicStateListener { /** @@ -108,7 +109,7 @@ public Playlist getPlaylist(int position) { @Override public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, - final Bundle savedInstanceState) { + final Bundle savedInstanceState) { // The View for the fragment's UI final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.list_base, container, false); // Initialize the list diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java index 8c8461d..0dc31ce 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java @@ -29,9 +29,10 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; + import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -66,7 +67,7 @@ * * @author Andrew Neal (andrewdneal@gmail.com) */ -public class QueueFragment extends Fragment implements LoaderCallbacks>, +public class QueueFragment extends Fragment implements LoaderManager.LoaderCallbacks>, OnItemClickListener, DropListener, RemoveListener, DragScrollProfile, ServiceConnection { /** diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java index 63a0d4a..0348bb9 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java @@ -18,6 +18,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.loader.content.Loader; import org.lineageos.eleven.Config; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java index 38ae0bf..d124dea 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java @@ -15,6 +15,7 @@ import android.content.Context; import android.os.Bundle; + import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java index 6985e35..a0fe835 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java @@ -1,24 +1,24 @@ /* -* Copyright (C) 2014 The CyanogenMod Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright (C) 2014 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.lineageos.eleven.ui.fragments.phone; import android.os.Bundle; + import androidx.fragment.app.Fragment; import androidx.loader.app.LoaderManager; -import androidx.loader.app.LoaderManager.LoaderCallbacks; /** * This class is used for fragments under the {@link MusicBrowserFragment} @@ -33,11 +33,13 @@ public LoaderManager getContainingLoaderManager() { return getParentFragment().getLoaderManager(); } - protected void initLoader(Bundle args, LoaderCallbacks callback) { + protected void initLoader(Bundle args, + LoaderManager.LoaderCallbacks callback) { getContainingLoaderManager().initLoader(getLoaderId(), args, callback); } - protected void restartLoader(Bundle args, LoaderCallbacks callback) { + protected void restartLoader(Bundle args, + LoaderManager.LoaderCallbacks callback) { getContainingLoaderManager().restartLoader(getLoaderId(), args, callback); } } diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java index 5026b4f..f476dc0 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java @@ -17,6 +17,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; + import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java index 60e998a..7bc327b 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java @@ -22,10 +22,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; + import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.loader.app.LoaderManager; -import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.Loader; import org.lineageos.eleven.Config; @@ -53,7 +53,8 @@ * @author Andrew Neal (andrewdneal@gmail.com) */ public abstract class BasicSongFragment extends Fragment implements - LoaderCallbacks>, OnItemClickListener, MusicStateListener { + LoaderManager.LoaderCallbacks>, + OnItemClickListener, MusicStateListener { /** * Fragment UI diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java index d2dc541..f2a97ff 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java @@ -17,6 +17,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.loader.content.Loader; import org.lineageos.eleven.Config; diff --git a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java index 3dedcf1..62f3cba 100644 --- a/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java +++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java @@ -19,6 +19,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.loader.content.Loader; import org.lineageos.eleven.Config; diff --git a/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java index 70cff8e..6774fbb 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java +++ b/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java @@ -17,8 +17,11 @@ import android.app.Activity; import android.provider.MediaStore; + import android.view.MenuItem; + import androidx.fragment.app.FragmentManager; + import org.lineageos.eleven.Config; import org.lineageos.eleven.cache.ImageFetcher; import org.lineageos.eleven.menu.DeleteDialog; diff --git a/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java index 7c0e542..e21eca0 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java +++ b/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java @@ -16,8 +16,11 @@ package org.lineageos.eleven.utils; import android.app.Activity; + import android.view.MenuItem; + import androidx.fragment.app.FragmentManager; + import org.lineageos.eleven.Config; import org.lineageos.eleven.menu.DeleteDialog; import org.lineageos.eleven.menu.FragmentMenuItems; @@ -82,4 +85,4 @@ PhotoSelectionDialog.ProfileType.ARTIST, getArtistName()) return handled; } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java b/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java index 5b44de3..76b799f 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java +++ b/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java @@ -18,6 +18,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.drawable.Drawable; + import androidx.annotation.DrawableRes; import androidx.appcompat.widget.AppCompatDrawableManager; diff --git a/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java b/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java index 01b6194..c5241a2 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java +++ b/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java @@ -19,6 +19,7 @@ import android.graphics.Color; import android.os.Looper; import android.util.LruCache; + import androidx.palette.graphics.Palette; public class BitmapWithColors { diff --git a/app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java b/app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java index 0a63213..be6ffbf 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java +++ b/app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java @@ -143,22 +143,27 @@ public static boolean isOnline(final Context context) { final ConnectivityManager connectivityManager = (ConnectivityManager)context .getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo(); - // Internet connection - if (activeNetwork != null) { - /* Wi-Fi connection */ - if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI) { + /* Wi-Fi connection */ + final NetworkInfo wifiNetwork = connectivityManager + .getNetworkInfo(ConnectivityManager.TYPE_WIFI); + if (wifiNetwork != null) { + state = wifiNetwork.isConnectedOrConnecting(); + } + + /* Mobile data connection */ + final NetworkInfo mbobileNetwork = connectivityManager + .getNetworkInfo(ConnectivityManager.TYPE_MOBILE); + if (mbobileNetwork != null) { + if (!onlyOnWifi) { + state = mbobileNetwork.isConnectedOrConnecting(); + } + } + + /* Other networks */ + final NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo(); + if (activeNetwork != null) { + if (!onlyOnWifi) { state = activeNetwork.isConnectedOrConnecting(); - /* Mobile data connection */ - } else if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE) { - if (!onlyOnWifi) { - state = activeNetwork.isConnectedOrConnecting(); - } - /* Other networks */ - } else { - if (!onlyOnWifi) { - state = activeNetwork.isConnectedOrConnecting(); - } } } diff --git a/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java b/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java index 9162870..f9896c1 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java +++ b/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java @@ -6,13 +6,13 @@ import android.provider.MediaStore; import android.view.View; import android.widget.TextView; + import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; -import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.CursorLoader; import androidx.loader.content.Loader; -public class GenreFetcher implements LoaderCallbacks { +public class GenreFetcher implements LoaderManager.LoaderCallbacks { private static final String[] GENRE_PROJECTION = new String[] { MediaStore.Audio.Genres.NAME }; private Context mContext; @@ -53,4 +53,4 @@ public void onLoadFinished(Loader loader, Cursor cursor) { @Override public void onLoaderReset(Loader loader) {} -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java b/app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java index bf38d5e..2c56d1d 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java +++ b/app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java @@ -45,6 +45,7 @@ import android.util.Log; import android.view.Menu; import android.widget.Toast; + import androidx.annotation.WorkerThread; import org.lineageos.eleven.Config.IdType; @@ -1250,7 +1251,7 @@ public static void addToQueue(final Context context, final long[] list, long sou try { mService.enqueue(list, MusicPlaybackService.LAST, sourceId, sourceType.mId); final String message = makeLabel(context, R.plurals.NNNtrackstoqueue, list.length); - Toast.makeText((Activity) context, message, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); } catch (final RemoteException exc) { Log.e(TAG, "addToQueue(...)", exc); } diff --git a/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java index bb37545..6334ec1 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java +++ b/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java @@ -22,6 +22,7 @@ import android.content.DialogInterface.OnClickListener; import android.net.Uri; import android.provider.MediaStore; + import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java index f8308e3..6de7c52 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java +++ b/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java @@ -24,6 +24,7 @@ import android.view.View; import android.text.Spannable; import android.text.SpannableString; + import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java b/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java index 8dce302..b5869ec 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java +++ b/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java @@ -22,6 +22,7 @@ import android.os.Build; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.preference.PreferenceManager; + import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; @@ -364,4 +365,4 @@ public boolean getShakeToPlay() { public boolean getShowAlbumArtOnLockscreen() { return mPreferences.getBoolean(SHOW_ALBUM_ART_ON_LOCKSCREEN, true); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java index cd3f9af..df0a546 100644 --- a/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java +++ b/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java @@ -15,8 +15,10 @@ */ package org.lineageos.eleven.utils; + import android.app.Activity; import android.provider.MediaStore; + import androidx.fragment.app.FragmentManager; import org.lineageos.eleven.menu.DeleteDialog; diff --git a/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java b/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java index e2ebd95..83cb249 100644 --- a/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java +++ b/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java @@ -14,8 +14,10 @@ * limitations under the License. */ package org.lineageos.eleven.widgets; + import android.content.Context; import android.util.AttributeSet; + import androidx.fragment.app.FragmentActivity; import org.lineageos.eleven.ui.activities.SlidingPanelActivity; @@ -30,4 +32,4 @@ public AudioActivityButton(Context context, AttributeSet attrs) { public void setActivity(FragmentActivity activity) { mActivity = (SlidingPanelActivity)activity; } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java b/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java index 54211e3..c44f0ad 100644 --- a/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java +++ b/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java @@ -29,6 +29,7 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.text.TextUtils; + import androidx.core.content.ContextCompat; import org.lineageos.eleven.R; diff --git a/app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java b/app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java index 24e8c0b..b1165b0 100644 --- a/app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java +++ b/app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java @@ -70,6 +70,7 @@ public void showLoading() { public void showNoResults() { mHandler.removeCallbacks(mShowLoadingRunnable); + findViewById(R.id.progressbar).setVisibility(View.INVISIBLE); getNoResultsContainer().setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java b/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java index 65b8e77..6a793c8 100644 --- a/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java +++ b/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java @@ -17,6 +17,7 @@ import android.content.Context; import android.util.AttributeSet; + import androidx.viewpager.widget.ViewPager; /** diff --git a/build.gradle b/build.gradle index 9ed16f9..8188cf2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.2' } }