Merge pull request #76 from Esri/v1.3

V1.3
Esri · Jun 4, 2018 · dfe2c0e · dfe2c0e
2 parents 59893c8 + 9168568
commit dfe2c0e
Show file tree

Hide file tree

Showing 50 changed files with 1,785 additions and 470 deletions.
diff --git a/AboutDialog/AboutDialog.qml b/AboutDialog/AboutDialog.qml
@@ -54,7 +54,7 @@ Dialog {
 
                 text: qsTr("About %1").arg(app.info.title)
                 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                font.family: notoRegular
+                font.family: defaultFontFamily
                 font {
                     pointSize: 22
                     bold: true
@@ -81,7 +81,7 @@ Dialog {
         }
 
         AboutText {
-            text: "Copyright © 2016 Esri Inc. All Rights Reserved"
+            text: "Copyright © 2018 Esri Inc. All Rights Reserved"
         }
 
         AboutText {

diff --git a/AboutDialog/AboutLabelValue.qml b/AboutDialog/AboutLabelValue.qml
@@ -43,7 +43,7 @@ Item {
             pointSize: valueText.font.pointSize
             bold: !valueText.font.bold
         }
-        font.family: notoRegular
+        font.family: defaultFontFamily
         text: "Label"
         anchors {
             left: parent.left
@@ -57,7 +57,7 @@ Item {
             pointSize: 9
             bold: true
         }
-        font.family: notoRegular
+        font.family: defaultFontFamily
         color: labelText.color
 
         wrapMode: Text.WordWrap

diff --git a/AboutDialog/AboutText.qml b/AboutDialog/AboutText.qml
@@ -25,7 +25,7 @@ Text {
     font {
         pointSize: 14
     }
-    font.family: notoRegular
+    font.family: defaultFontFamily
 
     onLinkActivated: {
         Qt.openUrlExternally(link);

diff --git a/AppMetrics/FeedbackDialog.qml b/AppMetrics/FeedbackDialog.qml
@@ -60,7 +60,7 @@ Dialog {
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
                     font.pointSize: Singletons.Config.largeFontSizePoint
-                    font.family: notoRegular
+                    font.family: defaultFontFamily
                     color: Singletons.Colors.formElementFontColor
                 }
             }
@@ -82,7 +82,7 @@ Dialog {
                         textFormat: Text.RichText
                         text: qsTr("Subject") + "<span style:\"color:red\">*</span>"
                         verticalAlignment: Text.AlignVCenter
-                        font.family: notoRegular
+                        font.family: defaultFontFamily
                     }
 
                     TextField {
@@ -99,7 +99,7 @@ Dialog {
                                 color: Singletons.Colors.formElementBackground
                             }
                             textColor: Singletons.Colors.formElementFontColor
-                            font.family: notoRegular
+                            font.family: defaultFontFamily
 
                         }
                         onTextChanged: {
@@ -132,7 +132,7 @@ Dialog {
                         textFormat: Text.RichText
                         text: qsTr("Message") + "<span style:\"color:red\">*</span>"
                         verticalAlignment: Text.AlignTop
-                        font.family: notoRegular
+                        font.family: defaultFontFamily
                     }
                     TextArea {
                         id: feedbackMessage
@@ -141,7 +141,7 @@ Dialog {
                         style: TextAreaStyle {
                             backgroundColor: Singletons.Colors.formElementBackground
                             textColor: Singletons.Colors.formElementFontColor
-                            font.family: notoRegular
+                            font.family: defaultFontFamily
                             frame: Rectangle {
                                 border.width: Singletons.Config.formElementBorderWidth
                                 border.color: Singletons.Colors.formElementBorderColor
@@ -194,7 +194,7 @@ Dialog {
                                 textFormat: Text.RichText
                                 text: qsTr("Cancel")
                                 font.pointSize: Singletons.Config.baseFontSizePoint
-                                font.family: notoRegular
+                                font.family: defaultFontFamily
                             }
 
                             onClicked: {
@@ -236,7 +236,7 @@ Dialog {
                                 textFormat: Text.RichText
                                 text: qsTr("Send")
                                 font.pointSize: Singletons.Config.baseFontSizePoint
-                                font.family: notoRegular
+                                font.family: defaultFontFamily
                             }
 
 

diff --git a/AppMetrics/HockeyApp.qml b/AppMetrics/HockeyApp.qml
@@ -1,4 +1,4 @@
-/* Copyright 2016 Esri
+/* Copyright 2018 Esri
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/AppToolBar.qml b/AppToolBar.qml
@@ -1,4 +1,4 @@
-/* Copyright 2016 Esri
+/* Copyright 2018 Esri
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,6 +69,8 @@ Item {
     property alias aboutButtonEnabled: aboutButton.enabled
     property alias userButtonVisible: userButton.visible
     property alias userButtonEnabled: userButton.enabled
+    property alias settingsButtonVisible: settingsButton.visible
+    property alias settingsButtonEnabled: settingsButton.enabled
 
     // UI //////////////////////////////////////////////////////////////////////
 
@@ -84,7 +86,7 @@ Item {
             //------------------------------------------------------------------
 
             Button{
-                id:backButton
+                id: backButton
                 Layout.preferredWidth: toolBarHeight
                 Layout.fillHeight: true
 
@@ -112,7 +114,7 @@ Item {
                 Accessible.name: Singletons.Strings.goBackToPreviousView
                 Accessible.description: Singletons.Strings.goBackToPreviousViewDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
@@ -131,7 +133,7 @@ Item {
                     anchors.centerIn: parent
                     verticalAlignment: Text.AlignVCenter
                     leftPadding: sf(20)
-                    font.family: notoRegular
+                    font.family: defaultFontFamily
                     font.pointSize: toolBarFontPointSize
                     color: toolBarFontColor
                     textFormat: Text.RichText
@@ -165,7 +167,7 @@ Item {
                     Accessible.ignored: true
                 }
 
-                Rectangle{
+                Rectangle {
                     id: numberOfUpdatesIndicator
                     visible: false
                     color: "orange"
@@ -176,7 +178,7 @@ Item {
                     anchors.right: updatesButton.right
                     anchors.topMargin: 4 * AppFramework.displayScaleFactor
                     anchors.rightMargin: 4 * AppFramework.displayScaleFactor
-                    Text{
+                    Text {
                         id: numberOfUpdatesIndicatorCount
                         anchors.centerIn: parent
                         text: "0"
@@ -193,23 +195,23 @@ Item {
                 Accessible.name: Singletons.Strings.xUpdatesAvaliable.arg(numberOfUpdatesIndicatorCount.text)
                 Accessible.description: Singletons.Strings.xUpdatesAvaliableDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
             }
 
             //------------------------------------------------------------------
 
-            Button{
+            Button {
                 id: feedbackButton
                 Layout.preferredWidth: toolBarHeight
                 Layout.fillHeight: true
                 ToolTip.visible: hovered
                 ToolTip.text: Singletons.Strings.feedback
                 enabled: true
 
-                background: Rectangle{
+                background: Rectangle {
                     color: toolBarBackground
                     anchors.fill: parent
                 }
@@ -230,7 +232,7 @@ Item {
                 Accessible.name: Singletons.Strings.feedback
                 Accessible.description: Singletons.Strings.feedbackDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
@@ -266,22 +268,58 @@ Item {
                 Accessible.name: Singletons.Strings.aboutTheApp
                 Accessible.description: Singletons.Strings.aboutTheAppDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
             }
 
             //------------------------------------------------------------------
 
-            Button{
+            Button {
+                id: settingsButton
+                Layout.preferredWidth: toolBarHeight
+                Layout.fillHeight: true
+                ToolTip.visible: hovered
+                ToolTip.text: Singletons.Strings.settings
+
+                background: Rectangle {
+                    color: toolBarBackground
+                    anchors.fill: parent
+                }
+
+                IconFont {
+                    anchors.centerIn: parent
+                    icon: _icons.settings
+                    iconSizeMultiplier: 1.1
+                    color: _returnButtonColor(settingsButton)
+                    Accessible.ignored: true
+                }
+
+                onClicked: {
+                    stackView.push(sv);
+                }
+
+                Accessible.role: Accessible.Button
+                Accessible.name: Singletons.Strings.settings
+                Accessible.description: Singletons.Strings.settingsDesc
+                Accessible.onPressAction: {
+                    if (enabled && visible) {
+                        clicked();
+                    }
+                }
+            }
+
+            //------------------------------------------------------------------
+
+            Button {
                 id: historyButton
                 Layout.preferredWidth: toolBarHeight
                 Layout.fillHeight: true
                 ToolTip.visible: hovered
                 ToolTip.text: Singletons.Strings.history
 
-                background: Rectangle{
+                background: Rectangle {
                     color: toolBarBackground
                     anchors.fill: parent
                 }
@@ -302,23 +340,23 @@ Item {
                 Accessible.name: Singletons.Strings.exportAndUploadHistory
                 Accessible.description: Singletons.Strings.exportAndUploadHistoryDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
             }
 
             //------------------------------------------------------------------
 
-            Button{
+            Button {
                 id: userButton
                 Layout.preferredWidth: toolBarHeight
                 Layout.fillHeight: true
                 ToolTip.visible: hovered
                 ToolTip.text: (portal.user !== null && portal.user !== "" && portal.user !== undefined) ? Singletons.Strings.signOut + ": " + portal.user.fullName : "User Unknown"
                 enabled: true
 
-                background: Rectangle{
+                background: Rectangle {
                     color: toolBarBackground
                     anchors.fill: parent
                 }
@@ -341,7 +379,7 @@ Item {
                 Accessible.name: Singletons.Strings.signOut
                 Accessible.description: Singletons.Strings.signOutDesc
                 Accessible.onPressAction: {
-                    if(enabled && visible){
+                    if (enabled && visible) {
                         clicked();
                     }
                 }
@@ -355,7 +393,7 @@ Item {
     // SIGNAL IMPLEMENTATIONS //////////////////////////////////////////////////
 
     onUpdateCountChanged: {
-        if(updateCount > 0){
+        if (updateCount > 0) {
             updatesButtonEnabled = true;
             updatesButtonVisible = true;
             updateIndicatorVisible = true;
@@ -365,21 +403,21 @@ Item {
 
     // COMPONENTS //////////////////////////////////////////////////////////////
 
-    AboutDialog{
+    AboutDialog {
         id: aboutDialog
     }
 
     //--------------------------------------------------------------------------
 
-    FeedbackDialog{
+    FeedbackDialog {
         id: feedbackDialog
         metrics: mainView.appMetrics
     }
 
     // METHODS /////////////////////////////////////////////////////////////////
 
-    function _returnButtonColor(cntrl){
-        if(cntrl.enabled === false){
+    function _returnButtonColor(cntrl) {
+        if (cntrl.enabled === false) {
             return toolBarButtonDisabledColor;
         }
         else if(cntrl.hovered){
@@ -388,7 +426,7 @@ Item {
         else if(cntrl.pressed){
             return toolBarButtonPressedColor;
         }
-        else{
+        else {
             return toolBarButtonColor;
         }
     }