ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview into lp:ubuntu-clock-app.

Commit message:
Play background sound during volume slider changes (LP: #1362078)

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1362078 in Ubuntu Clock App: "[Clock] Alarm volume slider should lose the hint and play the alarm sound while changing volume"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1362078

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview/+merge/264783

Play background sound during volume slider changes (LP: #1362078)
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview into lp:ubuntu-clock-app.

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-07-07 20:54:57 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-07-15 01:26:27 +0000
@@ -17,9 +17,11 @@
  */
 
 import QtQuick 2.3
+import QtMultimedia 5.0
 import DateTime 1.0
 import Alarm.Settings 1.0
 import Ubuntu.Components 1.1
+import Ubuntu.Settings.Menus 0.1 as Menus
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
 
@@ -30,6 +32,11 @@
     visible: false
     flickable: settingsPlugin
 
+    Audio {
+        id: previewAlarmVolume
+        audioRole: MediaPlayer.alert
+    }
+
     Connections {
         target: clockApp
         onApplicationStateChanged: {
@@ -100,7 +107,7 @@
                     }
                 }
 
-                Slider {
+                Menus.SliderMenu {
                     anchors {
                         left: parent.left
                         right: parent.right
@@ -110,10 +117,14 @@
 
                     minimumValue: 1
                     maximumValue: 100
+                    live: true
                     value: alarmSettings.volume
 
                     onValueChanged: {
-                        alarmSettings.volume = formatValue(value)
+                        alarmSettings.volume = value
+                        previewAlarmVolume.volume = value/100
+                        previewAlarmVolume.source = "/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"
+                        previewAlarmVolume.play()
                     }
                 }
             }

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2015-05-15 16:38:24 +0000
+++ app/clock/ClockPage.qml	2015-07-15 01:26:27 +0000
@@ -244,7 +244,7 @@
 
             text: clock.analogTime.toLocaleDateString()
             opacity: settingsIcon.opacity
-            color: locationRow.visible ? Theme.palette.baseText : UbuntuColors.midAubergine
+            color: locationRow.visible ? Theme.palette.normal.baseText : UbuntuColors.midAubergine
             fontSize: "medium"
         }
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-10 19:42:45 +0000
+++ debian/changelog	2015-07-15 01:26:27 +0000
@@ -8,8 +8,9 @@
 
   [ Bartosz Kosiorek]
   * Add more time choices for snooze time (LP: #1450767)
+  * Play background sound during volume slider changes (LP: #1362078)
 
- -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Sun, 05 Jul 2015 15:10:12 +0200
+ -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Wed, 15 Jul 2015 15:10:12 +0200
 
 ubuntu-clock-app (3.4) vivid; urgency=medium