From 1993f779e8b25507a4096effd72618937c2f4ad0 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Sat, 19 Sep 2015 14:40:01 -0400
Subject: basic favorite functionality

---
 .../res/layout/episodes_fragment_with_undo.xml     | 67 ++++++++++++++++++++++
 app/src/main/res/layout/new_episodes_fragment.xml  | 67 ----------------------
 app/src/main/res/menu/allepisodes_context.xml      |  9 ++-
 app/src/main/res/menu/feeditem_options.xml         | 10 ++++
 app/src/main/res/menu/queue_context.xml            |  8 +++
 5 files changed, 93 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/res/layout/episodes_fragment_with_undo.xml
 delete mode 100644 app/src/main/res/layout/new_episodes_fragment.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/episodes_fragment_with_undo.xml b/app/src/main/res/layout/episodes_fragment_with_undo.xml
new file mode 100644
index 000000000..e90171630
--- /dev/null
+++ b/app/src/main/res/layout/episodes_fragment_with_undo.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:dslv="http://schemas.android.com/apk/res-auto"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:orientation="vertical"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+        <com.mobeta.android.dslv.DragSortListView
+            android:id="@android:id/list"
+            android:scrollbarStyle="outsideOverlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/list_vertical_padding"
+            android:paddingBottom="@dimen/list_vertical_padding"
+            android:clipToPadding="false"
+            dslv:collapsed_height="2dp"
+            dslv:drag_enabled="true"
+            dslv:drag_handle_id="@id/drag_handle"
+            dslv:drag_scroll_start="0.33"
+            dslv:float_alpha="0.6"
+            dslv:max_drag_scroll_speed="0.5"
+            dslv:remove_enabled="true"
+            dslv:remove_mode="flingRemove"
+            dslv:slide_shuffle_speed="0.3"
+            dslv:sort_enabled="false"
+            dslv:track_drag_sort="false"
+            dslv:float_background_color="?attr/dragview_float_background"
+            dslv:use_default_controller="true"
+            tools:background="@android:color/holo_green_dark"/>
+
+    <TextView
+        android:id="@id/android:empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/no_items_label"/>
+
+    <ProgressBar
+        android:id="@+id/progLoading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminateOnly="true"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:layout_width="match_parent"
+        tools:layout_height="64dp"
+        tools:background="@android:color/holo_red_light"/>
+
+    <LinearLayout
+        android:id="@+id/undobar"
+        style="@style/UndoBar">
+
+        <TextView
+            android:id="@+id/undobar_message"
+            style="@style/UndoBarMessage"/>
+
+        <Button
+            android:id="@+id/undobar_button"
+            style="@style/UndoBarButton"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml
deleted file mode 100644
index e90171630..000000000
--- a/app/src/main/res/layout/new_episodes_fragment.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:dslv="http://schemas.android.com/apk/res-auto"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:orientation="vertical"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-        <com.mobeta.android.dslv.DragSortListView
-            android:id="@android:id/list"
-            android:scrollbarStyle="outsideOverlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="@dimen/list_vertical_padding"
-            android:paddingBottom="@dimen/list_vertical_padding"
-            android:clipToPadding="false"
-            dslv:collapsed_height="2dp"
-            dslv:drag_enabled="true"
-            dslv:drag_handle_id="@id/drag_handle"
-            dslv:drag_scroll_start="0.33"
-            dslv:float_alpha="0.6"
-            dslv:max_drag_scroll_speed="0.5"
-            dslv:remove_enabled="true"
-            dslv:remove_mode="flingRemove"
-            dslv:slide_shuffle_speed="0.3"
-            dslv:sort_enabled="false"
-            dslv:track_drag_sort="false"
-            dslv:float_background_color="?attr/dragview_float_background"
-            dslv:use_default_controller="true"
-            tools:background="@android:color/holo_green_dark"/>
-
-    <TextView
-        android:id="@id/android:empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:text="@string/no_items_label"/>
-
-    <ProgressBar
-        android:id="@+id/progLoading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminateOnly="true"
-        android:visibility="gone"
-        tools:visibility="visible"
-        tools:layout_width="match_parent"
-        tools:layout_height="64dp"
-        tools:background="@android:color/holo_red_light"/>
-
-    <LinearLayout
-        android:id="@+id/undobar"
-        style="@style/UndoBar">
-
-        <TextView
-            android:id="@+id/undobar_message"
-            style="@style/UndoBarMessage"/>
-
-        <Button
-            android:id="@+id/undobar_button"
-            style="@style/UndoBarButton"/>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
index 171e509a8..c5356535c 100644
--- a/app/src/main/res/menu/allepisodes_context.xml
+++ b/app/src/main/res/menu/allepisodes_context.xml
@@ -24,7 +24,14 @@
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
-
+    <item
+        android:id="@+id/add_to_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/add_to_favorite_label" />
+    <item
+        android:id="@+id/remove_from_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/remove_from_favorite_label" />
     <item
         android:id="@+id/reset_position"
         android:menuCategory="container"
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index 650912ea2..898081486 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -30,6 +30,16 @@
         android:title="@string/remove_from_queue_label">
     </item>
 
+    <item
+        android:id="@+id/add_to_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/add_to_favorite_label" />
+
+    <item
+        android:id="@+id/remove_from_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/remove_from_favorite_label" />
+
     <item
         android:id="@+id/reset_position"
         custom:showAsAction="collapseActionView"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index d09f3c84c..3eb1d9d5e 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -27,6 +27,14 @@
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
 
+    <item
+        android:id="@+id/add_to_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/add_to_favorite_label" />
+    <item
+        android:id="@+id/remove_from_favorites_item"
+        android:menuCategory="container"
+        android:title="@string/remove_from_favorite_label" />
     <item
         android:id="@+id/reset_position"
         android:menuCategory="container"
-- 
cgit v1.2.3