Add settings page

This page currently only allows enabling/disabling the two currently supported sensors
This also necessitated the addition of a layerstack to allow layer navigation

3 files changed, 143 insertions, 136 deletions

diff --git a/src/SettingsPage.qml b/src/SettingsPage.qml
index 5cc32b1..600017e 100644
--- a/src/SettingsPage.qml
+++ b/src/SettingsPage.qml
@@ -35,26 +35,29 @@ Item {
             Item { width: parent.width; height: parent.width*0.2}
 
             LabeledSwitch {
+                id: stepsEnableSwitch
                 width: parent.width
                 height: width*0.25
                 text: "Log step count"
-                onCheckedChanged: loggerSettings.stepCounterEnabled = checked
-                checked: loggerSettings.stepCounterEnabled
+                Component.onCompleted: checked = loggerSettings.stepCounterEnabled
             }
             LabeledSwitch {
                 id: hrEnableSwitch
                 width: parent.width
                 height: width*0.25
                 text: "Log heart rate"
-                onCheckedChanged: loggerSettings.heartrateSensorEnabled = checked
-                checked: loggerSettings.heartrateSensorEnabled
+                Component.onCompleted: checked = loggerSettings.heartrateSensorEnabled
             }
-            LabeledActionButton {
-                text: "reload dbus"
-                width: parent.width
-                height: width*0.25
+            IconButton {
+                iconName: "ios-checkmark-circle-outline"
+                height: parent.width*0.2
+                width: height
+                anchors.horizontalCenter: parent.horizontalCenter
                 onClicked: {
-                    hrEnableSwitch.checked = loggerSettings.heartrateSensorEnabled
+                    loggerSettings.stepCounterEnabled = stepsEnableSwitch.checked
+                    loggerSettings.heartrateSensorEnabled = hrEnableSwitch.checked
+                    loggerSettings.reInitLogger()
+                    pageStack.pop(pageStack.currentLayer)
                 }
             }
         }
diff --git a/src/main.qml b/src/main.qml
index ba0102f..cb97b7a 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -34,161 +34,164 @@ Application {
 
     property var weekday: ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
 
+
     LayerStack {
         id: pageStack
         anchors.fill: parent
-        firstPage: Item {
-            PageHeader {
-                id: title
-                text: "Overview"
-                z: 5
-            }
+        firstPage: Component {
+            Item {
+                PageHeader {
+                    id: title
+                    text: "Overview"
+                    z: 5
+                }
 
-            Flickable {
-                z: 1
-                anchors.fill: parent
-                contentHeight: contentColumn.implicitHeight
-                Column {
-                    id: contentColumn
+                Flickable {
+                    z: 1
                     anchors.fill: parent
+                    contentHeight: contentColumn.implicitHeight
+                    Column {
+                        id: contentColumn
+                        anchors.fill: parent
 
-                    Item { width: parent.width; height: parent.width*0.2}
+                        Item { width: parent.width; height: parent.width*0.2}
 
-                    Label {
-                        width: parent.width*0.8
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        text: "You've walked " + stepsDataLoader.getTodayData() + " steps today, keep it up!"
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignHCenter
-                    }
+                        Label {
+                            width: parent.width*0.8
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            text: "You've walked " + stepsDataLoader.getTodayData() + " steps today, keep it up!"
+                            wrapMode: Text.WordWrap
+                            horizontalAlignment: Text.AlignHCenter
+                        }
 
-                    Item { width: parent.width; height: parent.width*0.1}
-
-                    Column { //this is the graph of steps for the past week
-                        id: stepsGraph
-                        width: parent.width*0.9
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        property var valuesArr: []
-                        property var labelsArr: []
-                        property var maxValue: 0
-                        property var divisionsInterval: 0
-                        property var divisionsCount: 0
-                        Component.onCompleted: {
-                            var currDate = new Date()
-                            currDate.setDate(currDate.getDate() - 7)
-                            for (var i = 0; i < 7; i++) {
-                                currDate.setDate(currDate.getDate() + 1)
-                                console.log(currDate)
-                                var currvalue = stepsDataLoader.getDataForDate(currDate)
-                                if (currvalue > 0 || valuesArr.count>0) {
-                                    if (currvalue > maxValue) {
-                                        maxValue = currvalue
+                        Item { width: parent.width; height: parent.width*0.1}
+
+                        Column { //this is the graph of steps for the past week
+                            id: stepsGraph
+                            width: parent.width*0.9
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            property var valuesArr: []
+                            property var labelsArr: []
+                            property var maxValue: 0
+                            property var divisionsInterval: 0
+                            property var divisionsCount: 0
+                            Component.onCompleted: {
+                                var currDate = new Date()
+                                currDate.setDate(currDate.getDate() - 7)
+                                for (var i = 0; i < 7; i++) {
+                                    currDate.setDate(currDate.getDate() + 1)
+                                    console.log(currDate)
+                                    var currvalue = stepsDataLoader.getDataForDate(currDate)
+                                    if (currvalue > 0 || valuesArr.count>0) {
+                                        if (currvalue > maxValue) {
+                                            maxValue = currvalue
+                                        }
+                                        valuesArr.push(currvalue)
+                                        labelsArr.push(weekday[currDate.getDay()])
                                     }
-                                    valuesArr.push(currvalue)
-                                    labelsArr.push(weekday[currDate.getDay()])
                                 }
-                            }
 
-                            //this code figures out graph scaling
-                            var powTen = Math.floor(Math.log10(maxValue))
-                            divisionsInterval = Math.pow(10,powTen)
-                                                console.log(Math.floor(maxValue/divisionsInterval))
-                            maxValue = divisionsInterval*Math.floor(maxValue/divisionsInterval) + (divisionsInterval/5)*Math.ceil((maxValue%divisionsInterval)/(divisionsInterval/5))
-                            divisionsCount = Math.floor(maxValue/divisionsInterval) + 1
-                            console.log(maxValue,divisionsInterval,divisionsCount)
-                            // now update the repeater so it reloads the data. for some reason a normal qml binding doesn't do it here.
-                            barsRepeater.model = valuesArr.length
-                            labelsRepeater.model = valuesArr.length
-                        }
-                        Label {
-                            anchors {
-                                left: parent.left
-                                margins: app.width*0.1
+                                //this code figures out graph scaling
+                                var powTen = Math.floor(Math.log10(maxValue))
+                                divisionsInterval = Math.pow(10,powTen)
+                                                    console.log(Math.floor(maxValue/divisionsInterval))
+                                maxValue = divisionsInterval*Math.floor(maxValue/divisionsInterval) + (divisionsInterval/5)*Math.ceil((maxValue%divisionsInterval)/(divisionsInterval/5))
+                                divisionsCount = Math.floor(maxValue/divisionsInterval) + 1
+                                console.log(maxValue,divisionsInterval,divisionsCount)
+                                // now update the repeater so it reloads the data. for some reason a normal qml binding doesn't do it here.
+                                barsRepeater.model = valuesArr.length
+                                labelsRepeater.model = valuesArr.length
                             }
-                            text: "Steps"
-                        }
-                        Item {
-                            height: app.height/2
-                            anchors {
-                                margins: app.width*0.05
-                                left: parent.left
-                                right: parent.right
-                            }
-                            Item {
-                                id: markerParent
-                                width: parent.width/8
-                                height: parent.height
+                            Label {
                                 anchors {
                                     left: parent.left
-                                    top: barsRow.top
-                                    bottom: barsRow.bottom
-                                }
-                                Repeater {
-                                    model: stepsGraph.divisionsCount
-                                    delegate: Label {
-                                        anchors.right: parent.right
-                                        text: stepsGraph.divisionsInterval*index
-                                        font.pixelSize: Dims.w(5)
-                                        y: parent.height - parent.height*stepsGraph.divisionsInterval*index/stepsGraph.maxValue - height/2
-                                        verticalAlignment: Text.AlignVCenter
-                                    }
+                                    margins: app.width*0.1
                                 }
+                                text: "Steps"
                             }
-                            Row {
-                                id: barsRow
+                            Item {
+                                height: app.height/2
                                 anchors {
-                                    horizontalCenter: parent.horizontalCenter
-                                    top: parent.top
-                                    bottom: labelsRow.top
+                                    margins: app.width*0.05
+                                    left: parent.left
+                                    right: parent.right
                                 }
-                                Repeater {
-                                    id: barsRepeater
-                                    delegate: Item { //this contains the graph column and positions it correctly
-                                        width: stepsGraph.width/8
-                                        height: parent.height
-                                        Rectangle {
-                                            id: bar
-                                            anchors.bottom: parent.bottom
-                                            anchors.horizontalCenter: parent.horizontalCenter
-                                            width: parent.width*2/3
-                                            radius: width/2
-                                            property int value: stepsGraph.valuesArr[index]
-                                            height: (value/stepsGraph.maxValue)*parent.height
+                                Item {
+                                    id: markerParent
+                                    width: parent.width/8
+                                    height: parent.height
+                                    anchors {
+                                        left: parent.left
+                                        top: barsRow.top
+                                        bottom: barsRow.bottom
+                                    }
+                                    Repeater {
+                                        model: stepsGraph.divisionsCount
+                                        delegate: Label {
+                                            anchors.right: parent.right
+                                            text: stepsGraph.divisionsInterval*index
+                                            font.pixelSize: Dims.w(5)
+                                            y: parent.height - parent.height*stepsGraph.divisionsInterval*index/stepsGraph.maxValue - height/2
+                                            verticalAlignment: Text.AlignVCenter
                                         }
                                     }
                                 }
-                            }
-                            Row {
-                                id: labelsRow
-                                height: Dims.w(5)
-                                anchors {
-                                    bottom: parent.bottom
-                                    left: barsRow.left
-                                    right: barsRow.right
+                                Row {
+                                    id: barsRow
+                                    anchors {
+                                        horizontalCenter: parent.horizontalCenter
+                                        top: parent.top
+                                        bottom: labelsRow.top
+                                    }
+                                    Repeater {
+                                        id: barsRepeater
+                                        delegate: Item { //this contains the graph column and positions it correctly
+                                            width: stepsGraph.width/8
+                                            height: parent.height
+                                            Rectangle {
+                                                id: bar
+                                                anchors.bottom: parent.bottom
+                                                anchors.horizontalCenter: parent.horizontalCenter
+                                                width: parent.width*2/3
+                                                radius: width/2
+                                                property int value: stepsGraph.valuesArr[index]
+                                                height: (value/stepsGraph.maxValue)*parent.height
+                                            }
+                                        }
+                                    }
                                 }
-                                Repeater {
-                                    id: labelsRepeater
-                                    delegate: Label {
-                                        width: stepsGraph.width/8
-                                        id: dowLabel
-                                        // anchors.horizontalCenter: parent.horizontalCenter
-                                        horizontalAlignment: Text.AlignHCenter
-                                        text: stepsGraph.labelsArr[index]
-                                        font.pixelSize: Dims.w(5)
+                                Row {
+                                    id: labelsRow
+                                    height: Dims.w(5)
+                                    anchors {
+                                        bottom: parent.bottom
+                                        left: barsRow.left
+                                        right: barsRow.right
+                                    }
+                                    Repeater {
+                                        id: labelsRepeater
+                                        delegate: Label {
+                                            width: stepsGraph.width/8
+                                            id: dowLabel
+                                            // anchors.horizontalCenter: parent.horizontalCenter
+                                            horizontalAlignment: Text.AlignHCenter
+                                            text: stepsGraph.labelsArr[index]
+                                            font.pixelSize: Dims.w(5)
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
 
-                    Item { width: parent.width; height: parent.width*0.1}
-                    ListItem {
-                        title: "Settings"
-                        iconName: "ios-settings-outline"
-                        onClicked: pageStack.push(settingsPage)
-                    }
+                        Item { width: parent.width; height: parent.width*0.1}
+                        ListItem {
+                            title: "Settings"
+                            iconName: "ios-settings-outline"
+                            onClicked: pageStack.push(settingsPage)
+                        }
 
-                    Item { width: parent.width; height: parent.width*0.2}
+                        Item { width: parent.width; height: parent.width*0.2}
+                    }
                 }
             }
         }
diff --git a/src/resources.qrc b/src/resources.qrc
index 5f6483a..4e26cb8 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
+        <file>SettingsPage.qml</file>
     </qresource>
 </RCC>