add the Circle Demo

ApiDemos/kotlin/app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_key" />
@@ -34,7 +35,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".BasicMapDemoActivity"></activity>
+        <activity android:name=".BasicMapDemoActivity" />
+        <activity android:name=".CircleDemoActivity" />
     </application>
 
 </manifest>

ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CircleDemoActivity.kt

@@ -0,0 +1,322 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+package com.example.kotlindemos
+
+import android.graphics.Color
+import android.graphics.Point
+import android.location.Location
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.CheckBox
+import android.widget.SeekBar
+import android.widget.Spinner
+
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.SupportMapFragment
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import com.google.android.gms.maps.model.Circle
+import com.google.android.gms.maps.model.CircleOptions
+import com.google.android.gms.maps.model.Dash
+import com.google.android.gms.maps.model.Dot
+import com.google.android.gms.maps.model.Gap
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
+import com.google.android.gms.maps.model.PatternItem
+
+import java.util.ArrayList
+import java.util.Arrays
+
+/**
+ * This shows how to draw circles on a map.
+ */
+class CircleDemoActivity :
+        AppCompatActivity(),
+        SeekBar.OnSeekBarChangeListener,
+        AdapterView.OnItemSelectedListener,
+        OnMapReadyCallback {
+
+    private val DEFAULT_RADIUS_METERS = 1000000.0
+
+    private val MAX_WIDTH_PX = 50
+    private val MAX_HUE_DEGREE = 360
+
+    private val MAX_ALPHA = 255
+    private val PATTERN_DASH_LENGTH = 100
+    private val PATTERN_GAP_LENGTH = 200
+
+    private val sydney = LatLng(-33.87365, 151.20689)
+
+    private val dot = Dot()
+    private val dash = Dash(PATTERN_DASH_LENGTH.toFloat())
+    private val gap = Gap(PATTERN_GAP_LENGTH.toFloat())
+    private val patternDotted = Arrays.asList(dot, gap)
+    private val patternDashed = Arrays.asList(dash, gap)
+    private val patternMixed = Arrays.asList(dot, gap, dot, dash, gap)
+
+    // These are the options for stroke patterns
+    private val patterns: List<Pair<Int, List<PatternItem>?>> = listOf(
+            Pair(R.string.pattern_solid, null),
+            Pair(R.string.pattern_dashed, patternDashed),
+            Pair(R.string.pattern_dotted, patternDotted),
+            Pair(R.string.pattern_mixed, patternMixed)
+    )
+
+    private lateinit var map: GoogleMap
+
+    private val circles = ArrayList<DraggableCircle>(1)
+
+    private var fillColorArgb : Int = 0
+    private var strokeColorArgb: Int = 0
+
+    private lateinit var fillHueBar: SeekBar
+    private lateinit var fillAlphaBar: SeekBar
+    private lateinit var strokeWidthBar: SeekBar
+    private lateinit var strokeHueBar: SeekBar
+    private lateinit var strokeAlphaBar: SeekBar
+    private lateinit var strokePatternSpinner: Spinner
+    private lateinit var clickabilityCheckbox: CheckBox
+
+    /**
+     * This class contains information about a circle, including its markers
+     */
+    private inner class DraggableCircle(center: LatLng, private var radiusMeters: Double) {
+        private val centerMarker: Marker = map.addMarker(MarkerOptions().apply {
+            position(center)
+            draggable(true)
+        })
+
+        private val radiusMarker: Marker = map.addMarker(
+                MarkerOptions().apply {
+                    position(center.getPointAtDistance(radiusMeters))
+                    icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE))
+                    draggable(true)
+                })
+
+        private val circle: Circle = map.addCircle(
+                CircleOptions().apply {
+                    center(center)
+                    radius(radiusMeters)
+                    strokeWidth(strokeWidthBar.progress.toFloat())
+                    strokeColor(strokeColorArgb)
+                    fillColor(fillColorArgb)
+                    clickable(clickabilityCheckbox.isChecked)
+                    strokePattern(getSelectedPattern(strokePatternSpinner.selectedItemPosition))
+                })
+
+        fun onMarkerMoved(marker: Marker): Boolean {
+            when (marker) {
+                centerMarker -> {
+                    circle.center = marker.position
+                    radiusMarker.position = marker.position.getPointAtDistance(radiusMeters)
+                }
+                radiusMarker -> {
+                    radiusMeters = centerMarker.position.distanceFrom(radiusMarker.position)
+                    circle.radius = radiusMeters
+                }
+                else -> return false
+            }
+            return true
+        }
+
+        fun onStyleChange() {
+            with(circle) {
+                strokeWidth = strokeWidthBar.progress.toFloat()
+                strokeColor = strokeColorArgb
+                fillColor = fillColorArgb
+            }
+        }
+
+        fun setStrokePattern(pattern: List<PatternItem>?) {
+            circle.strokePattern = pattern
+        }
+
+        fun setClickable(clickable: Boolean) {
+            circle.isClickable = clickable
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_circle_demo)
+
+        // Set all the SeekBars
+        fillHueBar = findViewById<SeekBar>(R.id.fillHueSeekBar).apply {
+            max = MAX_HUE_DEGREE
+            progress = MAX_HUE_DEGREE / 2
+        }
+        fillAlphaBar = findViewById<SeekBar>(R.id.fillAlphaSeekBar).apply {
+            max = MAX_ALPHA
+            progress = MAX_ALPHA / 2
+        }
+        strokeWidthBar = findViewById<SeekBar>(R.id.strokeWidthSeekBar).apply {
+            max = MAX_WIDTH_PX
+            progress = MAX_WIDTH_PX / 3
+        }
+        strokeHueBar = findViewById<SeekBar>(R.id.strokeHueSeekBar).apply {
+            max = MAX_HUE_DEGREE
+            progress = 0
+        }
+        strokeAlphaBar = findViewById<SeekBar>(R.id.strokeAlphaSeekBar).apply {
+            max = MAX_ALPHA
+            progress = MAX_ALPHA
+        }
+
+        strokePatternSpinner = findViewById<Spinner>(R.id.strokePatternSpinner).apply {
+            adapter = ArrayAdapter(this@CircleDemoActivity,
+                    android.R.layout.simple_spinner_item,
+                    getResourceStrings())
+        }
+
+        clickabilityCheckbox = findViewById(R.id.toggleClickability)
+
+        val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment
+        mapFragment.getMapAsync(this)
+    }
+
+    /** Get all the strings of patterns and return them as Array. */
+    private fun getResourceStrings() = (patterns).map { getString(it.first) }.toTypedArray()
+
+    /**
+     * When the map is ready, move the camera to put the Circle in the middle of the screen,
+     * create a circle in Sydney, and set the listeners for the map, circles, and SeekBars.
+     */
+    override fun onMapReady(googleMap: GoogleMap?) {
+        map = googleMap ?: return
+        // we need to initialise map before creating a circle
+        with(map) {
+            moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 4.0f))
+            setContentDescription(getString(R.string.circle_demo_details))
+            setOnMapLongClickListener { point ->
+                // We know the center, let's place the outline at a point 3/4 along the view.
+                val view: View = supportFragmentManager.findFragmentById(R.id.map).view as View
+                val radiusLatLng = map.projection.fromScreenLocation(
+                        Point(view.height * 3 / 4, view.width * 3 / 4))
+                // Create the circle.
+                val newCircle = DraggableCircle(point, point.distanceFrom(radiusLatLng))
+                circles.add(newCircle)
+            }
+
+            setOnMarkerDragListener(object : GoogleMap.OnMarkerDragListener {
+                override fun onMarkerDragStart(marker: Marker) {
+                    onMarkerMoved(marker)
+                }
+
+                override fun onMarkerDragEnd(marker: Marker) {
+                    onMarkerMoved(marker)
+                }
+
+                override fun onMarkerDrag(marker: Marker) {
+                    onMarkerMoved(marker)
+                }
+            })
+
+            // Flip the red, green and blue components of the circle's stroke color.
+            setOnCircleClickListener { c -> c.strokeColor = c.strokeColor xor 0x00ffffff }
+        }
+
+        fillColorArgb = Color.HSVToColor(fillAlphaBar.progress,
+                floatArrayOf(fillHueBar.progress.toFloat(), 1f, 1f))
+        strokeColorArgb = Color.HSVToColor(strokeAlphaBar.progress,
+                floatArrayOf(strokeHueBar.progress.toFloat(), 1f, 1f))
+
+        val circle = DraggableCircle(sydney, DEFAULT_RADIUS_METERS)
+        circles.add(circle)
+
+        // Set listeners for all the SeekBar
+        fillHueBar.setOnSeekBarChangeListener(this)
+        fillAlphaBar.setOnSeekBarChangeListener(this)
+
+        strokeWidthBar.setOnSeekBarChangeListener(this)
+        strokeHueBar.setOnSeekBarChangeListener(this)
+        strokeAlphaBar.setOnSeekBarChangeListener(this)
+
+        strokePatternSpinner.onItemSelectedListener = this
+    }
+
+    private fun getSelectedPattern(pos: Int): List<PatternItem>? = patterns[pos].second
+
+    override fun onItemSelected(parent: AdapterView<*>, view: View, pos: Int, id: Long) {
+        if (parent.id == R.id.strokePatternSpinner) {
+            circles.map { it.setStrokePattern(getSelectedPattern(pos)) }
+        }
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>) {
+        // Don't do anything here.
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar) {
+        // Don't do anything here.
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar) {
+        // Don't do anything here.
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+        // Update the fillColorArgb if the SeekBars for it is changed, otherwise keep the old value
+        fillColorArgb = when (seekBar) {
+            fillHueBar -> Color.HSVToColor(Color.alpha(fillColorArgb),
+                    floatArrayOf(progress.toFloat(), 1f, 1f))
+            fillAlphaBar -> Color.argb(progress, Color.red(fillColorArgb),
+                    Color.green(fillColorArgb), Color.blue(fillColorArgb))
+            else -> fillColorArgb
+        }
+
+        // Set the strokeColorArgb if the SeekBars for it is changed, otherwise keep the old value
+        strokeColorArgb = when (seekBar) {
+            strokeHueBar -> Color.HSVToColor(Color.alpha(strokeColorArgb),
+                    floatArrayOf(progress.toFloat(), 1f, 1f))
+            strokeAlphaBar -> Color.argb(progress, Color.red(strokeColorArgb),
+                    Color.green(strokeColorArgb), Color.blue(strokeColorArgb))
+            else -> strokeColorArgb
+        }
+
+        circles.map { it.onStyleChange() }
+    }
+
+    private fun onMarkerMoved(marker: Marker) {
+        circles.forEach { if (it.onMarkerMoved(marker)) return }
+    }
+
+    /** Listener for the Clickable CheckBox, to set if all the circles can be click */
+    fun toggleClickability(view: View) {
+        circles.map { it.setClickable((view as CheckBox).isChecked) }
+    }
+}
+
+/**
+ * Extension function to find the distance from this to another LatLng object
+ */
+private fun LatLng.distanceFrom(other: LatLng): Double {
+    val result = FloatArray(1)
+    Location.distanceBetween(latitude, longitude, other.latitude, other.longitude, result)
+    return result[0].toDouble()
+}
+
+private fun LatLng.getPointAtDistance(distance: Double): LatLng {
+    val radiusOfEarth = 6371009.0
+    val radiusAngle = (Math.toDegrees(distance / radiusOfEarth)
+            / Math.cos(Math.toRadians(latitude)))
+    return LatLng(latitude, longitude + radiusAngle)
+}

ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/DemoDetailsList.kt

