Cease development

Fix search for some backends

README.md

@@ -1,4 +1,11 @@
 # Audinaut
+⚠ No longer maintained. 
+
+Although not a direct replacement, I've since moved onto syncing an Opus version
+of my entire library to my phone using [harmonize](https://github.com/nvllsvm/harmonize)
+and [Syncthing](https://syncthing.net/).
+
+--- 
 <img src="audinaut.png" align="left" width="200" hspace="10" vspace="10">
 
 A Subsonic client for Android.

app/build.gradle

@@ -2,23 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "net.nullsum.audinaut"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 202
         versionName '0.5.1'
         setProperty("archivesBaseName", "Audinaut $versionName")
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     lintOptions {
         checkReleaseBuilds false
         warning 'InvalidPackage'
@@ -31,16 +26,16 @@ android {
 
 dependencies {
     implementation 'com.esotericsoftware:kryo:4.0.2'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.github.hannesa2:AndroidSlidingUpPanel:4.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.github.hannesa2:AndroidSlidingUpPanel:4.4.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.media:media:1.1.0"
+    implementation "androidx.media:media:1.5.0"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.6.0'
     repositories {
         mavenCentral()
     }

app/src/main/AndroidManifest.xml

@@ -47,6 +47,7 @@
         android:icon="@drawable/launch"
         android:label="@string/common.appname"
         android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/LaunchScreen">
 
         <uses-library android:name="android.test.runner" />

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

@@ -65,10 +65,10 @@ public class QueryReceiverActivity extends AppCompatActivity {
             intent.putExtra(Constants.INTENT_EXTRA_VIEW_ALBUM, true);
             if (albumId.indexOf("ar-") == 0) {
                 intent.putExtra(Constants.INTENT_EXTRA_NAME_ARTIST, true);
-                albumId = albumId.replace("ar-", "");
+                albumId = albumId.replaceFirst("ar-", "");
             } else if (albumId.indexOf("so-") == 0) {
                 intent.putExtra(Constants.INTENT_EXTRA_SEARCH_SONG, name);
-                albumId = albumId.replace("so-", "");
+                albumId = albumId.replaceFirst("so-", "");
             }
             intent.putExtra(Constants.INTENT_EXTRA_NAME_ID, albumId);
             if (name != null) {

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

@@ -21,11 +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;
@@ -68,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;
 
@@ -85,7 +82,13 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
     private static ImageLoader IMAGE_LOADER;
 
     static {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
+        // If Android Pie or older, set night mode by system clock
+        if (Build.VERSION.SDK_INT<29) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
+        } else {
+            // Else, for Android 10+, follow system dark mode setting
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+        }
     }
 
     final List<SubsonicFragment> backStack = new ArrayList<>();
@@ -835,7 +838,6 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
             }
             Util.setActiveServer(this, instance);
             invalidate();
-            UserUtil.refreshCurrentUser(this);
             updateDrawerHeader();
         }
     }
@@ -863,7 +865,6 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
             service.setOnline(isOffline);
         }
 
-        UserUtil.seedCurrentUser(this);
         this.updateDrawerHeader();
         drawer.closeDrawers();
     }

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

@@ -37,8 +37,9 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.sothree.slidinguppanel.PanelSlideListener;
+import com.sothree.slidinguppanel.PanelState;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
-import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelState;
 
 import net.nullsum.audinaut.R;
 import net.nullsum.audinaut.domain.MusicDirectory;
@@ -56,7 +57,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;
@@ -69,7 +69,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
     private static boolean infoDialogDisplayed;
     private static boolean sessionInitialized = false;
     private SlidingUpPanelLayout slideUpPanel;
-    private SlidingUpPanelLayout.PanelSlideListener panelSlideListener;
+    private PanelSlideListener panelSlideListener;
     private boolean isPanelClosing = false;
     private boolean resuming = false;
     private NowPlayingFragment nowPlayingFragment;
@@ -168,7 +168,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
         }
 
         slideUpPanel = findViewById(R.id.slide_up_panel);
-        panelSlideListener = new SlidingUpPanelLayout.PanelSlideListener() {
+        panelSlideListener = new PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
                 Util.hideKeyboard(panel);
@@ -367,7 +367,6 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
             getIntent().removeExtra(Constants.INTENT_EXTRA_VIEW_ALBUM);
         }
 
