Merge branch 'master' of /Users/karim/Code/AndroidProjects/Phonograph with conflicts.

app/build.gradle

@@ -63,10 +63,8 @@ android {
         renderscriptTargetApi 23
 
         applicationId "com.kabouzeid.gramophone"
-        versionCode 92
-        versionName "invalid"
-
-        manifestPlaceholders = [appName: "@string/app_name"]
+        versionCode 93
+        versionName "0.9.53 TEMP"
     }
     buildTypes {
         release {
@@ -76,9 +74,6 @@ android {
             signingConfig signingConfigs.release
         }
         debug {
-            applicationIdSuffix '.debug'
-            versionNameSuffix ' DEBUG'
-            manifestPlaceholders = [appName: "Phonograph DEBUG"]
             signingConfig signingConfigs.debug
         }
     }
@@ -137,5 +132,5 @@ dependencies {
     compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
     compile 'com.github.kabouzeid:AppIntro:3.3.0k'
     compile 'com.github.bumptech.glide:glide:3.6.1'
-    compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.2-kmod'
+    compile 'com.github.kabouzeid:RecyclerView-FastScroll:4a2754f1d6'
 }

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java

@@ -13,11 +13,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.afollestad.materialdialogs.internal.ThemeSingleton;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
-import com.kabouzeid.gramophone.util.ColorUtil;
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
+import com.kabouzeid.gramophone.views.FastScroller;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -29,8 +27,6 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
 
     public static final String TAG = AbsMainActivityRecyclerViewFragment.class.getSimpleName();
 
-    @Bind(R.id.container)
-    View container;
     @Bind(R.id.recycler_view)
     RecyclerView recyclerView;
     @Nullable
@@ -60,13 +56,6 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
     }
 
     private void setUpRecyclerView() {
-        if (recyclerView instanceof FastScrollRecyclerView) {
-            int accentColor = ThemeSingleton.get().positiveColor.getDefaultColor();
-            ((FastScrollRecyclerView) recyclerView).setPopupBgColor(accentColor);
-            ((FastScrollRecyclerView) recyclerView).setPopupTextColor(ColorUtil.getPrimaryTextColorForBackground(getActivity(), accentColor));
-            ((FastScrollRecyclerView) recyclerView).setThumbColor(accentColor);
-            ((FastScrollRecyclerView) recyclerView).setTrackColor(ColorUtil.getColorWithAlpha(0.12f, ColorUtil.resolveColor(getContext(), R.attr.colorControlNormal)));
-        }
         invalidateLayoutManager();
         invalidateAdapter();
     }
@@ -102,7 +91,7 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
 
     @Override
     public void onOffsetChanged(AppBarLayout appBarLayout, int i) {
-        container.setPadding(container.getPaddingLeft(), container.getPaddingTop(), container.getPaddingRight(), getMainActivity().getTotalAppBarScrollingRange() + i);
+        int bottomPadding = getMainActivity().getTotalAppBarScrollingRange() + i;
     }
 
     @Override

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

@@ -8,7 +8,6 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
         android:scrollbars="none" />
 
     <TextView