Merge pull request #23 from ArcGIS/sample-renameing

Rebrand the Android SDK

Author: shubham7109

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 # ArcGIS Android Issue Template
 
-GitHub is **ONLY** used for issues pertaining to ArcGIS Runtime SDK Samples. Use [Esri Community](https://community.esri.com/t5/arcgis-runtime-sdk-for-android-questions/bd-p/arcgis-runtime-sdk-for-android-questions) for any general ArcGIS Runtime Android SDK questions. 
+GitHub is **ONLY** used for issues pertaining to ArcGIS Maps SDK Kotlin Samples. Use [Esri Community](https://community.esri.com/t5/arcgis-runtime-sdk-for-android-questions/bd-p/arcgis-runtime-sdk-for-android-questions) for any general ArcGIS Maps SDK questions. 
 
 Is this something you can [contribute](CONTRIBUTING.md)? Send a pull request! New Samples, bug fixes and documentation fixes are welcome.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,7 @@ PR to add a new Kotlin sample _"SAMPLE_NAME"_ in `SAMPLE_CATEGORY` category.
 -->
 ## Links and Data
 <!--
-Sample Epic: `runtime/common-samples/issues/ISSUE_NUMBER`
+Sample Epic: `runtime/kotlin/issues/ISSUE_NUMBER`
 -->
 ## What To Review
 <!--

README.md

@@ -1,10 +1,80 @@
-# ArcGIS Android Kotlin Samples
+# ArcGIS Maps SDK Kotlin Samples
 
-## Requirements 
-- [Android Plugin for Gradle 7.4.2](https://developer.android.com/studio/releases/gradle-plugin#7.4.2)
-- [Kotlin 1.5.20](https://blog.jetbrains.com/kotlin/2021/06/kotlin-1-5-20-released/)
+# Overview
+ArcGIS Maps SDK Kotlin for Android v200.0.0 samples.  The `main` branch of this repository contains sample app modules for the latest available version of the [ArcGIS Maps SDK Android Kotlin](https://developers.arcgis.com/android/). Samples released under older versions can be found through the [git tags](https://github.com/Esri/arcgis-maps-sdk-kotlin-samples/tags).  Please read our [wiki](https://github.com/Esri/arcgis-maps-sdk-kotlin-samples/wiki) for help with working with this repository.
 
-## Import Kotlin Samples into Android Studio
+# Prerequisites
+* The samples are building with `compileSdkVersion 33`
+* [Android Studio](http://developer.android.com/sdk/index.html)
+* [An ArcGIS Developers API key](https://developers.arcgis.com/android/get-started/#3-get-an-api-key)
 
-- From the Android Studio toolbar select **File > Import Project** project from the **Welcome Quick Start**.
-- Navigate to the **kotlin** project directory and click OK
+## Developer Instructions
+Please read our [developer instructions wiki page](https://github.com/Esri/arcgis-maps-sdk-kotlin-samples/wiki/dev-instructions) to set up your developer environment with Android Studio.  Instructions include forking and cloning the repository for those new to Git.
+
+Once the project is cloned to disk you can import into Android Studio:
+
+* From the Welcome to Android Studio screen, click the **Open** button. (If you're already inside a project, click **File > Open** in the menu bar instead.)
+* Navigate to the **arcgis-maps-sdk-kotlin-samples/** folder and click **OK**.
+
+## Accessing Esri location services
+Accessing Esri location services, including basemaps, routing, and geocoding, requires authentication using either an API Key or an ArcGIS identity:
+ 1. API key: A permanent key that gives your application access to Esri location services. Visit your [ArcGIS Developers Dashboard](https://developers.arcgis.com/dashboard) to create a new API key or access an existing API key.
+ 
+The Android samples in this repository have been structured to use an API key, set once, which will run in all samples. Set your API key in the `gradle.properties` file located in the `/.gradle` folder within your home directory (`/Users/<user_name>/.gradle/gradle.properties`). The API_KEY property should contain quotes around the key itself: `API_KEY = "YOUR_API_KEY"`
+
+2. ArcGIS identity: An ArcGIS named user account that is a member of an organization in ArcGIS Online or ArcGIS Enterprise.
+
+## Run a sample
+Once you have set up your developer environment you can run any sample from within Android Studio by selecting the app module from the **Edit Configurations** drop down and clicking the **Run** button from the toolbar. 
+
+### Build/Run sample from Gradle
+You can execute all the build tasks using the [Gradle Wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html) command line tool. It's available as a batch file for Windows (gradlew.bat) and a shell script for Linux/Mac (gradlew.sh) and it is accessible from the root of the project.  
+
+- Build a debug APK
+
+```
+$ ./gradlew assembleDebug
+```
+
+- Run the app
+
+**Device**
+```
+adb -d install path/to/sample.apk
+```
+
+Built APK's are saved to **arcgis-maps-sdk-kotlin-samples/[module-name]/build/outputs/apk/**. More information about running apps on devices can be found [here](https://developer.android.com/studio/run/device.html).
+
+### Run samples through the sample viewer
+The samples in this repository can also be viewed in a single sample viewer app. It can be found on the Play Store or [on ArcGIS Online](https://arcgisruntime.maps.arcgis.com/home/item.html?id=21ac248ea189406c821400dc28bf686c). If downloading from ArcGIS Online, follow these instructions to run the app locally on your device:
+- Download and unzip the file to get the apk **ArcGIS_Maps_SDK_Sample_Viewer_Android_20000.apk**.
+
+## Issues
+
+Have a question about functionality in the ArcGIS Maps SDK Kotlin Samples? Want to ask other users for development advice, discuss a workflow, ask Esri staff and other users about bugs in the API? Use [GeoNet](https://community.esri.com/t5/arcgis-runtime-sdk-for-android/bd-p/arcgis-runtime-sdk-for-android-questions) for any general questions like this, so others can learn from and contribute to the discussion.
+
+Do you have something to [contribute](.github/CONTRIBUTING.md)? Send a pull request! New Samples, bug fixes and documentation fixes are welcome.
+
+Have a problem running one of the samples in this repo? Does the sample not work on a specific device? Have questions about how the code in this repo is working? Want to request a specific sample? In that case, [submit a new issue](https://github.com/Esri/arcgis-maps-sdk-kotlin-samples/issues).
+
+
+## Contributing
+Anyone and everyone is welcome to [contribute](.github/CONTRIBUTING.md). We do accept pull requests.
+
+1. Get Involved
+2. Report Issues
+3. Contribute Code
+4. Improve Documentation
+
+Please see our [guidelines for contributing doc](https://github.com/Esri/contributing/blob/main/README.md)
+
+## Licensing
+Copyright 2022 Esri
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+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.

add-feature-layers/README.metadata.json

@@ -37,8 +37,8 @@
         "ShapefileFeatureTable"
     ],
     "snippets": [
-        "src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/DownloadActivity.kt",
-        "src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/MainActivity.kt"
+        "src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/DownloadActivity.kt",
+        "src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/MainActivity.kt"
     ],
     "title": "Add feature layers"
 }

add-feature-layers/build.gradle

@@ -5,7 +5,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        applicationId "com.esri.arcgisruntime.sample.addfeaturelayers"
+        applicationId "com.esri.arcgismaps.sample.addfeaturelayers"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode

add-feature-layers/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.esri.arcgisruntime.sample.addfeaturelayers">
+    package="com.esri.arcgismaps.sample.addfeaturelayers">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

…ple/addfeaturelayers/DownloadActivity.kt …ple/addfeaturelayers/DownloadActivity.ktadd-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/DownloadActivity.kt renamed to add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/DownloadActivity.kt add-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/DownloadActivity.kt renamed to add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/DownloadActivity.kt

@@ -1,8 +1,8 @@
-package com.esri.arcgisruntime.sample.addfeaturelayers
+package com.esri.arcgismaps.sample.addfeaturelayers
 
 import android.content.Intent
 import android.os.Bundle
-import com.esri.arcgisruntime.sample.sampleslib.DownloaderActivity
+import com.esri.arcgismaps.sample.sampleslib.DownloaderActivity
 
 class DownloadActivity : DownloaderActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

…/sample/addfeaturelayers/MainActivity.kt …/sample/addfeaturelayers/MainActivity.ktadd-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/MainActivity.kt renamed to add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/MainActivity.kt add-feature-layers/src/main/java/com/esri/arcgisruntime/sample/addfeaturelayers/MainActivity.kt renamed to add-feature-layers/src/main/java/com/esri/arcgismaps/sample/addfeaturelayers/MainActivity.kt

@@ -14,33 +14,29 @@
  *
  */
 
-package com.esri.arcgisruntime.sample.addfeaturelayers
+package com.esri.arcgismaps.sample.addfeaturelayers
 
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.lifecycleScope
-import arcgisruntime.ApiKey
-import arcgisruntime.ArcGISRuntimeEnvironment
-import arcgisruntime.data.GeoPackage
-import arcgisruntime.data.Geodatabase
-import arcgisruntime.data.ServiceFeatureTable
-import arcgisruntime.data.ShapefileFeatureTable
-import arcgisruntime.mapping.ArcGISMap
-import arcgisruntime.mapping.BasemapStyle
-import arcgisruntime.mapping.Viewpoint
-import arcgisruntime.mapping.ViewpointType
-import arcgisruntime.mapping.layers.FeatureLayer
-import arcgisruntime.portal.Portal
-import arcgisruntime.portal.PortalItem
-import com.esri.arcgisruntime.sample.addfeaturelayers.databinding.ActivityMainBinding
-import kotlinx.coroutines.Dispatchers
+import com.arcgismaps.ApiKey
+import com.arcgismaps.ArcGISEnvironment
+import com.arcgismaps.data.GeoPackage
+import com.arcgismaps.data.Geodatabase
+import com.arcgismaps.data.ServiceFeatureTable
+import com.arcgismaps.data.ShapefileFeatureTable
+import com.arcgismaps.mapping.ArcGISMap
+import com.arcgismaps.mapping.BasemapStyle
+import com.arcgismaps.mapping.Viewpoint
+import com.arcgismaps.mapping.layers.FeatureLayer
+import com.arcgismaps.portal.Portal
+import com.arcgismaps.portal.PortalItem
+import com.esri.arcgismaps.sample.addfeaturelayers.databinding.ActivityMainBinding
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.io.File
 
 
@@ -77,7 +73,7 @@ class MainActivity : AppCompatActivity() {
         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)
+        ArcGISEnvironment.apiKey = ApiKey.create(BuildConfig.API_KEY)
         lifecycle.addObserver(mapView)
         // set the map to be displayed in as the BasemapStyle topographic
         activityMainBinding.mapView.map = ArcGISMap(BasemapStyle.ArcGISTopographic)

add-feature-layers/src/main/res/layout/activity_main.xml

@@ -6,9 +6,9 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context="com.esri.arcgisruntime.sample.addfeaturelayers.MainActivity">
+        tools:context=".MainActivity">
 
-        <arcgisruntime.mapping.view.MapView
+        <com.arcgismaps.mapping.view.MapView
             android:id="@+id/mapView"
             android:layout_width="0dp"
             android:layout_height="0dp"

change-viewpoint/README.metadata.json

@@ -32,7 +32,7 @@
     "Viewpoint"
   ],
   "snippets": [
-    "src/main/java/com/esri/arcgisruntime/sample/changeviewpoint/MainActivity.kt"
+    "src/main/java/com/esri/arcgismaps/sample/changeviewpoint/MainActivity.kt"
   ],
   "title": "Change viewpoint"
 }