-        UserUtil.seedCurrentUser(this);
         createAccount();
         runWhenServiceAvailable(() -> getDownloadService().addOnSongChangedListener(SubsonicFragmentActivity.this));
         resuming = false;
@@ -416,7 +415,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
             drawerToggle.setDrawerIndicatorEnabled(false);
         }
 
-        if (savedInstanceState.getInt(Constants.MAIN_SLIDE_PANEL_STATE, -1) == SlidingUpPanelLayout.PanelState.EXPANDED.hashCode()) {
+        if (savedInstanceState.getInt(Constants.MAIN_SLIDE_PANEL_STATE, -1) == PanelState.EXPANDED.hashCode()) {
             panelSlideListener.onPanelStateChanged(null, null, PanelState.EXPANDED);
         }
     }
@@ -535,12 +534,12 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 
     @Override
     public void openNowPlaying() {
-        slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED);
+        slideUpPanel.setPanelState(PanelState.EXPANDED);
     }
 
     @Override
     public void closeNowPlaying() {
-        slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+        slideUpPanel.setPanelState(PanelState.COLLAPSED);
         isPanelClosing = true;
     }
 
@@ -705,7 +704,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
             getImageLoader().loadImage(coverArtView, song, false, height, false);
 
             // We need to update it immediately since it won't update if updater is not running for it
-            if (nowPlayingFragment != null && slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
+            if (nowPlayingFragment != null && slideUpPanel.getPanelState() == PanelState.COLLAPSED) {
                 nowPlayingFragment.onMetadataUpdate(song, fieldChange);
             }
         }

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;

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;

app/src/main/java/net/nullsum/audinaut/provider/AudinautWidgetProvider.java

@@ -245,6 +245,10 @@ public class AudinautWidgetProvider extends AppWidgetProvider {
             views.setImageViewResource(R.id.control_play, R.drawable.widget_media_start);
         }
 
+        // Set next/back button images
+        views.setImageViewResource(R.id.control_next, R.drawable.widget_media_forward);
+        views.setImageViewResource(R.id.control_previous, R.drawable.widget_media_backward);
+
         // Set the cover art
         try {
             boolean large = false;

app/src/main/java/net/nullsum/audinaut/receiver/PlayActionReceiver.java

@@ -24,21 +24,30 @@ import net.nullsum.audinaut.service.DownloadService;
 import net.nullsum.audinaut.util.Constants;
 
 public class PlayActionReceiver extends BroadcastReceiver {
+    private Bundle lastdata = null;
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (lastdata.equals(intent.getBundleExtra(Constants.TASKER_EXTRA_BUNDLE))) {
+            // nothing has changed; we can safely return
+            return;
+        }
+        updateValues(intent);
         if (intent.hasExtra(Constants.TASKER_EXTRA_BUNDLE)) {
-            Bundle data = intent.getBundleExtra(Constants.TASKER_EXTRA_BUNDLE);
-            Boolean startShuffled = data.getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE);
+            Boolean startShuffled = lastdata.getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE);
 
             Intent start = new Intent(context, DownloadService.class);
             start.setAction(DownloadService.START_PLAY);
             start.putExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, startShuffled);
-            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR, data.getString(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR));
-            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR, data.getString(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR));
-            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, data.getString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE));
-            start.putExtra(Constants.PREFERENCES_KEY_OFFLINE, data.getInt(Constants.PREFERENCES_KEY_OFFLINE));
+            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR, lastdata.getString(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR));
+            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR, lastdata.getString(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR));
+            start.putExtra(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, lastdata.getString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE));
+            start.putExtra(Constants.PREFERENCES_KEY_OFFLINE, lastdata.getInt(Constants.PREFERENCES_KEY_OFFLINE));
             context.startService(start);
         }
     }
+
+    private void updateValues(Intent intent) {
+        lastdata = intent.getBundleExtra(Constants.TASKER_EXTRA_BUNDLE);
+    }
 }

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;
@@ -616,24 +615,6 @@ public class CachedMusicService implements MusicService {
         }
     }
 
