Merge pull request #35 from ArcGIS/update-patches

Quality patches for v200

Author: shubham7109

display-map-from-mobile-map-package/README.md

@@ -24,23 +24,10 @@ When the sample opens, it will automatically display the map in the mobile map p
 * MapView
 * MobileMapPackage
 
-## Offline data
-
-The sample app will use the `sampleslib` to provision offline data automatically. Alternatively, load the offline data to the scoped storage of the sample app:
-
-1. Download the data from [ArcGIS Online](https://www.arcgis.com/home/item.html?id=e1f3a7254cb845b09450f54937c16061).
-2. Open your command prompt and navigate to the folder where you extracted the contents of the data from step 1.
-3. Push the data into the scoped storage of the sample app:
-
-```kotlin
-adb push Yellowstone.mmpk /Android/data/com.esri.arcgismaps.sample.displaymapfrommobilemappackage/files/Yellowstone.mmpk
-```
-
 ## About the data
 
 This mobile map package shows points of interest within Yellowstone National Park. It is available for download [here on ArcGIS Online](https://arcgisruntime.maps.arcgis.com/home/item.html?id=e1f3a7254cb845b09450f54937c16061).
 
 ## Tags
 
 mmpk, mobile map package, offline
-

display-map-from-mobile-map-package/README.metadata.json

@@ -14,12 +14,6 @@
     "MobileMapPackage"
   ],
   "language": "kotlin",
-  "provision_from": [
-      "https://www.arcgis.com/home/item.html?id=e1f3a7254cb845b09450f54937c16061"
-  ],
-  "provision_to": [
-      "/Yellowstone.mmpk"
-  ],
   "redirect_from": [
     "/android/latest/sample-code/open-mobile-map-package.htm"
   ],

display-map/README.metadata.json

@@ -8,9 +8,15 @@
     ],
     "keywords": [
         "basemap",
-        "map"
+        "map",
+        "ArcGISMap",
+        "BasemapStyle",
+        "MapView"
     ],
     "language": "kotlin",
+    "redirect_from": [
+        "/android/latest/sample-code/display-map.htm"
+    ],
     "relevant_apis": [
         "ArcGISMap",
         "BasemapStyle",

tools/NewModuleScript.jar

@@ -14,37 +14,48 @@
  *
  */
 
-package com.esri.arcgisruntime.sample.displaymap
+package com.esri.arcgismaps.sample.displaymap
 
 import android.os.Bundle
+import android.util.Log
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import arcgisruntime.ApiKey
-import arcgisruntime.ArcGISRuntimeEnvironment
-import arcgisruntime.mapping.ArcGISMap
-import arcgisruntime.mapping.BasemapStyle
-import arcgisruntime.mapping.view.MapView
-import com.esri.arcgisruntime.sample.displaymap.databinding.ActivityMainBinding
+import com.arcgismaps.ApiKey
+import com.arcgismaps.ArcGISEnvironment
+import com.arcgismaps.mapping.ArcGISMap
+import com.arcgismaps.mapping.BasemapStyle
+import com.esri.arcgismaps.sample.displaymap.databinding.ActivityMainBinding
+import com.google.android.material.snackbar.Snackbar
 
 class MainActivity : AppCompatActivity() {
 
     private val TAG = MainActivity::class.java.simpleName
 
+    // set up data binding for the activity
+    private val activityMainBinding: ActivityMainBinding by lazy {
+        DataBindingUtil.setContentView(this, R.layout.activity_main)
+    }
+
+    private val mapView by lazy {
+        activityMainBinding.mapView
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         // authentication with an API key or named user is
         // required to access basemaps and other location services
-        ArcGISRuntimeEnvironment.apiKey = ApiKey.create(BuildConfig.API_KEY)
-
-        // set up data binding for the activity
-        val activityMainBinding: ActivityMainBinding =
-            DataBindingUtil.setContentView(this, R.layout.activity_main)
-        val mapView = activityMainBinding.mapView
+        ArcGISEnvironment.apiKey = ApiKey.create(BuildConfig.API_KEY)
         lifecycle.addObserver(mapView)
 
         // create and add a map with a navigation night basemap style
         val map = ArcGISMap(BasemapStyle.ArcGISNavigationNight)
         mapView.map = map
     }
+
+    private fun showError(message: String, view: View) {
+        Log.e(TAG, message)
+        Snackbar.make(view, message, Snackbar.LENGTH_SHORT).show()
+    }
 }

tools/NewModuleScript/MainActivityTemplate.kt

@@ -60,7 +60,7 @@ private void run(){
     private void deleteUnwantedFiles() {
         File buildFolder = new File(samplesRepoPath + "/" + sampleWithHyphen + "/build");
         File displayMapKotlinFolder = new File(
-                samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgisruntime/sample/displaymap");
+                samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgismaps/sample/displaymap");
         File image = new File(samplesRepoPath + "/" + sampleWithHyphen + "/display-map.png");
         try {
             FileUtils.deleteDirectory(buildFolder);
@@ -91,7 +91,7 @@ private void createFilesAndFolders() {
         }
 
         // Create the sample package directory in the source folder
-        File packageDirectory = new File(samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgisruntime/sample/" + sampleWithoutSpaces);
+        File packageDirectory = new File(samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgismaps/sample/" + sampleWithoutSpaces);
         if(!packageDirectory.exists()){
             packageDirectory.mkdirs();
         }else{
@@ -153,6 +153,8 @@ private void updateSampleContent() {
         try {
             String fileContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
             fileContent = fileContent.replace("demos.displaymap", "sample." + sampleWithoutSpaces);
+            fileContent = fileContent.replace("constraintLayoutVersion\"","constraintLayoutVersion\"\n" +
+                    "    implementation \"com.google.android.material:material:$materialVersion\"");
             FileUtils.write(file,fileContent, StandardCharsets.UTF_8);
         } catch (IOException e) {
             e.printStackTrace();
@@ -195,7 +197,7 @@ private void updateSampleContent() {
         }
 
         //Update MainActivity.kt
-        file = new File(samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgisruntime/sample/"+sampleWithoutSpaces+"/MainActivity.kt");
+        file = new File(samplesRepoPath + "/" + sampleWithHyphen + "/src/main/java/com/esri/arcgismaps/sample/"+sampleWithoutSpaces+"/MainActivity.kt");
         try {
             String fileContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
             fileContent = fileContent.replace("Copyright 2017", "Copyright " + Calendar.getInstance().get(Calendar.YEAR));

tools/NewModuleScript/out/artifacts/NewModuleScript_jar/NewModuleScript.jar

@@ -3,8 +3,8 @@ ext {
     compileSdkVersion = 33
     minSdkVersion = 26
     targetSdkVersion = 33
-    versionCode = 10015000
-    versionName = '100.15.0.0'
+    versionCode = 2000000
+    versionName = '200.0.0'
     // library versions
     kotlinVersion = '1.7.10'
     ktxLifecycle = '2.5.1'