#35 Updated layout.

Esri · Jul 3, 2017 · bde3a39 · bde3a39
1 parent 5408fb0
commit bde3a39
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 19 deletions.
diff --git a/MapViewPlus/GeoSearch.qml b/MapViewPlus/GeoSearch.qml
@@ -35,8 +35,7 @@ Rectangle{
 
     id: geoSearchMenu
 
-    width: parent.width
-    height: sf(58)
+    anchors.fill: parent
     color: "white"
     radius: sf(5)
 
@@ -61,6 +60,16 @@ Rectangle{
 
     //--------------------------------------------------------------------------
 
+    onBusyChanged: {
+        if (busy){
+            rotator.start();
+        }
+        else {
+            rotator.stop();
+            searchAndStatus.rotation = 0;
+        }
+    }
+
     // UI //////////////////////////////////////////////////////////////////////
 
     Controls.StyledTextField {
@@ -75,7 +84,7 @@ Rectangle{
                 geoSearchMenu.clear();
             }
             else {
-               geocodeTimer.restart();
+                geocodeTimer.restart();
             }
         }
 
@@ -141,18 +150,30 @@ Rectangle{
         anchors.left: textField.left
 
         Text {
+            id: searchAndStatus
             anchors.centerIn: parent
             font.pointSize: Singletons.Config.largeFontSizePoint
-            color: app.info.properties.mainButtonBorderColor
+            color: !busy ? app.info.properties.mainButtonBorderColor : "green"
             font.family: icons.name
-            text: icons.magnifying_glass
+            text: busy ? icons.spinner2 : icons.magnifying_glass
+        }
+
+        RotationAnimation {
+            id: rotator
+            direction: RotationAnimation.Clockwise
+            from: 0
+            to: 360
+            duration: 2000
+            property: "rotation"
+            target: searchAndStatus
+            loops: Animation.Infinite
         }
     }
 
     Item {
         id: clearButton
         height: textField.height
-        width: textField.height - sf(10)
+        width: textField.height - sf(7)
         anchors.top: textField.top
         anchors.right: textField.right
         visible: textField.text > ""
@@ -170,8 +191,10 @@ Rectangle{
                 radius: width / 2
                 color: clearText.enabled ? app.info.properties.mainButtonBorderColor : Singletons.Colors.lightGray
                 Text {
-                    anchors.centerIn: parent
-                    font.pointSize: Singletons.Config.mediumFontSizePoint * .7
+                    anchors.fill: parent
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+                    font.pointSize: 10
                     color: "#fff"
                     font.family: icons.name
                     text: icons.x_cross
@@ -273,7 +296,7 @@ Rectangle{
     Timer {
         id: geocodeTimer
 
-        interval: 1000
+        interval: 600
         repeat: false
 
         onTriggered: {

diff --git a/MapViewPlus/MapDrawingMenu.qml b/MapViewPlus/MapDrawingMenu.qml
@@ -29,13 +29,12 @@ Rectangle{
 
     id: mapDrawingToolMenu
 
-    width: parent.width //(parent.width < 700) ? sf(parent.width - 20) : sf(500)
-    height: sf(58)
+    anchors.fill: parent
     color: "white"
     radius: sf(5)
     opacity: (!drawing) ? 1 : .4
 
-    property int buttonWidth: sf(50)
+    property int buttonWidth: layoutView.height
 
     property bool drawing: false
     property bool drawingExists: false
@@ -46,6 +45,7 @@ Rectangle{
     // UI //////////////////////////////////////////////////////////////////////
 
     RowLayout{
+        id: layoutView
         anchors.fill: parent
         anchors.margins: sf(4)
         anchors.rightMargin: sf(6)

diff --git a/MapViewPlus/MapViewPlus.qml b/MapViewPlus/MapViewPlus.qml
@@ -117,7 +117,7 @@ Item {
         anchors.top: parent.top
         anchors.topMargin: sf(10)
         anchors.horizontalCenter: parent.horizontalCenter
-        height: sf(58)
+        height: sf(50)
 
         z: previewMap.z + 3
 

diff --git a/ProgressIndicator/ProgressIndicator.qml b/ProgressIndicator/ProgressIndicator.qml
@@ -134,7 +134,7 @@ Rectangle {
 
     // COMPONENTS //////////////////////////////////////////////////////////////
 
-    RotationAnimation{
+    RotationAnimation {
         id:rotator
         direction: RotationAnimation.Clockwise
         from: 0

diff --git a/appinfo.json b/appinfo.json
@@ -82,7 +82,7 @@
     "urlScheme": "arcgis-tilepackage",
     "version": {
         "major": 1,
-        "micro": 3,
+        "micro": 4,
         "minor": 2
     }
 }
diff --git a/iteminfo.json b/iteminfo.json
@@ -24,19 +24,19 @@
     "largeThumbnail": null,
     "licenseInfo": "\n<p style='-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'><br /></p>",
     "listed": false,
-    "modified": 1498717174000,
+    "modified": 1499046624000,
     "name": "561a8441825441349a3b1ad23fdaea75.zip",
-    "numComments": 18,
+    "numComments": 19,
     "numRatings": 0,
-    "numViews": 91,
+    "numViews": 94,
     "owner": "appstudio_apps",
     "ownerFolder": null,
     "properties": null,
     "protected": false,
     "proxyFilter": null,
     "screenshots": [
     ],
-    "size": 832421,
+    "size": 835583,
     "snippet": "Tile package creation tool.",
     "spatialReference": null,
     "tags": [