Merge pull request #1523 from recalculated/lock-icons

Reverse (un)lock icons in queue

2 files changed, 12 insertions, 5 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index cc6b44f6a..ee23402dc 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -268,10 +268,17 @@ public class QueueFragment extends Fragment {
         if (!super.onOptionsItemSelected(item)) {
             switch (item.getItemId()) {
                 case R.id.queue_lock:
-                    boolean locked = !UserPreferences.isQueueLocked();
-                    UserPreferences.setQueueLocked(locked);
+                    boolean newLockState = !UserPreferences.isQueueLocked();
+                    UserPreferences.setQueueLocked(newLockState);
                     getActivity().supportInvalidateOptionsMenu();
-                    recyclerAdapter.setLocked(locked);
+                    recyclerAdapter.setLocked(newLockState);
+                    if (newLockState) {
+                        Snackbar.make(getActivity().findViewById(R.id.content), R.string
+                                .queue_locked, Snackbar.LENGTH_SHORT).show();
+                    } else {
+                        Snackbar.make(getActivity().findViewById(R.id.content), R.string
+                                .queue_unlocked, Snackbar.LENGTH_SHORT).show();
+                    }
                     return true;
                 case R.id.refresh_item:
                     List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index cfc540fd6..0d2ff8a75 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -34,10 +34,10 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte
         TypedArray ta = context.obtainStyledAttributes(lockIcons);
         if (UserPreferences.isQueueLocked()) {
             queueLock.setTitle(de.danoeh.antennapod.R.string.unlock_queue);
-            queueLock.setIcon(ta.getDrawable(1));
+            queueLock.setIcon(ta.getDrawable(0));
         } else {
             queueLock.setTitle(de.danoeh.antennapod.R.string.lock_queue);
-            queueLock.setIcon(ta.getDrawable(0));
+            queueLock.setIcon(ta.getDrawable(1));
         }
     }