Merge lp:~nik90/ubuntu-calendar-app/tweak-event-color into lp:ubuntu-calendar-app

[Nekhelesh Ramananthan]

Set the event background color to that of its calendar to make it more clear to the user. Also distinguished past events from future events.

This MP implements the following,
- Sets the event background color to that of its calendar to make it more clear to the user
- Distinguish past events from future events.

[Nekhelesh Ramananthan (nik90)]

https://imgur.com/rPTgb1d

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Hi,
Thanks for MR and it looks great, couple of observation :-

1. this might look cumbersome when there are overlapping events in past because of opacity [1].
2. As kunal pointed out, wouldn't opacity will cause performance issues..? [2]

[1]: http://i.imgur.com/nEIXY3y.png
[2]: https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1369025

[Nekhelesh Ramananthan (nik90)]

> Hi,
> Thanks for MR and it looks great, couple of observation :-
>
> 1. this might look cumbersome when there are overlapping events in past
> because of opacity [1].
> 2. As kunal pointed out, wouldn't opacity will cause performance issues..? [2]
>
>
> [1]: http://i.imgur.com/nEIXY3y.png
> [2]: https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1369025

Good Point! I addressed them both by removing the opacity change and instead reducing the darkness of the background and striking out the event details of past events.

https://imgur.com/T0SBwVP

[Nekhelesh Ramananthan (nik90)]

An even better screenshot -> https://imgur.com/zlXeX9l

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

lgtm!
Thanks Nekhelesh

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2014-09-08 10:21:19 +0000
+++ EventBubble.qml	2014-09-19 07:44:22 +0000
@@ -15,7 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 
 Item{
@@ -40,8 +41,6 @@
     UbuntuShape{
         id: bg
         anchors.fill: parent
-        color: "white"
-        gradientColor: "#F5F5F5"
     }
 
     function resize() {
@@ -126,10 +125,10 @@
                 timeLabel.text = event.displayLabel;
         }
 
-       if(model) {
-           var collection = model.collection( event.collectionId );
-           calendarIndicator.color = collection.color
-       }
+        if(model) {
+            var collection = model.collection( event.collectionId );
+            bg.color = collection.color
+        }
 
         layoutBubbleDetails();
     }
@@ -161,47 +160,41 @@
         width: parent.width
         height: detailsColumn.height
 
-        Column{
+        Column {
             id: detailsColumn
 
             anchors {
-                top: parent.top; left: parent.left; right: parent.right; margins: units.gu(1)
+                top: parent.top
+                left: parent.left
+                right: parent.right
+                margins: units.gu(1)
             }
 
-            Row{
+            Label {
+                id: timeLabel
+                objectName: "timeLabel"
+                color: "White"
+                fontSize:"small"
+                font.bold: true
                 width: parent.width
+            }
 
-                Label{
-                    id: timeLabel
-                    objectName: "timeLabel"
-                    fontSize:"small";
-                    color:"gray"
-                    width: parent.width - calendarIndicator.width
-                }
-                Rectangle{
-                    id: calendarIndicator
-                    width: units.gu(1)
-                    radius: width/2
-                    height: width
-                    color: "#715772"
-                }
-            }
-            Label{
+            Label {
                 id: titleLabel
                 objectName: "titleLabel"
+                color: "White"
                 fontSize: "small"
-                color: "black"
+                width: parent.width
                 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                width: parent.width
             }
 
-            Label{
+            Label {
                 id: descriptionLabel
-                fontSize: "small"
-                color:"gray"
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                color: "White"
+                fontSize: "x-small"
                 width: parent.width
                 visible: type == wideType
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             }
         }
     }