From 7055b443fb922d3e2f52e348d7f201495b357ea7 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <drummer.aidan@gmail.com>
Date: Thu, 16 Apr 2015 19:47:32 -0500
Subject: [PATCH] Small fixes, also added empty text to playlist fragment and
 detail viewer.

---
 .../ui/activities/PlaylistDetailActivity.java     |  5 +++++
 .../AbsMainActivityFragment.java                  |  4 ----
 .../PlaylistViewFragment.java                     | 11 +++++++++--
 .../gramophone/views/DynamicEditText.java         |  4 ++--
 app/src/main/res/drawable/list_selector.xml       |  2 +-
 app/src/main/res/drawable/list_selector_dark.xml  |  2 +-
 app/src/main/res/drawable/round_selector.xml      |  2 +-
 app/src/main/res/drawable/round_selector_dark.xml |  2 +-
 app/src/main/res/layout/activity_album_detail.xml |  4 ++--
 .../main/res/layout/activity_artist_detail.xml    |  4 ++--
 .../main/res/layout/activity_playlist_detail.xml  | 15 +++++++++++++--
 .../main/res/layout/fragment_playlist_view.xml    | 14 ++++++++++++--
 app/src/main/res/values/dimens.xml                |  1 +
 app/src/main/res/values/strings.xml               |  2 ++
 14 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index 07157c1f..ba25b1e8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.songadapter.PlaylistSongAdapter;
@@ -44,6 +45,10 @@ public class PlaylistDetailActivity extends AbsFabActivity {
         recyclerView.setLayoutManager(new GridLayoutManager(this, 1));
         recyclerView.setAdapter(adapter);
 
+        findViewById(android.R.id.empty).setVisibility(
+                songs.size() == 0 ? View.VISIBLE : View.GONE
+        );
+
         DragSortRecycler dragSortRecycler = new DragSortRecycler();
         dragSortRecycler.setViewHandleId(R.id.album_art);
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java
index 020dba8c..c12fce84 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java
@@ -60,8 +60,4 @@ public abstract class AbsMainActivityFragment extends Fragment implements KabVie
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
     }
