Merge branch 'PullRefresh' of https://github.com/daneren2005/Subsonic

18 files changed, 37 insertions, 88 deletions

diff --git a/res/layout/abstract_list_fragment.xml b/res/layout/abstract_list_fragment.xml
index bfce4792..3923f120 100644
--- a/res/layout/abstract_list_fragment.xml
+++ b/res/layout/abstract_list_fragment.xml
@@ -20,10 +20,17 @@
 		android:text="@string/common.empty"

 		android:visibility="gone" />

 

-	<ListView

-		android:id="@+id/fragment_list"

+	<android.support.v4.widget.SwipeRefreshLayout

+		android:id="@+id/refresh_layout"

 		android:layout_width="fill_parent"

 		android:layout_height="0dip"

-		android:layout_weight="1.0"

-		android:fastScrollEnabled="true"/>

+		android:layout_weight="1.0">

+

+		<ListView

+			android:id="@+id/fragment_list"

+			android:layout_width="fill_parent"

+			android:layout_height="fill_parent"

+			android:fastScrollEnabled="true"/>

+

+	</android.support.v4.widget.SwipeRefreshLayout>

 </LinearLayout>

diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 9b8f7d17..f2c1c3fd 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -7,12 +7,18 @@
 
 	<include layout="@layout/tab_progress" />
 
-	<ListView
-		android:id="@+id/chat_entries"
+	<android.support.v4.widget.SwipeRefreshLayout
+		android:id="@+id/refresh_layout"
 		android:layout_width="fill_parent"
 		android:layout_height="0dip"
-		android:layout_weight="1.0"
-		android:textFilterEnabled="true" />
+		android:layout_weight="1.0">
+
+		<ListView
+			android:id="@+id/chat_entries"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:textFilterEnabled="true" />
+	</android.support.v4.widget.SwipeRefreshLayout>
 
 	<LinearLayout 
 		android:layout_height="4dip" 
@@ -32,7 +38,7 @@
 			android:layout_weight="1"
 			android:autoLink="all"
 			android:hint="@string/chat.send_a_message"
-			android:inputType="textEmailAddress|textMultiLine"            
+			android:inputType="textEmailAddress|textMultiLine"
 			android:linksClickable="true"
 			android:paddingBottom="10dip"
 			android:paddingTop="10dip" />
diff --git a/res/layout/select_album.xml b/res/layout/select_album.xml
index 01df495a..55747a18 100644
--- a/res/layout/select_album.xml
+++ b/res/layout/select_album.xml
@@ -20,12 +20,19 @@
 		android:layout_height="wrap_content"

 		android:padding="10dip"/>

 

-	<com.mobeta.android.dslv.DragSortListView

-		style="@style/DragDropListView"

-		android:id="@+id/select_album_entries"

-		android:textFilterEnabled="true"

+	<android.support.v4.widget.SwipeRefreshLayout

+		android:id="@+id/refresh_layout"

 		android:layout_width="fill_parent"

 		android:layout_height="0dip"

-		android:layout_weight="1.0"

-		android:fastScrollEnabled="true"/>

+		android:layout_weight="1.0">

+

+		<com.mobeta.android.dslv.DragSortListView

+			style="@style/DragDropListView"

+			android:id="@+id/select_album_entries"

+			android:textFilterEnabled="true"

+			android:layout_width="fill_parent"

+			android:layout_height="fill_parent"

+			android:fastScrollEnabled="true"/>

+

+	</android.support.v4.widget.SwipeRefreshLayout>

 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/abstract_top_menu.xml b/res/menu/abstract_top_menu.xml
index 46419d0f..67d18390 100644
--- a/res/menu/abstract_top_menu.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -2,12 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"

 	  xmlns:compat="http://schemas.android.com/apk/res-auto">

 	<item

-		android:id="@+id/menu_refresh"

-		android:icon="?attr/refresh"

-		android:title="@string/menu.refresh"

-		compat:showAsAction="always|withText"/>

-

-	<item

 		android:id="@+id/menu_search"

 		android:icon="?attr/search"

 		android:title="@string/menu.search"

diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index 9bb43bf7..cf7b82de 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
+
 </menu>
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 8dc004f1..4b79d251 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -8,12 +8,6 @@
 		compat:showAsAction="always|withText"/>
 		
 	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
deleted file mode 100644
index 60b636e3..00000000
--- a/res/menu/select_album_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-</menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index d1e1f4e3..127736d6 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -2,12 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 8a86b49b..dbb369e9 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
 	<item
 		android:id="@+id/menu_download_all"
 		android:title="@string/select_podcasts.server_download"/>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 7080768a..3665d317 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -2,12 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
 		android:id="@+id/menu_delete"
 		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 212feb04..2f0ab38a 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-
 	<item
 		android:id="@+id/menu_search"
 		android:icon="?attr/search"
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index d5bfc2b2..ec4af96a 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -8,12 +8,6 @@
 		compat:showAsAction="always|withText"/>
 		
 	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 0b482a5e..6915c873 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -8,12 +8,6 @@
 		compat:showAsAction="always|withText"/>
 		
 	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="?attr/refresh"
-		android:title="@string/menu.refresh"
-		compat:showAsAction="always|withText"/>
-		
-	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1963790c..ce9a68e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -420,8 +420,6 @@
 

     <string name="service.connecting">Kontaktiere Server, bitte warten.</string>

 

-    <string name="parser.reading">Lese vom Server.</string>

-    <string name="parser.reading_done">Lese vom Server. Fertig!</string>

     <string name="parser.upgrade_client">Inkompatible Versionen. Aktualisierung der DSub Android App erforderlich.</string>

     <string name="parser.upgrade_server">Inkompatible Versionen. Aktualisierung des Subsonic Server erforderlich.</string>

     <string name="parser.not_authenticated">Benutzername oder/und Passwort falsch.</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index db557f19..e18e4b08 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -434,8 +434,6 @@
 
     <string name="service.connecting">Conectando con el servidor, espere por favor.</string>
 
-    <string name="parser.reading">Leyendo desde el servidor.</string>
-    <string name="parser.reading_done">Leyendo desde el servidor. Hecho!</string>
     <string name="parser.upgrade_client">Versiones incompatibles. Por favor, actualice la aplicación DSub de Android.</string>
     <string name="parser.upgrade_server">Versiones incompatibles. Por favor, actualice su servidor Subsonic.</string>
     <string name="parser.not_authenticated">Usuario o contraseña inconrrectos.</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1625ab84..9a4e51ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -441,8 +441,6 @@
 

     <string name="service.connecting">Csatlakozás a kiszolgálóhoz, kérem várjon!</string>

 

-    <string name="parser.reading">Olvasás a kiszolgálóról...</string>

-    <string name="parser.reading_done">Olvasás a kiszolgálóról. Kész!</string>

     <string name="parser.upgrade_client">Nem kompatibilis verzió. Kérjük, frissítse a DSub Android alkalmazást!</string>

     <string name="parser.upgrade_server">Nem kompatibilis verzió. Kérjük, frissítse a Subsonic kiszolgálót!</string>

     <string name="parser.not_authenticated">Hibás felhasználónév vagy jelszó!</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d4edbf46..7094fe7d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -259,8 +259,6 @@
 

     <string name="service.connecting">Подключение к серверу. Пожалуйста, подождите.</string>

 

-    <string name="parser.reading">Чтение с сервера.</string>

-    <string name="parser.reading_done">Чтение с сервера выполнено!</string>

     <string name="parser.upgrade_client">Несовместимые версии. Пожалуйста, обновите приложение DSub для Android.</string>

     <string name="parser.upgrade_server">Несовместимые версии. Пожалуйста, обновите сервер Subsonic.</string>

     <string name="parser.not_authenticated">Неправильное имя пользователя или пароль.</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0df0d24..0cbb9330 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -440,9 +440,7 @@
 

     <string name="service.connecting">Contacting server, please wait.</string>

 

-    <string name="parser.reading">Reading from server.</string>

-    <string name="parser.reading_done">Reading from server. Done!</string>

-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub Android app.</string>

+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub.</string>

     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>

     <string name="parser.not_authenticated">Wrong username or password.</string>

     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>