Playing queue dialog finished

- rearranged code structure

app/src/main/res/layout/tab_indicator.xml

@@ -13,13 +13,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<TextView android:id="@android:id/text1"
-          style="@style/ThemeOverlay.AppCompat.Light"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:layout_width="wrap_content"
-          android:layout_height="48dp"
-          android:gravity="center"
-          android:paddingLeft="16dp"
-          android:paddingRight="16dp"
-          android:textColor="@color/white"
-          android:textSize="14sp"/>
+<TextView
+    android:id="@android:id/text1"
+    style="@style/ThemeOverlay.AppCompat.Light"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="48dp"
+    android:gravity="center"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:textColor="@color/white"
+    android:textSize="14sp"/>

app/src/main/res/menu/drawer.xml

@@ -7,7 +7,7 @@
         android:id="@+id/action_current_playing"
         android:icon="@drawable/music_box"
         android:title="@string/action_current_playing"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_search"
@@ -16,6 +16,12 @@
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom"/>
 
+    <item
+        android:id="@+id/action_playing_queue"
+        android:icon="@drawable/playlist"
+        android:title="@string/action_playing_queue"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/settings"

app/src/main/res/menu/menu_playing_queue_song.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_play_next"
+        android:title="@string/action_play_next"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_remove_from_playing_queue"
+        android:title="@string/action_remove_from_playing_queue"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_add_to_current_playing"
+        android:title="@string/action_add_to_playing_queue"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_add_to_playlist"
+        android:title="@string/action_add_to_playlist"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_go_to_album"
+        android:title="@string/action_go_to_album"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_go_to_artist"
+        android:title="@string/action_go_to_artist"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_tag_editor"
+        android:title="@string/action_tag_editor"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_details"
+        android:title="@string/action_details"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_delete_from_disk"
+        android:title="@string/action_delete_from_disk"
+        app:showAsAction="never"/>
+</menu>

app/src/main/res/menu/menu_song.xml

@@ -7,7 +7,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:title="@string/action_add_to_current_playing"
+        android:title="@string/action_add_to_playing_queue"
         app:showAsAction="never"/>
     <item
         android:id="@+id/action_add_to_playlist"

app/src/main/res/values/strings.xml

@@ -9,12 +9,13 @@
     <string name="action_playing_queue">Playing queue</string>
     <string name="action_search">Search</string>
     <string name="action_play_next">Play next</string>
-    <string name="action_add_to_current_playing">Add to playing queue"</string>
-    <string name="action_add_to_playlist">Add to playlist..."</string>
+    <string name="action_add_to_playing_queue">Add to playing queue"</string>
+    <string name="action_remove_from_playing_queue">Remove from playing queue</string>
+    <string name="action_add_to_playlist">Add to playlist…"</string>
     <string name="action_tag_editor">Tag Editor"</string>
     <string name="action_delete_from_disk">Delete from disk"</string>
     <string name="action_details">Details</string>
-    <string name="action_go_to">Go to...</string>
+    <string name="action_go_to">Go to…</string>
     <string name="albums">Albums</string>
     <string name="artists">Artists</string>
     <string name="genres">Genres</string>
@@ -55,7 +56,7 @@
     <string name="label_track_length">Length</string>
     <string name="label_bit_rate">Bitrate</string>
     <string name="label_sampling_rate">Sampling rate</string>
-    <string name="ok">ok</string>
+    <string name="ok">OK</string>
     <string name="action_go_to_artist">Go to artist</string>
     <string name="action_go_to_album">Go to album</string>
     <string name="label_current_playing_queue">Playing queue</string>