ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #08986
[Merge] lp:~nik90/ubuntu-clock-app/ota-10-design-polish into lp:ubuntu-clock-app
Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/ota-10-design-polish into lp:ubuntu-clock-app.
Commit message:
- Fixed world city list item vertical centering
- Replaced hex color codes with UbuntuColors counterparts
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/ota-10-design-polish/+merge/289699
- Fixed world city list item vertical centering
- Replaced hex color codes with UbuntuColors counterparts
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/ota-10-design-polish into lp:ubuntu-clock-app.
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2016-03-02 12:04:48 +0000
+++ app/clock/ClockPage.qml 2016-03-21 19:05:37 +0000
@@ -208,7 +208,7 @@
text: clock.localizedDateString
textSize: Label.Medium
opacity: 0
- color: "#5D5D5D"
+ color: UbuntuColors.slate
}
Row {
@@ -236,7 +236,7 @@
id: location
objectName: "location"
- color: "#5D5D5D"
+ color: UbuntuColors.slate
anchors.verticalCenter: locationIcon.verticalCenter
text: {
@@ -257,7 +257,7 @@
id: divider
width: parent.width
height: 1
- color: "#cdcdcd"
+ color: UbuntuColors.silk
anchors {
top: locationRow.bottom
topMargin: units.gu(3)
=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml 2016-02-29 12:37:51 +0000
+++ app/components/ActionIcon.qml 2016-03-21 19:05:37 +0000
@@ -30,7 +30,7 @@
Rectangle {
visible: abstractButton.pressed
anchors.fill: parent
- color: "#CDCDCD" // #TODO: Replace with UbuntuColors.Silk after OTA-10
+ color: UbuntuColors.silk
}
Icon {
@@ -38,6 +38,6 @@
width: units.gu(2)
height: width
anchors.centerIn: parent
- color: "#5d5d5d"
+ color: UbuntuColors.slate
}
}
=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml 2016-02-25 22:16:54 +0000
+++ app/components/ClockCircle.qml 2016-03-21 19:05:37 +0000
@@ -29,7 +29,7 @@
property bool isFoldVisible: true
- color: "#f7f7f7"
+ color: UbuntuColors.porcelain
borderWidth: units.dp(1)
borderColorTop: "#00000000"
borderColorBottom: "#6E6E6E"
@@ -42,10 +42,10 @@
anchors.margins: borderWidth
radius: height / 2
gradient: Gradient {
- GradientStop { position: 0.0; color: "#f7f7f7" }
- GradientStop { position: 0.5; color: "#f7f7f7" }
- GradientStop { position: 0.5; color: "#fdfdfd" }
- GradientStop { position: 1.0; color: "#fdfdfd" }
+ GradientStop { position: 0.0; color: UbuntuColors.porcelain }
+ GradientStop { position: 0.5; color: UbuntuColors.porcelain }
+ GradientStop { position: 0.5; color: "#FDFDFD" }
+ GradientStop { position: 1.0; color: "#FDFDFD" }
}
}
}
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml 2016-03-02 12:04:48 +0000
+++ app/components/DigitalMode.qml 2016-03-21 19:05:37 +0000
@@ -48,7 +48,7 @@
anchors.centerIn: parent
- color: "#5D5D5D"
+ color: UbuntuColors.slate
font.pixelSize: maxTimeFontSize
text: {
@@ -75,7 +75,7 @@
font.pixelSize: maxPeriodFontSize
visible: text !== ""
- color: "#5D5D5D"
+ color: UbuntuColors.slate
text: {
if (localizedTimeString.search(Qt.locale().amText) !== -1) {
// 12 hour format detected with the localised AM text
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml 2016-02-28 20:43:39 +0000
+++ app/components/EmptyState.qml 2016-03-21 19:05:37 +0000
@@ -51,7 +51,7 @@
anchors.top: emptyIcon.bottom
anchors.topMargin: units.gu(4)
horizontalAlignment: Text.AlignHCenter
- color: "#5d5d5d"
+ color: UbuntuColors.slate
}
Label {
@@ -60,6 +60,6 @@
wrapMode: Text.WordWrap
anchors.top: emptyLabel.bottom
horizontalAlignment: Text.AlignHCenter
- color: "#888888"
+ color: UbuntuColors.ash
}
}
=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml 2016-03-03 10:37:15 +0000
+++ app/components/HeaderNavigation.qml 2016-03-21 19:05:37 +0000
@@ -35,7 +35,7 @@
objectName: "clockNavigationButton"
icon.name: "clock"
- icon.color: listview.currentIndex === 0 ? "#19b6ee" : "#5d5d5d" // #TODO: Replace with UbuntuColors.Blue and UbuntuColors.Slate after OTA-10
+ icon.color: listview.currentIndex === 0 ? UbuntuColors.blue : UbuntuColors.slate
onClicked: listview.moveToClockPage()
}
@@ -44,7 +44,7 @@
objectName: "stopwatchNavigationButton"
icon.name: "stopwatch"
- icon.color: listview.currentIndex === 1 ? "#19b6ee" : "#5d5d5d" // #TODO: Replace with UbuntuColors.Blue and UbuntuColors.Slate after OTA-10
+ icon.color: listview.currentIndex === 1 ? UbuntuColors.blue : UbuntuColors.slate
onClicked: listview.moveToStopwatchPage()
}
}
=== modified file 'app/stopwatch/StopwatchFace.qml'
--- app/stopwatch/StopwatchFace.qml 2016-03-03 10:37:15 +0000
+++ app/stopwatch/StopwatchFace.qml 2016-03-21 19:05:37 +0000
@@ -40,7 +40,7 @@
text: stopwatchFormatTime.millisToTimeString(milliseconds, true)
font.pixelSize: units.dp(36)
anchors.centerIn: parent
- color: "#5D5D5D"
+ color: UbuntuColors.slate
}
Label {
@@ -49,7 +49,7 @@
text: stopwatchFormatTime.millisToString(milliseconds)
textSize: Label.Large
- color: "#5D5D5D"
+ color: UbuntuColors.slate
anchors {
top: time.bottom
topMargin: units.gu(1.5)
=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml 2016-03-03 14:38:55 +0000
+++ app/stopwatch/StopwatchPage.qml 2016-03-21 19:05:37 +0000
@@ -101,7 +101,7 @@
width: parent.width / 2 - units.gu(1)
height: units.gu(4)
x: stopwatchEngine.previousTimeOfStopwatch !== 0 || stopwatchEngine.running ? parent.width - width : parent.width
- color: "#f7f7f7"
+ color: UbuntuColors.porcelain
visible: stopwatchEngine.previousTimeOfStopwatch !== 0 || stopwatchEngine.running
onClicked: {
if (stopwatchEngine.running) {
=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml 2016-02-29 12:37:51 +0000
+++ app/upstreamcomponents/FastScroll.qml 2016-03-21 19:05:37 +0000
@@ -83,7 +83,7 @@
id: magnified
aspect: UbuntuShape.Flat
- backgroundColor: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
+ backgroundColor: UbuntuColors.inkstone
radius: "large"
height: pinSize * 2
width: height
@@ -122,7 +122,7 @@
height: pinSize
width: height
aspect: UbuntuShape.Flat
- backgroundColor: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
+ backgroundColor: UbuntuColors.inkstone
opacity: rail.opacity
x: rail.x
y: {
@@ -183,7 +183,7 @@
horizontalAlignment: Text.AlignHCenter
text: modelData
textSize: Label.XSmall
- color: cursor.y === y ? "white" : "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
+ color: cursor.y === y ? "white" : UbuntuColors.inkstone
opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
}
}
=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml 2016-02-29 12:37:51 +0000
+++ app/worldclock/AddWorldCityButton.qml 2016-03-21 19:05:37 +0000
@@ -48,7 +48,7 @@
Icon {
anchors.centerIn: parent
- color: "#3B3B3B" // #TODO: Replace with UbuntuColors.Inkstone after OTA-10
+ color: UbuntuColors.inkstone
name: "add"
height: units.gu(2)
width: height
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml 2016-03-02 12:04:48 +0000
+++ app/worldclock/UserWorldCityDelegate.qml 2016-03-21 19:05:37 +0000
@@ -59,7 +59,7 @@
textSize: Label.Medium
width: parent.width
elide: Text.ElideRight
- color: "#5d5d5d"
+ color: UbuntuColors.slate
}
Label {
@@ -68,7 +68,7 @@
textSize: Label.Medium
width: parent.width
elide: Text.ElideRight
- color: "#888888"
+ color: UbuntuColors.ash
}
}
@@ -122,7 +122,7 @@
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
- color: "#5d5d5d"
+ color: UbuntuColors.slate
textSize: Label.Medium
wrapMode: Text.WordWrap
maximumLineCount: 2
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2016-03-02 19:15:40 +0000
+++ app/worldclock/WorldCityList.qml 2016-03-21 19:05:37 +0000
@@ -330,13 +330,20 @@
delegate: ListItem {
divider.visible: false
objectName: "defaultWorldCityItem" + index
+ height: worldCityListItemLayout.height
+
ListItemLayout {
+ id: worldCityListItemLayout
+
title.text: cityName
title.objectName: "defaultCityNameText"
subtitle.text: countryName
subtitle.textSize: Label.Medium
subtitle.objectName: "defaultCountryNameText"
+ padding.top: units.gu(1.5)
+ padding.bottom: units.gu(1.5)
+
Label {
id: _localTime
text: localizedZoneTime
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-21 18:38:43 +0000
+++ debian/changelog 2016-03-21 19:05:37 +0000
@@ -7,6 +7,8 @@
* Added Stopwatch autopilot tests for adding/deleting laps, checking
start, pause and stop stopwatch states. (LP: #1490206)
* Moved laps list delegate into its own file
+ * Fixed world city listitem vertical centering.
+ * Replaced hex color codes with UbuntuColors counterparts.
[Ken VanDine]
* Bump Ubuntu.Content import to 1.3 to fix theme issue (LP: #1554621)
Follow ups
