From 7481b31b7f80b8fe1fe0ca395a8e328a6e3c0518 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Wed, 22 Apr 2015 15:53:17 -0500 Subject: [PATCH 1/4] MD 0.7.2.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1bbbc0f7..e0bc88ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,7 +69,7 @@ dependencies { compile 'de.hdodenhof:circleimageview:1.2.2' compile 'com.github.bumptech.glide:glide:3.5.2' - compile 'com.afollestad:material-dialogs:0.7.2.6' + compile 'com.afollestad:material-dialogs:0.7.2.7' compile 'com.jpardogo.materialtabstrip:library:1.0.9' compile 'com.readystatesoftware.systembartint:systembartint:1.0.3' compile 'com.melnykov:floatingactionbutton:1.3.0' From fbc5731c47d047d4108250ff8779afd5ff3e2e8a Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Wed, 22 Apr 2015 16:11:09 -0500 Subject: [PATCH 2/4] Added serialization version IDs so that songs don't become deserializable after updates. --- .../main/java/com/kabouzeid/gramophone/model/PlaylistSong.java | 3 +++ app/src/main/java/com/kabouzeid/gramophone/model/Song.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java b/app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java index 694d4e17..6b59ea49 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java @@ -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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Song.java b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java index 58007c3d..0c4903dc 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/Song.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java @@ -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; From 5df986539c4a38cfb302ce3341ffb7266c606445 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Wed, 22 Apr 2015 18:53:02 -0500 Subject: [PATCH 3/4] Fixed search crash. I'm assuming you're adding search results tomorrow? --- .../kabouzeid/gramophone/ui/activities/SearchActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index d8327793..c3732184 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -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); } From 049d4262b7548c4fce40eeeb3e9fb960fca504e5 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Thu, 23 Apr 2015 12:48:30 -0500 Subject: [PATCH 4/4] Added bottom padding to the playlist detail list so the FAB doesn't cut off menus at the bottom of the list. --- app/src/main/res/layout/activity_playlist_detail.xml | 7 ++++--- app/src/main/res/values/dimens.xml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 21085751..9842ce10 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -1,7 +1,7 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b7ae5e10..42208fcd 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -48,4 +48,5 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout 2dp 128dp + 86dp