← Back to branch summary

~renatofilho/ubuntu-calendar-app/majster-new-event-page

« back to all changes in this revision

Viewing changes to TimeLineHeaderComponent.qml

  • Committer: Tarmac
  • Author(s): Kunal Parmar
  • Date: 2015-06-08 11:14:19 UTC
  • mfrom: (643.1.8 ubuntu-calendar-app)
  • Revision ID: tarmac-20150608111419-91vi9dgg1rbjx26n
WeekView highlight day before moving to day view.

Approved by Ubuntu Phone Apps Jenkins Bot, Alan Pope .

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineHeaderComponent.qml
30
30
    property bool isCurrentItem: false
31
31
    property var currentDay
32
32
 
 
33
    property int highlightedIndex;
 
34
 
33
35
    signal dateSelected(var date);
34
36
 
35
37
    width: parent.width
36
38
    height: units.gu(4)
37
39
 
 
40
    onStartDayChanged: {
 
41
        highlightedIndex = 0
 
42
    }
 
43
 
38
44
    Repeater{
39
45
        model: type == ViewType.ViewTypeWeek ? 7 : 1
40
46
 
41
47
        delegate: HeaderDateComponent{
42
48
            date: type == ViewType.ViewTypeWeek ? startDay.addDays(index) : startDay
43
49
            dayFormat: Locale.ShortFormat
 
50
            highlighted: (type == ViewType.ViewTypeWeek) && (highlightedIndex == index)
44
51
 
45
52
            dayColor: {
46
53
                if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
 
54
                    header.highlightedIndex = index
47
55
                    UbuntuColors.orange
48
56
                } /*else if( type == ViewType.ViewTypeDay && date.isSameDay(currentDay) ) {
49
57
                    UbuntuColors.orange
56
64
            height: header.height
57
65
 
58
66
            onDateSelected: {
59
 
                header.dateSelected(date);
 
67
                if( type == ViewType.ViewTypeDay ){
 
68
                    header.dateSelected(date);
 
69
                } else {
 
70
                    if(highlighted) {
 
71
                        header.dateSelected(date);
 
72
                    } else {
 
73
                        header.highlightedIndex = index
 
74
                    }
 
75
                }
60
76
            }
61
77
 
62
78
            Loader{