Update and fixes

architjn · Dec 19, 2015 · 16b8ce5 · 16b8ce5
1 parent 8d0198e
commit 16b8ce5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.architjn.acjmusicplayer"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 6
-        versionName "0.5.6beta"
+        versionCode 7
+        versionName "0.6.0beta"
     }
     buildTypes {
         release {
@@ -30,7 +30,7 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'com.android.support:design:23.1.1'
     compile 'com.android.support:palette-v7:23.1.1'
-    compile 'com.squareup.picasso:picasso:+'
+    compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.sothree.slidinguppanel:library:3.2.0'
     compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
     compile('com.github.afollestad.material-dialogs:core:0.8.5.2@aar') {

diff --git a/app/src/main/java/com/architjn/acjmusicplayer/ui/layouts/fragments/SearchViewFragment.java b/app/src/main/java/com/architjn/acjmusicplayer/ui/layouts/fragments/SearchViewFragment.java
@@ -14,7 +14,12 @@
 import com.architjn.acjmusicplayer.utils.ListSongs;
 import com.architjn.acjmusicplayer.utils.SearchListSpacesItemDecoration;
 import com.architjn.acjmusicplayer.utils.adapters.SearchListAdapter;
+import com.architjn.acjmusicplayer.utils.items.Album;
+import com.architjn.acjmusicplayer.utils.items.Artist;
 import com.architjn.acjmusicplayer.utils.items.Search;
+import com.architjn.acjmusicplayer.utils.items.Song;
+
+import java.util.ArrayList;
 
 /**
  * Created by architjn on 17/12/15.
@@ -25,7 +30,7 @@ public class SearchViewFragment extends Fragment {
     private SearchView searchView;
     private RecyclerView rv;
     private Context context;
-    private View mainView;
+    private View mainView, emptyView;
     private SearchListAdapter adapter;
 
     @Override
@@ -39,8 +44,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     }
 
     private void setRecyclerView() {
-        Search searchRes = ListSongs.getSearchResults(context, "Pharrell");
+        Search searchRes = new Search(new ArrayList<Song>(), new ArrayList<Album>(),
+                new ArrayList<Artist>());
         rv = (RecyclerView) mainView.findViewById(R.id.search_view_results);
+        emptyView = mainView.findViewById(R.id.search_empty_view);
         final GridLayoutManager manager = new GridLayoutManager(context, 2);
         manager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
@@ -57,6 +64,8 @@ public int getSpanSize(int position) {
                 searchRes.getAlbums(), searchRes.getArtists());
         rv.addItemDecoration(new SearchListSpacesItemDecoration(2, adapter));
         rv.setAdapter(adapter);
+        emptyView.setVisibility(View.VISIBLE);
+        rv.setVisibility(View.GONE);
     }
 
     public void setSearchView(SearchView searchView) {
@@ -73,8 +82,15 @@ public boolean onQueryTextSubmit(String query) {
 
             @Override
             public boolean onQueryTextChange(String newText) {
-                if (newText.matches(""))
+                if (newText.matches("")) {
+                    if (emptyView != null) {
+                        emptyView.setVisibility(View.VISIBLE);
+                        rv.setVisibility(View.GONE);
+                    }
                     return false;
+                }
+                emptyView.setVisibility(View.GONE);
+                rv.setVisibility(View.VISIBLE);
                 Search searchRes = ListSongs.getSearchResults(context, newText);
                 adapter.updateList(searchRes);
                 return true;

diff --git a/app/src/main/java/com/architjn/acjmusicplayer/utils/adapters/SearchListAdapter.java b/app/src/main/java/com/architjn/acjmusicplayer/utils/adapters/SearchListAdapter.java
@@ -183,6 +183,7 @@ public void onBindViewHolder(final SearchListAdapter.SimpleItemViewHolder holder
         } else if (whatView(position) == ITEM_VIEW_TYPE_LIST_ARTIST) {
             if (artists.size() == 0)
                 return;
+            holder.artistArt.setImageDrawable(new ColorDrawable(0xffffffff));
             getArtistImg(holder, getPosition(position));
             holder.expandView.setVisibility(View.GONE);
             holder.artistName.setText(artists.get(getPosition(position)).getArtistName());
@@ -202,6 +203,7 @@ public void onClick(View view) {
         } else if (whatView(position) == ITEM_VIEW_TYPE_LIST_ALBUM) {
             if (albums.size() == 0)
                 return;
+            holder.albumArt.setImageDrawable(new ColorDrawable(0xffffffff));
             holder.albumName.setText(albums.get(getPosition(position)).getAlbumTitle());
             holder.albumArtist.setText(albums.get(getPosition(position)).getAlbumArtist());
             setArt(holder, getPosition(position));
@@ -217,6 +219,7 @@ public void onClick(View view) {
         } else {
             if (songs.size() == 0)
                 return;
+            holder.songArt.setImageDrawable(new ColorDrawable(0xffffffff));
             setSongArt(getPosition(position), holder);
             holder.songName.setText(songs.get(getPosition(position)).getName());
             holder.songArtist.setText(songs.get(getPosition(position)).getArtist());

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
@@ -10,4 +10,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <LinearLayout
+        android:id="@+id/search_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color400"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files