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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-23 22:09:52 +02:00
commit 82b1f36379
6 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java
View file

@ -1,6 +1,9 @@
package com.kabouzeid.gramophone.model;
public class PlaylistSong extends Song {
private static final long serialVersionUID = 1098600801627571043L;
public final int playlistId;
public int idInPlayList;

2
app/src/main/java/com/kabouzeid/gramophone/model/Song.java
View file

@ -7,6 +7,8 @@ import java.io.Serializable;
*/
public class Song implements Serializable {
private static final long serialVersionUID = 3720703366054566981L;
public int id;
public final int albumId;
public final int artistId;

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
View file

@ -8,6 +8,7 @@ import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar;
@ -28,7 +29,6 @@ public class SearchActivity extends AbsBaseActivity {
public static final String TAG = SearchActivity.class.getSimpleName();
private RecyclerView recyclerView;
private SearchView searchView;
private SearchAdapter searchAdapter;
@SuppressLint("NewApi")
@Override
@ -39,7 +39,8 @@ public class SearchActivity extends AbsBaseActivity {
setContentView(R.layout.activity_search);
recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
searchAdapter = new SearchAdapter(this);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
SearchAdapter searchAdapter = new SearchAdapter(this);
recyclerView.setAdapter(searchAdapter);
recyclerView.setOnTouchListener(new View.OnTouchListener() {
@ -56,6 +57,7 @@ public class SearchActivity extends AbsBaseActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setBackgroundColor(PreferenceUtils.getInstance(this).getThemeColorPrimary());
setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}

7
app/src/main/res/layout/activity_playlist_detail.xml
View file

@ -1,7 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -21,6 +21,7 @@
android:clipToPadding="false"
android:divider="@null"
android:dividerHeight="0px"
android:paddingBottom="@dimen/playlist_list_bottom_offset"
android:scrollbars="vertical" />
</LinearLayout>

1
app/src/main/res/values/dimens.xml
View file

@ -48,4 +48,5 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
<dimen name="list_padding_vertical">2dp</dimen>
<dimen name="notification_albumart_size">128dp</dimen>
<dimen name="playlist_list_bottom_offset">86dp</dimen>
</resources>