Merge lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlight into lp:ubuntu-calendar-app

[Kunal Parmar]

Resolves #1432640
First tap set the highlight and then react to tap

Resolves #1432640
First tap set the highlight and then react to tap

[Kunal Parmar (pkunal-parmar)]

We need proper UI design for this

What should happen if cell is both selected and today, how should highlight look.

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

FAILED: Continuous integration, rev:645
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1166/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2752
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/637
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/163

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This results in some odd highlights in the year view.

http://i.imgur.com/FAfLe7R.png

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

Note you will need to update the test if you plan on changing how tapping a month in yearview will operate.

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlight]

646. By Kunal Parmar on 2015-05-30

design improvement

647. By Kunal Parmar on 2015-05-30

Long press on selected item only

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

FAILED: Continuous integration, rev:646
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1179/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2848
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/650
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/176

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:647
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1180/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2849
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/651
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/177

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlight]

648. By Kunal Parmar on 2015-05-30

AP fix

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

PASSED: Continuous integration, rev:648
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1181/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2850
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/652
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/178

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

review: Approve (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlight]

649. By Kunal Parmar on 2015-06-11

dynamic width for highlight

650. By Kunal Parmar on 2015-06-11

merge from trunk

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

PASSED: Continuous integration, rev:650
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1191/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2903
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/662
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/188

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks kunal.

Two more issues.

Swipe between months, I'd expect no day to be hi-lighted, but the 1st of the month always is.
Sometimes I can trigger a situation where a day is hi-lighted with grey box _and_ has orange in-fill... *and* today is highlighted in orange too. Not quite sure how to trigger it, but managed to a couple of times with a bit of excessive swiping.

review: Needs Fixing

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlight]

651. By Kunal Parmar on 2015-06-11

merge from trunk

652. By Kunal Parmar on 2015-06-11

review comment

[Kunal Parmar (pkunal-parmar)]

> Thanks kunal.
>
> Two more issues.
>
> Swipe between months, I'd expect no day to be hi-lighted, but the 1st of the
> month always is.
> Sometimes I can trigger a situation where a day is hi-lighted with grey box
> _and_ has orange in-fill... *and* today is highlighted in orange too. Not
> quite sure how to trigger it, but managed to a couple of times with a bit of
> excessive swiping.

Thanks, Modified code, please have another look

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

PASSED: Continuous integration, rev:652
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1203/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3012
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/674
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/200

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Great! Thanks Kunal.

review: Approve

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2015-06-09 10:45:01 +0000
+++ MonthComponent.qml	2015-06-25 11:59:14 +0000
@@ -111,6 +111,12 @@
 
         property int dateFontSize: FontUtils.sizeToPixels(root.dateLabelFontSize)
         property int dayFontSize: FontUtils.sizeToPixels(root.dayLabelFontSize)
+
+        property int selectedIndex: -1
+    }
+
+    onCurrentMonthChanged: {
+        intern.selectedIndex = -1
     }
 
     Column{
@@ -216,10 +222,12 @@
 
             isToday: intern.todayDate == date && intern.isCurMonthTodayMonth
 
+            isSelected: showEvents && intern.selectedIndex == index
+
             width: parent.dayWidth
             height: parent.dayHeight
             fontSize: intern.dateFontSize
-            showEvent : showEvents
+            showEvent: showEvents
                         && intern.eventStatus !== undefined
                         && intern.eventStatus[index] !== undefined
                         && intern.eventStatus[index]

=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-05-14 14:07:00 +0000
+++ MonthComponentDateDelegate.qml	2015-06-25 11:59:14 +0000
@@ -10,10 +10,15 @@
     property bool showEvent;
     property alias fontSize: dateLabel.font.pixelSize
 
+    property bool isSelected: false
+
     Loader {
-        sourceComponent: isToday && isCurrentMonth ? highLightComp : undefined
+        sourceComponent: (isToday && isCurrentMonth) || isSelected ? highLightComp : undefined
         onSourceComponentChanged: {
-            width = Qt.binding( function() { return ( dateRootItem.height / 1.5 ); });
+            width = Qt.binding( function() {
+                var width = dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height
+                return ( width / 1.1 );
+            });
             height = Qt.binding ( function() { return width} );
             anchors.centerIn = Qt.binding( function() { return dateLabel});
         }
@@ -26,13 +31,17 @@
         fontSize: root.dateLabelFontSize
         color: {
             if( isCurrentMonth ) {
-                if(isToday) {
+                if( isToday || isSelected ) {
                     "white"
                 } else {
                     "#5D5D5D"
                 }
             } else {
-                "#AEA79F"
+                if(isSelected) {
+                    "white"
+                } else {
+                    "#AEA79F"
+                }
             }
         }
     }
@@ -58,31 +67,48 @@
     Component{
         id: highLightComp
         UbuntuShape{
-            color: "#DD4814"
+            color: {
+                if( isToday && !isSelected ) {
+                    "#DD4814"
+                } else {
+                    "gray"
+                }
+            }
+
+            Rectangle{
+                anchors.fill: parent
+                anchors.margins: units.gu(0.5)
+                color: isToday ? "#DD4814" : "darkgray"
+            }
         }
     }
 
     MouseArea {
         anchors.fill: parent
         onPressAndHold: {
-            var selectedDate = new Date();
-            selectedDate.setFullYear(intern.monthStartYear)
-            selectedDate.setMonth(intern.monthStartMonth + 1)
-            selectedDate.setDate(date)
-            selectedDate.setMinutes(60, 0, 0)
-            pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});
+            if( isSelected ) {
+                var selectedDate = new Date();
+                selectedDate.setFullYear(intern.monthStartYear)
+                selectedDate.setMonth(intern.monthStartMonth + 1)
+                selectedDate.setDate(date)
+                selectedDate.setMinutes(60, 0, 0)
+                pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});
+            }
         }
         onClicked: {
             var selectedDate = new Date(intern.monthStartYear,
                                         intern.monthStartMonth,
                                         intern.monthStartDate + index, 0, 0, 0, 0)
-            //If monthView is clicked then open selected DayView
-            if ( isYearView === false ) {
-                root.dateSelected(selectedDate);
-            }
-            //If yearView is clicked then open selected MonthView
-            else {
+            if( isYearView ) {
+                //If yearView is clicked then open selected MonthView
                 root.monthSelected(selectedDate);
+            } else {
+                if( isSelected ) {
+                    //If monthView is clicked then open selected DayView
+                    root.dateSelected(selectedDate);
+                } else {
+                    intern.selectedIndex = index
+                }
             }
         }
     }