code refactor

app/app.iml

@@ -191,7 +191,6 @@
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/app/libs/juniversalchardet-1.0.3.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/app/libs/jsoup-1.11.2.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-8.8.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
@@ -206,9 +205,7 @@
     <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library-1.4.2" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:3.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.6@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mpatric:mp3agic:0.8.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: jp.wasabeef:glide-transformations-2.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons-0.9.6.0" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.2" level="project" />

app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java

@@ -108,7 +108,7 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    setDrawUnderStatusbar(true);
+    setDrawUnderStatusBar(true);
     super.onCreate(savedInstanceState);
     ButterKnife.bind(this);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java

@@ -118,7 +118,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
   @Override
   protected void onCreate(Bundle bundle) {
-    setDrawUnderStatusbar(true);
+    setDrawUnderStatusBar(true);
     super.onCreate(bundle);
     ButterKnife.bind(this);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java

@@ -88,7 +88,7 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.java

@@ -30,7 +30,7 @@ public class LockScreenActivity extends AbsMusicServiceActivity {
                 | WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         setContentView(R.layout.activity_lock_screen_old_style);
 
         hideStatusBar();

app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java

@@ -88,7 +88,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    setDrawUnderStatusbar(true);
+    setDrawUnderStatusBar(true);
     super.onCreate(savedInstanceState);
 
     ButterKnife.bind(this);

app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java

@@ -87,7 +87,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/ProVersionActivity.java

@@ -53,7 +53,7 @@ public class ProVersionActivity extends AbsBaseActivity implements
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pro_version);
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         ButterKnife.bind(this);
         RetroUtil.statusBarHeight(statusBar);
         setStatusbarColorAuto();

app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java

@@ -68,7 +68,7 @@ public class SearchActivity extends AbsMusicServiceActivity implements OnQueryTe
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java

@@ -12,7 +12,7 @@ public class UserInfoActivity extends AbsBaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderStatusbar(true);
+        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user_info);
 

app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java

@@ -1,21 +1,22 @@
 package code.name.monkey.retromusic.ui.activities.base;
 
 import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.ColorInt;
+import android.support.v4.content.ContextCompat;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
-
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.MaterialDialogsUtil;
+import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.appthemehelper.util.VersionUtils;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.util.PreferenceUtil;
@@ -36,7 +37,6 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity implements Run
     setImmersiveFullscreen();
     registerSystemUiVisibility();
     toggleScreenOn();
