Merge lp:~neokore/ubuntu-weather-app/improveSheetsText into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

Changed text color for settigns and location sheets to improve its readability.

Changed text color for settings and location sheets to improve its readability.
By now it's a bit tricky unless the SDK let us change this values or I learn to use themes correctly.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/15

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/23/rebuild

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Haven't found a way to do so, very cool!

review: Approve

=== modified file 'components/LocationManagerSheet.qml'
--- components/LocationManagerSheet.qml	2013-07-19 11:39:31 +0000
+++ components/LocationManagerSheet.qml	2013-07-23 21:24:31 +0000
@@ -34,8 +34,9 @@
         property int initial_sum: 0
 
         Component.onCompleted: {
-            locationsRemoved.clear()
-            loadData()
+            locationsRemoved.clear();
+            loadData();
+            Theme.palette.selected.backgroundText = "#656565"
         }
 
         function loadData() {
@@ -136,7 +137,8 @@
                 width: parent.width
                 clip:true
                 color:"transparent"
-                height: units.gu(40)
+                height: units.gu(45)
+
                 ListView {
                     objectName: "LocationList"
                     anchors.fill: parent
@@ -210,6 +212,7 @@
             currentLocationItem.visible = false
             locationLookupItem.visible = true
             lookupItemAddButton.visible = true
+            Theme.palette.selected.backgroundText = "#f4f4e8"
         }
 
         onCancelClicked: {
@@ -219,6 +222,7 @@
                 // opening the sheet
                 mainView.refreshData()
             }
+            Theme.palette.selected.backgroundText = "#f4f4e8"
         }
 
         AddLocationSheet {

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2013-07-20 16:52:37 +0000
+++ components/SettingsSheet.qml	2013-07-23 21:24:31 +0000
@@ -22,12 +22,11 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Component {
-
     ComposerSheet {
         id: sheet
         objectName: "SettingsSheet"
         title: i18n.tr("Settings")
-        contentsHeight: parent.height        
+        contentsHeight: parent.height
 
         container: ListItem.ValueSelector {
             id: unitsSelector
@@ -37,6 +36,10 @@
             selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
         }
 
+        Component.onCompleted: {
+            Theme.palette.selected.backgroundText = "#656565"
+        }
+
         onConfirmClicked: {
             var refresh = false,
                 selectedUnit = (unitsSelector.selectedIndex === 0) ? "metric" : "imperial";
@@ -57,7 +60,12 @@
                     refreshData(true);
                 });
             }
+            Theme.palette.selected.backgroundText = "#f4f4e8"
             PopupUtils.close(sheet)
         }
+
+        onCancelClicked: {
+            Theme.palette.selected.backgroundText = "#f4f4e8"
+        }
     }
 }