aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-11-27 22:56:57 -0800
committerScott Jackson <daneren2005@gmail.com>2012-11-27 22:56:57 -0800
commit8691998f4c7ebb4ed1123222338e7a16b9d57f2e (patch)
treec0e0dc4c02896218a97a42a209083150c72ea3f3 /subsonic-android/res
parent6cff977bd3b1f7e324fb86cf94faea1b0d6132a7 (diff)
downloaddsub-8691998f4c7ebb4ed1123222338e7a16b9d57f2e.tar.gz
dsub-8691998f4c7ebb4ed1123222338e7a16b9d57f2e.tar.bz2
dsub-8691998f4c7ebb4ed1123222338e7a16b9d57f2e.zip
Added shuffle by start/end year + genre
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/layout/shuffle_dialog.xml71
-rw-r--r--subsonic-android/res/values/strings.xml4
2 files changed, 75 insertions, 0 deletions
diff --git a/subsonic-android/res/layout/shuffle_dialog.xml b/subsonic-android/res/layout/shuffle_dialog.xml
new file mode 100644
index 00000000..2a21dc11
--- /dev/null
+++ b/subsonic-android/res/layout/shuffle_dialog.xml
@@ -0,0 +1,71 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/start_year_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:textSize="20dp"
+ android:text="@string/shuffle.startYear" />
+ <EditText
+ android:id="@+id/start_year"
+ android:inputType="number"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="4dp"
+ android:hint="@string/shuffle.startYear" />
+ </LinearLayout>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/end_year_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:textSize="20dp"
+ android:text="@string/shuffle.endYear" />
+ <EditText
+ android:id="@+id/end_year"
+ android:inputType="number"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="4dp"
+ android:hint="@string/shuffle.endYear" />
+ </LinearLayout>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/genre_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:textSize="20dp"
+ android:text="@string/shuffle.genre" />
+ <EditText
+ android:id="@+id/genre"
+ android:inputType="text"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="4dp"
+ android:hint="@string/shuffle.genre" />
+ </LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index dc02569a..bc8f31f7 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -235,6 +235,10 @@
<string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>
<string name="settings.temp_loss_lower">Always lower volume</string>
<string name="settings.temp_loss_nothing">Do Nothing</string>
+
+ <string name="shuffle.startYear">Start Year:</string>
+ <string name="shuffle.endYear">End Year:</string>
+ <string name="shuffle.genre">Genre:</string>
<string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>