-    @Override
-    public User getUser(boolean refresh, String username, Context context, ProgressListener progressListener) {
-        User result = null;
-
-        try {
-            result = musicService.getUser(refresh, username, context, progressListener);
-            FileUtil.serialize(context, result, getCacheName(context, "user-" + username));
-        } catch (Exception e) {
-            // Don't care
-        }
-
-        if (result == null && !refresh) {
-            result = FileUtil.deserialize(context, getCacheName(context, "user-" + username), User.class);
-        }
-
-        return result;
-    }
-
     @Override
     public void startScan(Context c) throws Exception {
         musicService.startScan(c);

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;
 
@@ -87,8 +86,6 @@ public interface MusicService {
 
     MusicDirectory getSongsByGenre(String genre, int count, int offset, Context context, ProgressListener progressListener) throws Exception;
 
-    User getUser(boolean refresh, String username, Context context, ProgressListener progressListener) throws Exception;
-
     void startScan(Context c) throws Exception;
 
     void setInstance(Integer instance) throws Exception;

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;
@@ -500,11 +498,6 @@ public class OfflineMusicService implements MusicService {
         return result;
     }
 
-    @Override
-    public User getUser(boolean refresh, String username, Context context, ProgressListener progressListener) throws Exception {
-        throw new OfflineException();
-    }
-
     @Override
     public void startScan(Context c) throws Exception {
         throw new OfflineException();

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;
@@ -656,29 +654,6 @@ public class RESTMusicService implements MusicService {
         }
     }
 
-    @Override
-    public User getUser(boolean refresh, String username, Context context, ProgressListener progressListener) throws Exception {
-        Map<String, String> parameters = new HashMap<>();
-
-        parameters.put("username", username);
-
-        String url = getRestUrl(context, "getUser", parameters);
-
-        Request request = new Request.Builder()
-                .url(url)
-                .build();
-
-        try (Response response = client.newCall(request).execute()) {
-            List<User> users = new UserParser(context, getInstance(context)).parse(response.body().byteStream());
-            if (users.size() > 0) {
-                // Should only have returned one anyways
-                return users.get(0);
-            } else {
-                return null;
-            }
-        }
-    }
-
     @Override
     public void startScan(Context context) throws Exception {
         String url = getRestUrl(context, "startScan", null);

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;

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;
@@ -77,18 +77,27 @@ public final class Notifications {
                 .setComponent(new ComponentName(context, DownloadService.class))
                 .putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_STOP));
         int[] compactActions = new int[]{0, 1, 2};
+
         MediaSessionCompat mediaSession = new MediaSessionCompat(context, "Audinaut");
+        MediaSessionCompat.Token mediaToken = mediaSession.getSessionToken();
         MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();
-        mediaSession.setMetadata(metadataBuilder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, -1).build());
+
+        mediaSession.setMetadata(metadataBuilder
+                .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, -1)
+                .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, getAlbumArt(context, song))
+                //.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, R.drawable.notification_logo)
+                .putString(MediaMetadataCompat.METADATA_KEY_TITLE, song.getTitle())
+                .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, song.getArtist())
+                .build() );
+
         MediaStyle mediaStyle = new MediaStyle()
                 .setShowActionsInCompactView(compactActions)
                 .setShowCancelButton(true)
                 .setCancelButtonIntent(PendingIntent.getService(context, 0, cancelIntent, 0))
-                .setMediaSession(mediaSession.getSessionToken());
+                .setMediaSession(mediaToken);
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_PLAYING_ID)
                 .setChannelId(CHANNEL_PLAYING_ID)
-                .setSmallIcon(R.drawable.stat_notify_playing)
                 .setContentTitle(song.getTitle())
                 .setContentText(song.getArtist())
                 .setSubText(song.getAlbum())
