Merge pull request #535 from Esri/ldanzinger/deprecation_updates

Ldanzinger/deprecation updates

Author: ldanzinger

calcite-qml/demo/iOS/Info.plist

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleDisplayName</key>
-    <string>calite_test</string>
+    <string>calcite_test</string>
     <key>CFBundleExecutable</key>
-    <string>calite_test</string>
+    <string>calcite_test</string>
     <key>CFBundleGetInfoString</key>
     <string>ArcGIS</string>
     <key>CFBundleIcons</key>

calcite-qml/demo/qml/main.qml

@@ -24,7 +24,7 @@ ApplicationWindow {
     id: appWindow
     width: 800
     height: 800
-    title: "Calite_test"
+    title: "Calcite_test"
     visible: true
 
     Component.onCompleted: {

uitools/cpp/Esri/ArcGISRuntime/Toolkit/ScalebarController.cpp

@@ -292,7 +292,7 @@ namespace Toolkit {
   {
     double displayDistance = distance;
     LinearUnit displayUnit = selectLinearUnit(distance, unitSystem);
-    if (displayUnit.unitId() != m_baseUnit.unitId())
+    if (displayUnit.wkid() != m_baseUnit.wkid())
     {
       displayDistance = m_baseUnit.convertTo(displayUnit, displayDistance);
     }

uitools/examples/cpp_quick/src/demos/ScalebarDemo.cpp

@@ -0,0 +1,20 @@
+// Copyright 2022 ESRI
+//
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
+#include "ScalebarDemo.h"
+
+ScalebarDemo::ScalebarDemo(QObject* parent) :
+  BaseDemo(parent)
+{
+}
+
+ScalebarDemo::~ScalebarDemo()
+{
+}

uitools/examples/cpp_quick/src/demos/ScalebarDemo.h

@@ -0,0 +1,28 @@
+// Copyright 2022 ESRI
+//
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
+#ifndef ARCGIS_RUNTIME_TOOLKIT_CPP_QUICK_DEMO_SCALEBARDEMO_H
+#define ARCGIS_RUNTIME_TOOLKIT_CPP_QUICK_DEMO_SCALEBARDEMO_H
+
+#include "BaseDemo.h"
+
+#include <QObject>
+#include <QQmlEngine>
+
+class ScalebarDemo : public BaseDemo
+{
+  Q_OBJECT
+  QML_ELEMENT
+public:
+  Q_INVOKABLE ScalebarDemo(QObject* parent = nullptr);
+  ~ScalebarDemo() override;
+};
+
+#endif // ARCGIS_RUNTIME_TOOLKIT_CPP_QUICK_DEMO_SCALEBARDEMO_H

uitools/examples/cpp_quick/src/demos/ScalebarDemoForm.qml

@@ -0,0 +1,36 @@
+// Copyright 2022 ESRI
+//
+// All rights reserved under the copyright laws of the United States
+// and applicable international laws, treaties, and conventions.
+//
+// You may freely redistribute and use this sample code, with or
+// without modification, provided you include the original copyright
+// notice and use restrictions.
+//
+// See the Sample code usage restrictions document for further information.
+//
+
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import Esri.ArcGISRuntime 100.15
+import Esri.ArcGISRuntime.Toolkit 100.15
+import DemoApp 1.0
+
+DemoPage {
+    mapViewContents: Component {
+        MapView {
+            id: view
+            Scalebar {
+                anchors {
+                    bottom: parent.attributionTop
+                    left: parent.left
+                    margins: 10
+                }
+                mapView: parent
+            }
+            OverviewMapDemo {
+                geoView: view
+            }
+        }
+    }
+}

uitools/examples/cpp_quick/src/demos/demos.pri

@@ -12,6 +12,7 @@ HEADERS += $$PWD/AuthenticationViewDemo.h \
            $$PWD/NorthArrowDemo.h \
            $$PWD/OverviewMapDemo.h \
            $$PWD/PopupViewDemo.h \
+           $$PWD/ScalebarDemo.h \
            $$PWD/SearchViewDemo.h \
            $$PWD/TimeSliderDemo.h
 
@@ -24,5 +25,6 @@ SOURCES += $$PWD/AuthenticationViewDemo.cpp \
            $$PWD/NorthArrowDemo.cpp \
            $$PWD/OverviewMapDemo.cpp \
            $$PWD/PopupViewDemo.cpp \
+           $$PWD/ScalebarDemo.cpp \
            $$PWD/SearchViewDemo.cpp \
            $$PWD/TimeSliderDemo.cpp

uitools/examples/cpp_quick/src/demos/demos.qrc

@@ -9,6 +9,7 @@
         <file>NorthArrowDemoForm.qml</file>
         <file>OverviewMapDemoForm.qml</file>
         <file>PopupViewDemoForm.qml</file>
+        <file>ScalebarDemoForm.qml</file>
         <file>SearchViewDemoForm.qml</file>
         <file>TimeSliderDemoForm.qml</file>
     </qresource>

uitools/examples/shared/qml/DemoPage.qml

@@ -72,6 +72,8 @@ Control {
         contentItem: TextField {
             id: apiKeyInput
             placeholderText: "Enter your API Key here."
+            Keys.onReturnPressed: apiKeyPopup.accept()
+            Component.onCompleted: forceActiveFocus()
         }
         anchors.centerIn: demoPage
         standardButtons: Dialog.Ok | Dialog.Cancel

uitools/examples/shared/qml/tools.js

@@ -49,6 +49,10 @@ const TOOLS = [
     "name": "Time slider",
     "url": "TimeSliderDemoForm.qml"
   },
+  {
+    "name": "Scalebar",
+    "url": "ScalebarDemoForm.qml"
+  },
   {
     "name": "Authentication view",
     "url": "AuthenticationViewDemoForm.qml",