aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-02-02 17:10:34 -0800
committerScott Jackson <daneren2005@gmail.com>2016-02-02 17:10:34 -0800
commit6367446901769c050676fb553f2a1a396facbcf7 (patch)
treebd339765c4e2ae3e0d2ce1bb1ecd17e403ec5355 /app/src
parent456a4d99197a77cfd0e1135b890d64036b02ce58 (diff)
downloaddsub-6367446901769c050676fb553f2a1a396facbcf7.tar.gz
dsub-6367446901769c050676fb553f2a1a396facbcf7.tar.bz2
dsub-6367446901769c050676fb553f2a1a396facbcf7.zip
Increase max timer length to 1 hour
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java8
-rw-r--r--app/src/main/res/layout/start_timer.xml2
2 files changed, 7 insertions, 3 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 5de9c595..8e459996 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -906,10 +906,14 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
private int getMinutes(int progress) {
if(progress < 30) {
return progress + 1;
- } else if(progress < 61) {
+ } else if(progress < 49) {
return (progress - 30) * 5 + getMinutes(29);
+ } else if(progress < 57) {
+ return (progress - 48) * 30 + getMinutes(48);
+ } else if(progress < 81) {
+ return (progress - 56) * 60 + getMinutes(56);
} else {
- return (progress - 61) * 15 + getMinutes(60);
+ return (progress - 80) * 150 + getMinutes(80);
}
}
diff --git a/app/src/main/res/layout/start_timer.xml b/app/src/main/res/layout/start_timer.xml
index 59bd60e3..61a72233 100644
--- a/app/src/main/res/layout/start_timer.xml
+++ b/app/src/main/res/layout/start_timer.xml
@@ -18,5 +18,5 @@
android:id="@+id/timer_length_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:max="97"/>
+ android:max="92"/>
</LinearLayout> \ No newline at end of file