Merge pull request #210 from Esri/develop

Release 100.13.0

Author: puneet-pdx

Documentation/setup.md

@@ -4,8 +4,8 @@
 
 To use the ArcGIS Runtime Toolkit for Android, first you need an app that uses the ArcGIS Runtime SDK for Android:
 
-1. Install the ArcGIS Runtime SDK for Android by following the instructions to [Install the SDK](https://developers.arcgis.com/android/latest/guide/install-and-set-up.htm).
-2. Create an app that uses the ArcGIS Runtime SDK. For example you could follow the instructions to [Develop your first map app with Java](https://developers.arcgis.com/android/latest/guide/develop-your-first-map-app.htm) or [Develop your first map app with Kotlin](https://developers.arcgis.com/android/latest/guide/develop-your-first-map-app-with-kotlin.htm).
+1. Install the ArcGIS Runtime SDK for Android by following the instructions to [Install the SDK](https://developers.arcgis.com/android/install-and-set-up/).
+2. Create an app that uses the ArcGIS Runtime SDK. For example you could follow the instructions to [Display a map](https://developers.arcgis.com/android/maps-2d/tutorials/display-a-map/).
 
 ## Use the toolkit library
 

README.md

@@ -23,7 +23,7 @@ You can use the Toolkit in your projects by:
 
     ```
     dependencies {
-    	implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.12.0'
+    	implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.13.0'
     }
     ```
 
@@ -61,6 +61,7 @@ The following table shows which versions of the SDK are compatible with the tool
 | 100.10.0 | 100.10.0 |
 | 100.11.0 | 100.11.0 |
 | 100.12.0 | 100.12.0 |
+| 100.13.0 | 100.13.0 |
 
 ## Resources
 

arcgis-android-toolkit/build.gradle

@@ -17,7 +17,6 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
     id 'kotlin-kapt'
     id 'org.jetbrains.dokka-android'
     // https://github.com/wupdigital/android-maven-publish
@@ -76,20 +75,21 @@ dokka {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_reflect"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines"
     implementation "androidx.appcompat:appcompat:$droid.appcompat"
     implementation "androidx.constraintlayout:constraintlayout:$droid.constraintLayout"
     implementation "androidx.multidex:multidex:$droid.multiDex"
     implementation "androidx.navigation:navigation-fragment-ktx:$droid.nav_version"
-    implementation "androidx.lifecycle:lifecycle-runtime:$droid.lifecycle"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$droid.lifecycle"
     implementation "androidx.recyclerview:recyclerview:$droid.recyclerview"
     implementation "com.google.android.material:material:$droid.material"
+    implementation "com.google.ar:core:$droid.arCore"
     api "androidx.lifecycle:lifecycle-common-java8:$droid.lifecycle"
-    api "com.google.ar.sceneform.ux:sceneform-ux:$droid.arCore"
-    api "com.google.ar.sceneform:core:$droid.arCore"
+    api "com.google.ar.sceneform.ux:sceneform-ux:$droid.arCoreSceneForm"
+    api "com.google.ar.sceneform:core:$droid.arCoreSceneForm"
     // fixing failing D8 https://github.com/google-ar/sceneform-android-sdk/issues/575
-    implementation "com.google.ar.sceneform:animation:$droid.arCore"
+    implementation "com.google.ar.sceneform:animation:$droid.arCoreSceneForm"
     api "com.esri.arcgisruntime:arcgis-android:$arcgis"
     androidTestImplementation "androidx.test:rules:$test.rules"
     androidTestImplementation "androidx.test.ext:junit:$test.jUnit"

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/ar/ArCalibrationView.kt

@@ -20,12 +20,11 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.esri.arcgisruntime.toolkit.R
 import com.esri.arcgisruntime.toolkit.ar.ArCalibrationView.Companion.SCENEVIEW_CALIBRATING_OPACITY
 import com.esri.arcgisruntime.toolkit.control.JoystickSeekBar
-import kotlinx.android.synthetic.main.view_ar_calibration.view.elevationControl
-import kotlinx.android.synthetic.main.view_ar_calibration.view.elevationLabel
-import kotlinx.android.synthetic.main.view_ar_calibration.view.headingControl
 
 /**
  * The ArCalibrationView allows the modification of the following properties of the SceneView within
@@ -90,6 +89,8 @@ class ArCalibrationView : FrameLayout {
     var elevationControlVisibility: Boolean = true
         set(value) {
             field = value
+            val elevationLabel = findViewById<TextView>(R.id.elevationLabel)
+            val elevationControl = findViewById<JoystickSeekBar>(R.id.elevationControl)
             elevationLabel.visibility = if (value) View.VISIBLE else View.INVISIBLE
             elevationControl.visibility = if (value) View.VISIBLE else View.INVISIBLE
         }
@@ -113,7 +114,9 @@ class ArCalibrationView : FrameLayout {
     }
 
     private fun initialize() {
-        inflate(context, R.layout.view_ar_calibration, this)
+        inflate(context, R.layout.layout_arcalibrationview, this)
+        val headingControl = findViewById<JoystickSeekBar>(R.id.headingControl)
+        val elevationControl = findViewById<JoystickSeekBar>(R.id.elevationControl)
 
         // Begin listening for delta progress updates on the elevation control
         elevationControl.addDeltaProgressUpdatedListener(object :

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/ar/ArLocationDataSource.kt

@@ -86,7 +86,7 @@ class ArLocationDataSource(private val context: Context) : LocationDataSource()
     private val selectedLocationProviders = ArrayList<String>()
 
     // The internal android location listener implementation
-    private var internalLocationListener: InternalLocationListener? = null
+    private val internalLocationListener = InternalLocationListener()
 
     // The internal listener to update the heading for compass mode
     private var internalHeadingListener: InternalHeadingListener? = null
@@ -250,7 +250,6 @@ class ArLocationDataSource(private val context: Context) : LocationDataSource()
      */
     override fun onStop() {
         locationManager?.removeUpdates(internalLocationListener)
-        internalLocationListener = null
 
         // Stop update heading if it is started
         stopUpdateHeading()
@@ -302,10 +301,6 @@ class ArLocationDataSource(private val context: Context) : LocationDataSource()
      */
     @SuppressLint("MissingPermission")
     private fun startLocationProviders() {
-        if (internalLocationListener == null) {
-            internalLocationListener = InternalLocationListener()
-        }
-
         for (provider in selectedLocationProviders) {
             locationManager?.requestLocationUpdates(
                 provider,

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/ar/ArcGISArView.kt

@@ -50,8 +50,6 @@ import com.google.ar.core.TrackingState
 import com.google.ar.sceneform.ArSceneView
 import com.google.ar.sceneform.FrameTime
 import com.google.ar.sceneform.Scene
-import kotlinx.android.synthetic.main.layout_arcgisarview.view._arSceneView
-import kotlinx.android.synthetic.main.layout_arcgisarview.view.arcGisSceneView
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -216,7 +214,7 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
      *
      * @since 100.6.0
      */
-    val sceneView: SceneView get() = arcGisSceneView
+    val sceneView: SceneView get() = findViewById(R.id.arcGisSceneView)
 
     /**
      * A SurfaceView that integrates with ARCore and renders a scene.
@@ -225,7 +223,7 @@ class ArcGISArView : FrameLayout, DefaultLifecycleObserver, Scene.OnUpdateListen
      */
     var arSceneView: ArSceneView? = null
         private set
-        get() = _arSceneView
+        get() = findViewById(R.id._arSceneView)
 
     /**
      * A Camera that defines the origin of the Camera used as the viewpoint for the [SceneView]. Setting this property

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/bookmark/BookmarkView.kt

@@ -31,7 +31,6 @@ import com.esri.arcgisruntime.mapping.Bookmark
 import com.esri.arcgisruntime.mapping.BookmarkList
 import com.esri.arcgisruntime.toolkit.BR
 import com.esri.arcgisruntime.toolkit.R
-import kotlinx.android.synthetic.main.layout_bookmarkview.view.bookmarkRecyclerView
 
 /**
  * The BookmarkView will display a list of bookmarks in a [RecyclerView] and allows the user to
@@ -80,6 +79,7 @@ class BookmarkView : FrameLayout {
      */
     private fun init(context: Context) {
         inflate(context, R.layout.layout_bookmarkview, this)
+        val bookmarkRecyclerView = findViewById<RecyclerView>(R.id.bookmarkRecyclerView)
         bookmarkRecyclerView.layoutManager = LinearLayoutManager(context)
         bookmarkRecyclerView.adapter = bookmarksAdapter
     }

arcgis-android-toolkit/src/main/java/com/esri/arcgisruntime/toolkit/popup/PopupView.kt

@@ -46,8 +46,6 @@ import com.esri.arcgisruntime.mapping.popup.PopupField
 import com.esri.arcgisruntime.mapping.popup.PopupManager
 import com.esri.arcgisruntime.toolkit.BR
 import com.esri.arcgisruntime.toolkit.R
-import kotlinx.android.synthetic.main.item_popup_row.view.*
-import kotlinx.android.synthetic.main.layout_popupview.view.*
 
 private const val TAG = "PopupView"
 
@@ -95,6 +93,7 @@ class PopupView : FrameLayout {
      */
     private fun init(context: Context) {
         inflate(context, R.layout.layout_popupview, this)
+        val popupRecyclerView = findViewById<RecyclerView>(R.id.popupRecyclerView)
         popupRecyclerView.layoutManager = LinearLayoutManager(context)
         popupRecyclerView.adapter = popupAttributeListAdapter
     }
@@ -168,23 +167,23 @@ class PopupView : FrameLayout {
         RecyclerView.ViewHolder(binding.root) {
 
         val labelTextView: TextView by lazy {
-            binding.root.labelTextView
+            binding.root.findViewById(R.id.labelTextView)
         }
 
         val valueTextView: TextView by lazy {
-            binding.root.valueTextView
+            binding.root.findViewById(R.id.valueTextView)
         }
 
         val valueEditText: EditText by lazy {
-            binding.root.valueEditText
+            binding.root.findViewById(R.id.valueEditText)
         }
 
         val codedValueDomainSpinner: Spinner by lazy {
-            binding.root.codedValueDomainSpinner
+            binding.root.findViewById(R.id.codedValueDomainSpinner)
         }
 
         val separatingLineView: View by lazy {
-            binding.root.separatingLine
+            binding.root.findViewById(R.id.separatingLine)
         }
 
         fun bind(
@@ -219,6 +218,7 @@ class PopupView : FrameLayout {
                         valueEditText.visibility = View.VISIBLE
                         separatingLineView.visibility = View.GONE
                         valueTextView.visibility = View.GONE
+                        codedValueDomainSpinner.visibility = View.GONE
                         //save original colors
                         val oldColors: ColorStateList = labelTextView.textColors
                         // here we assign and hold the values of the editable fields, entered by the user

arcgis-android-toolkit/src/main/res/layout/layout_arcalibrationview.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2019 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.
+  -->
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingStart="@dimen/ar_calibration_view_padding_horz"
+            android:paddingTop="@dimen/ar_calibration_view_padding_vert"
+            android:paddingEnd="@dimen/ar_calibration_view_padding_horz"
+            android:paddingBottom="@dimen/ar_calibration_view_padding_vert">
+
+        <!-- Not currently used -->
+        <TextView
+                android:id="@+id/calibrationInstructionsLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/instructions_label_bg"
+                android:gravity="center"
+                android:paddingStart="@dimen/ar_calibration_view_instructions_label_padding_horz"
+                android:paddingEnd="@dimen/ar_calibration_view_instructions_label_padding_horz"
+                android:textColor="@android:color/black"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="@id/guideline"
+                app:layout_constraintStart_toStartOf="@id/guideline"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+                android:id="@+id/elevationLabel"
+                style="@style/TextView.CalibrationLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/ar_calibration_view_child_margin"
+                android:text="@string/ar_calibration_view_elevation_label"
+                app:layout_constraintBottom_toTopOf="@id/headingLabel"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+                android:id="@+id/headingLabel"
+                style="@style/TextView.CalibrationLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ar_calibration_view_heading_label"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+        <com.esri.arcgisruntime.toolkit.control.JoystickSeekBar
+                android:id="@+id/elevationControl"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:jsb_max="@integer/calibration_elevation_control_max"
+                app:jsb_min="@integer/calibration_elevation_control_min"
+                app:layout_constraintBottom_toBottomOf="@id/elevationLabel"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/elevationLabel" />
+
+        <com.esri.arcgisruntime.toolkit.control.JoystickSeekBar
+                android:id="@+id/headingControl"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:jsb_max="@integer/calibration_heading_control_max"
+                app:jsb_min="@integer/calibration_heading_control_min"
+                app:layout_constraintBottom_toBottomOf="@id/headingLabel"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/headingLabel" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

arcgis-android-toolkit/src/main/res/layout/layout_bookmarkview.xml

@@ -14,9 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/bookmarkRecyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-</androidx.recyclerview.widget.RecyclerView>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/bookmarkRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"></androidx.recyclerview.widget.RecyclerView>
+
+</layout>