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

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 457
Merged at revision: 450
Proposed branch: lp:~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues
Merge into: lp:ubuntu-clock-app
Diff against target: 138 lines (+16/-12)
7 files modified
app/MainPage.qml (+1/-0)
app/components/ActionIcon.qml (+1/-1)
app/components/AlarmBottomEdge.qml (+0/-1)
app/components/HeaderNavigation.qml (+2/-2)
app/upstreamcomponents/FastScroll.qml (+10/-7)
app/worldclock/AddWorldCityButton.qml (+1/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/fix-clock-ota10-sdk-issues
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Michal Predotka Approve
Review via email: mp+287414@code.launchpad.net

Commit message

- Fixed FastScroll and ActionButton colors being broken with the latest UITK Silo 50 which brings new palette colors.
- Replaced deprecated UbuntuColors with color codes.
- Hid bottomedge when in stopwatch page
- Replaced fastscroll rounded rectangle with ubuntushape

Description of the change

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

Old: http://imgur.com/HBLNmD5
New: http://imgur.com/V90GqIu

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Predotka (mpredotka) wrote :

Seems to work fine.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Unapproved changes made after approval.
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/4907/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5635/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/4908/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5636/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/MainPage.qml'
2--- app/MainPage.qml 2016-02-26 12:34:26 +0000
3+++ app/MainPage.qml 2016-02-29 12:50:26 +0000
4@@ -59,6 +59,7 @@
5 height: parent.height
6 pageStack: mainStack
7 alarmModel: _mainPage.alarmModel
8+ hint.visible: bottomEdge.enabled && isClockPage
9 Component.onCompleted: hideBottomEdgeHintTimer.start()
10 }
11
12
13=== modified file 'app/components/ActionIcon.qml'
14--- app/components/ActionIcon.qml 2016-02-26 09:43:35 +0000
15+++ app/components/ActionIcon.qml 2016-02-29 12:50:26 +0000
16@@ -30,7 +30,7 @@
17 Rectangle {
18 visible: abstractButton.pressed
19 anchors.fill: parent
20- color: Theme.palette.selected.background
21+ color: "#CDCDCD" // #TODO: Replace with UbuntuColors.Silk after OTA-10
22 }
23
24 Icon {
25
26=== modified file 'app/components/AlarmBottomEdge.qml'
27--- app/components/AlarmBottomEdge.qml 2016-02-26 11:24:13 +0000
28+++ app/components/AlarmBottomEdge.qml 2016-02-29 12:50:26 +0000
29@@ -33,7 +33,6 @@
30 property var _realPage: null
31
32 hint {
33- visible: bottomEdge.enabled
34 enabled: visible
35 iconName: "alarm-clock"
36 text: i18n.tr("Alarms")
37
38=== modified file 'app/components/HeaderNavigation.qml'
39--- app/components/HeaderNavigation.qml 2016-02-26 09:43:35 +0000
40+++ app/components/HeaderNavigation.qml 2016-02-29 12:50:26 +0000
41@@ -32,13 +32,13 @@
42
43 ActionIcon {
44 icon.name: "clock"
45- icon.color: listview.currentIndex === 0 ? "#19b6ee" : "#5d5d5d"
46+ icon.color: listview.currentIndex === 0 ? "#19b6ee" : "#5d5d5d" // #TODO: Replace with UbuntuColors.Blue and UbuntuColors.Slate after OTA-10
47 onClicked: listview.currentIndex = 0
48 }
49
50 ActionIcon {
51 icon.name: "stopwatch"
52- icon.color: listview.currentIndex === 1 ? "#19b6ee" : "#5d5d5d"
53+ icon.color: listview.currentIndex === 1 ? "#19b6ee" : "#5d5d5d" // #TODO: Replace with UbuntuColors.Blue and UbuntuColors.Slate after OTA-10
54 onClicked: listview.currentIndex = 1
55 }
56 }
57
58=== modified file 'app/upstreamcomponents/FastScroll.qml'
59--- app/upstreamcomponents/FastScroll.qml 2016-02-16 17:29:34 +0000
60+++ app/upstreamcomponents/FastScroll.qml 2016-02-29 12:50:26 +0000
61@@ -79,11 +79,12 @@
62 }
63 }
64
65- Rectangle {
66+ UbuntuShape {
67 id: magnified
68
69- color: Theme.palette.normal.overlay
70- radius: height * 0.3
71+ aspect: UbuntuShape.Flat
72+ backgroundColor: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
73+ radius: "large"
74 height: pinSize * 2
75 width: height
76 opacity: internal.fastScrolling && root.enabled ? 1.0 : 0.0
77@@ -103,6 +104,7 @@
78 verticalAlignment: Text.AlignVCenter
79 text: internal.desireSection
80 textSize: Label.Small
81+ color: "white"
82 }
83
84 Behavior on opacity {
85@@ -110,16 +112,17 @@
86 }
87 }
88
89- Rectangle {
90+ UbuntuShape {
91 id: cursor
92
93 property bool showLabel: false
94 property string currentSectionName: ""
95
96- radius: pinSize * 0.3
97+ radius: "large"
98 height: pinSize
99 width: height
100- color: Theme.palette.normal.foreground
101+ aspect: UbuntuShape.Flat
102+ backgroundColor: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
103 opacity: rail.opacity
104 x: rail.x
105 y: {
106@@ -180,7 +183,7 @@
107 horizontalAlignment: Text.AlignHCenter
108 text: modelData
109 textSize: Label.XSmall
110- color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText
111+ color: cursor.y === y ? "white" : "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
112 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
113 }
114 }
115
116=== modified file 'app/worldclock/AddWorldCityButton.qml'
117--- app/worldclock/AddWorldCityButton.qml 2016-02-25 22:16:54 +0000
118+++ app/worldclock/AddWorldCityButton.qml 2016-02-29 12:50:26 +0000
119@@ -48,7 +48,7 @@
120
121 Icon {
122 anchors.centerIn: parent
123- color: UbuntuColors.coolGrey
124+ color: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
125 name: "add"
126 height: units.gu(2)
127 width: height
128
129=== modified file 'debian/changelog'
130--- debian/changelog 2016-02-28 20:44:36 +0000
131+++ debian/changelog 2016-02-29 12:50:26 +0000
132@@ -26,6 +26,7 @@
133 * Migrate to the new SDK Bottom edge (LP: #1549988)
134 * Migrated all page head to the new PageHeader (LP: #1550991)
135 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
136+ * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
137
138 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
139

Subscribers

People subscribed via source and target branches