-
-    protected MainActivity getMainActivity() {
-        return (MainActivity) getActivity();
-    }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java
index 3e575549..fd027e53 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java
@@ -4,6 +4,7 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.PlaylistAdapter;
@@ -24,6 +25,12 @@ public class PlaylistViewFragment extends AbsMainActivityRecyclerViewFragment {
 
     @Override
     protected RecyclerView.Adapter createAdapter() {
-        return new PlaylistAdapter((ActionBarActivity) getActivity());
+        PlaylistAdapter adapter = new PlaylistAdapter((ActionBarActivity) getActivity());
+        View v = getView();
+        if (v != null) {
+            v.findViewById(android.R.id.empty).setVisibility(
+                    adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+        }
+        return adapter;
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/DynamicEditText.java b/app/src/main/java/com/kabouzeid/gramophone/views/DynamicEditText.java
index 9da85f0c..5337837b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/views/DynamicEditText.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/views/DynamicEditText.java
@@ -1,7 +1,7 @@
 package com.kabouzeid.gramophone.views;
 
 import android.content.Context;
-import android.support.v7.internal.widget.TintCheckBox;
+import android.support.v7.internal.widget.TintEditText;
 import android.util.AttributeSet;
 
 import com.afollestad.materialdialogs.ThemeSingleton;
@@ -10,7 +10,7 @@ import com.afollestad.materialdialogs.internal.MDTintHelper;
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class DynamicEditText extends TintCheckBox {
+public class DynamicEditText extends TintEditText {
 
     public DynamicEditText(Context context) {
         super(context);
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
index 45ab4502..d12dbb6f 100755
--- a/app/src/main/res/drawable/list_selector.xml
+++ b/app/src/main/res/drawable/list_selector.xml
@@ -1,4 +1,4 @@
-<selector android:exitFadeDuration="@android:integer/config_mediumAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/list_activated" android:state_activated="true" />
     <item android:drawable="@drawable/rect_selected" android:state_pressed="true" />
     <item android:drawable="@drawable/transparent" />
diff --git a/app/src/main/res/drawable/list_selector_dark.xml b/app/src/main/res/drawable/list_selector_dark.xml
index 862b9ce8..7c2d6d11 100755
--- a/app/src/main/res/drawable/list_selector_dark.xml
+++ b/app/src/main/res/drawable/list_selector_dark.xml
@@ -1,4 +1,4 @@
-<selector android:exitFadeDuration="@android:integer/config_mediumAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/list_activated_dark" android:state_activated="true" />
     <item android:drawable="@drawable/rect_selected_dark" android:state_pressed="true" />
     <item android:drawable="@drawable/transparent" />
diff --git a/app/src/main/res/drawable/round_selector.xml b/app/src/main/res/drawable/round_selector.xml
index a12a0b25..201f5062 100644
--- a/app/src/main/res/drawable/round_selector.xml
+++ b/app/src/main/res/drawable/round_selector.xml
@@ -1,4 +1,4 @@
-<selector android:exitFadeDuration="@android:integer/config_shortAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/round_selected" />
     <item android:drawable="@android:color/transparent" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector_dark.xml b/app/src/main/res/drawable/round_selector_dark.xml
index 149dc119..5d4d429e 100644
--- a/app/src/main/res/drawable/round_selector_dark.xml
+++ b/app/src/main/res/drawable/round_selector_dark.xml
@@ -1,4 +1,4 @@
-<selector android:exitFadeDuration="@android:integer/config_shortAnimTime" xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/round_selected_dark" />
     <item android:drawable="@android:color/transparent" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 4a21af2e..8d6657f8 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -1,4 +1,4 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
@@ -80,4 +80,4 @@
         android:layout_marginRight="16dp"
         tools:ignore="RtlHardcoded" />
 
-</merge>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index b45f778c..594db88e 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -1,4 +1,4 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
@@ -82,4 +82,4 @@
         android:layout_marginRight="16dp"
         tools:ignore="RtlHardcoded" />
 
-</merge>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index 237e50b7..5000ea33 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -1,4 +1,4 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
@@ -21,8 +21,19 @@
             android:divider="@null"
             android:dividerHeight="0px"
             android:scrollbars="vertical" />
+
     </LinearLayout>
 
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/empty_text_size"
+        android:textColor="?android:textColorSecondary"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/playlist_empty_text"
+        android:layout_gravity="center" />
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -37,4 +48,4 @@
 
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlist_view.xml b/app/src/main/res/layout/fragment_playlist_view.xml
index 7f7fe927..cbef8e05 100644
--- a/app/src/main/res/layout/fragment_playlist_view.xml
+++ b/app/src/main/res/layout/fragment_playlist_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     android:id="@+id/fragment_song_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -14,4 +14,14 @@
         android:divider="@null"
         android:scrollbars="vertical" />
 
-</LinearLayout>
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/empty_text_size"
+        android:textColor="?android:textColorSecondary"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/no_playlists"
+        android:layout_gravity="center" />
+
+</FrameLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2cba4300..41b5814e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -40,5 +40,6 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <!-- Color Chooser Dialog -->
     <dimen name="circle_view_border">1dp</dimen>
     <dimen name="circle_view_check">24dp</dimen>
+    <dimen name="empty_text_size">20sp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59512a40..11f035f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,6 +98,8 @@
     <string name="primary_color_desc">The primary theme color, defaults to indigo.</string>
     <string name="accent_color_desc">The accent theme color, defaults to pink.</string>
     <string name="update_image">Update Image</string>
+    <string name="playlist_empty_text">This playlist is empty</string>
+    <string name="no_playlists">No playlists</string>
 
     <string-array name="update_albumcover_options">
         <item>Download from LastFM</item>