tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Karim Abou Zeid 2016-01-27 12:13:53 +01:00
commit e7769b8c5d
3 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/build.gradle
View file

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

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

@ -13,11 +13,9 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.internal.ThemeSingleton;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener; import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
import com.kabouzeid.gramophone.util.ColorUtil; import com.kabouzeid.gramophone.views.FastScroller;
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import butterknife.Bind; import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -29,8 +27,6 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
public static final String TAG = AbsMainActivityRecyclerViewFragment.class.getSimpleName(); public static final String TAG = AbsMainActivityRecyclerViewFragment.class.getSimpleName();
@Bind(R.id.container)
View container;
@Bind(R.id.recycler_view) @Bind(R.id.recycler_view)
RecyclerView recyclerView; RecyclerView recyclerView;
@Nullable @Nullable
@ -60,13 +56,6 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
} }
private void setUpRecyclerView() { 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(); invalidateLayoutManager();
invalidateAdapter(); invalidateAdapter();
} }
@ -102,7 +91,7 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
@Override @Override
public void onOffsetChanged(AppBarLayout appBarLayout, int i) { public void onOffsetChanged(AppBarLayout appBarLayout, int i) {
container.setPadding(container.getPaddingLeft(), container.getPaddingTop(), container.getPaddingRight(), getMainActivity().getTotalAppBarScrollingRange() + i); int bottomPadding = getMainActivity().getTotalAppBarScrollingRange() + i;
} }
@Override @Override

1
app/src/main/res/layout/fragment_main_activity_recycler_view.xml
View file

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