Merge lp:~twstd-dev/ubuntu-calendar-app/1360314 into lp:ubuntu-calendar-app

[twstd]

A fix for bug #1360314

Unfortunately event page gets open instantly, highlight doesn't even have time to render. This is a pretty hacky way.

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

FAILED: Continuous integration, rev:423
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/722/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1768/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/280

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

I think delaying click event and displaying the EventDetails page is not a good idea.
However, if user keep pressing the ListItem, that time we should change background color.

So I suggest, we should change background color on MousePress and MouseRelease, and let click event do what it was doing previously.

And we may add color anaimation of color change behavior.

[twstd (twstd-dev)]

> I think delaying click event and displaying the EventDetails page is not a
> good idea.
> However, if user keep pressing the ListItem, that time we should change
> background color.
>
> So I suggest, we should change background color on MousePress and
> MouseRelease, and let click event do what it was doing previously.
>
> And we may add color anaimation of color change behavior.

Thank you for the hint! Was not sure that pressed gets called before. Good to know!

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

FAILED: Continuous integration, rev:424
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/726/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1790/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1790/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/284

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:425
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/728/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1792/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/286

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:425
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/732/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1836
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1836/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/290

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

Works as expected.
Thanks for MR.

review: Approve

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

PASSED: Continuous integration, rev:425
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/765/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/186
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/323

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/303/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/188
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/123

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

Could you please merge with trunk ?

review: Needs Fixing

[lp:~twstd-dev/ubuntu-calendar-app/1360314]

426. By twstd on 2014-09-06

Merge with the main branch

[twstd (twstd-dev)]

Updated

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

PASSED: Continuous integration, rev:426
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/778/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/236
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/336

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Tested and works as expected :)

review: Approve

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2014-09-05 05:36:00 +0000
+++ AgendaView.qml	2014-09-06 17:59:57 +0000
@@ -193,12 +193,35 @@
 
                 UbuntuShape{
                     id: detailsContainer
-                    color: "white"
+                    color: backgroundColor
 
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width - units.gu(4)
                     height: detailsColumn.height + units.gu(1)
 
+                    states: [
+                        State {
+                            name: "selected"
+
+                            PropertyChanges {
+                                target: detailsContainer
+                                color: UbuntuColors.orange
+                            }
+
+                            PropertyChanges {
+                                target: timeLabel
+                                color: "white"
+                            }
+                        }
+
+                    ]
+
+                    Behavior on color {
+                        ColorAnimation {
+                            duration: 50
+                        }
+                    }
+
                     Column{
                         id: detailsColumn
 
@@ -229,6 +252,12 @@
                             color:"black"
                             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                             width: parent.width
+
+                            Behavior on color {
+                                ColorAnimation {
+                                    duration: 50
+                                }
+                            }
                         }
                     }
 
@@ -237,6 +266,14 @@
                         onClicked: {
                             pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventListModel});
                         }
+
+                        onPressed: {
+                            parent.state = "selected"
+                        }
+
+                        onReleased: {
+                            parent.state = ""
+                        }
                     }
                 }
             }