diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 597e318f..1ee61abb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Phonograph.Light"
tools:ignore="UnusedAttribute">
+
@@ -94,6 +95,31 @@
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/kabouzeid/gramophone/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java
index bf8d228e..9937185f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/App.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/App.java
@@ -25,7 +25,7 @@ public class App extends Application {
.build();
Fabric.with(this, crashlyticsKit);
- //Set up dynamic shortcuts
+ // Set up dynamic shortcuts
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
new DynamicShortcutManager(this).initDynamicShortcuts();
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java
index 6984edf7..a01488b2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java
@@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.util.Util;
/**
* @author Adrian Campos
*/
-
@RequiresApi(Build.VERSION_CODES.N_MR1)
public final class AppShortcutIconGenerator {
public static Icon generateThemedIcon(Context context, int iconId) {
@@ -30,7 +29,7 @@ public final class AppShortcutIconGenerator {
}
private static Icon generateDefaultThemedIcon(Context context, int iconId) {
- //Return an Icon of iconId with default colors
+ // Return an Icon of iconId with default colors
return generateThemedIcon(context, iconId,
context.getColor(R.color.app_shortcut_default_foreground),
context.getColor(R.color.app_shortcut_default_background)
@@ -38,11 +37,11 @@ public final class AppShortcutIconGenerator {
}
private static Icon generateUserThemedIcon(Context context, int iconId) {
- //Get background color from context's theme
+ // Get background color from context's theme
final TypedValue typedColorBackground = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.colorBackground, typedColorBackground, true);
- //Return an Icon of iconId with those colors
+ // Return an Icon of iconId with those colors
return generateThemedIcon(context, iconId,
ThemeStore.primaryColor(context),
typedColorBackground.data
@@ -50,14 +49,14 @@ public final class AppShortcutIconGenerator {
}
private static Icon generateThemedIcon(Context context, int iconId, int foregroundColor, int backgroundColor) {
- //Get and tint foreground and background drawables
+ // Get and tint foreground and background drawables
Drawable vectorDrawable = Util.getTintedVectorDrawable(context, iconId, foregroundColor);
Drawable backgroundDrawable = Util.getTintedVectorDrawable(context, R.drawable.ic_app_shortcut_background, backgroundColor);
- //Squash the two drawables together
+ // Squash the two drawables together
LayerDrawable layerDrawable = new LayerDrawable(new Drawable[]{backgroundDrawable, vectorDrawable});
- //Return as an Icon
+ // Return as an Icon
return Icon.createWithBitmap(drawableToBitmap(layerDrawable));
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java
index 03bbdb79..b2beae9c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java
@@ -31,7 +31,7 @@ public class AppShortcutLauncherActivity extends Activity {
int shortcutType = SHORTCUT_TYPE_NONE;
- //Set shortcutType from the intent extras
+ // Set shortcutType from the intent extras
Bundle extras = getIntent().getExtras();
if (extras != null) {
//noinspection WrongConstant
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java
index 53733d9f..c260261f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java
@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ShortcutInfo;
+import android.os.Build;
import android.os.Bundle;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
@@ -11,8 +12,7 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos
*/
-
-@TargetApi(25)
+@TargetApi(Build.VERSION_CODES.N_MR1)
public abstract class BaseShortcutType {
static final String ID_PREFIX = "com.kabouzeid.gramophone.appshortcuts.id.";
@@ -23,13 +23,11 @@ public abstract class BaseShortcutType {
this.context = context;
}
-
- abstract ShortcutInfo getShortcutInfo();
-
static public String getId() {
return ID_PREFIX + "invalid";
}
+ abstract ShortcutInfo getShortcutInfo();
/**
* Creates an Intent that will launch MainActivtiy and immediately play {@param songs} in either shuffle or normal mode
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
index 77182f1e..7b764939 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.pm.ShortcutInfo;
+import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
@@ -11,13 +12,16 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos
*/
-
-@TargetApi(25)
+@TargetApi(Build.VERSION_CODES.N_MR1)
public final class LastAddedShortcutType extends BaseShortcutType {
public LastAddedShortcutType(Context context) {
super(context);
}
+ public static String getId() {
+ return ID_PREFIX + "last_added";
+ }
+
public ShortcutInfo getShortcutInfo() {
return new ShortcutInfo.Builder(context, getId())
.setShortLabel(context.getString(R.string.app_shortcut_last_added_short))
@@ -26,8 +30,4 @@ public final class LastAddedShortcutType extends BaseShortcutType {
.setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_LAST_ADDED))
.build();
}
-
- public static String getId(){
- return ID_PREFIX + "last_added";
- }
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
index dd952d16..bd90d577 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.pm.ShortcutInfo;
+import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
@@ -11,13 +12,16 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos
*/
-
-@TargetApi(25)
+@TargetApi(Build.VERSION_CODES.N_MR1)
public final class ShuffleAllShortcutType extends BaseShortcutType {
public ShuffleAllShortcutType(Context context) {
super(context);
}
+ public static String getId() {
+ return ID_PREFIX + "shuffle_all";
+ }
+
public ShortcutInfo getShortcutInfo() {
return new ShortcutInfo.Builder(context, getId())
.setShortLabel(context.getString(R.string.app_shortcut_shuffle_all_short))
@@ -26,8 +30,4 @@ public final class ShuffleAllShortcutType extends BaseShortcutType {
.setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SHUFFLE_ALL))
.build();
}
-
- public static String getId() {
- return ID_PREFIX + "shuffle_all";
- }
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
index ef82f306..068700ce 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.pm.ShortcutInfo;
+import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
@@ -11,13 +12,16 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos
*/
-
-@TargetApi(25)
+@TargetApi(Build.VERSION_CODES.N_MR1)
public final class TopTracksShortcutType extends BaseShortcutType {
public TopTracksShortcutType(Context context) {
super(context);
}
+ public static String getId() {
+ return ID_PREFIX + "top_tracks";
+ }
+
public ShortcutInfo getShortcutInfo() {
return new ShortcutInfo.Builder(context, getId())
.setShortLabel(context.getString(R.string.app_shortcut_top_tracks_short))
@@ -26,8 +30,4 @@ public final class TopTracksShortcutType extends BaseShortcutType {
.setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_TOP_TRACKS))
.build();
}
-
- public static String getId() {
- return ID_PREFIX + "top_tracks";
- }
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java
index 562132b5..7445cb47 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java
@@ -32,6 +32,7 @@ public class AppWidgetBig extends BaseAppWidget {
public static final String NAME = "app_widget_big";
private static AppWidgetBig mInstance;
+ private Target target; // for cancellation
public static synchronized AppWidgetBig getInstance() {
if (mInstance == null) {
@@ -125,14 +126,14 @@ public class AppWidgetBig extends BaseAppWidget {
int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getPrimaryTextColor(service, false)), 1f));
- // set prev/next button drawables
+ // Set prev/next button drawables
appWidgetView.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, false)), 1f));
appWidgetView.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, false)), 1f));
// Link actions buttons to intents
linkButtons(service, appWidgetView);
- // load the album cover async and push the update on completion
+ // Load the album cover async and push the update on completion
Point p = Util.getScreenSize(service);
final int widgetImageSize = Math.min(p.x, p.y);
final Context appContext = service.getApplicationContext();
@@ -171,8 +172,6 @@ public class AppWidgetBig extends BaseAppWidget {
});
}
- private Target target; // for cancellation
-
/**
* Link up various button actions using {@link PendingIntent}.
*/
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
index 0a75e38a..bdbc01f0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
@@ -31,6 +31,7 @@ public class AppWidgetClassic extends BaseAppWidget {
public static final String NAME = "app_widget_classic";
private static AppWidgetClassic mInstance;
+ private Target target; // for cancellation
public static synchronized AppWidgetClassic getInstance() {
if (mInstance == null) {
@@ -124,14 +125,14 @@ public class AppWidgetClassic extends BaseAppWidget {
int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
- // set prev/next button drawables
+ // Set prev/next button drawables
appWidgetView.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
appWidgetView.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
// Link actions buttons to intents
linkButtons(service, appWidgetView);
- // load the album cover async and push the update on completion
+ // Load the album cover async and push the update on completion
final Context appContext = service.getApplicationContext();
final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_classic_image_size);
service.runOnUiThread(new Runnable() {
@@ -169,8 +170,6 @@ public class AppWidgetClassic extends BaseAppWidget {
});
}
- private Target target; // for cancellation
-
/**
* Link up various button actions using {@link PendingIntent}.
*/
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
index 78f3a6e6..de54ac0b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
@@ -31,6 +31,7 @@ public class AppWidgetSmall extends BaseAppWidget {
public static final String NAME = "app_widget_small";
private static AppWidgetSmall mInstance;
+ private Target target; // for cancellation
public static synchronized AppWidgetSmall getInstance() {
if (mInstance == null) {
@@ -130,14 +131,14 @@ public class AppWidgetSmall extends BaseAppWidget {
int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
- // set prev/next button drawables
+ // Set prev/next button drawables
appWidgetView.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
appWidgetView.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, false)), 1f));
// Link actions buttons to intents
linkButtons(service, appWidgetView);
- // load the album cover async and push the update on completion
+ // Load the album cover async and push the update on completion
final Context appContext = service.getApplicationContext();
final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_small_image_size);
service.runOnUiThread(new Runnable() {
@@ -175,8 +176,6 @@ public class AppWidgetSmall extends BaseAppWidget {
});
}
- private Target target; // for cancellation
-
/**
* Link up various button actions using {@link PendingIntent}.
*/
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BaseAppWidget.java b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BaseAppWidget.java
index c44f0bf6..1ba0e4b9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BaseAppWidget.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BaseAppWidget.java
@@ -14,12 +14,6 @@ import android.graphics.drawable.Drawable;
*/
public class BaseAppWidget extends AppWidgetProvider {
- protected PendingIntent buildPendingIntent(Context context, final String action, final ComponentName serviceName) {
- Intent intent = new Intent(action);
- intent.setComponent(serviceName);
- return PendingIntent.getService(context, 0, intent, 0);
- }
-
protected static Bitmap createBitmap(Drawable drawable, float sizeMultiplier) {
Bitmap bitmap = Bitmap.createBitmap((int) (drawable.getIntrinsicWidth() * sizeMultiplier), (int) (drawable.getIntrinsicHeight() * sizeMultiplier), Bitmap.Config.ARGB_8888);
Canvas c = new Canvas(bitmap);
@@ -27,4 +21,10 @@ public class BaseAppWidget extends AppWidgetProvider {
drawable.draw(c);
return bitmap;
}
+
+ protected PendingIntent buildPendingIntent(Context context, final String action, final ComponentName serviceName) {
+ Intent intent = new Intent(action);
+ intent.setComponent(serviceName);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java
index 679d1f99..fda8216c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java
@@ -1,35 +1,31 @@
package com.kabouzeid.gramophone.misc;
import android.annotation.TargetApi;
+import android.os.Build;
import android.transition.Transition;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
-@TargetApi(21)
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public abstract class SimpleTransitionListener implements Transition.TransitionListener {
@Override
public void onTransitionStart(Transition transition) {
-
}
@Override
public void onTransitionEnd(Transition transition) {
-
}
@Override
public void onTransitionCancel(Transition transition) {
-
}
@Override
public void onTransitionPause(Transition transition) {
-
}
@Override
public void onTransitionResume(Transition transition) {
-
}
}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
index 02958ef2..9009632a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
@@ -7,7 +7,6 @@ import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.loader.LastAddedLoader;
import com.kabouzeid.gramophone.model.Song;
-import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
index eb38fcae..f94a395e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
@@ -69,7 +69,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
LinearLayout addToGooglePlusCircles;
@BindView(R.id.follow_on_twitter)
LinearLayout followOnTwitter;
- @BindView(R.id.fork_on_git_hub)
+ @BindView(R.id.fork_on_github)
LinearLayout forkOnGitHub;
@BindView(R.id.visit_website)
LinearLayout visitWebsite;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
index c8ae4186..0837e08d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -9,8 +9,8 @@ import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.album.AlbumAdapter;
-import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtil;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
index 7b39f14d..b4dbc956 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -9,8 +9,8 @@ import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.artist.ArtistAdapter;
-import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.util.PreferenceUtil;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
index 0927f3f4..359b956b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java
@@ -9,8 +9,8 @@ import android.support.v7.widget.LinearLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.PlaylistAdapter;
-import com.kabouzeid.gramophone.loader.PlaylistLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.loader.PlaylistLoader;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.smartplaylist.HistoryPlaylist;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 1b57fc9a..0b9e3023 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -10,8 +10,8 @@ import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.song.ShuffleButtonSongAdapter;
import com.kabouzeid.gramophone.adapter.song.SongAdapter;
-import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtil;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java
index 136f686f..0cd4751a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/CalendarUtil.java
@@ -4,7 +4,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
/**
- * @author Karim Abou Zeid (kabouzeid)
+ * @author Eugene Cheung (arkon)
*/
public class CalendarUtil {
private static final long MS_PER_MINUTE = 60 * 1000;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
index b71c550b..531ccda9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
@@ -49,7 +49,7 @@ public class Util {
return size;
}
- @TargetApi(19)
+ @TargetApi(Build.VERSION_CODES.KITKAT)
public static void setStatusBarTranslucent(@NonNull Window window) {
window.setFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
diff --git a/app/src/main/res/drawable-v21/rect_selector.xml b/app/src/main/res/drawable-v21/rect_selector.xml
index f12d9ce1..08954384 100644
--- a/app/src/main/res/drawable-v21/rect_selector.xml
+++ b/app/src/main/res/drawable-v21/rect_selector.xml
@@ -7,8 +7,8 @@
-
diff --git a/app/src/main/res/drawable-v21/rect_selector_dark.xml b/app/src/main/res/drawable-v21/rect_selector_dark.xml
index bc94abd5..f76d5d15 100644
--- a/app/src/main/res/drawable-v21/rect_selector_dark.xml
+++ b/app/src/main/res/drawable-v21/rect_selector_dark.xml
@@ -1,5 +1,5 @@
+ android:color="@color/ripple_material_dark">
-
diff --git a/app/src/main/res/drawable-v21/round_selector_mask.xml b/app/src/main/res/drawable-v21/round_selector_mask.xml
index 04c6208f..a6f3dfaa 100644
--- a/app/src/main/res/drawable-v21/round_selector_mask.xml
+++ b/app/src/main/res/drawable-v21/round_selector_mask.xml
@@ -1,5 +1,5 @@
+ android:shape="oval">
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
index be0c17aa..f8b46989 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_access_time_white_24dp.xml b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
index cc55531c..eff2d327 100644
--- a/app/src/main/res/drawable/ic_access_time_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml b/app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml
index 1b87ba3f..61e5d911 100644
--- a/app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
index 7ec7f093..fa10a8fa 100644
--- a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
index ae908f44..7775f342 100644
--- a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
index f7da14ba..ad25117e 100644
--- a/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
index c63eeb59..fd67dab5 100644
--- a/app/src/main/res/drawable/ic_close_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml b/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
index 03f39dd9..47850a05 100644
--- a/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_comment_text_outline_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
index 1014e3d9..1decb44f 100644
--- a/app/src/main/res/drawable/ic_delete_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_description_white_24dp.xml b/app/src/main/res/drawable/ic_description_white_24dp.xml
index 6f55b8de..19b33df0 100644
--- a/app/src/main/res/drawable/ic_description_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_description_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_email_white_24dp.xml b/app/src/main/res/drawable/ic_email_white_24dp.xml
index 86700b9c..7827ffbc 100644
--- a/app/src/main/res/drawable/ic_email_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_email_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_expand_less_white_24dp.xml b/app/src/main/res/drawable/ic_expand_less_white_24dp.xml
index 2648fbba..04ec6dd5 100644
--- a/app/src/main/res/drawable/ic_expand_less_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_expand_less_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
index fd124161..7e5e0ac1 100644
--- a/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
index 48dfa57b..a5db7a2d 100644
--- a/app/src/main/res/drawable/ic_favorite_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_file_music_white_24dp.xml b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
index 96594671..4d018bdf 100644
--- a/app/src/main/res/drawable/ic_file_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_flag_white_24dp.xml b/app/src/main/res/drawable/ic_flag_white_24dp.xml
index 0a6acfb6..0a211ea1 100644
--- a/app/src/main/res/drawable/ic_flag_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_flag_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_folder_white_24dp.xml b/app/src/main/res/drawable/ic_folder_white_24dp.xml
index cbccbd4b..a410a795 100644
--- a/app/src/main/res/drawable/ic_folder_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_folder_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
index e236be14..b2446883 100644
--- a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml b/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
index 77db0fcb..58ee29f9 100644
--- a/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_google_plus_white_24dp.xml b/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
index 2d3f0c6d..6c2c66b0 100644
--- a/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_help_white_24dp.xml b/app/src/main/res/drawable/ic_help_white_24dp.xml
index 04c1c00f..26e7d0db 100644
--- a/app/src/main/res/drawable/ic_help_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
index a6ad5d39..9893be24 100644
--- a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_insert_drive_file_white_24dp.xml b/app/src/main/res/drawable/ic_insert_drive_file_white_24dp.xml
index 0a8dd41e..dd78df45 100644
--- a/app/src/main/res/drawable/ic_insert_drive_file_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_insert_drive_file_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml
index 0793e1d3..4ef25e3f 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_library_add_white_24dp.xml b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
index be44d76c..23a1d967 100644
--- a/app/src/main/res/drawable/ic_library_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_library_music_white_24dp.xml b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
index e040bd52..bc20fd65 100644
--- a/app/src/main/res/drawable/ic_library_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml
index c47718d9..fcfdec1d 100644
--- a/app/src/main/res/drawable/ic_menu_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
index 61e8792a..c42c1dcd 100644
--- a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_music_note_white_24dp.xml b/app/src/main/res/drawable/ic_music_note_white_24dp.xml
index 645f5822..3a3652b3 100644
--- a/app/src/main/res/drawable/ic_music_note_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_music_note_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
index 7a90c802..7671bbbc 100644
--- a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml
index 193030b1..660fbd6b 100644
--- a/app/src/main/res/drawable/ic_pause_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_person_white_24dp.xml b/app/src/main/res/drawable/ic_person_white_24dp.xml
index 4726b88c..1bfe6f2b 100644
--- a/app/src/main/res/drawable/ic_person_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
index 4250d72c..69301a3c 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
index d2ce69e9..1b3f8ba5 100644
--- a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
index 39f63a2d..fa6188af 100644
--- a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_redo_white_24dp.xml b/app/src/main/res/drawable/ic_redo_white_24dp.xml
index ece45645..63153f06 100644
--- a/app/src/main/res/drawable/ic_redo_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_redo_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
index 109f1744..0482a447 100644
--- a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
index cf0fb37c..59caeb1e 100644
--- a/app/src/main/res/drawable/ic_repeat_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_restore_white_24dp.xml b/app/src/main/res/drawable/ic_restore_white_24dp.xml
index bb75fb8b..4e76e285 100644
--- a/app/src/main/res/drawable/ic_restore_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_restore_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml
index 79a5174f..0599800e 100644
--- a/app/src/main/res/drawable/ic_save_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_white_24dp.xml
index 9cfa9cce..f4d24f08 100644
--- a/app/src/main/res/drawable/ic_send_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_send_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
index 60555103..df63c9aa 100644
--- a/app/src/main/res/drawable/ic_settings_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
index e9860b73..22d32c8c 100644
--- a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
index b5e31f5d..473f8513 100644
--- a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
index dd6c1cb2..487947c7 100644
--- a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml
index de6119f8..8e90db92 100644
--- a/app/src/main/res/drawable/ic_star_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
index 6ac9a1c8..1842c8b1 100644
--- a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/ic_twitter_white_24dp.xml b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
index 08b364bc..3a3a6ddb 100644
--- a/app/src/main/res/drawable/ic_twitter_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
@@ -1,9 +1,9 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
index 5d604f82..b57d5c00 100644
--- a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
@@ -1,8 +1,8 @@
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
diff --git a/app/src/main/res/drawable/round_selected.xml b/app/src/main/res/drawable/round_selected.xml
index 6903efe2..0a18d996 100644
--- a/app/src/main/res/drawable/round_selected.xml
+++ b/app/src/main/res/drawable/round_selected.xml
@@ -1,5 +1,5 @@
+ android:shape="oval">
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selected_dark.xml b/app/src/main/res/drawable/round_selected_dark.xml
index 6912e24a..9fa8e56b 100644
--- a/app/src/main/res/drawable/round_selected_dark.xml
+++ b/app/src/main/res/drawable/round_selected_dark.xml
@@ -1,5 +1,5 @@
+ android:shape="oval">
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector.xml b/app/src/main/res/drawable/round_selector.xml
index 7c07220e..77f09a4c 100644
--- a/app/src/main/res/drawable/round_selector.xml
+++ b/app/src/main/res/drawable/round_selector.xml
@@ -1,7 +1,7 @@
-