diff --git a/AppMetrics/FeedbackDialog.qml b/AppMetrics/FeedbackDialog.qml
index d7c6fef..99b3456 100644
--- a/AppMetrics/FeedbackDialog.qml
+++ b/AppMetrics/FeedbackDialog.qml
@@ -180,7 +180,7 @@ Dialog {
background: Rectangle {
anchors.fill: parent
- color: Singletons.Config.buttonStates(control, "major")
+ color: Singletons.Config.buttonStates(cancelFeedbackBtn, "major")
radius: app.info.properties.mainButtonRadius
border.width: app.info.properties.mainButtonBorderWidth
border.color: app.info.properties.mainButtonBorderColor
@@ -221,9 +221,9 @@ Dialog {
background: Rectangle {
anchors.fill: parent
- color: Singletons.Config.buttonStates(control)
+ color: Singletons.Config.buttonStates(sendFeedbackBtn)
radius: app.info.properties.mainButtonRadius
- border.width: control.enabled ? app.info.properties.mainButtonBorderWidth : 0
+ border.width: sendFeedbackBtn.enabled ? app.info.properties.mainButtonBorderWidth : 0
border.color: app.info.properties.mainButtonBorderColor
}
diff --git a/AppMetrics/UpdatesDialog.qml b/AppMetrics/UpdatesDialog.qml
index 9e75658..7c70823 100644
--- a/AppMetrics/UpdatesDialog.qml
+++ b/AppMetrics/UpdatesDialog.qml
@@ -78,7 +78,7 @@ Dialog {
delegate: Rectangle {
height: 50 * AppFramework.displayScaleFactor
- width: parent.width
+ width: ListView.view.width
ColumnLayout {
anchors.fill: parent
@@ -171,9 +171,9 @@ Dialog {
enabled: true
background: Rectangle {
anchors.fill: parent
- color: Singletons.Config.buttonStates(control)
+ color: Singletons.Config.buttonStates(closeDialogBtn)
radius: app.info.properties.mainButtonRadius
- border.width: control.enabled ? app.info.properties.mainButtonBorderWidth : 0
+ border.width: closeDialogBtn.enabled ? app.info.properties.mainButtonBorderWidth : 0
border.color: app.info.properties.mainButtonBorderColor
}
diff --git a/Controls/StyledButton.qml b/Controls/StyledButton.qml
index bf95928..d4be114 100755
--- a/Controls/StyledButton.qml
+++ b/Controls/StyledButton.qml
@@ -22,8 +22,9 @@ import QtGraphicalEffects 1.12
import ArcGIS.AppFramework 1.0
Button {
- id: button
+ id: control
+ property string iconSource
property real textPointSize: 13
property color backgroundColor: "#fefefe"
@@ -46,7 +47,7 @@ Button {
property int radius: height / 2
property int labelSpacing: 5 * AppFramework.displayScaleFactor
- readonly property alias progress: button.__progress
+ readonly property alias progress: control.__progress
property real __progress: 0.0
property string fontFamily
@@ -68,9 +69,7 @@ Button {
onProgressChanged: {
if (__progress === 1.0) {
- if (activeFocusOnPress) {
- forceActiveFocus();
- }
+ forceActiveFocus();
checked = true;
activated();
}
@@ -174,7 +173,7 @@ Button {
background: Rectangle {
implicitWidth: 110
- radius: button.radius
+ radius: control.radius
color: control.enabled
? control.pressed
@@ -197,7 +196,7 @@ Button {
}
radius: parent.radius
- width: parent.width * button.progress
+ width: parent.width * control.progress
color: activateColor
visible: activateDelay > 0 && progress > 0 && width > radius * 2
diff --git a/Controls/StyledSwitch.qml b/Controls/StyledSwitch.qml
index dafd40c..814fce2 100755
--- a/Controls/StyledSwitch.qml
+++ b/Controls/StyledSwitch.qml
@@ -17,18 +17,24 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
+import ArcGIS.AppFramework 1.0
+
Switch {
+ id: control
+
property color disabledColor: "grey"
property color uncheckedColor: "red"
property color checkedColor: "green"
indicator: Rectangle {
+ id: rect
+
property color shadow: control.checked ? Qt.darker(highlight, 1.2): "#999"
property color bg: control.checked ? highlight : uncheckedColor
property color highlight: control.enabled ? checkedColor : disabledColor
implicitWidth: Math.round(implicitHeight * 3)
- implicitHeight: Math.max(16, Math.round(TextSingleton.implicitHeight))
+ implicitHeight: 24 * AppFramework.displayScaleFactor
border.color: "gray"
color: "red"
@@ -37,9 +43,9 @@ Switch {
Behavior on shadow {ColorAnimation{ duration: 80 }}
Behavior on bg {ColorAnimation{ duration: 80 }}
gradient: Gradient {
- GradientStop {color: shadow; position: 0}
- GradientStop {color: bg ; position: 0.2}
- GradientStop {color: bg ; position: 1}
+ GradientStop {color: rect.shadow; position: 0}
+ GradientStop {color: rect.bg ; position: 0.2}
+ GradientStop {color: rect.bg ; position: 1}
}
Rectangle {
color: "#44ffffff"
diff --git a/appinfo.json b/appinfo.json
index 5417ac4..0c851da 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -1,6 +1,5 @@
{
"appLink": "",
- "arcgisRuntime": 0,
"capabilities": {
"audio": false,
"backgroundModes": {
@@ -123,6 +122,6 @@
"version": {
"major": 1,
"micro": 1,
- "minor": 4
+ "minor": 5
}
}
diff --git a/iteminfo.json b/iteminfo.json
index f5878ce..0a09a43 100644
--- a/iteminfo.json
+++ b/iteminfo.json
@@ -1,6 +1,7 @@
{
"access": "org",
"accessInformation": null,
+ "advancedSettings": null,
"appCategories": [
],
"avgRating": 0,
@@ -10,7 +11,7 @@
"commentsEnabled": true,
"created": 1481688674000,
"culture": "en-au",
- "description": "\nTile package creation tool.
",
+ "description": "\nTile package creation tool.
",
"documentation": null,
"extent": [
],
@@ -19,17 +20,18 @@
"id": "561a8441825441349a3b1ad23fdaea75",
"industries": [
],
+ "isOrgItem": true,
"itemControl": "admin",
"languages": [
],
"largeThumbnail": null,
- "licenseInfo": "",
+ "licenseInfo": "\n
",
"listed": false,
- "modified": 1529977877000,
+ "modified": 1632811420000,
"name": "561a8441825441349a3b1ad23fdaea75.zip",
- "numComments": 67,
+ "numComments": 70,
"numRatings": 0,
- "numViews": 365,
+ "numViews": 498,
"owner": "appstudio_apps",
"ownerFolder": null,
"properties": null,
@@ -38,9 +40,10 @@
"scoreCompleteness": 65,
"screenshots": [
],
- "size": 859236,
+ "size": 988385,
"snippet": "Tile package creation tool.",
"spatialReference": null,
+ "subInfo": 0,
"tags": [
],
"thumbnail": "thumbnail/thumbnail.png",