diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 86965df1..1c70e7ae 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -19,25 +19,31 @@ update_configs: prefix: "chore(deps)" - package_manager: "java:gradle" - directory: "./tutorials/CurrentPlaceDetailsOnMap/" + directory: "./tutorials/java/CurrentPlaceDetailsOnMap/" update_schedule: "daily" commit_message: prefix: "chore(deps)" - package_manager: "java:gradle" - directory: "./tutorials/MapWithMarker/" + directory: "./tutorials/java/MapWithMarker/" update_schedule: "daily" commit_message: prefix: "chore(deps)" - package_manager: "java:gradle" - directory: "./tutorials/Polygons/" + directory: "./tutorials/java/Polygons/" update_schedule: "daily" commit_message: prefix: "chore(deps)" - package_manager: "java:gradle" - directory: "./tutorials/StyledMap/" + directory: "./tutorials/java/StyledMap/" + update_schedule: "daily" + commit_message: + prefix: "chore(deps)" + + - package_manager: "java:gradle" + directory: "./tutorials/kotlin/MapWithMarker/" update_schedule: "daily" commit_message: prefix: "chore(deps)" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6fa52ac..c7f156c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,4 +61,13 @@ jobs: - name: Build and check run: | cd tutorials - for dir in ./*/ ; do ( cd "$dir" && ./gradlew assembleDebug lintDebug ); done + for dir in ./*/ + do + cd "$dir" + for tutorial in ./*/ + do + cd "$tutorial" && ./gradlew assembleDebug lintDebug + cd .. + done + cd .. + done diff --git a/tutorials/CurrentPlaceDetailsOnMap/.gitignore b/tutorials/java/CurrentPlaceDetailsOnMap/.gitignore similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/.gitignore rename to tutorials/java/CurrentPlaceDetailsOnMap/.gitignore diff --git a/tutorials/CurrentPlaceDetailsOnMap/README.md b/tutorials/java/CurrentPlaceDetailsOnMap/README.md similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/README.md rename to tutorials/java/CurrentPlaceDetailsOnMap/README.md diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/.gitignore b/tutorials/java/CurrentPlaceDetailsOnMap/app/.gitignore similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/.gitignore rename to tutorials/java/CurrentPlaceDetailsOnMap/app/.gitignore diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/build.gradle rename to tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/proguard-rules.pro b/tutorials/java/CurrentPlaceDetailsOnMap/app/proguard-rules.pro similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/proguard-rules.pro rename to tutorials/java/CurrentPlaceDetailsOnMap/app/proguard-rules.pro diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java similarity index 96% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java index 4abd63b5..5dd30794 100644 --- a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java +++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java @@ -1,3 +1,17 @@ +// Copyright 2020 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 +// +// 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. + package com.example.currentplacedetailsonmap; import android.content.DialogInterface; diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/layout/activity_maps.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/layout/activity_maps.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/layout/activity_maps.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/layout/activity_maps.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/layout/custom_info_contents.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/layout/custom_info_contents.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/layout/custom_info_contents.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/layout/custom_info_contents.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/menu/current_place_menu.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/menu/current_place_menu.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/menu/current_place_menu.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/menu/current_place_menu.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/colors.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/colors.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/colors.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/colors.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/strings.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/strings.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/strings.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/strings.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/styles.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/styles.xml similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/app/src/main/res/values/styles.xml rename to tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/res/values/styles.xml diff --git a/tutorials/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/build.gradle rename to tutorials/java/CurrentPlaceDetailsOnMap/build.gradle diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradle.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle.properties similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/gradle.properties rename to tutorials/java/CurrentPlaceDetailsOnMap/gradle.properties diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar rename to tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.jar diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties rename to tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradlew b/tutorials/java/CurrentPlaceDetailsOnMap/gradlew similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/gradlew rename to tutorials/java/CurrentPlaceDetailsOnMap/gradlew diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradlew.bat b/tutorials/java/CurrentPlaceDetailsOnMap/gradlew.bat similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/gradlew.bat rename to tutorials/java/CurrentPlaceDetailsOnMap/gradlew.bat diff --git a/tutorials/CurrentPlaceDetailsOnMap/settings.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/settings.gradle similarity index 100% rename from tutorials/CurrentPlaceDetailsOnMap/settings.gradle rename to tutorials/java/CurrentPlaceDetailsOnMap/settings.gradle diff --git a/tutorials/MapWithMarker/.gitignore b/tutorials/java/MapWithMarker/.gitignore similarity index 100% rename from tutorials/MapWithMarker/.gitignore rename to tutorials/java/MapWithMarker/.gitignore diff --git a/tutorials/MapWithMarker/README.md b/tutorials/java/MapWithMarker/README.md similarity index 63% rename from tutorials/MapWithMarker/README.md rename to tutorials/java/MapWithMarker/README.md index 2fccb3b0..985c10f6 100644 --- a/tutorials/MapWithMarker/README.md +++ b/tutorials/java/MapWithMarker/README.md @@ -18,14 +18,19 @@ This sample uses the Gradle build system. 1. Download the samples by cloning this repository or downloading an archived snapshot. (See the options at the top of the page.) -1. In Android Studio, create a new project and choose the "Import non-Android Studio project" or - "Import Project" option. -1. Select the `MapWithMarker` directory that you downloaded with this repository. +1. In Android Studio, use "Open an existing Android Studio project". Next select the + `tutorials/java/MapWithMarker` directory that you downloaded 1. If prompted for a gradle configuration, accept the default settings. - Alternatively use the "gradlew build" command to build the project directly. -1. Add your API key to your app's `gradle.properties` file. - (For information on getting an API key, see the - [documentation](https://developers.google.com/maps/documentation/android-api/signup).) + Alternatively use the `gradlew build` command to build the project directly. + +This demo app requires that you add your own Google Maps API key: + +1. [Get a Maps API key](https://developers.google.com/maps/documentation/android-sdk/get-api-key) +1. Create a file in the `tutorials/java/MapWithMarker` directory called `secure.properties` + (this file should *NOT* be under version control to protect your API key) +1. Add a single line to `tutorials/java/MapWithMarker/secure.properties` that looks like + `MAPS_API_KEY=YOUR_API_KEY`, where `YOUR_API_KEY` is the API key you obtained in the first step +1. Build and run Support ------- diff --git a/tutorials/MapWithMarker/app/.gitignore b/tutorials/java/MapWithMarker/app/.gitignore similarity index 100% rename from tutorials/MapWithMarker/app/.gitignore rename to tutorials/java/MapWithMarker/app/.gitignore diff --git a/tutorials/MapWithMarker/app/build.gradle b/tutorials/java/MapWithMarker/app/build.gradle similarity index 59% rename from tutorials/MapWithMarker/app/build.gradle rename to tutorials/java/MapWithMarker/app/build.gradle index e90f38d1..9182f816 100644 --- a/tutorials/MapWithMarker/app/build.gradle +++ b/tutorials/java/MapWithMarker/app/build.gradle @@ -10,7 +10,18 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - resValue "string", "google_maps_key", (project.findProperty("GOOGLE_MAPS_API_KEY") ?: "") + + // Read the API key from tutorials/java/MapWithMarker/app/secure.properties into R.string.maps_api_key + def secureProps = new Properties() + if (file("secure.properties").exists()) { + file("secure.properties")?.withInputStream { secureProps.load(it) } + } + resValue "string", "maps_api_key", (secureProps.getProperty("MAPS_API_KEY") ?: "") + + // To add your Maps API key to this project: + // 1. Create a file tutorials/java/MapWithMarker/app/secure.properties + // 2. Add this line, where YOUR_API_KEY is your API key: + // MAPS_API_KEY=YOUR_API_KEY } buildTypes { release { diff --git a/tutorials/MapWithMarker/app/proguard-rules.pro b/tutorials/java/MapWithMarker/app/proguard-rules.pro similarity index 100% rename from tutorials/MapWithMarker/app/proguard-rules.pro rename to tutorials/java/MapWithMarker/app/proguard-rules.pro diff --git a/tutorials/MapWithMarker/app/src/main/AndroidManifest.xml b/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml similarity index 94% rename from tutorials/MapWithMarker/app/src/main/AndroidManifest.xml rename to tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml index b6c146e9..90adbd7a 100644 --- a/tutorials/MapWithMarker/app/src/main/AndroidManifest.xml +++ b/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ --> + android:value="@string/maps_api_key" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/java/com/example/mapwithmarker/MapsMarkerActivity.kt b/tutorials/kotlin/MapWithMarker/app/src/main/java/com/example/mapwithmarker/MapsMarkerActivity.kt new file mode 100644 index 00000000..05d164e6 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/app/src/main/java/com/example/mapwithmarker/MapsMarkerActivity.kt @@ -0,0 +1,63 @@ +// Copyright 2020 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 +// +// 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. + +package com.example.mapwithmarker + +import android.os.Bundle +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.coroutineScope +import com.google.android.gms.maps.CameraUpdateFactory +import com.google.android.gms.maps.SupportMapFragment +import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.ktx.MapsExperimentalFeature +import com.google.maps.android.ktx.addMarker +import com.google.maps.android.ktx.awaitMap + +/** + * An activity that displays a Google map with a marker (pin) to indicate a particular location. + */ +class MapsMarkerActivity : AppCompatActivity() { + + @MapsExperimentalFeature + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + // Retrieve the content view that renders the map. + setContentView(R.layout.activity_maps) + if (getString(R.string.maps_api_key).isEmpty()) { + Toast.makeText(this, "Add your own API key in MapWithMarker/app/secure.properties as MAPS_API_KEY=YOUR_API_KEY", Toast.LENGTH_LONG).show() + } + + // Get the SupportMapFragment and request notification when the map is ready to be used. + val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as? SupportMapFragment + + // This is using Android's Lifecycle-aware architecture components to launch and run the + // provided code block so that it executes as soon as the Activity is at least in the + // CREATED state. + lifecycle.coroutineScope.launchWhenCreated { + val googleMap = mapFragment?.awaitMap() + // Execution pauses here until we get the callback from the Maps SDK with a googleMap. + // This is where we can add markers or lines, add listeners or move the camera. + // In this case, we just move the camera to Sydney and add a marker in Sydney. + googleMap?.apply { + val sydney = LatLng(-33.852, 151.211) + addMarker { + position(sydney) + title("Marker in Sydney") + } + moveCamera(CameraUpdateFactory.newLatLng(sydney)) + } + } + } +} diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/layout/activity_maps.xml b/tutorials/kotlin/MapWithMarker/app/src/main/res/layout/activity_maps.xml new file mode 100644 index 00000000..44404228 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/app/src/main/res/layout/activity_maps.xml @@ -0,0 +1,23 @@ + + + diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..cde69bcc Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..c133a0cb Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..bfa42f0e Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..324e72cd Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..aee44e13 Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/values/colors.xml b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..3124a2a9 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/colors.xml @@ -0,0 +1,22 @@ + + + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/values/strings.xml b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..6ae087c6 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/strings.xml @@ -0,0 +1,20 @@ + + + + Map With Marker + Map with Marker + diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/res/values/styles.xml b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..b684c88b --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/app/src/main/res/values/styles.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/tutorials/kotlin/MapWithMarker/build.gradle b/tutorials/kotlin/MapWithMarker/build.gradle new file mode 100644 index 00000000..9feef37f --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.72' + repositories { + jcenter() + google() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + google() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/tutorials/kotlin/MapWithMarker/gradle.properties b/tutorials/kotlin/MapWithMarker/gradle.properties new file mode 100644 index 00000000..01236edf --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + +android.useAndroidX=true diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.jar b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..13372aef Binary files /dev/null and b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.jar differ diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..c4e48ab9 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 15 11:27:18 PDT 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/tutorials/kotlin/MapWithMarker/gradlew b/tutorials/kotlin/MapWithMarker/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/tutorials/kotlin/MapWithMarker/gradlew.bat b/tutorials/kotlin/MapWithMarker/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/tutorials/kotlin/MapWithMarker/settings.gradle b/tutorials/kotlin/MapWithMarker/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/tutorials/kotlin/MapWithMarker/settings.gradle @@ -0,0 +1 @@ +include ':app'