@@ -23,7 +23,9 @@ class DemoDetailsList {
     companion object {
         val DEMOS = listOf<DemoDetails>(
                 DemoDetails(R.string.basic_demo_label, R.string.basic_demo_details,
-                        BasicMapDemoActivity::class.java)
+                        BasicMapDemoActivity::class.java),
+                DemoDetails(R.string.circle_demo_label, R.string.circle_demo_details,
+                        CircleDemoActivity::class.java)
         )
     }
 }

ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MainActivity.kt

@@ -61,8 +61,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     class CustomArrayAdapter(context: Context, demos: List<DemoDetails>) :
             ArrayAdapter<DemoDetails>(context, R.id.title, demos) {
 
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup) : View {
-            val demo : DemoDetails = getItem(position)
+        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+            val demo: DemoDetails = getItem(position)
             return (convertView as? FeatureView ?: FeatureView(context)).apply {
                 setTitleId(demo.titleId)
                 setDescriptionId(demo.descriptionId)

ApiDemos/kotlin/app/src/main/res/layout/activity_circle_demo.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2018 Google LLC
+
+    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
+
+        https://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.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="@string/properties_circle" />
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1">
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView android:text="@string/fill_hue" />
+            <SeekBar android:id="@+id/fillHueSeekBar" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView android:text="@string/fill_alpha" />
+            <SeekBar android:id="@+id/fillAlphaSeekBar" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView android:text="@string/stroke_width" />
+            <SeekBar android:id="@+id/strokeWidthSeekBar" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView android:text="@string/stroke_hue" />
+            <SeekBar android:id="@+id/strokeHueSeekBar" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView android:text="@string/stroke_alpha" />
+            <SeekBar android:id="@+id/strokeAlphaSeekBar" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <TextView
+                android:text="@string/stroke_pattern"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+            <Spinner
+                android:id="@+id/strokePatternSpinner"
+                android:spinnerMode="dropdown"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+            <CheckBox
+                android:id="@+id/toggleClickability"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:onClick="toggleClickability"
+                android:text="@string/clickable"/>
+        </TableRow>
+
+    </TableLayout>
+
+    <fragment
+        android:id="@+id/map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        class="com.google.android.gms.maps.SupportMapFragment"/>
+
+</LinearLayout>

ApiDemos/kotlin/app/src/main/res/values/strings.xml

@@ -23,4 +23,29 @@
     <string name="basic_demo_label">Basic Map</string>
     <string name="basic_demo_details">Launches a map with marker pointing at Sydney</string>
 
+    <!-- Circle Demo -->
+    <string name="circle_demo_label">Circle Demo</string>
+    <string name="circle_demo_details">Demonstrate how to add circles to a map</string>
+    <string name="properties_circle">Properties for Circle(s)</string>
+
+    <!-- Polygon Demo -->
+    <string name="clickable">Clickable</string>
+    <string name="fill_alpha">Fill Alpha</string>
+    <string name="fill_hue">Fill Hue</string>
+    <string name="joint_type_bevel">Bevel</string>
+    <string name="joint_type_default">Default</string>
+    <string name="joint_type_round">Round</string>
+    <string name="pattern_dashed">Dashed</string>
+    <string name="pattern_dotted">Dotted</string>
+    <string name="pattern_mixed">Mixed</string>
+    <string name="pattern_solid">Solid</string>
+    <string name="polygon_demo_description">Demonstrates how to add Polygons to a map.</string>
+    <string name="polygon_demo_details">Demonstrates how to add Polygons to a map</string>
+    <string name="polygon_demo_label">Polygons</string>
+    <string name="properties_australia_polygon">Properties for Polygon over Australia</string>
+    <string name="stroke_alpha">Stroke Alpha</string>
+    <string name="stroke_hue">Stroke Hue</string>
+    <string name="stroke_joint_type">Stroke Joint Type</string>
+    <string name="stroke_pattern">Stroke Pattern</string>
+    <string name="stroke_width">Stroke Width</string>
 </resources>