ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #09114
[Merge] lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather into lp:ubuntu-weather-app
Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather into lp:ubuntu-weather-app.
Commit message:
Finish OTA10 SDK updates
Requested reviews:
Ubuntu Weather Developers (ubuntu-weather-dev)
For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/finish-ota10-updates-weather/+merge/290169
Finish OTA10 SDK theming updates.
1. Fix fastscroll.
2. Fix label in LocationsPage
3. Fix selected item indicator in Data Provider settings (probably not SDK related)
--
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather into lp:ubuntu-weather-app.
=== modified file 'app/components/FastScroll.qml'
--- app/components/FastScroll.qml 2015-11-02 21:28:34 +0000
+++ app/components/FastScroll.qml 2016-03-26 17:03:27 +0000
@@ -119,7 +119,7 @@
radius: pinSize * 0.3
height: pinSize
width: height
- color: Theme.palette.normal.foreground
+ color: UbuntuColors.orange
opacity: rail.opacity
x: rail.x
y: {
@@ -180,7 +180,7 @@
horizontalAlignment: Text.AlignHCenter
text: modelData
fontSize: "x-small"
- color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText
+ color: cursor.y === y ? UbuntuColors.porcelain : UbuntuColors.jet
opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
}
}
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-11-02 21:28:34 +0000
+++ app/ui/LocationsPage.qml 2016-03-26 17:03:27 +0000
@@ -117,7 +117,7 @@
leftMargin: units.gu(2)
}
- color: UbuntuColors.lightGrey
+ color: UbuntuColors.graphite
elide: Text.ElideRight
fontSize: "small"
font.weight: Font.Light
@@ -213,7 +213,7 @@
}
Label {
id: locationName2
- color: UbuntuColors.lightGrey
+ color: UbuntuColors.graphite
elide: Text.ElideRight
fontSize: "small"
font.weight: Font.Light
=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml 2016-02-28 22:49:32 +0000
+++ app/ui/settings/DataProviderPage.qml 2016-03-26 17:03:27 +0000
@@ -45,7 +45,7 @@
delegate: StandardListItem {
title.text: model.text
icon.name: "ok"
- icon.visible: dataProviderSetting.subText === model.text
+ icon.visible: dataProviderSetting.subText.text === model.text
onClicked: {
if (model.text === "The Weather Channel") {
settings.service = "weatherchannel"
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-26 03:19:29 +0000
+++ debian/changelog 2016-03-26 17:03:27 +0000
@@ -9,6 +9,7 @@
[ Victor Thompson ]
* Change translatable string from "rain" to "precipitation" (LP: #1521701)
+ * Add further fixes for SDK palette issues (LP: #1550507)
[ Nekhelesh Ramananthan ]
* Update frameworks to ubuntu-sdk-15.04.3-qml
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2016-02-28 22:53:13 +0000
+++ po/com.ubuntu.weather.pot 2016-03-26 17:03:27 +0000
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ubuntu-weather-app package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ubuntu-weather-app\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 04:21+0530\n"
+"POT-Creation-Date: 2016-03-26 11:43-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -94,11 +94,11 @@
msgid "Retry"
msgstr ""
-#: ../app/components/NoAPIKeyErrorStateComponent.qml:48
+#: ../app/components/NoAPIKeyErrorStateComponent.qml:47
msgid "No API Keys Found"
msgstr ""
-#: ../app/components/NoAPIKeyErrorStateComponent.qml:57
+#: ../app/components/NoAPIKeyErrorStateComponent.qml:56
msgid ""
"If you are a developer, please see the README file for instructions on how "
"to obtain your own Open Weather Map API key."
Follow ups