Merge branch 'main' into sample/Download-vector-tiles-to-local-cache

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

add-feature-layers/README.md

@@ -47,7 +47,7 @@ Tap the button on the bottom menu to add feature layers, from different sources,
 
 ## About the data
 
-This sample uses the [Naperville damage assessment service](https://sampleserver7.arcgisonline.com/server/rest/services/DamageAssessment/FeatureServer/0), [Trees of Portland portal item](https://www.arcgis.com/home/item.html?id=1759fd3e8a324358a0c58d9a687a8578), [Los Angeles Trailheads geodatabase](https://www.arcgis.com/home/item.html?id=2b0f9e17105847809dfeb04e3cad69e0), [Aurora, Colorado GeoPackage](https://www.arcgis.com/home/item.html?id=68ec42517cdd439e81b036210483e8e7), and [Scottish Wildlife Trust Reserves Shapefile](https://www.arcgis.com/home/item.html?id=15a7cbd3af1e47cfa5d2c6b93dc44fc2).
+This sample uses the [Naperville damage assessment service](https://sampleserver7.arcgisonline.com/server/rest/services/DamageAssessment/FeatureServer/0), [Trees of Portland portal item](https://www.arcgis.com/home/item.html?id=1759fd3e8a324358a0c58d9a687a8578), [Los Angeles Trailheads geodatabase](https://www.arcgis.com/home/item.html?id=cb1b20748a9f4d128dad8a87244e3e37), [Aurora, Colorado GeoPackage](https://www.arcgis.com/home/item.html?id=68ec42517cdd439e81b036210483e8e7), and [Scottish Wildlife Trust Reserves Shapefile](https://www.arcgis.com/home/item.html?id=15a7cbd3af1e47cfa5d2c6b93dc44fc2).
 
 The Scottish Wildlife Trust shapefile data is provided from Scottish Wildlife Trust under [CC-BY licence](https://creativecommons.org/licenses/by/4.0/). Data Copyright Scottish Wildlife Trust (2022).
 

add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/DownloadActivity.kt

@@ -13,7 +13,7 @@ class DownloadActivity : DownloaderActivity() {
             getString(R.string.app_name),
             listOf(
                 // ArcGIS Portal item containing the .mmpk mobile map package
-                "https://www.arcgis.com/home/item.html?id=2b0f9e17105847809dfeb04e3cad69e0",
+                "https://www.arcgis.com/home/item.html?id=cb1b20748a9f4d128dad8a87244e3e37",
                 // ArcGIS Portal item containing shapefiles of Scottish Wildlife Trust reserve boundaries
                 "https://www.arcgis.com/home/item.html?id=15a7cbd3af1e47cfa5d2c6b93dc44fc2",
                 // GeoPackage AuroraCO.gpkg with datasets that cover Aurora Colorado

add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/MainActivity.kt

@@ -141,7 +141,7 @@ class MainActivity : AppCompatActivity() {
         geodatabase.load().onSuccess {
             // get the feature table with the name
             val geodatabaseFeatureTable =
-                geodatabase.getGeodatabaseFeatureTable("Trailheads")
+                geodatabase.getFeatureTable("Trailheads")
             if (geodatabaseFeatureTable == null) {
                 showError("Feature table name not found in geodatabase")
                 return

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
@@ -94,8 +94,8 @@ class MainActivity : AppCompatActivity() {
                 }
                 .onSuccess {
                     // limit the map scale to the largest layer scale
-                    map.maxScale = map.operationalLayers[6].maxScale
-                    map.minScale = map.operationalLayers[6].minScale
+                    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

version.gradle

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