From b0f124c158f11636ee18698eb338e2b6a33b0bef Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sat, 4 Jan 2014 17:41:44 +0100
Subject: [PATCH] Changed string.xml organization, fixed play/pause button
 description.

---
 res/values/strings.xml                        | 37 ++++++++++++++-----
 .../controldlna/gui/RouteFragment.java        |  4 ++
 .../controldlna/gui/ServerFragment.java       |  2 +-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f689f0..dc145f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,25 +2,42 @@
 <resources>
 
     <string name="app_name">ControlDLNA</string>
-    <string name="title_route">Route</string>
+    
+    <!-- Server Fragment -->
     <string name="title_server">Server</string>
+	<string name="folder_list_empty">Folder is empty</string>
+    <string name="device_list_empty">No UPNP devices found. 
+        \nNew devices will be added automatically when they are available.</string>
+    
+    <!-- Route Fragment -->
+    <string name="title_route">Route</string>
+	<string name="playlist_empty">Playlist is empty</string>
+    <string name="route_list_empty">No routes found. 
+        \nNew routes will be added automatically when they are available.</string>
+    
+    <!-- Playback controls -->
     <string name="play">Play</string>
     <string name="pause">Pause</string>
-    <string name="exit_renderer">Do you really want to exit the renderer? Playback will be stopped.</string>
     <string name="previous">Previous</string>
     <string name="next">Next</string>
     <string name="shuffle">Shuffle</string>
     <string name="repeat">Repeat</string>
+    
+    <!-- Toasts/Dialogs -->
+    <string name="exit_renderer">Do you really want to exit the renderer? 
+        Playback will be stopped.</string>
     <string name="select_route">Please select a route</string>
-    <string name="album_art">Album Art</string>
-    <string name="route_description">DLNA Playback</string>
     <string name="warning_wifi_not_connected">Wifi needs to be connected for playback</string>
-    <string name="auto_enable_wifi">Enable Wifi automatically on start</string>
-    <string name="dont_show_dialog_again">"Do not show this dialog again"</string>
-    <string name="device_list_empty">No UPNP devices found. \nNew devices will be added automatically when they are available.</string>
-    <string name="route_list_empty">No routes found. \nNew routes will be added automatically when they are available.</string>
-	<string name="folder_list_etmpy">Folder is empty</string>
-	<string name="playlist_empty">Playlist is empty</string>
+    
+    <!-- Image alt text -->
+    <string name="album_art">Album Art</string>
+    
+    <!-- MediaRouter strings -->
+    <string name="route_description">DLNA Playback</string>
 	<string name="upnp_route_provider_service">UPNP Route Provider Service</string>
 	
+	<!-- Settings -->
+    <string name="auto_enable_wifi">Enable Wifi automatically on start</string>
+    <string name="dont_show_dialog_again">"Do not show this dialog again"</string>
+	
 </resources>
diff --git a/src/com/github/nutomic/controldlna/gui/RouteFragment.java b/src/com/github/nutomic/controldlna/gui/RouteFragment.java
index 1a30012..92ec346 100644
--- a/src/com/github/nutomic/controldlna/gui/RouteFragment.java
+++ b/src/com/github/nutomic/controldlna/gui/RouteFragment.java
@@ -391,10 +391,12 @@ public class RouteFragment extends MediaRouteDiscoveryFragment implements
 			if (mPlaying) {
 				s.pause();
 				mPlayPause.setImageResource(R.drawable.ic_action_play);
+				mPlayPause.setContentDescription(getResources().getString(R.string.play));
 			} else {
 				s.resume();
 				mListView.smoothScrollToPosition(s.getCurrentTrack());
 				mPlayPause.setImageResource(R.drawable.ic_action_pause);
+				mPlayPause.setContentDescription(getResources().getString(R.string.pause));
 			}
 			mPlaying = !mPlaying;
 			break;
@@ -557,10 +559,12 @@ public class RouteFragment extends MediaRouteDiscoveryFragment implements
 				status.getPlaybackState() == MediaItemStatus.PLAYBACK_STATE_PENDING) {
 			mPlaying = true;
 			mPlayPause.setImageResource(R.drawable.ic_action_pause);
+			mPlayPause.setContentDescription(getResources().getString(R.string.pause));
 		}
 		else {
 			mPlaying = false;
 			mPlayPause.setImageResource(R.drawable.ic_action_play);
+			mPlayPause.setContentDescription(getResources().getString(R.string.play));
 		}
 		
 		if (mListView.getAdapter() == mPlaylistAdapter) 
diff --git a/src/com/github/nutomic/controldlna/gui/ServerFragment.java b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
index d3d2d1c..c17567e 100644
--- a/src/com/github/nutomic/controldlna/gui/ServerFragment.java
+++ b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
@@ -251,7 +251,7 @@ public class ServerFragment extends ListFragment implements OnBackPressedListene
 		mCurrentServer = server;
 		getFiles(ROOT_DIRECTORY);
 		TextView emptyView = (TextView) getListView().getEmptyView();
-		emptyView.setText(R.string.folder_list_etmpy);    	
+		emptyView.setText(R.string.folder_list_empty);    	
     }
     /**
      * Opens a new directory and displays it.