Merge branch 'main' into sample/find-route

Author: shubham7109

LICENSE

@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 Esri
+   Copyright 2017 Esri
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Apache License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

README.md

@@ -77,4 +77,4 @@ http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-A copy of the license is available in the repository's [license.txt](https://github.com/Esri/arcgis-android-sdk-gradle-samples/blob/main/LICENSE) file.
+A copy of the license is available in the repository's [LICENSE](LICENSE?raw=1) file

build.gradle

@@ -18,7 +18,7 @@ subprojects {
             dependencies {
                 implementation "androidx.appcompat:appcompat:$appcompatVersion"
                 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-                implementation "arcgisruntime:arcgis-android:$arcgisVersion"
+                implementation "com.esri:arcgis-maps-kotlin:$arcgisVersion"
                 implementation "androidx.multidex:multidex:$multidexVersion"
             }
         }

find-nearest-vertex/src/main/java/com/esri/arcgismaps/sample/findnearestvertex/MainActivity.kt

@@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity() {
 
         // create a map using the portal item
         val map = ArcGISMap(statePlaneCaliforniaZone5SpatialReference)
-        val portal = Portal("https://arcgisruntime.maps.arcgis.com", false)
+        val portal = Portal("https://arcgisruntime.maps.arcgis.com")
         val portalItem = PortalItem(portal, "99fd67933e754a1181cc755146be21ca")
         val usStatesGeneralizedLayer = FeatureLayer(portalItem, 0)
         // and add the feature layer to the map's operational layers

generate-offline-map/src/main/java/com/esri/arcgismaps/sample/generateofflinemap/MainActivity.kt

@@ -79,7 +79,7 @@ class MainActivity : AppCompatActivity() {
         takeMapOfflineButton.isEnabled = false
 
         // create a portal item with the itemId of the web map
-        val portal = Portal(getString(R.string.portal_url), false)
+        val portal = Portal(getString(R.string.portal_url))
         val portalItem = PortalItem(portal, getString(R.string.item_id))
 
         // create a symbol to show a box around the extent we want to download
@@ -93,20 +93,13 @@ class MainActivity : AppCompatActivity() {
                     showMessage(it.message.toString())
                 }
                 .onSuccess {
-                    // get the min an max scale of the the operational layer
-                    val maxScale = map.operationalLayers[6].maxScale
-                    val minScale = map.operationalLayers[6].minScale
-                    if(minScale != null && maxScale != null){
-                        // limit the map scale to the largest layer scale
-                        map.maxScale = maxScale
-                        map.minScale = minScale
-                        // set the map to the map view
-                        mapView.map = map
-                        // add the graphics overlay to the map view when it is created
-                        mapView.graphicsOverlays.add(graphicsOverlay)
-                    } else {
-                        showMessage("Error retrieving map scale")
-                    }
+                    // limit the map scale to the largest layer scale
+                    map.maxScale = map.operationalLayers[6].maxScale ?: 0.0
+                    map.minScale = map.operationalLayers[6].minScale ?: 0.0
+                    // set the map to the map view
+                    mapView.map = map
+                    // add the graphics overlay to the map view when it is created
+                    mapView.graphicsOverlays.add(graphicsOverlay)
                 }
         }
         lifecycleScope.launch {

version.gradle

@@ -12,7 +12,7 @@ ext {
     appcompatVersion = '1.3.0'
     constraintLayoutVersion = '2.1.4'
     multidexVersion = '2.0.1'
-    arcgisVersion = '200.0.0-3707'
+    arcgisVersion = '200.0.0-3709'
     materialVersion = '1.6.1'
     recyclerViewVersion = '1.1.0'
     // plugin versions