ubuntu-touch-coreapps-reviewers team mailing list archive

[Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>]

Nekhelesh Ramananthan has proposed merging lp:~ubuntu-clock-dev/ubuntu-clock-app/2-migrate-add-city-listitems into lp:ubuntu-clock-app with lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework as a prerequisite.

Commit message:
Migrate World City page listitems to the new 15.04 listitems

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/2-migrate-add-city-listitems/+merge/263887

Migrate World City page listitems to the new 15.04 listitems

#blocked

Blocked due to,

1. Pre-requisite branch needs to go in first
2. There is a bug where deleting a world city does not remove the listitem when the world city count is 1.
3. Autopilot tests and qml tests needs to be updated.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~ubuntu-clock-dev/ubuntu-clock-app/2-migrate-add-city-listitems into lp:ubuntu-clock-app.

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2015-07-06 10:53:15 +0000
+++ app/worldclock/WorldCityList.qml	2015-07-06 10:53:16 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import Timezone 1.0
 import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
 import "../upstreamcomponents"
 
@@ -304,12 +303,23 @@
         section.criteria: ViewSection.FirstCharacter
         section.labelPositioning: ViewSection.InlineLabels
 
-        section.delegate: ListItem.Header {
-            text: section
+        section.delegate: ListItem {
+            height: header.implicitHeight + units.gu(2)
+            Label {
+                id: header
+                text: section
+                font.weight: Font.DemiBold
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+            }
         }
 
-        delegate: ListItem.Empty {
-            showDivider: false
+        delegate: ListItem {
+            height: worldCityDelegateColumn.height + units.gu(2)
+            divider.visible: false
             objectName: "defaultWorldCityItem" + index
 
             Column {

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-07-06 10:53:15 +0000
+++ po/com.ubuntu.clock.pot	2015-07-06 10:53:16 +0000
@@ -11,7 +11,7 @@
 <<<<<<< TREE
 "POT-Creation-Date: 2015-06-18 18:12+0000\n"
 =======
-"POT-Creation-Date: 2015-05-27 16:05+0000\n"
+"POT-Creation-Date: 2015-06-03 18:51+0000\n"
 >>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"