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

Started to fix the sliding panel playing queue. WIP

Browse source
This commit is contained in:
Karim Abou Zeid 2015-11-27 00:14:16 +01:00
commit 188ead81dc
8 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -14,7 +14,7 @@ import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment;
import com.kabouzeid.gramophone.ui.fragments.player.PlayerFragment;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import com.kabouzeid.gramophone.views.SlidingUpPanelLayout;
import butterknife.Bind;
import butterknife.ButterKnife;
@ -67,6 +67,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
}
});
slidingUpPanelLayout.setScrollingEnabled(false);
}
protected abstract View createContentView();

11
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
View file

@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.ColorInt;
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
@ -24,11 +25,11 @@ import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
import com.kabouzeid.gramophone.dialogs.SongDetailDialog;
import com.kabouzeid.gramophone.dialogs.SongShareDialog;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.CabHolder;
import com.kabouzeid.gramophone.interfaces.MusicServiceEventListener;
import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
import com.kabouzeid.gramophone.ui.activities.tageditor.AbsTagEditorActivity;
import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
@ -37,8 +38,8 @@ import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.kabouzeid.gramophone.views.SlidingUpPanelLayout;
import com.kabouzeid.gramophone.views.SquareLayout;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import org.solovyev.android.views.llm.LinearLayoutManager;
@ -107,11 +108,11 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
setUpSubFragments();
recyclerView.setAdapter(new SongAdapter(
((MainActivity) getActivity()),
((AppCompatActivity) getActivity()),
SongLoader.getAllSongs(getActivity()),
R.layout.item_list,
false,
((MainActivity) getActivity())));
((CabHolder) getActivity())));
// TODO set child size
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
@ -274,4 +275,6 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
public interface Callbacks {
void onPaletteColorChanged();
}
}