workoutview is working, fixes to main menu

Author: kapraran

HighlightedText.qml

@@ -0,0 +1,20 @@
+import QtQuick 2.0
+
+Rectangle {
+    property string text;
+    property int textPadding: 20;
+
+    id: rect
+    color: "#42f480"
+    anchors.horizontalCenter: parent.horizontalCenter
+    width: txt.width + textPadding
+    height: txt.height + textPadding
+
+    Text {
+        id: txt
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.margins: rect.textPadding / 2
+        text: rect.text.toUpperCase()
+    }
+}

MainMenu.qml

@@ -14,18 +14,20 @@ Rectangle {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        height: parent.height*0.5
-        color: "red"
+        anchors.margins: 20
+        height: parent.height * 0.5 - anchors.margins*2
+        color: "#42f480"
+        clip: true
 
         Row {
             width: parent.width * 0.8
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
 
             Image {
-                source: "icons/add_black.png"
-                width: 100
-                height: 100
+                source: "icons/fitness_black_2x.png"
+                width: workoutListLink.width * 0.2 > 100 ? 100: workoutListLink.width * 0.2
+                height: width
             }
 
             Text{
@@ -36,27 +38,37 @@ Rectangle {
         }
 
         MouseArea{
+            id: workoutMa
             anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: workoutMa.containsMouse ? Qt.PointingHandCursor: Qt.ArrowCursor
+
+            onEntered: workoutListLink.color = "#39ce6d"
+            onExited: workoutListLink.color = "#42f480"
+
             onClicked: mainStack.push(workoutListViewComponent)
         }
     }
 
     Rectangle  {
+        id: blogLink
         anchors.top: workoutListLink.bottom
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        color:"blue"
+        anchors.margins: 20
+        color: "#42f480"
+        clip: true
 
         Row {
             width: parent.width * 0.8
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
 
             Image {
-                source: "icons/menu_black.png"
-                width: 100
-                height: 100
+                source: "icons/log_black_2x.png"
+                width: blogLink.width * 0.2 > 100 ? 100: blogLink.width * 0.2
+                height: width
             }
 
             Text{
@@ -69,7 +81,14 @@ Rectangle {
         }
 
         MouseArea{
+            id: postMa
             anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: postMa.containsMouse ? Qt.PointingHandCursor: Qt.ArrowCursor
+
+            onEntered: blogLink.color = "#39ce6d"
+            onExited: blogLink.color = "#42f480"
+
             onClicked: mainStack.push(postListViewComponent)
         }
     }

PostListView.qml

@@ -159,34 +159,30 @@ Rectangle {
         subtitle: "Diary posts"
         Layout.preferredWidth: parent.width
 
-        ToolImageButton {
-            id: goBackButton
-            anchors.right: statsButton.left
-            imgSrc: "icons/back_black.png"
+//        ToolImageButton {
+//            id: statsButton
+//            anchors.right: addNewButton.left
+//            imgSrc: "icons/stats_black.png"
 
-            onClicked: {
-                mainStack.pop();
-            }
-        }
+//            onClicked: {
 
-        ToolImageButton {
-            id: statsButton
-            anchors.right: addNewButton.left
-            imgSrc: "icons/stats_black.png"
+//            }
+//        }
 
-            onClicked: {
+        ToolImageButton {
+            id: addNewButton
+            anchors.right: goBackButton.left
+            imgSrc: "icons/add_black.png"
 
-            }
+            onClicked: mainStack.push(comp_addPostView)
         }
 
         ToolImageButton {
-            id: addNewButton
+            id: goBackButton
             anchors.right: parent.right
-            imgSrc: "icons/add_black.png"
+            imgSrc: "icons/menu_black.png"
 
-            onClicked: {
-                mainStack.push(comp_addPostView);
-            }
+            onClicked: mainStack.pop()
         }
 
     }

WorkoutListView.qml

@@ -114,18 +114,24 @@ Rectangle {
                         cursorShape: ma.containsMouse ? Qt.PointingHandCursor: Qt.ArrowCursor
 
                         onClicked: {
+                            var photos = [];
+                            for (var i=0; i<images.count; i++)
+                                photos.push(images.get(i));
+
                             var intent = {
                                 "item": workoutViewComponent,
                                 "properties": {
                                     "postIndex": index,
                                     "title": title,
-                                    "category":category,
-                                    "photos":images,
-                                    "preparation":preparation,
-                                    "execution":execution
+                                    "category": category,
+                                    "photos": photos,
+                                    "preparation": preparation,
+                                    "execution": execution
                                 }
                             }
 
+                            console.log(JSON.stringify(images, null, 2));
+
                             mainStack.push(intent);
                         }
                     }