-
   }
 
   private void toggleScreenOn() {
@@ -72,17 +72,17 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity implements Run
 
 
   private void changeBackgroundShape() {
-        if (PreferenceUtil.getInstance(this).isRoundCorners()) {
+    Drawable background = PreferenceUtil.getInstance(this).isRoundCorners() ?
-            getWindow().setBackgroundDrawableResource(R.drawable.round_window);
+        ContextCompat.getDrawable(this, R.drawable.round_window)
-        } else {
+        : ContextCompat.getDrawable(this, R.drawable.square_window);
-            getWindow().setBackgroundDrawableResource(R.drawable.square_window);
+    background = TintHelper.createTintedDrawable(background, ThemeStore.primaryColor(this));
-        }
+    getWindow().setBackgroundDrawable(background);
-        View decor = getWindow().getDecorView();
+    //View decor = getWindow().getDecorView();
-        GradientDrawable gradientDrawable = (GradientDrawable) decor.getBackground();
+    //GradientDrawable gradientDrawable = (GradientDrawable) decor.getBackground();
-        gradientDrawable.setColor(ThemeStore.primaryColor(this));
+    //gradientDrawable.setColor(ThemeStore.primaryColor(this));
   }
 
-    protected void setDrawUnderStatusbar(boolean drawUnderStatusbar) {
+  protected void setDrawUnderStatusBar(boolean drawUnderStatusbar) {
     if (VersionUtils.hasLollipop()) {
       RetroUtil.setAllowDrawUnderStatusBar(getWindow());
     } else if (VersionUtils.hasKitKat()) {

app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java

@@ -16,7 +16,6 @@ import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -60,8 +59,9 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements
   }
 
   @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
+  public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
+    //noinspection ConstantConditions
     view.setBackgroundColor(ThemeStore.primaryColor(getContext()));
     view.setOnTouchListener(new FlingPlayBackController(getActivity()));
     setUpMiniPlayer();

app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.java

@@ -22,6 +22,7 @@ import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.glide.BlurTransformation;
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget;
 import code.name.monkey.retromusic.glide.SongGlideRequest;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
@@ -35,7 +36,6 @@ import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator;
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
-import jp.wasabeef.glide.transformations.BlurTransformation;
 
 /**
  * @author Hemanth S (h4h13).
@@ -207,7 +207,7 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
     }
 
     int blurAmount = PreferenceManager.getDefaultSharedPreferences(getContext())
-        .getInt("blur_amount", 25);
+        .getInt("new_blur_amount", 25);
 
     colorBackground.clearColorFilter();
 
@@ -216,7 +216,7 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
         .generatePalette(activity)
         .build()
         .override(320, 480)
-        .transform(new BlurTransformation(getActivity(), blurAmount))
+        .transform(new BlurTransformation.Builder(getActivity()).blurRadius(blurAmount).build())
         .into(new RetroMusicColoredTarget(colorBackground) {
           @Override
           public void onColorReady(int color) {

app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.java

@@ -9,19 +9,15 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.glide.BlurTransformation;
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget;
 import code.name.monkey.retromusic.glide.SongGlideRequest;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
@@ -29,9 +25,11 @@ import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment;
 import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment;
-import jp.wasabeef.glide.transformations.BlurTransformation;
+import com.bumptech.glide.Glide;
+
+public class CardBlurFragment extends AbsPlayerFragment implements
+    PlayerAlbumCoverFragment.Callbacks {
 
-public class CardBlurFragment extends AbsPlayerFragment implements PlayerAlbumCoverFragment.Callbacks {
   @BindView(R.id.player_toolbar)
   Toolbar toolbar;
   @BindView(R.id.status_bar)
@@ -172,14 +170,15 @@ public class CardBlurFragment extends AbsPlayerFragment implements PlayerAlbumCo
     if (activity == null) {
       return;
     }
-        int blurAmount = PreferenceManager.getDefaultSharedPreferences(getContext()).getInt("blur_amount", 25);
+    int blurAmount = PreferenceManager.getDefaultSharedPreferences(getContext())
+        .getInt("new_blur_amount", 25);
 
     colorBackground.clearColorFilter();
     SongGlideRequest.Builder.from(Glide.with(activity), MusicPlayerRemote.getCurrentSong())
         .checkIgnoreMediaStore(activity)
         .generatePalette(activity)
         .build()
-                .transform(new BlurTransformation(getActivity(), blurAmount))
+        .transform(new BlurTransformation.Builder(getActivity()).blurRadius(blurAmount).build())
         .into(new RetroMusicColoredTarget(colorBackground) {
           @Override
           public void onColorReady(int color) {

app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java

@@ -18,17 +18,6 @@ import android.support.v4.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
-
-import org.jaudiotagger.audio.AudioFileIO;
-import org.jaudiotagger.tag.FieldKey;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Pattern;
-
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.loaders.PlaylistLoader;
@@ -38,6 +27,14 @@ import code.name.monkey.retromusic.model.Playlist;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics;
 import io.reactivex.Observable;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+import org.jaudiotagger.audio.AudioFileIO;
+import org.jaudiotagger.tag.FieldKey;
 
 
 public class MusicUtil {
@@ -224,10 +221,9 @@ public class MusicUtil {
         cursor.moveToFirst();
         while (!cursor.isAfterLast()) {
           final int id = cursor.getInt(0);
-                    SongLoader.getSong(activity, id).subscribe(song -> {
+          Song song = SongLoader.getSong(activity, id).blockingFirst();
           MusicPlayerRemote.removeFromQueue(song);
           cursor.moveToNext();
-                    });
         }
 
         // Step 2: Remove selected tracks from the database
@@ -364,8 +360,12 @@ public class MusicUtil {
   }
 
   public static boolean isArtistNameUnknown(@Nullable String artistName) {
-        if (TextUtils.isEmpty(artistName)) return false;
+    if (TextUtils.isEmpty(artistName)) {
-        if (artistName.equals(Artist.UNKNOWN_ARTIST_DISPLAY_NAME)) return true;
+      return false;
+    }
+    if (artistName.equals(Artist.UNKNOWN_ARTIST_DISPLAY_NAME)) {
+      return true;
+    }
     artistName = artistName.trim().toLowerCase();
     return artistName.equals("unknown") || artistName.equals("<unknown>");
   }

app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java

@@ -1,55 +0,0 @@
-package code.name.monkey.retromusic.util;
-
-import android.graphics.Canvas;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-
-public class SwipeAndDragHelper extends ItemTouchHelper.Callback {
-
-    private ActionCompletionContract contract;
-
-    public SwipeAndDragHelper(ActionCompletionContract contract) {
-        this.contract = contract;
-    }
-
-    @Override
-    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-        int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-        return makeMovementFlags(dragFlags, 0);
-    }
-
-    @Override
-    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-        contract.onViewMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
-        return true;
-    }
-
-    @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-    }
-
-    @Override
-    public boolean isLongPressDragEnabled() {
-        return false;
-    }
-
-    @Override
-    public void onChildDraw(Canvas c,
-                            RecyclerView recyclerView,
-                            RecyclerView.ViewHolder viewHolder,
-                            float dX,
-                            float dY,
-                            int actionState,
-                            boolean isCurrentlyActive) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            float alpha = 1 - (Math.abs(dX) / recyclerView.getWidth());
-            viewHolder.itemView.setAlpha(alpha);
-        }
-        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
-    }
-
-    public interface ActionCompletionContract {
-        void onViewMoved(int oldPosition, int newPosition);
-    }
-
-}

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners
+    android:topLeftRadius="12dp"
+    android:topRightRadius="12dp"/>
+  <padding
+    android:bottom="8dp"
+    android:top="8dp"/>
+  <solid android:color="?attr/cardBackgroundColor"/>
+</shape>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="25dp" />
-    <gradient
-        android:angle="135"
-        android:endColor="@color/md_green_A700"
-        android:startColor="@color/md_blue_A200" />
-</shape>

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

@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
   android:height="24dp"
   android:viewportHeight="24"
-    android:viewportWidth="24">
+  android:viewportWidth="24"
+  android:width="24dp">
   <path
     android:fillColor="@color/md_white_1000"
     android:pathData="M18.3,5.71L18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59L7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0l0,0c-0.39,0.39 -0.39,1.02 0,1.41L10.59,12L5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41h0c0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0l0,0c0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89C18.68,6.73 18.68,6.09 18.3,5.71z"/>

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

@@ -1,8 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="108dp"
         android:height="108dp"
-    android:viewportWidth="108"
+        android:viewportWidth="135"
-    android:viewportHeight="108">
+        android:viewportHeight="135">
+    <group android:translateX="13.5"
+            android:translateY="13.5">
       <path
           android:fillColor="#FF000000"
           android:pathData="M44,72l35,36h29V73.8L68,34c-2.74,0.28 -6.49,1.13 -9,4 -3.53,4 -2.09,9.18 -3,15C55.23,57.9 52.58,64.62 44,72Z"
@@ -11,4 +13,5 @@
       <path
           android:pathData="M52.9,34.2V54.57A10.32,10.32 0,0 0,49.6 54a9.9,9.9 0,1 0,9.9 9.9V40.8h8.8V34.2Z"
           android:fillColor="#fff"/>
+    </group>
 </vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="8dp"/>
+  <corners android:radius="12dp"/>
   <solid android:color="@android:color/black"/>
 </shape>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="25dp" />
-    <solid android:color="?cardBackgroundColor" />
-</shape>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/transparent"/>
+    <solid android:color="@android:color/white"/>
 </shape>

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

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

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
-    <solid android:color="@color/md_red_A400" />
-</shape>

app/src/main/res/layout-v24/layout_notification_collapsed.xml

@@ -19,14 +19,16 @@
       android:layout_height="match_parent"
       android:layout_alignParentEnd="true"
       android:adjustViewBounds="true"
-            android:scaleType="fitCenter" />
+      android:scaleType="centerCrop"
+      tools:src="@drawable/hemanth_s"/>
 
     <ImageView
       android:id="@+id/foregroundImage"
       android:layout_width="96dp"
       android:layout_height="match_parent"
       android:layout_alignStart="@id/largeIcon"
-            android:src="@drawable/background_image" />
+      android:src="@drawable/background_image"
+      tools:tint="@color/md_black_1000"/>
 
   </RelativeLayout>
 
@@ -36,17 +38,19 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
     android:layout_marginEnd="48dp"
+    android:paddingTop="6dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
     android:gravity="center_vertical"
-        android:orientation="horizontal"
+    android:orientation="horizontal">
-        android:paddingEnd="12dp"
-        android:paddingStart="24dp"
-        android:paddingTop="12dp">
 
     <ImageView
       android:id="@+id/smallIcon"
       android:layout_width="16dp"
       android:layout_height="16dp"
-            android:scaleType="centerInside" />
+      android:layout_marginStart="8dp"
+      tools:src="@drawable/ic_audiotrack_black_24dp"
+      tools:tint="@color/md_black_1000"/>
 
     <TextView
       android:id="@+id/appName"
@@ -56,7 +60,8 @@
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-            android:textSize="12sp" />
+      android:textSize="12sp"
+      tools:text="@string/app_name"/>
 
     <ImageView
       android:id="@+id/arrow"
@@ -65,45 +70,45 @@
       android:layout_marginStart="2dp"
       android:scaleType="centerInside"
       android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
+      android:tint="@color/md_black_1000"
       tools:ignore="VectorDrawableCompat"/>
 
   </LinearLayout>
 
   <LinearLayout
+    android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"
     android:layout_below="@id/app"
-        android:orientation="horizontal">
+    android:layout_toStartOf="@id/actions"
-
+    android:paddingBottom="12dp"
-        <LinearLayout
+    android:paddingStart="0dp"
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:paddingBottom="2dp"
     android:paddingEnd="12dp"
-            android:paddingStart="24dp">
+    android:orientation="vertical">
 
     <TextView
       android:id="@+id/title"
+      android:textStyle="bold"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-                android:textSize="14sp"
+      tools:text="@string/title_dashboard"/>
-                android:textStyle="bold" />
 
     <TextView
       android:id="@+id/subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-                android:textSize="12sp" />
+      tools:text="@string/title_dashboard"/>
 
   </LinearLayout>
 
@@ -111,9 +116,11 @@
     android:id="@+id/actions"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
     android:layout_marginEnd="48dp"
-            android:layout_weight="0"
+    android:layout_alignBottom="@id/content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignTop="@id/content"
+    android:layout_gravity="bottom"
     android:orientation="horizontal">
 
     <ImageView
@@ -147,5 +154,4 @@
       android:layout_height="42dp"
       android:scaleType="centerInside"/>
   </LinearLayout>
-    </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout-v24/layout_notification_expanded.xml

@@ -36,24 +36,25 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"
-        android:orientation="vertical"
+    android:paddingTop="8dp"
     android:paddingBottom="12dp"
-        android:paddingEnd="144dp"
     android:paddingStart="0dp"
-        android:paddingTop="16dp">
+    android:paddingEnd="144dp"
+    android:orientation="vertical">
 
     <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginBottom="4dp"
+      android:paddingStart="8dp"
+      android:paddingEnd="0dp"
       android:gravity="center_vertical"
-            android:orientation="horizontal"
+      android:orientation="horizontal">
-            android:paddingStart="8dp">
 
       <ImageView
         android:id="@+id/smallIcon"
-                android:layout_width="20dp"
+        android:layout_width="16dp"
-                android:layout_height="20dp"
+        android:layout_height="16dp"
         android:layout_marginStart="8dp"
         tools:src="@drawable/ic_audiotrack_black_24dp"
         tools:tint="@color/md_black_1000"/>
@@ -66,7 +67,7 @@
         android:ellipsize="end"
         android:lines="1"
         android:singleLine="true"
-                android:textSize="11sp"
+        android:textSize="13sp"
         tools:text="@string/app_name"/>
 
       <ImageView
@@ -82,33 +83,32 @@
 
     <TextView
       android:id="@+id/title"
+      android:textStyle="bold"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="16dp"
       android:singleLine="true"
-            android:textStyle="bold"
       tools:text="@string/title_dashboard"/>
 
     <TextView
       android:id="@+id/subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="16dp"
       android:singleLine="true"
-            android:textSize="13sp"
       tools:text="@string/title_dashboard"/>
 
     <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="match_parent"
-            android:layout_marginEnd="8dp"
       android:layout_marginStart="8dp"
+      android:layout_marginEnd="8dp"
       android:orientation="horizontal"
       tools:ignore="ContentDescription">
 

app/src/main/res/layout-xlarge-land/fragment_blur.xml

@@ -47,15 +47,27 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_above="@id/toolbar_container"
+    android:orientation="vertical">
+
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <include layout="@layout/status_bar"/>
+    </FrameLayout>
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
       android:orientation="horizontal">
 
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
+        android:padding="24dp"
         android:gravity="center"
-            android:orientation="vertical"
+        android:orientation="vertical">
-            android:padding="24dp">
 
         <TextView
           android:id="@+id/title"
@@ -93,13 +105,14 @@
             android:id="@+id/album_cover_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="0"
             android:layout_gravity="center_horizontal">
 
             <fragment
               android:id="@+id/player_album_cover_fragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
               android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+              android:layout_height="match_parent"
+              android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"/>
           </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
           <FrameLayout
@@ -110,14 +123,12 @@
 
             <fragment
               android:id="@+id/playback_controls_fragment"
-                        android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
               android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+              android:layout_height="match_parent"
+              android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"/>
           </FrameLayout>
-
-
         </LinearLayout>
       </FrameLayout>
     </LinearLayout>
-
+  </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout-xlarge/fragment_blur.xml

@@ -13,12 +13,14 @@
     android:layout_height="match_parent"
     android:scaleType="centerCrop"
     tools:src="@drawable/hemanth_s"/>
+
   <View
     android:id="@+id/mask"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/md_black_1000"
     android:visibility="gone"/>
+
   <View
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +29,6 @@
   <include layout="@layout/shadow_statusbar_toolbar"/>
 
   <LinearLayout
-    android:id="@+id/now_playing_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginStart="64dp"
@@ -35,6 +36,13 @@
     android:layout_gravity="center_horizontal"
     android:orientation="vertical">
 
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <include layout="@layout/status_bar"/>
+    </FrameLayout>
+
     <code.name.monkey.retromusic.views.WidthFitSquareLayout
       android:id="@+id/album_cover_container"
       android:layout_width="match_parent"
@@ -77,5 +85,4 @@
         app:navigationIcon="@drawable/ic_close_white_24dp"/>
     </FrameLayout>
   </LinearLayout>
-
 </FrameLayout>

app/src/main/res/layout-xlarge/fragment_mini_player.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:background="?android:windowBackground"
-    android:clickable="true"
-    android:focusable="false"
-    android:transitionName="@string/transition_mini_player"
-    tools:ignore="UnusedAttribute">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/mini_player_image"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="16dp"
-            android:scaleType="centerCrop"
-            app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/mini_player_title"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-        <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/mini_player_play_pause_button"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:scaleType="center"
-            tools:ignore="ContentDescription" />
-
-    </LinearLayout>
-
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:progress="20"
-        app:mpb_progressStyle="horizontal"
-        app:mpb_showProgressBackground="false"
-        app:mpb_useIntrinsicPadding="false" />
-
-</FrameLayout>

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

@@ -56,31 +56,37 @@
 
     <LinearLayout
       android:id="@+id/content"
+      android:layout_marginTop="4dp"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-            android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+      android:background="@drawable/bg_circular_top_corners"
       android:elevation="@dimen/card_elevation"
       android:orientation="vertical">
 
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:orientation="horizontal">
 
         <code.name.monkey.retromusic.views.CircularImageView
           android:id="@+id/artist_image"
           android:layout_width="52dp"
           android:layout_height="52dp"
+          android:layout_weight="0"
           android:layout_marginStart="8dp"
-                    android:layout_weight="0" />
+          app:civ_border="false"
+          app:civ_shadow="false"/>
 
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_weight="1"
-                    android:orientation="vertical"
+          android:paddingStart="16dp"
           android:paddingEnd="0dp"
-                    android:paddingStart="16dp">
+          android:orientation="vertical">
 
           <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@+id/title"
@@ -96,12 +102,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:paddingTop="4dp"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:freezesText="true"
             android:marqueeRepeatLimit="marquee_forever"
-                        android:paddingTop="4dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
@@ -116,10 +122,10 @@
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
         android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:text="@string/songs"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         tools:ignore="MissingPrefix"/>
@@ -135,10 +141,10 @@
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
         android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:text="@string/songs"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         android:visibility="gone"
@@ -157,8 +163,8 @@
     android:id="@+id/action_shuffle_all"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
     android:layout_margin="16dp"
+    android:layout_gravity="bottom|end"
     app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior"
     app:srcCompat="@drawable/ic_shuffle_white_24dp"/>
 </android.support.design.widget.CoordinatorLayout>

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

@@ -58,7 +58,7 @@
       android:id="@+id/content"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-            android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+      android:background="@drawable/bg_circular_top_corners"
       android:elevation="@dimen/card_elevation"
       android:orientation="vertical">
 
@@ -71,10 +71,10 @@
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
           android:layout_weight="1"
-                    android:orientation="vertical"
+          android:paddingStart="16dp"
-                    android:padding="16dp">
+          android:paddingEnd="0dp"
+          android:orientation="vertical">
 
           <android.support.v7.widget.AppCompatTextView
             android:id="@+id/title"
@@ -83,7 +83,8 @@
             android:layout_height="wrap_content"
             android:maxLines="2"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        tools:ignore="MissingPrefix" />
+            tools:ignore="MissingPrefix"
+            tools:text="Title"/>
 
           <android.support.v7.widget.AppCompatTextView
             android:id="@+id/text"
@@ -108,9 +109,12 @@
           android:id="@+id/action_shuffle_all"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_margin="16dp"
           android:layout_weight="0"
+          android:layout_marginTop="8dp"
+          android:layout_marginBottom="8dp"
+          android:layout_marginStart="16dp"
+          android:layout_marginEnd="16dp"
+          android:layout_gravity="center"
           android:src="@drawable/ic_shuffle_white_24dp"/>
       </LinearLayout>
 
@@ -130,9 +134,9 @@
         android:id="@+id/biography"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="16dp"
         android:ellipsize="end"
         android:maxLines="4"
-                android:padding="16dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:visibility="gone"/>
 

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

@@ -6,28 +6,61 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <android.support.v7.widget.Toolbar
-    android:id="@+id/toolbar"
-    style="@style/Toolbar"
-    app:contentInsetLeft="0dp"
-    app:contentInsetStart="0dp"
-    app:contentInsetStartWithNavigation="0dp"
-    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-    app:titleMargin="0dp"
-    app:titleMarginStart="0dp">
-
   <LinearLayout
-      android:id="@+id/actions_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-      android:gravity="center_vertical"
+    android:gravity="center_vertical">
-      android:orientation="horizontal">
+
+    <code.name.monkey.retromusic.views.IconImageView
+      android:id="@+id/back"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:padding="12dp"
+      android:src="@drawable/ic_keyboard_backspace_black_24dp"/>
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:paddingStart="12dp"
+      android:paddingEnd="0dp"
+      android:orientation="vertical">
+
+      <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
+
+      <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+    </LinearLayout>
+
+    <code.name.monkey.retromusic.views.IconImageView
+      android:id="@+id/edit_lyrics"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="0"
+      android:padding="12dp"
+      android:background="?roundSelector"
+      app:srcCompat="@drawable/ic_edit_white_24dp"/>
+  </LinearLayout>
 
   <RadioGroup
     android:id="@+id/actions"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-        android:layout_weight="1"
+    android:layout_weight="0"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
     android:orientation="horizontal">
 
     <android.support.v7.widget.AppCompatRadioButton
@@ -38,11 +71,11 @@
       android:layout_margin="4dp"
       android:padding="8dp"
       android:background="@drawable/toggle_outline_buttons"
-          android:button="@android:color/transparent"
+      android:button="@null"
+      android:checked="true"
       android:gravity="center"
       android:text="@string/synced_lyrics"
-          android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
+      android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"/>
-          android:textColor="?android:attr/textColorPrimary"/>
 
     <android.support.v7.widget.AppCompatRadioButton
       android:id="@+id/normal_lyrics"
@@ -52,73 +85,17 @@
       android:layout_margin="4dp"
       android:padding="8dp"
       android:background="@drawable/toggle_outline_buttons"
-          android:button="@android:color/transparent"
+      android:button="@null"
-          android:checked="true"
       android:gravity="center"
       android:text="@string/normal_lyrics"
       android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"/>
 
   </RadioGroup>
 
-      <code.name.monkey.retromusic.views.IconImageView
-        android:id="@+id/edit_lyrics"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:padding="16dp"
-        android:background="?roundSelector"
-        app:srcCompat="@drawable/ic_edit_white_24dp"/>
-    </LinearLayout>
-  </android.support.v7.widget.Toolbar>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
-
-    <android.support.v7.widget.CardView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="8dp"
-      app:cardElevation="8dp"
-      app:cardUseCompatPadding="true">
-
-      <ImageView
-        android:id="@+id/image"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:scaleType="centerCrop"/>
-    </android.support.v7.widget.CardView>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingStart="12dp"
-      android:paddingEnd="0dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
-
-      <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
-
-    </LinearLayout>
-  </LinearLayout>
-
   <android.support.v7.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_weight="1"
     app:cardCornerRadius="8dp"
     app:cardElevation="8dp"
     app:cardUseCompatPadding="true">
@@ -126,8 +103,14 @@
     <FrameLayout
       android:id="@+id/gradient_background"
       android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+      <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-      android:background="@drawable/gradient_5">
+        android:tint="#80000000"
+        android:scaleType="centerCrop"/>
 
       <ScrollView
         android:layout_width="match_parent"
@@ -146,6 +129,17 @@
           android:visibility="gone"/>
       </ScrollView>
 
+      <code.name.monkey.retromusic.views.LyricView
+        android:id="@+id/lyrics_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:fadeInFadeOut="true"
+        app:highlightColor="@color/md_white_1000"
+        app:hint="No Lyrics"
+        app:hintColor="@color/md_grey_400"
+        app:lineSpace="15dp"
+        app:textAlign="left"
+        app:textSize="18sp"/>
     </FrameLayout>
   </android.support.v7.widget.CardView>
 </LinearLayout>

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

@@ -31,17 +31,17 @@
         tools:ignore="MissingPrefix"/>
 
       <LinearLayout
-                android:id="@+id/gaurav_singh_link"
+        android:id="@+id/marko_name_link"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:background="?attr/rectSelector"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center_vertical"
         android:minHeight="@dimen/md_listitem_height"
         android:orientation="horizontal"
-                android:paddingEnd="0dp"
-                android:paddingStart="16dp"
         tools:ignore="PrivateResource">
 
         <code.name.monkey.retromusic.views.NetworkImageView
@@ -49,21 +49,21 @@
           android:layout_height="40dp"
           app:civ_border="false"
           app:civ_shadow="false"
-                    app:url_link="https://lh5.googleusercontent.com/-0qqf6WfBmzQ/AAAAAAAAAAI/AAAAAAAACos/W0yAbQwqffU/photo.jpg" />
+          app:url_link="https://avatars2.githubusercontent.com/u/35743654?s=400&amp;u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&amp;v=4"/>
 
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-                    android:orientation="vertical"
+          android:paddingTop="8dp"
           android:paddingBottom="8dp"
-                    android:paddingEnd="16dp"
           android:paddingStart="16dp"
-                    android:paddingTop="8dp">
+          android:paddingEnd="16dp"
+          android:orientation="vertical">
 
           <android.support.v7.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                        android:text="@string/leo_name"
+            android:text="@string/marko_name"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             android:textColor="@color/md_white_1000"/>
 
@@ -71,23 +71,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="0.85"
-                        android:text="@string/moderator"
+            android:text="@string/marko_summary"
             android:textColor="@color/md_white_1000"/>
         </LinearLayout>
       </LinearLayout>
 
       <LinearLayout
-                android:id="@+id/leo_link"
+        android:id="@+id/gaurav_singh_link"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:background="?attr/rectSelector"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center_vertical"
         android:minHeight="@dimen/md_listitem_height"
         android:orientation="horizontal"
-                android:paddingEnd="0dp"
-                android:paddingStart="16dp"
         tools:ignore="PrivateResource">
 
         <code.name.monkey.retromusic.views.NetworkImageView
@@ -100,11 +100,11 @@
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-                    android:orientation="vertical"
+          android:paddingTop="8dp"
           android:paddingBottom="8dp"
-                    android:paddingEnd="16dp"
           android:paddingStart="16dp"
-                    android:paddingTop="8dp">
+          android:paddingEnd="16dp"
+          android:orientation="vertical">
 
           <android.support.v7.widget.AppCompatTextView
             android:layout_width="match_parent"
@@ -126,14 +126,14 @@
         android:id="@+id/yt_gaming_link"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:background="?attr/rectSelector"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center_vertical"
         android:minHeight="@dimen/md_listitem_height"
         android:orientation="horizontal"
-                android:paddingEnd="0dp"
-                android:paddingStart="16dp"
         tools:ignore="PrivateResource">
 
         <code.name.monkey.retromusic.views.NetworkImageView
@@ -146,11 +146,11 @@
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-                    android:orientation="vertical"
+          android:paddingTop="8dp"
           android:paddingBottom="8dp"
-                    android:paddingEnd="16dp"
           android:paddingStart="16dp"
-                    android:paddingTop="8dp">
+          android:paddingEnd="16dp"
+          android:orientation="vertical">
 
 
           <android.support.v7.widget.AppCompatTextView
@@ -176,8 +176,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-        android:gravity="center"
     android:padding="16dp"
+    android:gravity="center"
     android:text="@string/made_with_love"
     android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
     android:textColor="?android:attr/textColorSecondary"

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

@@ -68,8 +68,8 @@
             android:id="@+id/user_image"
             android:layout_width="36dp"
             android:layout_height="36dp"
-                        android:layout_marginEnd="16dp"
             android:layout_weight="0"
+            android:layout_marginEnd="16dp"
             app:civ_border="false"/>
         </LinearLayout>
       </android.support.v7.widget.Toolbar>

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

@@ -19,8 +19,8 @@
       android:id="@+id/mini_player_image"
       android:layout_width="24dp"
       android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
       android:layout_margin="16dp"
+      android:layout_gravity="center_vertical"
       android:scaleType="centerCrop"
       app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
       tools:ignore="ContentDescription"/>
@@ -29,11 +29,11 @@
       android:id="@+id/mini_player_title"
       android:layout_width="0dp"
       android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:layout_marginStart="16dp"
       android:layout_marginEnd="16dp"
       android:layout_marginLeft="16dp"
       android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_weight="1"
       android:gravity="center_vertical"
       android:singleLine="true"
       android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
@@ -42,9 +42,9 @@
       android:id="@+id/mini_player_play_pause_button"
       android:layout_width="40dp"
       android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
       android:layout_marginEnd="16dp"
       android:layout_marginRight="16dp"
+      android:layout_gravity="center_vertical"
       android:scaleType="center"
       tools:ignore="ContentDescription"/>
 

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

@@ -19,14 +19,16 @@
       android:layout_height="match_parent"
       android:layout_alignParentEnd="true"
       android:adjustViewBounds="true"
-            android:scaleType="fitCenter" />
+      android:scaleType="centerCrop"
+      tools:src="@drawable/hemanth_s"/>
 
     <ImageView
       android:id="@+id/foregroundImage"
       android:layout_width="96dp"
       android:layout_height="match_parent"
       android:layout_alignStart="@id/largeIcon"
-            android:src="@drawable/background_image" />
+      android:src="@drawable/background_image"
+      tools:tint="@color/md_black_1000"/>
 
   </RelativeLayout>
 
@@ -36,17 +38,19 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
     android:layout_marginEnd="48dp"
-        android:gravity="center_vertical"
+    android:paddingTop="6dp"
-        android:orientation="horizontal"
-        android:paddingEnd="8dp"
     android:paddingStart="8dp"
-        android:paddingTop="6dp">
+    android:paddingEnd="8dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <ImageView
       android:id="@+id/smallIcon"
       android:layout_width="16dp"
       android:layout_height="16dp"
-            android:scaleType="centerInside" />
+      android:layout_marginStart="8dp"
+      tools:src="@drawable/ic_audiotrack_black_24dp"
+      tools:tint="@color/md_black_1000"/>
 
     <TextView
       android:id="@+id/appName"
@@ -56,7 +60,8 @@
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-            android:textSize="12sp" />
+      android:textSize="12sp"
+      tools:text="@string/app_name"/>
 
     <ImageView
       android:id="@+id/arrow"
@@ -65,6 +70,7 @@
       android:layout_marginStart="2dp"
       android:scaleType="centerInside"
       android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
+      android:tint="@color/md_black_1000"
       tools:ignore="VectorDrawableCompat"/>
 
   </LinearLayout>
@@ -72,33 +78,37 @@
   <LinearLayout
     android:id="@+id/content"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_alignParentStart="true"
     android:layout_below="@id/app"
     android:layout_toStartOf="@id/actions"
-        android:orientation="vertical"
+    android:paddingBottom="12dp"
-        android:paddingBottom="2dp"
+    android:paddingStart="0dp"
     android:paddingEnd="12dp"
-        android:paddingStart="8dp">
+    android:orientation="vertical">
 
     <TextView
       android:id="@+id/title"
+      android:textStyle="bold"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-            android:textSize="14sp"
+      tools:text="@string/title_dashboard"/>
-            android:textStyle="bold" />
 
     <TextView
       android:id="@+id/subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
       android:singleLine="true"
-            android:textSize="12sp" />
+      tools:text="@string/title_dashboard"/>
 
   </LinearLayout>
 
@@ -106,10 +116,11 @@
     android:id="@+id/actions"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="bottom"
     android:layout_marginEnd="48dp"
+    android:layout_alignBottom="@id/content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignTop="@id/content"
+    android:layout_gravity="bottom"
     android:orientation="horizontal">
 
     <ImageView

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

@@ -15,17 +15,19 @@
     <ImageView
       android:id="@+id/largeIcon"
       android:layout_width="@dimen/notification_big_image_size"
-            android:layout_height="@dimen/notification_big_image_size"
+      android:layout_height="match_parent"
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
-            android:scaleType="centerCrop" />
+      android:scaleType="centerCrop"
+      tools:src="@drawable/hemanth_s"/>
 
     <ImageView
       android:id="@+id/foregroundImage"
       android:layout_width="96dp"
       android:layout_height="match_parent"
       android:layout_alignStart="@id/largeIcon"
-            android:src="@drawable/background_image" />
+      android:src="@drawable/background_image"
+      tools:tint="@color/md_black_1000"/>
 
   </RelativeLayout>
 
@@ -34,10 +36,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentStart="true"
-        android:orientation="vertical"
+    android:paddingTop="8dp"
+    android:paddingBottom="12dp"
+    android:paddingStart="0dp"
     android:paddingEnd="144dp"
-        android:paddingStart="8dp"
+    android:orientation="vertical">
-        android:paddingTop="8dp">
 
     <LinearLayout
       android:layout_width="wrap_content"
@@ -48,19 +51,22 @@
 
       <ImageView
         android:id="@+id/smallIcon"
-                android:layout_width="18dp"
+        android:layout_width="16dp"
-                android:layout_height="18dp"
+        android:layout_height="16dp"
-                android:scaleType="centerInside" />
+        android:layout_marginStart="8dp"
+        tools:src="@drawable/ic_audiotrack_black_24dp"
+        tools:tint="@color/md_black_1000"/>
 
       <TextView
         android:id="@+id/appName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:ellipsize="end"
         android:lines="1"
         android:singleLine="true"
-                android:textSize="11sp" />
+        android:textSize="13sp"
+        tools:text="@string/app_name"/>
 
       <ImageView
         android:id="@+id/arrow"
@@ -75,26 +81,26 @@
 
     <TextView
       android:id="@+id/title"
+      android:textStyle="bold"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="8dp"
       android:singleLine="true"
-            android:textSize="16sp"
+      tools:text="@string/title_dashboard"/>
-            android:textStyle="bold" />
 
     <TextView
       android:id="@+id/subtitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:paddingStart="16dp"
+      android:paddingEnd="0dp"
       android:ellipsize="end"
       android:lines="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="8dp"
       android:singleLine="true"
-            android:textSize="12sp" />
+      tools:text="@string/title_dashboard"/>
 
     <LinearLayout
       android:layout_width="wrap_content"
@@ -124,7 +130,6 @@
         android:layout_width="42dp"
         android:layout_height="42dp"
         android:scaleType="centerInside"/>
-
     </LinearLayout>
   </LinearLayout>
 </RelativeLayout>

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

@@ -1,30 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="roundSelector" format="reference" />
+  <attr format="reference" name="roundSelector"/>
-    <attr name="rectSelector" format="reference" />
+  <attr format="reference" name="rectSelector"/>
-    <attr name="rectSelectorStrong" format="reference" />
+  <attr format="reference" name="rectSelectorStrong"/>
 
-    <attr name="defaultFooterColor" format="color" />
+  <attr format="color" name="defaultFooterColor"/>
 
-    <attr name="toolbarPopupTheme" format="reference" />
+  <attr format="reference" name="toolbarPopupTheme"/>
 
-    <attr name="iconColor" format="color" />
+  <attr format="color" name="iconColor"/>
-    <attr name="dividerColor" format="color" />
+  <attr format="color" name="dividerColor"/>
 
   <declare-styleable name="RoundCornerFrameLayout">
-        <attr name="corner_radius" format="dimension" />
+    <attr format="dimension" name="corner_radius"/>
   </declare-styleable>
 
   <declare-styleable name="BlurLayout">
-        <attr name="blk_downscaleFactor" format="float" />
+    <attr format="float" name="blk_downscaleFactor"/>
-        <attr name="blk_blurRadius" format="integer" />
+    <attr format="integer" name="blk_blurRadius"/>
-        <attr name="blk_fps" format="integer" />
+    <attr format="integer" name="blk_fps"/>
-        <attr name="blk_cornerRadius" format="dimension" />
+    <attr format="dimension" name="blk_cornerRadius"/>
   </declare-styleable>
 
   <declare-styleable name="NetworkImageView">
-        <attr name="url_link" format="string"/>
+    <attr format="string" name="url_link"/>
+  </declare-styleable>
+  <declare-styleable name="LyricView">
+    <attr format="string" name="hint"/>
+    <attr format="color" name="hintColor"/>
+    <attr format="color" name="textColor"/>
+    <attr format="color" name="highlightColor"/>
+    <attr format="dimension" name="textSize"/>
+    <attr format="dimension" name="maxLength"/>
+    <attr format="boolean" name="fadeInFadeOut"/>
+    <attr format="dimension" name="lineSpace"/>
+    <attr name="textAlign">
+      <enum name="left" value="0"/>
+      <enum name="center" value="1"/>
+      <enum name="right" value="2"/>
+    </attr>
   </declare-styleable>
-
 </resources>

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

@@ -38,8 +38,8 @@
     <string name="circular_std_book" translatable="false">fonts/circular_std_book.otf</string>
     <string name="sans_regular" translatable="false">fonts/product_sans_regular.ttf</string>
     <string name="sans_bold" translatable="false">fonts/product_sans_bold.ttf</string>
-    <string name="leo_name" translatable="false">Leo</string>
+    <string name="marko_name" translatable="false">Marko Ivanović </string>
-    <string name="leo_summary" translatable="false">Moderator</string>
+    <string name="marko_summary" translatable="false">Contributor</string>
     <string name="yt_gaming_name" translatable="false">Gaming Inc</string>
     <string name="yt_gaming_summary" translatable="false">Discord server maintainer</string>
     <string name="moderator" translatable="false">Moderator</string>

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

@@ -401,10 +401,10 @@
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
     <string name="pref_summary_language_en">Change app language forcefully to english(this is testing for multiple language option)</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
-    <string name="pref_summary_lock_screen">Use Retro Music's custom lockscreen controls</string>
+    <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
     <string name="pref_summary_lock_screen_app">Show full controls from the lock screen</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_round_corners">Round the app's edges</string>
+    <string name="pref_summary_round_corners">Round the app\'s edges</string>
     <string name="pref_summary_tab_titles">Toggle titles for the bottom navigation bar tabs</string>
     <string name="pref_summary_toggle_animations">Animations makes some device run slow, load images slow</string>
     <string name="pref_summary_toggle_bottom_bar_titles">Disable titles from bottom navigation bar</string>

app/src/main/res/xml/pref_advanced.xml

@@ -15,9 +15,9 @@
             android:title="@string/pref_title_toggle_toggle_shuffle" />
 
         <android.support.v7.preference.SeekBarPreference
-            android:defaultValue="0"
+            android:defaultValue="12"
-            android:key="blur_amount"
+            android:key="new_blur_amount"
-            android:max="255"
+            android:max="25"
             android:summary="@string/pref_blur_amount_summary"
             android:title="@string/pref_blur_amount_title" />