@@ -97,6 +106,7 @@ public final class Notifications {
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setShowWhen(false)
                 .setLargeIcon(getAlbumArt(context, song))
+                .setSmallIcon(R.drawable.notification_logo)
                 .setStyle(mediaStyle)
                 .setContentIntent(PendingIntent.getActivity(context, 0, notificationIntent, 0));
         addActions(context, builder, playing);

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

@@ -18,11 +18,9 @@ package net.nullsum.audinaut.util;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.util.Log;
+import android.os.Build;
 
 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";
@@ -33,7 +31,15 @@ public final class ThemeUtil {
 
     public static String getTheme(Context context) {
         SharedPreferences prefs = Util.getPreferences(context);
-        String theme = prefs.getString(Constants.PREFERENCES_KEY_THEME, null);
+        String theme;
+
+        if (Build.VERSION.SDK_INT<29) {
+            // If Android Pie or older, default to null (handled below as light)
+            theme = prefs.getString(Constants.PREFERENCES_KEY_THEME, null);
+        } else {
+            // Else, for Android 10+, default to follow system dark mode setting
+            theme = prefs.getString(Constants.PREFERENCES_KEY_THEME, THEME_DAY_NIGHT);
+        }
 
         if (THEME_DAY_NIGHT.equals(theme)) {
             int currentNightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

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

@@ -17,63 +17,8 @@ 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 final String TAG = UserUtil.class.getSimpleName();
-
-    private static int instance = -1;
-    private static int instanceHash = -1;
-    private static User currentUser;
-
-    public static void refreshCurrentUser(Context context) {
-        currentUser = null;
-        seedCurrentUser(context);
-    }
-
-    public static void seedCurrentUser(Context context) {
-        // Only try to seed if online
-        if (Util.isOffline(context)) {
-            currentUser = null;
-            return;
-        }
-
-        final int instance = Util.getActiveServer(context);
-        final int instanceHash = (instance == 0) ? 0 : Util.getRestUrl(context).hashCode();
-        if (UserUtil.instance == instance && UserUtil.instanceHash == instanceHash && currentUser != null) {
-            return;
-        } else {
-            UserUtil.instance = instance;
-            UserUtil.instanceHash = instanceHash;
-        }
-
-        new SilentBackgroundTask<Void>(context) {
-            @Override
-            protected Void doInBackground() throws Throwable {
-                currentUser = MusicServiceFactory.getMusicService(context).getUser(false, getCurrentUsername(context, instance), context, null);
-                return null;
-            }
-
-            @Override
-            protected void done(Void result) {
-                if (context instanceof AppCompatActivity) {
-                    ((AppCompatActivity) context).supportInvalidateOptionsMenu();
-                }
-            }
-
-            @Override
-            protected void error(Throwable error) {
-                // Don't do anything, supposed to be background pull
-                Log.e(TAG, "Failed to seed user information");
-            }
-        }.execute();
-    }
-
     private static String getCurrentUsername(Context context, int instance) {
         SharedPreferences prefs = Util.getPreferences(context);
         return prefs.getString(Constants.PREFERENCES_KEY_USERNAME + instance, null);

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

@@ -41,12 +41,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 +71,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;
@@ -1156,7 +1152,7 @@ public final class Util {
     }
 
     public static void hideKeyboard(View view) {
-        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(AppCompatActivity.INPUT_METHOD_SERVICE);
 
         imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }

app/src/main/res/drawable-v21/notification_divider.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<size android:width="1dip" />
-	<solid android:color="@android:color/darker_gray" />
-</shape>

app/src/main/res/drawable-v21/notification_media_fastforward.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/lightElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>

app/src/main/res/drawable-v21/notification_media_rewind.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/lightElement" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>

app/src/main/res/drawable/actionbar_download.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_backward.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_fastforward.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_forward.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_pause.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_rewind.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_start.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M8,5v14l11,-7z"/>
-</vector>

app/src/main/res/drawable/actionbar_media_stop.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,6h12v12H6z"/>
-</vector>

app/src/main/res/drawable/actionbar_radio.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" 
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
-</vector>

app/src/main/res/drawable/actionbar_shuffle.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
-</vector>

app/src/main/res/drawable/card_rounded_corners_black.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/background_material_dark" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>

app/src/main/res/drawable/card_rounded_corners_dark.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/black" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>

app/src/main/res/drawable/card_rounded_corners_light.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>

app/src/main/res/drawable/ic_action_bookmark.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>

app/src/main/res/drawable/ic_action_playback_speed.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
-</vector>

app/src/main/res/drawable/ic_action_rating_bad.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
-</vector>

app/src/main/res/drawable/ic_action_rating_bad_selected.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
-</vector>

app/src/main/res/drawable/ic_action_rating_good.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
-</vector>

app/src/main/res/drawable/ic_action_rating_good_selected.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
-</vector>

app/src/main/res/drawable/ic_action_song.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>

app/src/main/res/drawable/ic_menu_admin.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z"/>
-</vector>

app/src/main/res/drawable/ic_menu_bookmark.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>

app/src/main/res/drawable/ic_menu_bookmark_selected.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>

app/src/main/res/drawable/ic_menu_chat.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
-</vector>

app/src/main/res/drawable/ic_menu_chat_send.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>

app/src/main/res/drawable/ic_menu_podcast.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
-</vector>

app/src/main/res/drawable/ic_menu_radio.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" 
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
-</vector>

app/src/main/res/drawable/ic_menu_share.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>

app/src/main/res/drawable/ic_social_person.xml

@@ -1,5 +0,0 @@
-<vector android:height="126dp" android:tint="@color/lightPrimary"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="126dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

app/src/main/res/drawable/ic_toggle_played.xml

@@ -1,5 +0,0 @@
-<vector android:alpha="0.5" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>

app/src/main/res/drawable/ic_toggle_star.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>

app/src/main/res/drawable/ic_toggle_star_outline.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>

app/src/main/res/drawable/ic_toggle_star_outline_dark.xml

@@ -1,5 +0,0 @@
-<vector android:alpha="0.8" android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>

app/src/main/res/drawable/ic_toggle_star_outline_light.xml

@@ -1,5 +0,0 @@
-<vector android:alpha="0.5" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>

app/src/main/res/drawable/notification_logo.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="166.67238dp"
+    android:height="166.67238dp"
+    android:viewportWidth="590.5714"
+    android:viewportHeight="590.5714">
+  <path
+      android:pathData="M206.005,279.058L168.45,348.748C184.87,406.824 193.208,407.309 212.776,486.676C214.12,458.428 238.971,423.03 261.053,402.367C267.354,435.872 255.68,377.04 293.141,513.627C332.1,391.999 316.533,500.618 337.637,405.064C348.539,371.558 363.777,427.159 376.932,476.217C452.166,375.314 412.799,348.86 433.271,294.932L371.724,290.632C392.73,306.667 408.833,320.407 409.993,322.306C377.679,324.685 415.733,456.748 356.878,338.121C335.655,295.343 295.371,348.196 299.665,415.388C297.95,376.901 250.874,314.022 240.121,357.059C228.277,404.462 217.057,313.826 200.801,314.747C200.801,314.747 210.188,298.25 223.167,280.258L206.005,279.058z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.06667"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M299.698,57.766C203.66,58.469 106.33,194.128 115.327,470.79C173.525,604.547 148.628,384.605 194.797,317.036C217.046,284.475 360.513,287.543 378.398,310.373C453.87,406.714 408.23,613.071 475.558,467.012C493.324,197.684 398.733,59.207 301.967,57.773C301.211,57.762 300.454,57.761 299.698,57.766zM300.304,107.547C338.677,107.626 377.044,151.72 392.763,245.132C283.141,223.071 277.21,231.481 206.389,242.036C221.118,154.237 260.713,107.465 300.304,107.547z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="4.26667"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+</vector>

app/src/main/res/drawable/stat_notify_playing.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
-</vector>

app/src/main/res/drawable/stat_notify_sync.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
-</vector>

app/src/main/res/drawable/widget_media_fastforward.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>

app/src/main/res/layout/notification.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="64.0dip"
-        android:layout_height="64.0dip"
-        android:layout_weight="0.0"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingLeft="11.0dip">
-
-        <TextView
-            android:id="@+id/notification_title"
-            style="@style/NotificationText.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:singleLine="true" />
-
-        <TextView
-            android:id="@+id/notification_artist"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:scrollHorizontally="true" />
-
-        <TextView
-            android:id="@+id/notification_album"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/control_previous"
-        style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_media_backward" />
-
-    <ImageButton
-        android:id="@+id/control_pause"
-        style="@style/NotificationButton"
-        android:layout_width="54dip"
-        android:padding="0dip"
-        app:srcCompat="@drawable/notification_media_pause" />
-
-    <ImageButton
-        android:id="@+id/control_next"
-        style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_media_forward" />
-</LinearLayout>

app/src/main/res/layout/notification_expanded.xml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="128dp"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:paddingLeft="11.0dip">
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/notification_title"
-                style="@style/NotificationText.Title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left|center_vertical"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:singleLine="true" />
-
-            <ImageButton
-                android:id="@+id/notification_close"
-                style="@style/NotificationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                app:srcCompat="@drawable/notification_close"
-                android:visibility="invisible" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/notification_artist"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:scrollHorizontally="true" />
-
-        <TextView
-            android:id="@+id/notification_album"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingBottom="10dp"
-            android:scrollHorizontally="true" />
-
-        <ImageView
-            style="@style/NotificationDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="1dp" />
-
-        <LinearLayout
-            style="@style/NotificationLayoutDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:showDividers="middle">
-
-            <ImageButton
-                android:id="@+id/control_previous"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_backward" />
-
-            <ImageButton
-                android:id="@+id/control_pause"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_pause" />
-
-            <ImageButton
-                android:id="@+id/control_next"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_forward" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/values/colors.xml

@@ -11,5 +11,4 @@
     <color name="black">#000000</color>
     <color name="darkElement">#CCFFFFFF</color>
 
-    <color name="nowPlayingShadow">#44000000</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -95,7 +95,6 @@
     <string name="download.playerstate_downloading">Downloading - %s</string>
     <string name="download.playerstate_mobile_disabled">Waiting for WiFi network to download</string>
     <string name="download.playerstate_buffering">Buffering</string>
-    <string name="download.playerstate_playing_shuffle">Shuffle mode</string>
     <string name="download.menu_show_album">Show Album</string>
     <string name="download.menu_remove_all">Remove all</string>
     <string name="download.menu_shuffle">Shuffle</string>
@@ -162,8 +161,8 @@
     <string name="settings.theme_light">Light</string>
     <string name="settings.theme_dark">Dark</string>
     <string name="settings.theme_black">Black</string>
-    <string name="settings.theme_day_night">Day/Night</string>
-    <string name="settings.theme_day_black_night">Day/Black Night</string>
+    <string name="settings.theme_day_night">Dynamic (Light/Dark)</string>
+    <string name="settings.theme_day_black_night">Dynamic (Light/Black)</string>
     <string name="settings.theme_fullscreen">Fullscreen</string>
     <string name="settings.theme_fullscreen_summary">Hide as many UI elements as Android will allow</string>
     <string name="settings.track_title">Display Track #</string>

app/src/main/res/values/styles.xml

@@ -19,32 +19,6 @@
         <item name="background">?attr/selectableItemBackgroundBorderless</item>
     </style>
 
-    <style name="NotificationButton.ExpandedBase">
-        <item name="android:padding">2dip</item>
-        <item name="background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:scaleType">fitCenter</item>
-    </style>
-
-    <style name="NotificationButton.Expanded" parent="@style/NotificationButton.ExpandedBase">
-        <item name="android:padding">10dip</item>
-    </style>
-
-    <style name="NotificationText.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
-
-    <style name="NotificationText.Content" parent="@android:style/TextAppearance.Material.Notification" />
-
-    <style name="NotificationLayoutDivider">
-        <item name="divider">@drawable/notification_divider</item>
-    </style>
-
-    <style name="NotificationDivider">
-        <item name="background">@drawable/notification_divider</item>
-    </style>
-
     <style name="MoreButton" parent="@style/BasicButton">
         <item name="android:paddingRight">2dp</item>
     </style>

app/src/main/res/values/themes.xml

@@ -147,10 +147,6 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="DarkSpinnerItem" parent="Widget.AppCompat.TextView.SpinnerItem">
-        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
-    </style>
-
     <style name="LightActionMode" parent="@style/Widget.AppCompat.ActionMode">
         <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
         <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <!-- Trust preinstalled CAs -->
+            <certificates src="system"/>
+
+            <!-- Additionally trust user added CAs -->
+            <certificates src="user"/>
+        </trust-anchors>
+    </base-config>
+</network-security-config>

app/src/main/res/xml/settings_appearance.xml

@@ -3,7 +3,6 @@
     android:title="@string/settings.appearance_title">
 
     <ListPreference
-        android:defaultValue="light"
         android:entries="@array/themeNames"
         android:entryValues="@array/themeValues"
         android:key="theme"

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 13 11:19:05 EDT 2020
+#Sun Nov 01 18:55:24 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip