address-book-app

Merge lp:~renatofilho/address-book-app/fix-bottom-edge into lp:address-book-app

  1. fix-bottom-edge
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 490
Proposed branch: lp:~renatofilho/address-book-app/fix-bottom-edge
Merge into: lp:address-book-app
Prerequisite: lp:~renatofilho/address-book-app/autopilot-and-sdk-1.3
Diff against target: 201 lines (+54/-16)
6 files modified
src/imports/ABContactListPage.qml (+3/-1)
src/imports/BottomEdge.qml (+47/-12)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+2/-0)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+1/-1)
src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+1/-1)
src/imports/Ubuntu/Contacts/SectionDelegate.qml (+0/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/fix-bottom-edge
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+275246@code.launchpad.net

This proposal supersedes a proposal from 2015-10-21.

Commit message

Make bottom edge usable with a mouse.
Make it smarter when more than one column is available.

Compared with lp:~fboucault/address-book-app/converged_bottom_edge:
 Show a dark background while swiping the bottom edge page.
 Fixed bottom edge animation to avoid it to disappear on second interaction.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/272
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4755
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24446

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/969/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/970/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4753/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24447

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/970/rebuild

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/fix-bottom-edge updated
509. By Renato Araujo Oliveira Filho

Fixed font size for new UITK label.

510. By Renato Araujo Oliveira Filho

Use pageStack API on PageWithBottomEdge.

511. By Renato Araujo Oliveira Filho

Make the header invisible on contact share page.

512. By Renato Araujo Oliveira Filho

Does not show empty state message if contact editor is open.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/971/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24471

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/971/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml 2015-10-22 12:56:07 +0000
+++ src/imports/ABContactListPage.qml 2015-10-22 12:56:08 +0000
@@ -427,7 +427,8 @@
427 !contactList.favouritesIsSelected &&427 !contactList.favouritesIsSelected &&
428 mainPage.isEmpty &&428 mainPage.isEmpty &&
429 (mainPage.newPhoneToAdd === "") &&429 (mainPage.newPhoneToAdd === "") &&
430 !(contactList.filterTerm && contactList.filterTerm !== ""))430 !(contactList.filterTerm && contactList.filterTerm !== "")) &&
431 bottomEdge.visible
431432
432 Behavior on visible {433 Behavior on visible {
433 SequentialAnimation {434 SequentialAnimation {
@@ -582,6 +583,7 @@
582 flickable: contactList583 flickable: contactList
583 iconName: "contact-new"584 iconName: "contact-new"
584 enabled: !contactList.isInSelectionMode585 enabled: !contactList.isInSelectionMode
586 backGroundEffectEnabled: pageStack.columns === 1
585587
586 // FIXME: this is a workaround for the lack of fully asynchronous loading588 // FIXME: this is a workaround for the lack of fully asynchronous loading
587 // of Pages in AdaptativePageLayout589 // of Pages in AdaptativePageLayout
588590
=== modified file 'src/imports/BottomEdge.qml'
--- src/imports/BottomEdge.qml 2015-10-22 12:56:07 +0000
+++ src/imports/BottomEdge.qml 2015-10-22 12:56:08 +0000
@@ -20,12 +20,14 @@
20Item {20Item {
21 id: bottomEdge21 id: bottomEdge
2222
23 readonly property alias content: bottomEdgeLoader.item
23 readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready24 readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready
25
24 property bool opened: false26 property bool opened: false
25 property Component contentComponent27 property Component contentComponent
26 property Item content: bottomEdgeLoader.item
27 property string iconName28 property string iconName
28 property Item flickable29 property Item flickable
30 property alias backGroundEffectEnabled: darkBg.visible
2931
30 signal openBegin32 signal openBegin
31 signal openEnd33 signal openEnd
@@ -40,6 +42,17 @@
40 bottomEdge.state = "collapsed";42 bottomEdge.state = "collapsed";
41 }43 }
4244
45 Rectangle {
46 id: darkBg
47
48 anchors.fill: parent
49 color: "black"
50 opacity: bottomEdgeBody.y > 0 ? 0.8 - (bottomEdgeBody.y / bottomEdgeDragArea.drag.maximumY) : 0.8
51 Behavior on opacity {
52 NumberAnimation { duration: UbuntuAnimation.FastDuration }
53 }
54 }
55
43 Item {56 Item {
44 id: bottomEdgeBody57 id: bottomEdgeBody
45 anchors {58 anchors {
@@ -121,13 +134,19 @@
121 states: [134 states: [
122 State {135 State {
123 name: "collapsed"136 name: "collapsed"
137 ParentChange {
138 target: bottomEdgeContent
139 parent: bottomEdgeBody
140 x: 0
141 y: 0
142 }
124 PropertyChanges {143 PropertyChanges {
125 target: bottomEdgeBody144 target: bottomEdgeBody
126 y: bottomEdgeDragArea.drag.maximumY145 y: bottomEdgeDragArea.drag.maximumY
127 }146 }
128 PropertyChanges {147 PropertyChanges {
129 target: bottomEdgeContent148 target: bottomEdgeContent
130 visible: false149 opacity: 0.0
131 }150 }
132 },151 },
133 State {152 State {
@@ -139,9 +158,12 @@
139 y: 0158 y: 0
140 }159 }
141 PropertyChanges {160 PropertyChanges {
161 target: bottomEdgeContent
162 opacity: 1.0
163 }
164 PropertyChanges {
142 target: bottomEdgeBody165 target: bottomEdgeBody
143 y: bottomEdgeDragArea.drag.maximumY166 y: 0
144 opacity: 0.0
145 }167 }
146 PropertyChanges {168 PropertyChanges {
147 target: bottomEdgeShadows169 target: bottomEdgeShadows
@@ -154,7 +176,7 @@
154 when: bottomEdgeDragArea.drag.active176 when: bottomEdgeDragArea.drag.active
155 PropertyChanges {177 PropertyChanges {
156 target: bottomEdgeContent178 target: bottomEdgeContent
157 visible: true179 opacity: 1.0
158 }180 }
159 }181 }
160 ]182 ]
@@ -164,16 +186,28 @@
164 to: "collapsed"186 to: "collapsed"
165 SequentialAnimation {187 SequentialAnimation {
166 alwaysRunToEnd: true188 alwaysRunToEnd: true
167189 ParallelAnimation {
168 SmoothedAnimation {190 ParentAnimation {
169 target: bottomEdgeBody191 UbuntuNumberAnimation {
170 property: "y"192 properties: "x,y"
171 duration: UbuntuAnimation.SlowDuration193 duration: UbuntuAnimation.SlowDuration
194 target: bottomEdgeContent
195 }
196 }
197 UbuntuNumberAnimation {
198 target: bottomEdgeBody
199 property: "y"
200 duration: UbuntuAnimation.SlowDuration
201 }
202 }
203 PropertyAction {
204 target: bottomEdgeContent
205 property: "opacity"
172 }206 }
173 ScriptAction {207 ScriptAction {
174 script: {208 script: {
175 bottomEdgeLoader.active = false;209 bottomEdgeLoader.active = false
176 bottomEdgeLoader.active = true;210 bottomEdgeLoader.active = true
177 bottomEdge.opened = false211 bottomEdge.opened = false
178 }212 }
179 }213 }
@@ -182,6 +216,7 @@
182 Transition {216 Transition {
183 to: "expanded"217 to: "expanded"
184 SequentialAnimation {218 SequentialAnimation {
219 alwaysRunToEnd: true
185 ParallelAnimation {220 ParallelAnimation {
186 ScriptAction {221 ScriptAction {
187 script: bottomEdge.openBegin()222 script: bottomEdge.openBegin()
188223
=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-10-22 12:56:08 +0000
@@ -31,6 +31,8 @@
31 signal canceled()31 signal canceled()
32 signal completed()32 signal completed()
3333
34 // invisible header
35 header: Item { height: 0 }
34 ContentHub.ContentPeerPicker {36 ContentHub.ContentPeerPicker {
35 visible: true37 visible: true
36 anchors.fill: parent38 anchors.fill: parent
3739
=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-10-22 12:56:08 +0000
@@ -51,9 +51,9 @@
5151
52 anchors.centerIn: parent52 anchors.centerIn: parent
53 text: Contacts.contactInitialsFromString(contactDisplayName)53 text: Contacts.contactInitialsFromString(contactDisplayName)
54 font.pointSize: 88
55 color: UbuntuColors.lightAubergine54 color: UbuntuColors.lightAubergine
56 visible: (img.status != Image.Ready)55 visible: (img.status != Image.Ready)
56 fontSize: "large"
57 }57 }
5858
59 source: !img.visible ? img : null59 source: !img.visible ? img : null
6060
=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-10-22 12:56:08 +0000
@@ -103,7 +103,7 @@
103 {103 {
104 if (edgeLoader.status === Loader.Ready) {104 if (edgeLoader.status === Loader.Ready) {
105 edgeLoader.item.active = true105 edgeLoader.item.active = true
106 page.pageStack.addPageToCurrentColumn(page, edgeLoader.item)106 page.pageStack.push(edgeLoader.item)
107 if (edgeLoader.item.flickable) {107 if (edgeLoader.item.flickable) {
108 edgeLoader.item.flickable.contentY = -page.header.height108 edgeLoader.item.flickable.contentY = -page.header.height
109 edgeLoader.item.flickable.returnToBounds()109 edgeLoader.item.flickable.returnToBounds()
110110
=== modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml'
--- src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-10-22 12:56:08 +0000
@@ -28,7 +28,6 @@
2828
29 anchors.fill: parent29 anchors.fill: parent
30 verticalAlignment: Text.AlignVCenter30 verticalAlignment: Text.AlignVCenter
31 font.pointSize: 76
32 height: units.gu(3)31 height: units.gu(3)
33 }32 }
34 ThinDivider {33 ThinDivider {

Subscribers

People subscribed via source and target branches