Moved to lineage-17.0 branch

.classpath

@@ -7,7 +7,7 @@
 	<classpathentry kind="con" path="org.eclipse.andmore.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.andmore.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.andmore.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="/home/didi/Android/Sdk/build-tools/28.0.3/renderscript/lib/renderscript-v8.jar"/>
 	<classpathentry kind="lib" path="libs/guava-24.1-jre.jar"/>
+	<classpathentry kind="lib" path="/home/didi/Android/Sdk/build-tools/29.0.2/renderscript/lib/renderscript-v8.jar"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

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
 

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"

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;
 

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;

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;

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));
         }
     }
-}
+}

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;

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<ArtistDetailAlbumAdapter.ViewHolder>
-implements LoaderCallbacks<List<Album>>, IPopupMenuCallback {
+implements LoaderManager.LoaderCallbacks<List<Album>>, 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<List<Album>> loader) {
         notifyDataSetChanged();
         mImageFetcher.flush();
     }
-}
+}

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) {
             }
         }
     }
-}
+}

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<List<Song>>, OnItemClickListener, IPopupMenuCallback {
+public abstract class DetailSongAdapter extends BaseAdapter implements
+        LoaderManager.LoaderCallbacks<List<Song>>, 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);
     }
-}
+}

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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 ([email protected])
  */
-public abstract class BasePlaylistDialog extends AppCompatDialogFragment {
+public abstract class BasePlaylistDialog extends DialogFragment {
 
     /* The actual dialog */
     protected AlertDialog mPlaylistDialog;

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;
     }
-}
+}

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 ([email protected])
  */
-public class DeleteDialog extends AppCompatDialogFragment {
+public class DeleteDialog extends DialogFragment {
 
     public interface DeleteDialogCallback {
         public void onDelete(long[] id);

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 ([email protected])
  */
-public class PhotoSelectionDialog extends AppCompatDialogFragment {
+public class PhotoSelectionDialog extends DialogFragment {
 
     private static final int NEW_PHOTO = 0;
 

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;

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 {

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;

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;

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.

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