From eb6034ccd8e68e63414f3159854da69f03c4d61e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 24 Jan 2014 21:57:08 -0800
Subject: #269 Convert timer to slider

---
 res/layout/start_timer.xml | 16 +++++++---------
 res/values/strings.xml     |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'res')

diff --git a/res/layout/start_timer.xml b/res/layout/start_timer.xml
index 3b607a44..eb2ccbe8 100644
--- a/res/layout/start_timer.xml
+++ b/res/layout/start_timer.xml
@@ -1,6 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -12,16 +12,14 @@
 			android:id="@+id/timer_length_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="4dp"
-			android:textSize="20dp"
-			android:text="@string/download.timer_length" />
-		<EditText
-			android:id="@+id/timer_length"
-			android:inputType="number"
+			android:layout_marginLeft="8dp"
+			android:textSize="20dp"/>
+
+		<SeekBar
+			android:id="@+id/timer_length_bar"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:layout_marginLeft="4dp"
-			android:hint="@string/download.timer_length" />
+			android:max="97"/>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8115103f..a5753841 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -191,7 +191,7 @@
     <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users &gt; Settings</b> on your Subsonic server.</string>
 	<string name="download.show_downloading">Show Downloading</string>
 	<string name="download.show_now_playing">Show Now Playing</string>
-	<string name="download.timer_length">Timer Length</string>
+	<string name="download.timer_length">Timer:</string>
 	<string name="download.start_timer">Start Timer</string>
 	<string name="download.stop_timer">Stop Timer</string>
 	<string name="download.need_download">Video needs to be downloaded first</string>
-- 
cgit v1.2.3