Commit c90d5307 authored by Aleksei German's avatar Aleksei German

Watch Demo Resized images, readjusted qml files

parent c01e277e
......@@ -40,8 +40,6 @@ Item {
id: entryImage
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
width: ((root.state === "selected") ? 72 : 60)
height: ((root.state === "selected") ? 72 : 60)
}
Text {
......
......@@ -51,8 +51,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/middleback.png"
opacity: startOpacity
width: 200
height: 200
}
Image {
......@@ -60,8 +58,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/ring1.png"
opacity: startOpacity
width: 215
height: 215
}
Image {
......@@ -69,8 +65,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/ring2.png"
opacity: startOpacity
width: 290
height: 290
}
Item {
......@@ -81,8 +75,6 @@ Rectangle {
id: north
source: "images/compass/N.png"
opacity: startOpacity
width: 40
height: 40
property real angle: (offset - currentDegree) * radianRatio
property real radius: (root.height / 2) - (height / 2)
......@@ -94,8 +86,6 @@ Rectangle {
id: west
source: "images/compass/W.png"
opacity: startOpacity
width: 40
height: 40
property real angle: ((360 / directionsCount) + offset - currentDegree) * radianRatio
property real radius: (root.height / 2) - (height / 2)
......@@ -107,8 +97,6 @@ Rectangle {
id: south
source: "images/compass/S.png"
opacity: startOpacity
width: 40
height: 40
property real angle: ((360 / directionsCount) * 2 + offset
- currentDegree) * radianRatio
......@@ -121,8 +109,6 @@ Rectangle {
id: east
source: "images/compass/E.png"
opacity: startOpacity
width: 40
height: 40
property real angle: ((360 / directionsCount) * 3 + offset
- currentDegree) * radianRatio
......@@ -137,7 +123,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/arrows.png?rotated=true"
opacity: startOpacity
height: 215
transform: Rotation {
angle: currentDegree
......
/******************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
......@@ -18,7 +20,6 @@
** $QT_END_LICENSE$
**
******************************************************************************/
import QtQuick 2.12
Rectangle {
......@@ -39,8 +40,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/middleback.png"
opacity: startOpacity
width: 200
height: 200
}
Image {
......@@ -48,8 +47,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/ring1.png"
opacity: startOpacity
width: 215
height: 215
}
Image {
......@@ -57,8 +54,6 @@ Rectangle {
anchors.centerIn: parent
source: "images/compass/ring2.png"
opacity: startOpacity
width: 290
height: 290
}
Text {
......@@ -74,17 +69,41 @@ Rectangle {
states: [
State {
name: "default"
PropertyChanges { target: outerRing; opacity: startOpacity }
PropertyChanges { target: innerRing; opacity: startOpacity }
PropertyChanges { target: centerRing; opacity: startOpacity }
PropertyChanges { target: dummyText; opacity: startOpacity }
PropertyChanges {
target: outerRing
opacity: startOpacity
}
PropertyChanges {
target: innerRing
opacity: startOpacity
}
PropertyChanges {
target: centerRing
opacity: startOpacity
}
PropertyChanges {
target: dummyText
opacity: startOpacity
}
},
State {
name: "running"
PropertyChanges { target: outerRing; opacity: 1.0 }
PropertyChanges { target: innerRing; opacity: 1.0 }
PropertyChanges { target: centerRing; opacity: 1.0 }
PropertyChanges { target: dummyText; opacity: 1.0 }
PropertyChanges {
target: outerRing
opacity: 1.0
}
PropertyChanges {
target: innerRing
opacity: 1.0
}
PropertyChanges {
target: centerRing
opacity: 1.0
}
PropertyChanges {
target: dummyText
opacity: 1.0
}
}
]
}
......@@ -66,12 +66,9 @@ Item {
target: lineImg
source: root.verticalLine
anchors.centerIn: parent
//
height: 124
width: 2
}
PropertyChanges {
target: root;
target: root
width: lineImg.width
height: lineImg.height
}
......@@ -81,7 +78,7 @@ Item {
anchors.topMargin: 8
anchors.horizontalCenter: lineImg.horizontalCenter
text: root.value
font.pixelSize: 12;
font.pixelSize: 12
}
},
State {
......@@ -90,9 +87,6 @@ Item {
PropertyChanges {
target: lineImg
source: root.horizontalLine
//
width: 270
height: 2
}
PropertyChanges {
target: root
......
......@@ -173,8 +173,6 @@ Rectangle {
anchors.left: horizontalLines.left
Image {
id: graph
width: 260
height: 112
source: "images/health/graph.png"
}
}
......@@ -183,9 +181,9 @@ Rectangle {
id: graphPoint
source: "images/health/graph-point.png"
anchors.bottom: graphMask.bottom
anchors.bottomMargin: 41
anchors.bottomMargin: 35
anchors.right: graphMask.right
anchors.rightMargin: 4
anchors.rightMargin: 7
opacity: startOp
}
......
......@@ -28,8 +28,8 @@ Item {
width: Theme.appWidth
property real startOp: 0.0
property real stripesSideMargin: 4
property real stripesBottomMargin: 40
property real stripesSideMargin: 2
property real stripesBottomMargin: 33
property real stripesIconsMargin: 30
property real needleOffset: 18
property real secondNeedleOffset: 20
......@@ -54,8 +54,6 @@ Item {
anchors.centerIn: parent
source: "images/shield/dots-all.png"
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
......@@ -67,32 +65,26 @@ Item {
source: "images/shield/small-oval-alt.png"
anchors.centerIn: parent
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
id: batteryLevel
source: "images/shield/battery.png"
anchors.bottom: stripesBackground.bottom
anchors.bottomMargin: root.stripesBottomMargin - 7
anchors.bottomMargin: root.stripesBottomMargin
anchors.left: stripesBackground.left
anchors.leftMargin: root.stripesSideMargin - 1
anchors.leftMargin: root.stripesSideMargin
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
id: stepsLevel
source: "images/shield/steps.png"
anchors.bottom: stripesBackground.bottom
anchors.bottomMargin: root.stripesBottomMargin - 7
anchors.bottomMargin: root.stripesBottomMargin
anchors.right: stripesBackground.right
anchors.rightMargin: root.stripesSideMargin - 1
anchors.rightMargin: root.stripesSideMargin
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
......@@ -102,8 +94,6 @@ Item {
anchors.left: stripesBackground.left
anchors.leftMargin: root.stripesIconsMargin
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
......@@ -113,8 +103,6 @@ Item {
anchors.right: stripesBackground.right
anchors.rightMargin: root.stripesIconsMargin
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Row {
......@@ -128,8 +116,6 @@ Item {
Image {
anchors.verticalCenter: parent.verticalCenter
source: "images/shield/heart.png"
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Text {
......@@ -144,6 +130,36 @@ Item {
}
/*
* Calendar text
*/
Column {
id: calendar
opacity: startOp
anchors.bottom: parent.bottom
anchors.bottomMargin: parent.height / 4.5
anchors.horizontalCenter: parent.horizontalCenter
Text {
anchors.horizontalCenter: parent.horizontalCenter
text: WatchModel.dayOfWeek
font.pixelSize: 20
font.family: Theme.fontFamily
font.weight: Font.Light
color: Theme.whiteColor
}
Text {
anchors.horizontalCenter: parent.horizontalCenter
text: WatchModel.date
font.pixelSize: 20
font.family: Theme.fontFamily
font.weight: Font.Light
color: Theme.whiteColor
}
}
/*
* Watch arrows
*/
......@@ -160,8 +176,6 @@ Item {
origin.x: minuteArrow.width / 2
origin.y: minuteArrow.height - needleOffset
}
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
......@@ -177,8 +191,6 @@ Item {
origin.x: hourArrow.width / 2
origin.y: hourArrow.height - needleOffset
}
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
......@@ -195,8 +207,6 @@ Item {
origin.x: secondArrow.width / 2
origin.y: secondArrow.height - secondNeedleOffset
}
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
Image {
......@@ -204,40 +214,12 @@ Item {
source: "images/shield/hands-middle-dot.png"
anchors.centerIn: parent
opacity: startOp
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
/*
* Calendar text
* States
*/
Column {
id: calendar
opacity: startOp
anchors.bottom: parent.bottom
anchors.bottomMargin: parent.height / 4.5
anchors.horizontalCenter: parent.horizontalCenter
Text {
anchors.horizontalCenter: parent.horizontalCenter
text: WatchModel.dayOfWeek
font.pixelSize: 20
font.family: Theme.fontFamily
font.weight: Font.Light
color: Theme.whiteColor
}
Text {
anchors.horizontalCenter: parent.horizontalCenter
text: WatchModel.date
font.pixelSize: 20
font.family: Theme.fontFamily
font.weight: Font.Light
color: Theme.whiteColor
}
}
states: [
State {
name: "default"
......
......@@ -60,8 +60,6 @@ Item {
anchors.top: temperatureLabel.bottom
anchors.horizontalCenter: temperatureLabel.horizontalCenter
source: root.weatherImg
width: sourceSize.width * 0.75
height: sourceSize.height * 0.75
}
Image {
......
......@@ -84,8 +84,6 @@ Item {
anchors.right: currentWeather.left
anchors.rightMargin: 10
source: "images/weather/big-sun.png"
width: sourceSize.width * 0.82
height: sourceSize.height * 0.82
}
......@@ -117,8 +115,6 @@ Item {
Image {
id: bottomMask
width: 320
height: 136
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
source: "images/weather/w-bottom-mask.png"
......
playground/watch/images/compass/E.png

129 Bytes | W: | H:

playground/watch/images/compass/E.png

129 Bytes | W: | H:

playground/watch/images/compass/E.png
playground/watch/images/compass/E.png
playground/watch/images/compass/E.png
playground/watch/images/compass/E.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/N.png

129 Bytes | W: | H:

playground/watch/images/compass/N.png

129 Bytes | W: | H:

playground/watch/images/compass/N.png
playground/watch/images/compass/N.png
playground/watch/images/compass/N.png
playground/watch/images/compass/N.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/S.png

129 Bytes | W: | H:

playground/watch/images/compass/S.png

129 Bytes | W: | H:

playground/watch/images/compass/S.png
playground/watch/images/compass/S.png
playground/watch/images/compass/S.png
playground/watch/images/compass/S.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/W.png

129 Bytes | W: | H:

playground/watch/images/compass/W.png

129 Bytes | W: | H:

playground/watch/images/compass/W.png
playground/watch/images/compass/W.png
playground/watch/images/compass/W.png
playground/watch/images/compass/W.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/arrows.png

129 Bytes | W: | H:

playground/watch/images/compass/arrows.png

128 Bytes | W: | H:

playground/watch/images/compass/arrows.png
playground/watch/images/compass/arrows.png
playground/watch/images/compass/arrows.png
playground/watch/images/compass/arrows.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/middleback.png

130 Bytes | W: | H:

playground/watch/images/compass/middleback.png

130 Bytes | W: | H:

playground/watch/images/compass/middleback.png
playground/watch/images/compass/middleback.png
playground/watch/images/compass/middleback.png
playground/watch/images/compass/middleback.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/ring1.png

130 Bytes | W: | H:

playground/watch/images/compass/ring1.png

129 Bytes | W: | H:

playground/watch/images/compass/ring1.png
playground/watch/images/compass/ring1.png
playground/watch/images/compass/ring1.png
playground/watch/images/compass/ring1.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/compass/ring2.png

130 Bytes | W: | H:

playground/watch/images/compass/ring2.png

130 Bytes | W: | H:

playground/watch/images/compass/ring2.png
playground/watch/images/compass/ring2.png
playground/watch/images/compass/ring2.png
playground/watch/images/compass/ring2.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/health/graph-point.png

128 Bytes | W: | H:

playground/watch/images/health/graph-point.png

128 Bytes | W: | H:

playground/watch/images/health/graph-point.png
playground/watch/images/health/graph-point.png
playground/watch/images/health/graph-point.png
playground/watch/images/health/graph-point.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/health/graph.png

130 Bytes | W: | H:

playground/watch/images/health/graph.png

130 Bytes | W: | H:

playground/watch/images/health/graph.png
playground/watch/images/health/graph.png
playground/watch/images/health/graph.png
playground/watch/images/health/graph.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/health/horizontal-line.png

128 Bytes | W: | H:

playground/watch/images/health/horizontal-line.png

128 Bytes | W: | H:

playground/watch/images/health/horizontal-line.png
playground/watch/images/health/horizontal-line.png
playground/watch/images/health/horizontal-line.png
playground/watch/images/health/horizontal-line.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/health/vertical-line.png

128 Bytes | W: | H:

playground/watch/images/health/vertical-line.png

128 Bytes | W: | H:

playground/watch/images/health/vertical-line.png
playground/watch/images/health/vertical-line.png
playground/watch/images/health/vertical-line.png
playground/watch/images/health/vertical-line.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/compass-big.png

129 Bytes | W: | H:

playground/watch/images/list/compass-big.png

129 Bytes | W: | H:

playground/watch/images/list/compass-big.png
playground/watch/images/list/compass-big.png
playground/watch/images/list/compass-big.png
playground/watch/images/list/compass-big.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/compass.png

129 Bytes | W: | H:

playground/watch/images/list/compass.png

129 Bytes | W: | H:

playground/watch/images/list/compass.png
playground/watch/images/list/compass.png
playground/watch/images/list/compass.png
playground/watch/images/list/compass.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/settings-big.png

129 Bytes | W: | H:

playground/watch/images/list/settings-big.png

129 Bytes | W: | H:

playground/watch/images/list/settings-big.png
playground/watch/images/list/settings-big.png
playground/watch/images/list/settings-big.png
playground/watch/images/list/settings-big.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/settings.png

129 Bytes | W: | H:

playground/watch/images/list/settings.png

129 Bytes | W: | H:

playground/watch/images/list/settings.png
playground/watch/images/list/settings.png
playground/watch/images/list/settings.png
playground/watch/images/list/settings.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/sport-app-big.png

129 Bytes | W: | H:

playground/watch/images/list/sport-app-big.png

129 Bytes | W: | H:

playground/watch/images/list/sport-app-big.png
playground/watch/images/list/sport-app-big.png
playground/watch/images/list/sport-app-big.png
playground/watch/images/list/sport-app-big.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/sport-app.png

129 Bytes | W: | H:

playground/watch/images/list/sport-app.png

129 Bytes | W: | H:

playground/watch/images/list/sport-app.png
playground/watch/images/list/sport-app.png
playground/watch/images/list/sport-app.png
playground/watch/images/list/sport-app.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/tools-big.png

129 Bytes | W: | H:

playground/watch/images/list/tools-big.png

129 Bytes | W: | H:

playground/watch/images/list/tools-big.png
playground/watch/images/list/tools-big.png
playground/watch/images/list/tools-big.png
playground/watch/images/list/tools-big.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/tools.png

129 Bytes | W: | H:

playground/watch/images/list/tools.png

129 Bytes | W: | H:

playground/watch/images/list/tools.png
playground/watch/images/list/tools.png
playground/watch/images/list/tools.png
playground/watch/images/list/tools.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/your-health-big.png

129 Bytes | W: | H:

playground/watch/images/list/your-health-big.png

129 Bytes | W: | H:

playground/watch/images/list/your-health-big.png
playground/watch/images/list/your-health-big.png
playground/watch/images/list/your-health-big.png
playground/watch/images/list/your-health-big.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/list/your-health.png

129 Bytes | W: | H:

playground/watch/images/list/your-health.png

129 Bytes | W: | H:

playground/watch/images/list/your-health.png
playground/watch/images/list/your-health.png
playground/watch/images/list/your-health.png
playground/watch/images/list/your-health.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/battery-icon.png

128 Bytes | W: | H:

playground/watch/images/shield/battery-icon.png

128 Bytes | W: | H:

playground/watch/images/shield/battery-icon.png
playground/watch/images/shield/battery-icon.png
playground/watch/images/shield/battery-icon.png
playground/watch/images/shield/battery-icon.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/battery.png

129 Bytes | W: | H:

playground/watch/images/shield/battery.png

129 Bytes | W: | H:

playground/watch/images/shield/battery.png
playground/watch/images/shield/battery.png
playground/watch/images/shield/battery.png
playground/watch/images/shield/battery.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/dots-all.png

129 Bytes | W: | H:

playground/watch/images/shield/dots-all.png

129 Bytes | W: | H:

playground/watch/images/shield/dots-all.png
playground/watch/images/shield/dots-all.png
playground/watch/images/shield/dots-all.png
playground/watch/images/shield/dots-all.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/hand-hour.png

129 Bytes | W: | H:

playground/watch/images/shield/hand-hour.png

129 Bytes | W: | H:

playground/watch/images/shield/hand-hour.png
playground/watch/images/shield/hand-hour.png
playground/watch/images/shield/hand-hour.png
playground/watch/images/shield/hand-hour.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/hand-minute.png

129 Bytes | W: | H:

playground/watch/images/shield/hand-minute.png

129 Bytes | W: | H:

playground/watch/images/shield/hand-minute.png
playground/watch/images/shield/hand-minute.png
playground/watch/images/shield/hand-minute.png
playground/watch/images/shield/hand-minute.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/hand-second.png

128 Bytes | W: | H:

playground/watch/images/shield/hand-second.png

129 Bytes | W: | H:

playground/watch/images/shield/hand-second.png
playground/watch/images/shield/hand-second.png
playground/watch/images/shield/hand-second.png
playground/watch/images/shield/hand-second.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/hands-middle-dot.png

128 Bytes | W: | H:

playground/watch/images/shield/hands-middle-dot.png

128 Bytes | W: | H:

playground/watch/images/shield/hands-middle-dot.png
playground/watch/images/shield/hands-middle-dot.png
playground/watch/images/shield/hands-middle-dot.png
playground/watch/images/shield/hands-middle-dot.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/heart.png

129 Bytes | W: | H:

playground/watch/images/shield/heart.png

128 Bytes | W: | H:

playground/watch/images/shield/heart.png
playground/watch/images/shield/heart.png
playground/watch/images/shield/heart.png
playground/watch/images/shield/heart.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/small-oval-alt.png

130 Bytes | W: | H:

playground/watch/images/shield/small-oval-alt.png

130 Bytes | W: | H:

playground/watch/images/shield/small-oval-alt.png
playground/watch/images/shield/small-oval-alt.png
playground/watch/images/shield/small-oval-alt.png
playground/watch/images/shield/small-oval-alt.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/steps-icon.png

128 Bytes | W: | H:

playground/watch/images/shield/steps-icon.png

128 Bytes | W: | H:

playground/watch/images/shield/steps-icon.png
playground/watch/images/shield/steps-icon.png
playground/watch/images/shield/steps-icon.png
playground/watch/images/shield/steps-icon.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/shield/steps.png

129 Bytes | W: | H:

playground/watch/images/shield/steps.png

129 Bytes | W: | H:

playground/watch/images/shield/steps.png
playground/watch/images/shield/steps.png
playground/watch/images/shield/steps.png
playground/watch/images/shield/steps.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/weather/big-sun.png

128 Bytes | W: | H:

playground/watch/images/weather/big-sun.png

129 Bytes | W: | H:

playground/watch/images/weather/big-sun.png
playground/watch/images/weather/big-sun.png
playground/watch/images/weather/big-sun.png
playground/watch/images/weather/big-sun.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/weather/w-bottom-mask.png

129 Bytes | W: | H:

playground/watch/images/weather/w-bottom-mask.png

129 Bytes | W: | H:

playground/watch/images/weather/w-bottom-mask.png
playground/watch/images/weather/w-bottom-mask.png
playground/watch/images/weather/w-bottom-mask.png
playground/watch/images/weather/w-bottom-mask.png
  • 2-up
  • Swipe
  • Onion skin
playground/watch/images/weather/w-vertical.png

128 Bytes | W: | H:

playground/watch/images/weather/w-vertical.png

128 Bytes | W: | H:

playground/watch/images/weather/w-vertical.png
playground/watch/images/weather/w-vertical.png
playground/watch/images/weather/w-vertical.png
playground/watch/images/weather/w-vertical.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment