← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues into lp:ubuntu-clock-app

 

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues into lp:ubuntu-clock-app.

Commit message:
Fixes FastScroll and ActionButton colors being broken with the latest UITK Silo 50 which brings new palette colors.

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1550716 in Ubuntu Clock App: "Potential clock app updates needed due to a change in theming/UI toolkit in OTA10"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1550716

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues/+merge/287414

Fixes FastScroll and ActionButton colors being broken with the latest UITK Silo 50 which brings new palette colors.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues into lp:ubuntu-clock-app.
=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml	2016-02-26 09:43:35 +0000
+++ app/components/ActionIcon.qml	2016-02-28 19:52:19 +0000
@@ -30,7 +30,7 @@
     Rectangle {
         visible: abstractButton.pressed
         anchors.fill: parent
-        color: Theme.palette.selected.background
+        color: UbuntuColors.lightGrey
     }
 
     Icon {

=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	2016-02-16 17:29:34 +0000
+++ app/upstreamcomponents/FastScroll.qml	2016-02-28 19:52:19 +0000
@@ -82,7 +82,7 @@
     Rectangle {
         id: magnified
 
-        color: Theme.palette.normal.overlay
+        color: UbuntuColors.coolGrey
         radius: height * 0.3
         height: pinSize * 2
         width: height
@@ -119,7 +119,7 @@
         radius: pinSize * 0.3
         height: pinSize
         width: height
-        color: Theme.palette.normal.foreground
+        color: UbuntuColors.coolGrey
         opacity: rail.opacity
         x: rail.x
         y: {
@@ -180,7 +180,7 @@
                 horizontalAlignment: Text.AlignHCenter
                 text: modelData
                 textSize: Label.XSmall
-                color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText
+                color: cursor.y === y ? "white" : UbuntuColors.coolGrey
                 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
             }
         }

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 10:01:48 +0000
+++ debian/changelog	2016-02-28 19:52:19 +0000
@@ -25,6 +25,7 @@
   * Fix 'Shutter' effect animation on title bar when opening bottom edge (LP: #1543496)
   * Migrate to the new SDK Bottom edge (LP: #1549988)
   * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
+  * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
 
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Wed, 30 Dec 2015 01:43:24 +0100
 


Follow ups