merge v.next to master for 100.5 (#321)

* Updated UserCredentials Dialog to deal with QuickControls2 and scale factor changes.

* Removed uneeded whitespace.

* Host now displayed on newline.

* UserCredentials Dialog now versioned to retain old functionality.

* Ldanzinger/controls cleanup (#308)

* Update Callout.qml

Removing unused import

* Update PopupView.qml

removing superfluous import

* Update PopupViewBase.qml

removing superfluous import

* SslHandshakeView dialog now uses QuickControls 2. Made (#307)

* SslHandshakeView now uses QuickControls 2. Made tweak to UserCredentialsView so renders correctly in QtQuick Preview rendering.

* Update SslHandshakeView.qml

Removed unneeded whitespace.

* James/v.next/100.5 version update (#306)

* Version update pass 1.

* More version updates.

* Clarification on toolkit version compatibility.

* Updates for recent changes.

* Upgraded toolkit to 100.5

* Fixed syntax error in qmldir. Reduced the versioning of the CppApi sections as was causing issues. Swapped filenames of PopStackView/PopupStackView102 as wrong one was edited.

* Removed accidental copy of TimeSlider file.

* Fixed older authentication view using newer controls due to hard coding of file paths within the authentication view source.

* Updated suffixes 101, 102, 103 to 1001, 1002, 1003.

* Ldanzinger/controls2 upgrade (#310)

* updating import versions

* updating imports and changing banner to take in a color instead of a static image. This will enabled Qt Quick Controls 2 users to set Materials.PrimaryColor or other methods to customize the look and feel of the dialog

* Update UserCredentialsView.qml

* We don't need the full include here.

Bringing in <QtQml> also brings in qendian.h which has compile
errors with Qt 5.12.0 using gcc 4.8.x series compilers.

* Parse webview title in onTitleChanged signal handler

* James/android output folder (#313)

* Add a new arm64 output folder.

* Tighten the logic.

* adding missing qrc files (#314)

* updating controls to have a default color (#315)

* add override, change Q_DECL_OVERRIDE by override, fix indentation (#316)

* Make this a struct. (#317)

* Make this a struct.

That's what it really is. Also, move destructor logic to cpp file
and declare an explicit copy constructor as defaulted.

* Remove extra line.

* Stackview now more robust.

Push/pop logic was confusing. All we want
is a transition. We now use the replace function
to get this effect.

* Made swap function. Fixed transition bug.

Created a swap function to reduce repetition of swapping
the popup buffers.

Resolved a transition bug where rapid clicking forward/backwards
would leave the popup stack in an invalid state.

* Fixed missing semicolon.

* Fixed issue where show may be called to reset the stackview but state is not correctly reset in all cases.

Author: ldanzinger

Examples/CalloutExample.qml

@@ -14,13 +14,13 @@
  *  limitations under the License.
  ******************************************************************************/
 
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtPositioning 5.3
-import QtSensors 5.3
-import Esri.ArcGISRuntime 100.4
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtPositioning 5.8
+import QtSensors 5.9
+import Esri.ArcGISRuntime 100.5
 import Esri.ArcGISExtras 1.1
-import Esri.ArcGISRuntime.Toolkit.Controls 100.4
+import Esri.ArcGISRuntime.Toolkit.Controls 100.5
 
 Rectangle {
     width: 800
@@ -41,7 +41,7 @@ Rectangle {
             FeatureLayer {
                 id: featureLayer
                 ServiceFeatureTable {
-                    url: "http://holistic30.esri.com:6080/arcgis/rest/services/DamageInspection6/FeatureServer/0"
+                    url: "http://sampleserver6.arcgisonline.com/arcgis/rest/services/DamageAssessment/FeatureServer/0"
                 }
             }
 

Examples/Examples.qml

@@ -14,10 +14,10 @@
  *  limitations under the License.
  ******************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick 2.11
+import QtQuick.Controls 2.4
 import QtGraphicalEffects 1.0
-import Esri.ArcGISRuntime 100.4
+import Esri.ArcGISRuntime 100.5
 
 Rectangle {
     width: 640

Examples/PopupExample.qml

@@ -14,14 +14,14 @@
  *  limitations under the License.
  ******************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Controls 1.5
-import QtPositioning 5.3
-import QtSensors 5.3
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtPositioning 5.8
+import QtSensors 5.9
 import QtQuick.Dialogs 1.2
-import Esri.ArcGISRuntime 100.4
+import Esri.ArcGISRuntime 100.5
 import Esri.ArcGISExtras 1.1
-import Esri.ArcGISRuntime.Toolkit.Controls 100.4
+import Esri.ArcGISRuntime.Toolkit.Controls 100.5
 
 Rectangle {
     id: root

Import/Esri/ArcGISRuntime/Toolkit/Controls/Callout.qml

@@ -13,13 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  ******************************************************************************/
- 
-import QtQuick 2.4
-import QtQuick.Window 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Window 2.0
+
+import QtQuick 2.11
+import QtQuick.Window 2.11
+import QtQuick.Layouts 1.3
 import "LeaderPosition.js" as Enums
 
 /*!
@@ -44,7 +41,7 @@ import "LeaderPosition.js" as Enums
 Item {
     id: root
     x: 0
-    y: 0    
+    y: 0
 
     /*========================================
          Configurable properties
@@ -102,7 +99,7 @@ Item {
 
         The default width is \c 2.
     */
-    property int borderWidth: 2 * displayScaleFactor
+    property int borderWidth: 2
 
     /*!
         \brief The background color of the Callout.
@@ -130,35 +127,35 @@ Item {
 
         The default value is \c 5.
     */
-    property int cornerRadius: 5 * displayScaleFactor
+    property int cornerRadius: 5
 
     /*!
         \brief The height of the leader line in the Callout.
 
         The default leader height is \c 10.
     */
-    property int leaderHeight: 10 * displayScaleFactor
+    property int leaderHeight: 10
 
     /*!
         \brief The width of the leader line in the Callout.
 
         The default leader width is \c 20.
     */
-    property int leaderWidth: 20 * displayScaleFactor
+    property int leaderWidth: 20
 
     /*!
         \brief The x offset of the placement of the Callout.
 
         The default is \c 0.
     */
-    property int screenOffsetX: 0 * displayScaleFactor
+    property int screenOffsetX: 0
 
     /*!
         \brief The y offset of the placement of the Callout.
 
         The default is \c 0.
     */
-    property int screenOffsetY: 0 * displayScaleFactor
+    property int screenOffsetY: 0
 
     /*!
         \brief The type of accessory button to be displayed in the Callout.
@@ -204,18 +201,16 @@ Item {
     /*!
         \brief The maximum width of the Callout if autoAdjustWidth is true.
     */
-    property real maxWidth: 300 * displayScaleFactor
+    property real maxWidth: 300
 
     /*!
         \brief The width of the Callout if autoAdjustWidth is false.
     */
-    property real calloutWidth: 300 * displayScaleFactor
+    property real calloutWidth: 300
 
     // internal properties
     /*! \internal */
-    property int padding: 3 * displayScaleFactor
-    /*! \internal */
-    property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
+    property int padding: 3
     /*! \internal */
     property real anchorPointx: 0
     /*! \internal */
@@ -227,19 +222,19 @@ Item {
     /*! \internal */
     property bool calloutVisible
     /*! \internal */
-    property real calloutMaxHeight: 45 * displayScaleFactor
+    property real calloutMaxHeight: 45
     /*! \internal */
-    property real calloutMinWidth: 95 * displayScaleFactor
+    property real calloutMinWidth: 95
     /*! \internal */
     property real calloutMinHeight: calloutMaxHeight
     /*! \internal */
     property real rectWidth: 0
     /*! \internal */
     property real rectHeight: 0
     /*! \internal */
-    property real edgeBuffer: 10 * displayScaleFactor
+    property real edgeBuffer: 10
     /*! \internal */
-    property real calloutFramePadding: (2 * internalCornerRadius) * displayScaleFactor
+    property real calloutFramePadding: (2 * internalCornerRadius)
     /*! \internal */
     property string platform: Qt.platform.os
     /*! \internal */
@@ -251,11 +246,11 @@ Item {
     /*! \internal */
     property real imageWidth: rectWidth / 4
     /*! \internal */
-    property real titleWidth: Math.max(0, rectWidth - 95 * displayScaleFactor)
+    property real titleWidth: Math.max(0, rectWidth - 95)
     /*! \internal */
-    property real detailWidth: Math.max(0, rectWidth - 95 * displayScaleFactor)
+    property real detailWidth: Math.max(0, rectWidth - 95)
     /*! \internal */
-    property real cornerOffset: 15 * displayScaleFactor
+    property real cornerOffset: 15
     /*! \internal */
     property bool debug: false
     /*! \internal */
@@ -364,8 +359,8 @@ Item {
 
     Rectangle {
         id: calloutFrame
-        width: (rectWidth + 2 * leaderWidth + edgeBuffer) * displayScaleFactor
-        height: (rectHeight + 2 * leaderHeight + edgeBuffer) * displayScaleFactor
+        width: (rectWidth + 2 * leaderWidth + edgeBuffer)
+        height: (rectHeight + 2 * leaderHeight + edgeBuffer)
         visible: false
         z: 100
         clip: true
@@ -377,7 +372,7 @@ Item {
 
             property bool createPathAndPaint: false
 
-            antialiasing: true            
+            antialiasing: true
 
             // work around for Qt bug with Canvas on iOS.
             // Rendering to Frame buffer object causes weirdness with size.
@@ -390,7 +385,7 @@ Item {
             renderStrategy: Canvas.Cooperative
 
             // handler to override for drawing
-            onPaint: {                
+            onPaint: {
                 screenCoordinates.x = borderWidth;
                 screenCoordinates.y = borderWidth;
                 drawCalloutFrame();
@@ -409,14 +404,14 @@ Item {
                         left: parent.left
                         top: parent.top
                     }
-                    height: 45 * displayScaleFactor
+                    height: 45
                     columns: 3
                     rows: 2
-                    columnSpacing: 7 * displayScaleFactor
+                    columnSpacing: 7
 
                     Rectangle {
                         id: imageRect
-                        width: 40 * displayScaleFactor
+                        width: 40
                         height: width
                         color: "transparent"
                         Layout.rowSpan: 2
@@ -438,26 +433,26 @@ Item {
                         renderType: Text.NativeRendering
                         color: titleTextColor
                         font {
-                            pixelSize: 11 * displayScaleFactor
+                            pixelSize: 11
                             family: "sanserif"
                         }
                         clip: true
                         elide: Text.ElideRight
                         Layout.alignment: Qt.AlignVCenter
-                        Layout.maximumWidth: !autoAdjustWidth ? titleWidth : Math.max(0, adjustedMaxWidth - 90 * displayScaleFactor) // resets to implicit width if non-autoAdjust
+                        Layout.maximumWidth: !autoAdjustWidth ? titleWidth : Math.max(0, adjustedMaxWidth - 90) // resets to implicit width if non-autoAdjust
                     }
 
                     Rectangle {
                         id: accessoryButton
-                        width: 40 * displayScaleFactor
+                        width: 40
                         height: width
                         color: "transparent"
                         Layout.rowSpan: 2
 
                         Image {
                             id: accessoryButtonImage
                             anchors.fill: parent
-                            width: 40 * displayScaleFactor
+                            width: 40
                             height: width
                             fillMode: Image.PreserveAspectFit
                             visible: !accessoryButtonHidden
@@ -477,13 +472,13 @@ Item {
                         renderType: Text.NativeRendering
                         color: detailTextColor
                         font {
-                            pixelSize: 10 * displayScaleFactor
+                            pixelSize: 10
                             family: "sanserif"
                         }
                         wrapMode: Text.NoWrap
                         elide: Text.ElideRight
                         Layout.alignment: Qt.AlignVCenter
-                        Layout.maximumWidth: !autoAdjustWidth ? detailWidth : Math.max(0, adjustedMaxWidth - 90 * displayScaleFactor) // resets to implicit width if non-autoAdjust
+                        Layout.maximumWidth: !autoAdjustWidth ? detailWidth : Math.max(0, adjustedMaxWidth - 90) // resets to implicit width if non-autoAdjust
                     }
                 }
             }
@@ -523,7 +518,7 @@ Item {
 
         ctx.beginPath();
 
-        if (adjustedLeaderPosition === Enums.LeaderPosition.UpperLeft) {            
+        if (adjustedLeaderPosition === Enums.LeaderPosition.UpperLeft) {
             ctx.moveTo(screenCoordinates.x + leaderWidth + cornerOffset, screenCoordinates.y);
         } else {
             ctx.moveTo(screenCoordinates.x + internalCornerRadius, screenCoordinates.y);
@@ -632,16 +627,16 @@ Item {
         if (leaderPosition === Enums.LeaderPosition.Automatic) {
 
             // Move leader vertically if vertical position isn't optimal
-            if (calloutFrame.y - edgeBuffer < 0 + mapViewInsets.top * displayScaleFactor) {
+            if (calloutFrame.y - edgeBuffer < 0 + mapViewInsets.top) {
                 // Top edge of callout is above top edge of map
                 refresh = moveLeader(Enums.LeaderMoveDirection.Up, mousex, mousey);
             }
 
             // Move leader horizontally if horizontal position isn't optimal
-            if (calloutFrame.x - edgeBuffer < 0 + mapViewInsets.left * displayScaleFactor) {
+            if (calloutFrame.x - edgeBuffer < 0 + mapViewInsets.left) {
                 // Left edge of callout is left of left edge of map
                 refresh = moveLeader(Enums.LeaderMoveDirection.Left, mousex, mousey);
-            } else if (calloutFrame.x + rectWidth + edgeBuffer > root.parent.width - mapViewInsets.right * displayScaleFactor) {
+            } else if (calloutFrame.x + rectWidth + edgeBuffer > root.parent.width - mapViewInsets.right) {
                 // Right edge of callout is right of right edge of map
                 refresh = moveLeader(Enums.LeaderMoveDirection.Right, mousex, mousey);
             }
@@ -664,13 +659,13 @@ Item {
 
         // Callout is 'narrow' if it's less than half the width of the MapView
         var narrowCallout = true;
-        if (calloutFrame.width > (mapViewWidth + (mapViewInsets.left + mapViewInsets.right) * displayScaleFactor) / 2) {
+        if (calloutFrame.width > (mapViewWidth + (mapViewInsets.left + mapViewInsets.right)) / 2) {
           narrowCallout = false;
         }
 
         // Callout is 'short' if it's less than half the height of the MapView
         var shortCallout = true;
-        if (calloutFrame.height > (mapViewHeight + (mapViewInsets.top + mapViewInsets.bottom) * displayScaleFactor) / 2) {
+        if (calloutFrame.height > (mapViewHeight + (mapViewInsets.top + mapViewInsets.bottom)) / 2) {
           shortCallout = false;
         }
 
@@ -910,7 +905,6 @@ Item {
             console.log("maxWidth = ", maxWidth);
             console.log("calloutWidth = ", calloutWidth);
             console.log("adjustedMaxWidth = ", adjustedMaxWidth);
-            console.log("displayScaleFactor = ", displayScaleFactor);
         }
     }