diff --git a/.gitignore b/.gitignore index dda549a..10cfdbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,10 @@ -bin/ -gen/ -build/ -.settings/ - +*.iml +.gradle +/local.properties +/.idea .DS_Store -.classpath -.cproject -.project +/build +/captures +.externalNativeBuild +.cxx local.properties -lint.xml \ No newline at end of file diff --git a/README.md b/README.md index 7eaa260..8f357dd 100644 --- a/README.md +++ b/README.md @@ -25,14 +25,14 @@ Organic Maps works from *Android SDK version 21 (Android 5)* and above First step is to clone [repository][linkRepo] or download it as an archive. When your are done you find two folders: *lib* and *sample-app-capitals*. First one is a library project that you should add to your project. -You don't need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different `OrganicMapsApi` methods (more details below). +You don't need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different `Api` methods (more details below). ## Classes Overview and HOW TO Core classes you will work with are: -* [app.organicmaps.api.OrganicMapsApi][linkApiClass] - static class with methods such as `showPointOnMap(Activity, double, double, String)` etc. -* [app.organicmaps.api.OMPoint][linkPointClass] - model of POI, includes lat, lon, name, id, and style data. -* [app.organicmaps.api.OMResponse][linkRespClass] - helps you to extract response from Organic Maps by applying `OMResponse.extractFromIntent(Intent)` to Intent. Contains OMPoint data. +* [app.organicmaps.api.Api][linkApiClass] - static class with methods such as `showPointOnMap(Activity, double, double, String)` etc. +* [app.organicmaps.api.Point][linkPointClass] - model of POI, includes lat, lon, name, id, and style data. +* [app.organicmaps.api.Response][linkRespClass] - helps you to extract response from Organic Maps by applying `Response.extractFromIntent(Intent)` to Intent. Contains Point data. ### Show Points on the Map @@ -48,25 +48,25 @@ The simplest usage: final double lon = ...; final String name = ...; // Ask Organic Maps to show the point - OrganicMapsApi.showPointOnMap(this, lat, lon, name); + Api.showPointOnMap(this, lat, lon, name); } ... } -For multiple points use [OMPoint][linkPointClass] class: +For multiple points use [Point][linkPointClass] class: void showMultiplePoints(List list) { - // Convert objects to MMWPoints - final OMPoint[] points = new OMPoint[list.length]; + // Convert objects to OM Points + final Point[] points = new Point[list.length]; for (int i = 0; i < list.size; i++) { - // Get lat, lon, and name from object and assign it to new MMWPoint - points[i] = new OMPoint(lat, lon, name); + // Get lat, lon, and name from object and assign it to new Point + points[i] = new Point(lat, lon, name); } // Show all point on the map, you could also provide some title - OrganicMapsApi.showPointsOnMap(this, "Look at my points, my points are amazing!", points); + Api.showPointsOnMap(this, "Look at my points, my points are amazing!", points); } @@ -80,18 +80,18 @@ your application when user press "More Info" button : // Here is how to pass points with ID ant PendingIntent void showMultiplePointsWithPendingIntent(List list, PendingIntent pendingIntent) { - // Convert objects to OMPoints - final OMPoint[] points = new OMPoint[list.length]; + // Convert objects to Points + final Point[] points = new Point[list.length]; for (int i = 0; i < list.size; i++) { // || // || // \/ // Now you should specify string ID for each point - points[i] = new OMPoint(lat, lon, name, id); + points[i] = new Point(lat, lon, name, id); } // Show all points on the map, you could also provide some title - OrganicMapsApi.showPointsOnMap(this, "This title says that user should choose some point", pendingIntent, points); + Api.showPointsOnMap(this, "This title says that user should choose some point", pendingIntent, points); } //Code below shows general way to extract response data @@ -100,7 +100,7 @@ your application when user press "More Info" button : super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); // Handle intent you specified with PandingIntent - // Now it has additional information (OMPoint). + // Now it has additional information (Point). handleIntent(getIntent()); } @@ -114,10 +114,10 @@ your application when user press "More Info" button : void handleIntent(Intent intent) { - // Apply OMResponse extraction method to intent - final OMResponse mwmResponse = OMResponse.extractFromIntent(this, intent); + // Apply Response extraction method to intent + final Response mwmResponse = Response.extractFromIntent(this, intent); // Here is your point that user selected - final OMPoint point = mwmResponse.getPoint(); + final Point point = mwmResponse.getPoint(); // Now, for instance you can do some work depending on point id processUserInteraction(point.getId()); } @@ -125,24 +125,26 @@ your application when user press "More Info" button : ## FAQ #### How should I detect if user has Organic Maps installed? -`OrganicMapsApi.isOrganicMapsInstalled(Context)` will return `true` if user has *Lite* or *Pro* version that supports API call installed. +`Api.isOrganicMapsInstalled(Context)` will return `true` if user has *Lite* or *Pro* version that supports API call installed. #### Which versions of Organic Maps support API calls? All versions since 2.4.0 and above support API calls. -#### What will happen if I call for `OrganicMapsApi.showPoint()` but Organic Maps application is not installed? +#### What will happen if I call for `Api.showPoint()` but Organic Maps application is not installed? Nothing serious. API library will show simple dialog with gentle offer to download Organic Maps. You can see how it looks like below. ![Please install us](site/images/dlg.png) ## Sample Code and Application -* [Sample Application at Google Play][linkSampleGooglePlay] * [Sample Application Source Code][linkSampleSource] ------------------------------------------------------------------------------- ## API Code License + +Copyright (c) 2022, Organic Maps OÜ. Copyright (c) 2019, MY.COM B.V. +Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -154,12 +156,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND [linkOM]: https://organicmaps.app/ "Organic Maps" [linkPIntent]: http://developer.android.com/reference/android/app/PendingIntent.html "PendingIntent" -[linkRepo]: https://github.com/mapswithme/api-android "GitHub Repository" +[linkRepo]: https://github.com/organicmaps/api-android "GitHub Repository" [linkLibProj]: http://developer.android.com/tools/projects/index.html#LibraryProjects "Android Library Project" [linkIntents]: http://developer.android.com/guide/components/intents-filters.html "Intents and Intent Filters" -[linkApiClass]: lib/src/com/mapswithme/maps/api/OrganicMapsApi.java "OrganicMapsApi.java" -[linkPointClass]: lib/src/com/mapswithme/maps/api/OMPoint.java "OMPoint.java" -[linkRespClass]: lib/src/com/mapswithme/maps/api/OMResponse.java "OMResponse.java" -[linkSampleSource]: https://github.com/mapswithme/api-android/tree/master/sample-app-capitals "Api Source Code" -[linkSampleGooglePlay]: http://play.google.com/store/apps/details?id=com.mapswithme.capitals "Api Demo .apk" -[linkTravelGuides]: http://www.guidewithme.com +[linkApiClass]: lib/src/app/organicmaps/api/Api.java "Api.java" +[linkPointClass]: lib/src/app/organicmaps/api/Point.java "Point.java" +[linkRespClass]: lib/src/app/organicmaps/api/Response.java "Response.java" +[linkSampleSource]: https://github.com/organicmaps/api-android/tree/master/sample-app-capitals "Api Source Code" diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6453cee --- /dev/null +++ b/build.gradle @@ -0,0 +1,9 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..dab7c28 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# 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=-Xmx2048m -Dfile.encoding=UTF-8 +# 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 +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7f5ecd9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jun 06 09:48:49 TRT 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# 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 +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +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" -a "$nonstop" = "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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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 execute + +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 execute + +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 + +: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 %* + +: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/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/lib/AndroidManifest.xml b/lib/AndroidManifest.xml deleted file mode 100644 index 5c3706a..0000000 --- a/lib/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/lib/build.gradle b/lib/build.gradle index 94cd14f..55b6d8a 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,19 +1,32 @@ -apply plugin: 'android-library' +plugins { + id 'com.android.library' +} android { - - // Define these properties in the gradle.properties file in the root project folder - compileSdkVersion propTargetSdkVersion.toInteger() - buildToolsVersion propBuildToolsVersion + compileSdk 32 defaultConfig { - minSdkVersion propMinSdkVersion.toInteger() - targetSdkVersion propTargetSdkVersion.toInteger() + minSdk 21 + targetSdk 32 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" } - sourceSets.main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' +} \ No newline at end of file diff --git a/lib/build.xml b/lib/build.xml deleted file mode 100644 index dbb2595..0000000 --- a/lib/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/consumer-rules.pro b/lib/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/lib/proguard-rules.pro b/lib/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/lib/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/lib/project.properties b/lib/project.properties deleted file mode 100644 index 93c8c3c..0000000 --- a/lib/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-21 -android.library=true diff --git a/lib/src/com/mapswithme/maps/api/Const.java b/lib/src/com/mapswithme/maps/api/Const.java deleted file mode 100644 index a77ff98..0000000 --- a/lib/src/com/mapswithme/maps/api/Const.java +++ /dev/null @@ -1,55 +0,0 @@ -/****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ -package app.organicmaps.api; - -public class Const -{ - - /* Request extras */ - static final String AUTHORITY = "app.organicmaps.api"; - public static final String EXTRA_URL = AUTHORITY + ".url"; - public static final String EXTRA_TITLE = AUTHORITY + ".title"; - public static final String EXTRA_API_VERSION = AUTHORITY + ".version"; - public static final String EXTRA_CALLER_APP_INFO = AUTHORITY + ".caller_app_info"; - public static final String EXTRA_HAS_PENDING_INTENT = AUTHORITY + ".has_pen_intent"; - public static final String EXTRA_CALLER_PENDING_INTENT = AUTHORITY + ".pending_intent"; - public static final String EXTRA_RETURN_ON_BALLOON_CLICK = AUTHORITY + ".return_on_balloon_click"; - public static final String EXTRA_PICK_POINT = AUTHORITY + ".pick_point"; - public static final String EXTRA_CUSTOM_BUTTON_NAME = AUTHORITY + ".custom_button_name"; - - - /* Response extras */ - /* Point part-by-part*/ - public static final String EXTRA_OM_RESPONSE_POINT_NAME = AUTHORITY + ".point_name"; - public static final String EXTRA_OM_RESPONSE_POINT_LAT = AUTHORITY + ".point_lat"; - public static final String EXTRA_OM_RESPONSE_POINT_LON = AUTHORITY + ".point_lon"; - public static final String EXTRA_OM_RESPONSE_POINT_ID = AUTHORITY + ".point_id"; - public static final String EXTRA_OM_RESPONSE_ZOOM = AUTHORITY + ".zoom_level"; - - - public static final String ACTION_OM_REQUEST = AUTHORITY + ".request"; - static final int API_VERSION = 2; - static final String CALLBACK_PREFIX = "mapswithme.client."; - - private Const() {} -} diff --git a/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java b/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java deleted file mode 100644 index 4f83f2a..0000000 --- a/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java +++ /dev/null @@ -1,64 +0,0 @@ -/****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ -package app.organicmaps.api; - -import android.app.Activity; -import android.app.Dialog; -import android.content.Intent; -import android.net.Uri; -import android.view.View; -import android.view.Window; - -import app.organicmaps.api.R; - -public class DownloadOrganicMapsDialog extends Dialog implements android.view.View.OnClickListener -{ - - public DownloadOrganicMapsDialog(Activity activity) - { - super(activity); - - requestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.dlg_install_mwm); - - findViewById(R.id.btn_pro).setOnClickListener(this); - - setOwnerActivity(activity); - } - - - public void onDownloadButtonClicked(String url) - { - Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - getContext().startActivity(i); - dismiss(); - } - - - @Override - public void onClick(View v) - { - String url = getContext().getString(R.string.url); - onDownloadButtonClicked(url); - } -} diff --git a/lib/src/com/mapswithme/maps/api/MWMResponse.java b/lib/src/com/mapswithme/maps/api/MWMResponse.java deleted file mode 100644 index acdeee6..0000000 --- a/lib/src/com/mapswithme/maps/api/MWMResponse.java +++ /dev/null @@ -1,77 +0,0 @@ -/****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ -package app.organicmaps.api; - -import android.content.Context; -import android.content.Intent; - -public class OMResponse -{ - private OMPoint mPoint; - private double mZoomLevel; - - /** - * - * @return point, for which user requested more information in Organic Maps application. - */ - public OMPoint getPoint() { return mPoint; } - public boolean hasPoint() { return mPoint != null; } - public double getZoomLevel() { return mZoomLevel; } - - @Override - public String toString() - { - return "OMResponse [SelectedPoint=" + mPoint + "]"; - } - - /** - * Factory method to extract response data from intent. - * - * @param context - * @param intent - * @return - */ - public static OMResponse extractFromIntent(Context context, Intent intent) - { - final OMResponse response = new OMResponse(); - // parse point - final double lat = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_POINT_LAT, INVALID_LL); - final double lon = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_POINT_LON, INVALID_LL); - final String name = intent.getStringExtra(Const.EXTRA_OM_RESPONSE_POINT_NAME); - final String id = intent.getStringExtra(Const.EXTRA_OM_RESPONSE_POINT_ID); - - // parse additional info - response.mZoomLevel = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_ZOOM, 9); - - if (lat != INVALID_LL && lon != INVALID_LL) - response.mPoint = new OMPoint(lat, lon, name, id); - else - response.mPoint = null; - - return response; - } - - private final static double INVALID_LL = Double.MIN_VALUE; - - private OMResponse() {} -} diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c38e16e --- /dev/null +++ b/lib/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java b/lib/src/main/java/app/organicmaps/api/Api.java similarity index 50% rename from lib/src/com/mapswithme/maps/api/MapsWithMeApi.java rename to lib/src/main/java/app/organicmaps/api/Api.java index 4dd3ad3..6848378 100644 --- a/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java +++ b/lib/src/main/java/app/organicmaps/api/Api.java @@ -1,24 +1,25 @@ /****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. ******************************************************************************/ package app.organicmaps.api; @@ -26,11 +27,10 @@ import android.app.Activity; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.content.pm.ActivityInfo; import android.net.Uri; -public final class OrganicMapsApi +public final class Api { /** @@ -42,32 +42,28 @@ public final class OrganicMapsApi */ public static final double ZOOM_MIN = 1; - public static void showOrganicMapsUrl(Activity caller, PendingIntent pendingIntent, double zoomLevel, String url) { final Uri uri = Uri.parse(url); - final String latlon[] = uri.getQueryParameter("ll").split(","); + final String[] latlon = uri.getQueryParameter("ll").split(","); final double lat = Double.parseDouble(latlon[0]); final double lon = Double.parseDouble(latlon[1]); final String name = uri.getQueryParameter("n"); final String id = uri.getQueryParameter("id"); - showPointsOnMap(caller, name, zoomLevel, pendingIntent, new OMPoint(lat, lon, name, id)); + showPointsOnMap(caller, name, zoomLevel, pendingIntent, new Point(lat, lon, name, id)); } - public static void sendRequest(Activity caller, MwmRequest request) + public static void sendRequest(Activity caller, Request request) { final Intent mwmIntent = request.toIntent(caller); if (isOrganicMapsInstalled(caller)) { - // Match activity for intent - final ActivityInfo aInfo = caller.getPackageManager().resolveActivity(mwmIntent, 0).activityInfo; - mwmIntent.setClassName(aInfo.packageName, aInfo.name); caller.startActivity(mwmIntent); } else - (new DownloadOrganicMapsDialog(caller)).show(); + (new DownloadDialog(caller)).show(); } /** @@ -80,12 +76,12 @@ public final class OrganicMapsApi */ public static void showPointOnMap(Activity caller, double lat, double lon, String name) { - showPointsOnMap(caller, (String) null, (PendingIntent) null, new OMPoint(lat, lon, name)); + showPointsOnMap(caller, null, (PendingIntent) null, new Point(lat, lon, name)); } /** * Shows single point on the map using specified zoom level in range from - * {@link OrganicMapsApi#ZOOM_MIN} to {@link OrganicMapsApi#ZOOM_MAX}. + * {@link Api#ZOOM_MIN} to {@link Api#ZOOM_MAX}. * * @param caller * @param lat @@ -95,7 +91,7 @@ public final class OrganicMapsApi */ public static void showPointOnMap(Activity caller, double lat, double lon, String name, double zoomLevel) { - showPointsOnMap(caller, (String) null, zoomLevel, (PendingIntent) null, new OMPoint(lat, lon, name)); + showPointsOnMap(caller, null, zoomLevel, null, new Point(lat, lon, name)); } /** @@ -105,7 +101,7 @@ public final class OrganicMapsApi * @param title * @param points */ - public static void showPointsOnMap(Activity caller, String title, OMPoint... points) + public static void showPointsOnMap(Activity caller, String title, Point... points) { showPointsOnMap(caller, title, null, points); } @@ -119,34 +115,33 @@ public final class OrganicMapsApi * @param pendingIntent * @param points */ - public static void showPointsOnMap(Activity caller, String title, PendingIntent pendingIntent, OMPoint... points) + public static void showPointsOnMap(Activity caller, String title, PendingIntent pendingIntent, Point... points) { showPointsOnMap(caller, title, -1, pendingIntent, points); } private static void showPointsOnMap(Activity caller, String title, double zoomLevel, PendingIntent pendingIntent, - OMPoint... points) + Point... points) { - final MwmRequest request = new MwmRequest() - .setTitle(title) - .setZoomLevel(zoomLevel) - .setPendingIntent(pendingIntent) - .setPoints(points); + final Request request = new Request() + .setTitle(title) + .setZoomLevel(zoomLevel) + .setPendingIntent(pendingIntent) + .setPoints(points); sendRequest(caller, request); } public static void pickPoint(Activity caller, String title, PendingIntent pi) { - final MwmRequest request = new MwmRequest() - .setTitle(title) - .setPickPointMode(true) - .setPendingIntent(pi); + final Request request = new Request() + .setTitle(title) + .setPickPointMode(true) + .setPendingIntent(pi); sendRequest(caller, request); } /** - * Detects if any version (Lite, Pro) of Organic Maps, which supports API calls - * are installed on the device. + * Detects if Organic Maps is installed on the device. * * @param context * @return diff --git a/lib/src/main/java/app/organicmaps/api/Const.java b/lib/src/main/java/app/organicmaps/api/Const.java new file mode 100644 index 0000000..f11991b --- /dev/null +++ b/lib/src/main/java/app/organicmaps/api/Const.java @@ -0,0 +1,56 @@ +/****************************************************************************** + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ +package app.organicmaps.api; + +public class Const +{ + + /* Request extras */ + static final String AUTHORITY = "com.mapswithme.maps.api"; + public static final String EXTRA_URL = AUTHORITY + ".url"; + public static final String EXTRA_TITLE = AUTHORITY + ".title"; + public static final String EXTRA_API_VERSION = AUTHORITY + ".version"; + public static final String EXTRA_CALLER_APP_INFO = AUTHORITY + ".caller_app_info"; + public static final String EXTRA_HAS_PENDING_INTENT = AUTHORITY + ".has_pen_intent"; + public static final String EXTRA_CALLER_PENDING_INTENT = AUTHORITY + ".pending_intent"; + public static final String EXTRA_RETURN_ON_BALLOON_CLICK = AUTHORITY + ".return_on_balloon_click"; + public static final String EXTRA_PICK_POINT = AUTHORITY + ".pick_point"; + public static final String EXTRA_CUSTOM_BUTTON_NAME = AUTHORITY + ".custom_button_name"; + + + /* Response extras */ + /* Point part-by-part*/ + public static final String EXTRA_OM_RESPONSE_POINT_NAME = AUTHORITY + ".point_name"; + public static final String EXTRA_OM_RESPONSE_POINT_LAT = AUTHORITY + ".point_lat"; + public static final String EXTRA_OM_RESPONSE_POINT_LON = AUTHORITY + ".point_lon"; + public static final String EXTRA_OM_RESPONSE_POINT_ID = AUTHORITY + ".point_id"; + public static final String EXTRA_OM_RESPONSE_ZOOM = AUTHORITY + ".zoom_level"; + + + public static final String ACTION_OM_REQUEST = AUTHORITY + ".request"; + static final int API_VERSION = 2; + static final String CALLBACK_PREFIX = "mapswithme.client."; + + private Const() {} +} diff --git a/lib/src/main/java/app/organicmaps/api/DownloadDialog.java b/lib/src/main/java/app/organicmaps/api/DownloadDialog.java new file mode 100644 index 0000000..8e4fb5e --- /dev/null +++ b/lib/src/main/java/app/organicmaps/api/DownloadDialog.java @@ -0,0 +1,63 @@ +/****************************************************************************** + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ +package app.organicmaps.api; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Intent; +import android.net.Uri; +import android.view.View; +import android.view.Window; + +public class DownloadDialog extends Dialog implements android.view.View.OnClickListener +{ + + public DownloadDialog(Activity activity) + { + super(activity); + + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.dlg_install_mwm); + + findViewById(R.id.btn_pro).setOnClickListener(this); + + setOwnerActivity(activity); + } + + + public void onDownloadButtonClicked(String url) + { + Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + getContext().startActivity(i); + dismiss(); + } + + + @Override + public void onClick(View v) + { + String url = getContext().getString(R.string.url); + onDownloadButtonClicked(url); + } +} diff --git a/lib/src/com/mapswithme/maps/api/MWMPoint.java b/lib/src/main/java/app/organicmaps/api/Point.java similarity index 55% rename from lib/src/com/mapswithme/maps/api/MWMPoint.java rename to lib/src/main/java/app/organicmaps/api/Point.java index 52d18af..241a9f5 100644 --- a/lib/src/com/mapswithme/maps/api/MWMPoint.java +++ b/lib/src/main/java/app/organicmaps/api/Point.java @@ -1,25 +1,26 @@ /****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ package app.organicmaps.api; import java.io.Serializable; @@ -29,7 +30,7 @@ import java.io.Serializable; * Has its equals() and hashCode() methods overloaded * so could be used in Hash(Map/Set/etc) classes. */ -public final class OMPoint implements Serializable +public final class Point implements Serializable { private static final long serialVersionUID = 1L; @@ -39,12 +40,12 @@ public final class OMPoint implements Serializable private String mId; private Style mStyle; - public OMPoint(double lat, double lon, String name) + public Point(double lat, double lon, String name) { this(lat, lon, name, null); } - public OMPoint(double lat, double lon, String name, String id) + public Point(double lat, double lon, String name, String id) { this.mLat = lat; this.mLon = lon; @@ -52,7 +53,7 @@ public final class OMPoint implements Serializable this.mId = id; } - public OMPoint(double lat, double lon, String name, String id, Style style) + public Point(double lat, double lon, String name, String id, Style style) { this.mLat = lat; this.mLon = lon; @@ -61,20 +62,23 @@ public final class OMPoint implements Serializable this.mStyle = style; } - public double getLat() { return mLat; } - public double getLon() { return mLon; } - public String getName() { return mName; } - public String getId() { return mId; } - public Style getStyle() { return mStyle; } + public double getLat() {return mLat;} - public String getStyleForUrl() { return (mStyle == null) ? null : mStyle.getName(); } + public double getLon() {return mLon;} + + public String getName() {return mName;} + + public String getId() {return mId;} /** * Sets string ID for this point. Internally it is not used to distinguish point, * it's purpose to help clients code to associate point with domain objects of their application. + * * @param id */ - public void setId(String id) { mId = id; } + public void setId(String id) {mId = id;} + + public Style getStyle() {return mStyle;} /** * Sets the style (appearance) for this point. @@ -86,14 +90,16 @@ public final class OMPoint implements Serializable this.mStyle = style; } + public String getStyleForUrl() {return (mStyle == null) ? null : mStyle.getName();} + @Override public String toString() { return "OMPoint [lat=" + mLat + - ", lon=" + mLon + - ", name=" + mName + - ", id=" + mId + - ", style=" + mStyle + "]"; + ", lon=" + mLon + + ", name=" + mName + + ", id=" + mId + + ", style=" + mStyle + "]"; } @Override @@ -111,8 +117,8 @@ public final class OMPoint implements Serializable } /** - * Two point are considered - * equal if they have they lat, lon, and name attributes equal. + * Two point are considered + * equal if they have they lat, lon, and name attributes equal. */ @Override public boolean equals(Object obj) @@ -123,7 +129,7 @@ public final class OMPoint implements Serializable return false; if (getClass() != obj.getClass()) return false; - final OMPoint other = (OMPoint) obj; + final Point other = (Point) obj; if (Double.doubleToLongBits(mLat) != Double.doubleToLongBits(other.mLat)) return false; if (Double.doubleToLongBits(mLon) != Double.doubleToLongBits(other.mLon)) @@ -155,9 +161,9 @@ public final class OMPoint implements Serializable // placemark-lime // placemark-teal - private String name; + private final String name; - private Style(String name) + Style(String name) { this.name = name; } diff --git a/lib/src/com/mapswithme/maps/api/MwmRequest.java b/lib/src/main/java/app/organicmaps/api/Request.java similarity index 55% rename from lib/src/com/mapswithme/maps/api/MwmRequest.java rename to lib/src/main/java/app/organicmaps/api/Request.java index 5978edf..1a006f9 100644 --- a/lib/src/com/mapswithme/maps/api/MwmRequest.java +++ b/lib/src/main/java/app/organicmaps/api/Request.java @@ -1,78 +1,156 @@ +/****************************************************************************** + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ package app.organicmaps.api; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Locale; -import android.annotation.SuppressLint; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; - -public class MwmRequest +public class Request { // ** - private List mPoints = new ArrayList(); - private PendingIntent mPendingIntent; - private String mTitle; - private double mZoomLevel = 1; - private boolean mReturnOnBalloonClick; - private boolean mPickPoint = false; - private String mCustomButtonName = ""; + private List mPoints = new ArrayList<>(); + private PendingIntent mPendingIntent; + private String mTitle; + private double mZoomLevel = 1; + private boolean mReturnOnBalloonClick; + private boolean mPickPoint = false; + private String mCustomButtonName = ""; // ** - public MwmRequest setCustomButtonName(String buttonName) + private static StringBuilder createMwmUrl(Context context, String title, double zoomLevel, List points) + { + final StringBuilder urlBuilder = new StringBuilder("om://map?"); + // version + urlBuilder.append("v=").append(Const.API_VERSION).append("&"); + // back url, always not null + urlBuilder.append("backurl=").append(getCallbackAction(context)).append("&"); + // title + appendIfNotNull(urlBuilder, "appname", title); + // zoom + appendIfNotNull(urlBuilder, "z", isValidZoomLevel(zoomLevel) ? String.valueOf(zoomLevel) : null); + + // points + for (final Point point : points) + { + if (point != null) + { + urlBuilder.append("ll=").append(String.format(Locale.US, "%f,%f&", point.getLat(), point.getLon())); + + appendIfNotNull(urlBuilder, "n", point.getName()); + appendIfNotNull(urlBuilder, "id", point.getId()); + appendIfNotNull(urlBuilder, "s", point.getStyleForUrl()); + } + } + + return urlBuilder; + } + + private static String getCallbackAction(Context context) + { + return Const.CALLBACK_PREFIX + context.getPackageName(); + } + + private static Intent addCommonExtras(Context context, Intent intent) + { + intent.putExtra(Const.EXTRA_CALLER_APP_INFO, context.getApplicationInfo()); + intent.putExtra(Const.EXTRA_API_VERSION, Const.API_VERSION); + + return intent; + } + + private static StringBuilder appendIfNotNull(StringBuilder builder, String key, String value) + { + if (value != null) + builder.append(key).append("=").append(Uri.encode(value)).append("&"); + + return builder; + } + + private static boolean isValidZoomLevel(double zoom) + { + return zoom >= Api.ZOOM_MIN && zoom <= Api.ZOOM_MAX; + } + + public Request setCustomButtonName(String buttonName) { mCustomButtonName = buttonName != null ? buttonName : ""; return this; } - public MwmRequest setTitle(String title) + public Request setTitle(String title) { mTitle = title; return this; } - public MwmRequest setPickPointMode(boolean pickPoint) + public Request setPickPointMode(boolean pickPoint) { mPickPoint = pickPoint; return this; } - public MwmRequest addPoint(OMPoint point) + public Request addPoint(Point point) { mPoints.add(point); return this; } - public MwmRequest addPoint(double lat, double lon, String name, String id) + public Request addPoint(double lat, double lon, String name, String id) { - return addPoint(new OMPoint(lat, lon, name, id)); + return addPoint(new Point(lat, lon, name, id)); } - public MwmRequest setPoints(Collection points) + public Request setPoints(Collection points) { - mPoints = new ArrayList(points); + mPoints = new ArrayList(points); return this; } - public MwmRequest setReturnOnBalloonClick(boolean doReturn) + // Below are utilities from OrganicMapsApi because we are not "Feature Envy" + + public Request setReturnOnBalloonClick(boolean doReturn) { mReturnOnBalloonClick = doReturn; return this; } - public MwmRequest setZoomLevel(double zoomLevel) + public Request setZoomLevel(double zoomLevel) { mZoomLevel = zoomLevel; return this; } - public MwmRequest setPendingIntent(PendingIntent pi) + public Request setPendingIntent(PendingIntent pi) { mPendingIntent = pi; return this; @@ -105,70 +183,12 @@ public class MwmRequest } /** - * @Hidden - * This method is internal only. + * @Hidden This method is internal only. * Used for compatibility. */ - MwmRequest setPoints(OMPoint[] points) + Request setPoints(Point[] points) { return setPoints(Arrays.asList(points)); } - // Below are utilities from OrganicMapsApi because we are not "Feature Envy" - - private static StringBuilder createMwmUrl(Context context, String title, double zoomLevel, List points) - { - final StringBuilder urlBuilder = new StringBuilder("mapswithme://map?"); - // version - urlBuilder.append("v=").append(Const.API_VERSION).append("&"); - // back url, always not null - urlBuilder.append("backurl=").append(getCallbackAction(context)).append("&"); - // title - appendIfNotNull(urlBuilder, "appname", title); - // zoom - appendIfNotNull(urlBuilder, "z", isValidZoomLevel(zoomLevel) ? String.valueOf(zoomLevel) : null); - - // points - for (final OMPoint point : points) - { - if (point != null) - { - urlBuilder.append("ll=").append(String.format(Locale.US, "%f,%f&", point.getLat(), point.getLon())); - - appendIfNotNull(urlBuilder, "n", point.getName()); - appendIfNotNull(urlBuilder, "id", point.getId()); - appendIfNotNull(urlBuilder, "s", point.getStyleForUrl()); - } - } - - return urlBuilder; - } - - private static String getCallbackAction(Context context) - { - return Const.CALLBACK_PREFIX + context.getPackageName(); - } - - @SuppressLint("NewApi") - private static Intent addCommonExtras(Context context, Intent intent) - { - intent.putExtra(Const.EXTRA_CALLER_APP_INFO, context.getApplicationInfo()); - intent.putExtra(Const.EXTRA_API_VERSION, Const.API_VERSION); - - return intent; - } - - private static StringBuilder appendIfNotNull(StringBuilder builder, String key, String value) - { - if (value != null) - builder.append(key).append("=").append(Uri.encode(value)).append("&"); - - return builder; - } - - private static boolean isValidZoomLevel(double zoom) - { - return zoom >= OrganicMapsApi.ZOOM_MIN && zoom <= OrganicMapsApi.ZOOM_MAX; - } - } diff --git a/lib/src/main/java/app/organicmaps/api/Response.java b/lib/src/main/java/app/organicmaps/api/Response.java new file mode 100644 index 0000000..046b2eb --- /dev/null +++ b/lib/src/main/java/app/organicmaps/api/Response.java @@ -0,0 +1,78 @@ +/****************************************************************************** + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ +package app.organicmaps.api; + +import android.content.Context; +import android.content.Intent; + +public class Response +{ + private final static double INVALID_LL = Double.MIN_VALUE; + private Point mPoint; + private double mZoomLevel; + + private Response() {} + + /** + * Factory method to extract response data from intent. + * + * @param context + * @param intent + * @return + */ + public static Response extractFromIntent(Context context, Intent intent) + { + final Response response = new Response(); + // parse point + final double lat = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_POINT_LAT, INVALID_LL); + final double lon = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_POINT_LON, INVALID_LL); + final String name = intent.getStringExtra(Const.EXTRA_OM_RESPONSE_POINT_NAME); + final String id = intent.getStringExtra(Const.EXTRA_OM_RESPONSE_POINT_ID); + + // parse additional info + response.mZoomLevel = intent.getDoubleExtra(Const.EXTRA_OM_RESPONSE_ZOOM, 9); + + if (lat != INVALID_LL && lon != INVALID_LL) + response.mPoint = new Point(lat, lon, name, id); + else + response.mPoint = null; + + return response; + } + + /** + * @return point, for which user requested more information in Organic Maps application. + */ + public Point getPoint() {return mPoint;} + + public boolean hasPoint() {return mPoint != null;} + + public double getZoomLevel() {return mZoomLevel;} + + @Override + public String toString() + { + return "Response [SelectedPoint=" + mPoint + "]"; + } +} diff --git a/lib/res/drawable/background_pattern.xml b/lib/src/main/res/drawable/background_pattern.xml similarity index 100% rename from lib/res/drawable/background_pattern.xml rename to lib/src/main/res/drawable/background_pattern.xml diff --git a/lib/res/drawable/btn_back_gray.xml b/lib/src/main/res/drawable/btn_back_gray.xml similarity index 100% rename from lib/res/drawable/btn_back_gray.xml rename to lib/src/main/res/drawable/btn_back_gray.xml diff --git a/lib/res/drawable/btn_back_gray_active.xml b/lib/src/main/res/drawable/btn_back_gray_active.xml similarity index 100% rename from lib/res/drawable/btn_back_gray_active.xml rename to lib/src/main/res/drawable/btn_back_gray_active.xml diff --git a/lib/res/drawable/btn_back_green.xml b/lib/src/main/res/drawable/btn_back_green.xml similarity index 100% rename from lib/res/drawable/btn_back_green.xml rename to lib/src/main/res/drawable/btn_back_green.xml diff --git a/lib/res/drawable/btn_back_green_active.xml b/lib/src/main/res/drawable/btn_back_green_active.xml similarity index 100% rename from lib/res/drawable/btn_back_green_active.xml rename to lib/src/main/res/drawable/btn_back_green_active.xml diff --git a/lib/res/drawable/btn_gray_selector.xml b/lib/src/main/res/drawable/btn_gray_selector.xml similarity index 100% rename from lib/res/drawable/btn_gray_selector.xml rename to lib/src/main/res/drawable/btn_gray_selector.xml diff --git a/lib/res/drawable/btn_green_selector.xml b/lib/src/main/res/drawable/btn_green_selector.xml similarity index 100% rename from lib/res/drawable/btn_green_selector.xml rename to lib/src/main/res/drawable/btn_green_selector.xml diff --git a/lib/res/drawable/gray.xml b/lib/src/main/res/drawable/gray.xml similarity index 100% rename from lib/res/drawable/gray.xml rename to lib/src/main/res/drawable/gray.xml diff --git a/lib/res/drawable/green.xml b/lib/src/main/res/drawable/green.xml similarity index 100% rename from lib/res/drawable/green.xml rename to lib/src/main/res/drawable/green.xml diff --git a/lib/res/drawable/overflow.xml b/lib/src/main/res/drawable/overflow.xml similarity index 100% rename from lib/res/drawable/overflow.xml rename to lib/src/main/res/drawable/overflow.xml diff --git a/lib/res/drawable/pattern.png b/lib/src/main/res/drawable/pattern.png similarity index 100% rename from lib/res/drawable/pattern.png rename to lib/src/main/res/drawable/pattern.png diff --git a/lib/res/drawable/shadow.xml b/lib/src/main/res/drawable/shadow.xml similarity index 100% rename from lib/res/drawable/shadow.xml rename to lib/src/main/res/drawable/shadow.xml diff --git a/lib/res/layout/dlg_install_mwm.xml b/lib/src/main/res/layout/dlg_install_mwm.xml similarity index 94% rename from lib/res/layout/dlg_install_mwm.xml rename to lib/src/main/res/layout/dlg_install_mwm.xml index b547a7e..98303e1 100644 --- a/lib/res/layout/dlg_install_mwm.xml +++ b/lib/src/main/res/layout/dlg_install_mwm.xml @@ -22,9 +22,8 @@ OF SUCH DAMAGE. --> + android:layout_height="match_parent"> + android:text="@string/download" /> diff --git a/lib/res/values/strings.xml b/lib/src/main/res/values/strings.xml similarity index 100% rename from lib/res/values/strings.xml rename to lib/src/main/res/values/strings.xml diff --git a/lib/res/values/styles.xml b/lib/src/main/res/values/styles.xml similarity index 100% rename from lib/res/values/styles.xml rename to lib/src/main/res/values/styles.xml diff --git a/sample-app-capitals/.gitignore b/sample-app-capitals/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/sample-app-capitals/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/sample-app-capitals/build.gradle b/sample-app-capitals/build.gradle index 676cab8..e17af69 100644 --- a/sample-app-capitals/build.gradle +++ b/sample-app-capitals/build.gradle @@ -1,19 +1,35 @@ -apply plugin: 'android' +plugins { + id 'com.android.application' +} android { - - // Define these properties in the gradle.properties file in the root project folder - compileSdkVersion propTargetSdkVersion.toInteger() - buildToolsVersion propBuildToolsVersion + compileSdk 32 defaultConfig { - minSdkVersion propMinSdkVersion.toInteger() - targetSdkVersion propTargetSdkVersion.toInteger() + applicationId "app.organicmaps.api.sample.capitals" + minSdk 21 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - sourceSets.main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' + implementation project(path: ':lib') +} \ No newline at end of file diff --git a/sample-app-capitals/build.xml b/sample-app-capitals/build.xml deleted file mode 100644 index dbb2595..0000000 --- a/sample-app-capitals/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sample-app-capitals/proguard-rules.pro b/sample-app-capitals/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/sample-app-capitals/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/sample-app-capitals/project.properties b/sample-app-capitals/project.properties deleted file mode 100644 index 21acbea..0000000 --- a/sample-app-capitals/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-21 -android.library.reference.1=../lib diff --git a/sample-app-capitals/res/drawable-hdpi/ic_launcher.png b/sample-app-capitals/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 9e67a44..0000000 Binary files a/sample-app-capitals/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/sample-app-capitals/res/drawable-ldpi/ic_launcher.png b/sample-app-capitals/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 1e322e6..0000000 Binary files a/sample-app-capitals/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/sample-app-capitals/res/drawable-mdpi/ic_launcher.png b/sample-app-capitals/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 0555b55..0000000 Binary files a/sample-app-capitals/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png b/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 3508596..0000000 Binary files a/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png b/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 1520f13..0000000 Binary files a/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/sample-app-capitals/AndroidManifest.xml b/sample-app-capitals/src/main/AndroidManifest.xml similarity index 57% rename from sample-app-capitals/AndroidManifest.xml rename to sample-app-capitals/src/main/AndroidManifest.xml index 19308f6..fafe43e 100644 --- a/sample-app-capitals/AndroidManifest.xml +++ b/sample-app-capitals/src/main/AndroidManifest.xml @@ -1,10 +1,9 @@ - - + - + - - - - - - + + + + + + - - android:launchMode="singleTop" > - + - + - + \ No newline at end of file diff --git a/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CapitalsListActivity.java similarity index 80% rename from sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java rename to sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CapitalsListActivity.java index 257ff8c..b1fcf58 100644 --- a/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java +++ b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CapitalsListActivity.java @@ -1,5 +1,6 @@ /****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -20,7 +21,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -package com.mapswithme.capitals; +package app.organicmaps.api.sample.capitals; import android.app.ListActivity; import android.content.Context; @@ -32,8 +33,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; -import app.organicmaps.api.OMPoint; -import app.organicmaps.api.OrganicMapsApi; +import app.organicmaps.api.Point; +import app.organicmaps.api.Api; public class CapitalsListActivity extends ListActivity { @@ -48,11 +49,7 @@ public class CapitalsListActivity extends ListActivity mCityAdapter = new CityAdapter(this, City.CAPITALS); setListAdapter(mCityAdapter); - findViewById(R.id.btn_all).setOnClickListener(new OnClickListener() - { - @Override - public void onClick(View v) { showCityOnOMMap(City.CAPITALS); } - }); + findViewById(R.id.btn_all).setOnClickListener(v -> showCityOnOMMap(City.CAPITALS)); } @@ -64,12 +61,12 @@ public class CapitalsListActivity extends ListActivity private void showCityOnOMMap(City ... cities) { - OMPoint[] points = new OMPoint[cities.length]; + Point[] points = new Point[cities.length]; for (int i = 0; i < cities.length; i++) - points[i] = cities[i].toOMPoint(); + points[i] = cities[i].toPoint(); final String title = cities.length == 1 ? cities[0].getName() : "Capitals of the World"; - OrganicMapsApi.showPointsOnMap(this, title, CityDetailsActivity.getPendingIntent(this), points); + Api.showPointsOnMap(this, title, CityDetailsActivity.getPendingIntent(this), points); } private static class CityAdapter extends ArrayAdapter @@ -86,9 +83,9 @@ public class CapitalsListActivity extends ListActivity public View getView(int position, View convertView, ViewGroup parent) { final View view = super.getView(position, convertView, parent); - final TextView subText = (TextView) view.findViewById(android.R.id.text2); + final TextView subText = view.findViewById(android.R.id.text2); final City city = data[position]; - subText.setText(city.getCountryCode() + "/" + city.getTimeZone()); + subText.setText(String.format("%s/%s", city.getCountryCode(), city.getTimeZone())); return view; } } diff --git a/sample-app-capitals/src/com/mapswithme/capitals/City.java b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/City.java similarity index 98% rename from sample-app-capitals/src/com/mapswithme/capitals/City.java rename to sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/City.java index 1cdc979..d491fb5 100644 --- a/sample-app-capitals/src/com/mapswithme/capitals/City.java +++ b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/City.java @@ -1,28 +1,29 @@ /****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ -package com.mapswithme.capitals; + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ +package app.organicmaps.api.sample.capitals; -import app.organicmaps.api.OMPoint; +import app.organicmaps.api.Point; import java.util.Arrays; import java.util.Comparator; @@ -56,7 +57,7 @@ public class City @Override public String toString() { return name; } - public OMPoint toOMPoint() { return new OMPoint(lat, lon, name, id); } + public Point toPoint() { return new Point(lat, lon, name, id); } public String getId() { return id; } public String getName() { return name; } @@ -69,7 +70,7 @@ public class City public String getAltNames() { return altNames; } - public static City fromOMPoint(OMPoint point) + public static City fromPoint(Point point) { City result = null; final String id = point.getId(); diff --git a/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java similarity index 53% rename from sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java rename to sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java index ec2b772..c3fe059 100644 --- a/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java +++ b/sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java @@ -1,26 +1,27 @@ /****************************************************************************** - Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2022, Organic Maps OÜ. All rights reserved. + Copyright (c) 2013, MapsWithMe GmbH. All rights reserved. - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. Redistributions in binary form must - reproduce the above copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - OF SUCH DAMAGE. -******************************************************************************/ -package com.mapswithme.capitals; + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. Redistributions in binary form must + reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. + ******************************************************************************/ +package app.organicmaps.api.sample.capitals; import android.app.Activity; import android.app.PendingIntent; @@ -31,12 +32,12 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import app.organicmaps.api.OMResponse; -import app.organicmaps.api.OrganicMapsApi; +import app.organicmaps.api.Response; +import app.organicmaps.api.Api; public class CityDetailsActivity extends Activity { - public static String EXTRA_FROM_OM = "from-maps-with-me"; + public static String EXTRA_FROM_ORGANICMAPS = "from-organicmaps"; private TextView mName; private TextView mAltNames; @@ -54,8 +55,8 @@ public class CityDetailsActivity extends Activity public static PendingIntent getPendingIntent(Context context) { final Intent i = new Intent(context, CityDetailsActivity.class); - i.putExtra(EXTRA_FROM_OM, true); - return PendingIntent.getActivity(context, 0, i, 0); + i.putExtra(EXTRA_FROM_ORGANICMAPS, true); + return PendingIntent.getActivity(context, 0, i, PendingIntent.FLAG_IMMUTABLE); } @Override @@ -80,9 +81,8 @@ public class CityDetailsActivity extends Activity @Override public void onClick(View v) { - OrganicMapsApi - .showPointsOnMap(CityDetailsActivity.this,mCity.getName(), - CityDetailsActivity.getPendingIntent(CityDetailsActivity.this),mCity.toOMPoint()); + Api.showPointsOnMap(CityDetailsActivity.this,mCity.getName(), + CityDetailsActivity.getPendingIntent(CityDetailsActivity.this),mCity.toPoint()); } }); @@ -98,10 +98,10 @@ public class CityDetailsActivity extends Activity private void handleIntent(Intent intent) { - if (intent.getBooleanExtra(EXTRA_FROM_OM, false)) + if (intent.getBooleanExtra(EXTRA_FROM_ORGANICMAPS, false)) { - final OMResponse response = OMResponse.extractFromIntent(this, intent); - mCity = City.fromOMPoint(response.getPoint()); + final Response response = Response.extractFromIntent(this, intent); + mCity = City.fromPoint(response.getPoint()); if (mCity != null) { diff --git a/sample-app-capitals/src/main/res/drawable/ic_launcher_foreground.xml b/sample-app-capitals/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..d98c1df --- /dev/null +++ b/sample-app-capitals/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/sample-app-capitals/res/layout/capitals_list_activity.xml b/sample-app-capitals/src/main/res/layout/capitals_list_activity.xml similarity index 97% rename from sample-app-capitals/res/layout/capitals_list_activity.xml rename to sample-app-capitals/src/main/res/layout/capitals_list_activity.xml index 2046e4b..0e9d780 100644 --- a/sample-app-capitals/res/layout/capitals_list_activity.xml +++ b/sample-app-capitals/src/main/res/layout/capitals_list_activity.xml @@ -43,6 +43,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:text="@string/show_all" - android:drawableLeft="@drawable/ic_launcher"/> + android:drawableLeft="@mipmap/ic_launcher"/> diff --git a/sample-app-capitals/res/layout/city_details_activity.xml b/sample-app-capitals/src/main/res/layout/city_details_activity.xml similarity index 98% rename from sample-app-capitals/res/layout/city_details_activity.xml rename to sample-app-capitals/src/main/res/layout/city_details_activity.xml index 73e69a7..473aca4 100644 --- a/sample-app-capitals/res/layout/city_details_activity.xml +++ b/sample-app-capitals/src/main/res/layout/city_details_activity.xml @@ -39,8 +39,8 @@ android:id="@+id/showOnMap" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_launcher" - android:text="@string/open_with_mapswithme" /> + android:drawableLeft="@mipmap/ic_launcher" + android:text="@string/open_with_organicmaps" /> + + + + \ No newline at end of file diff --git a/sample-app-capitals/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample-app-capitals/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/sample-app-capitals/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher.png b/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..119f4d2 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..2c0ebd2 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher.png b/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..bfe29a3 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..92b394a Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..cdec5b5 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..f50796d Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..6b12487 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..bdb586e Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f4f4036 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..08e5084 Binary files /dev/null and b/sample-app-capitals/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/sample-app-capitals/res/values-sw720dp-land/dimens.xml b/sample-app-capitals/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from sample-app-capitals/res/values-sw720dp-land/dimens.xml rename to sample-app-capitals/src/main/res/values-sw720dp-land/dimens.xml diff --git a/sample-app-capitals/res/values-v11/styles.xml b/sample-app-capitals/src/main/res/values-v11/styles.xml similarity index 100% rename from sample-app-capitals/res/values-v11/styles.xml rename to sample-app-capitals/src/main/res/values-v11/styles.xml diff --git a/sample-app-capitals/res/values-v14/styles.xml b/sample-app-capitals/src/main/res/values-v14/styles.xml similarity index 100% rename from sample-app-capitals/res/values-v14/styles.xml rename to sample-app-capitals/src/main/res/values-v14/styles.xml diff --git a/sample-app-capitals/res/values/dimens.xml b/sample-app-capitals/src/main/res/values/dimens.xml similarity index 100% rename from sample-app-capitals/res/values/dimens.xml rename to sample-app-capitals/src/main/res/values/dimens.xml diff --git a/sample-app-capitals/src/main/res/values/ic_launcher_background.xml b/sample-app-capitals/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/sample-app-capitals/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/sample-app-capitals/res/values/strings.xml b/sample-app-capitals/src/main/res/values/strings.xml similarity index 68% rename from sample-app-capitals/res/values/strings.xml rename to sample-app-capitals/src/main/res/values/strings.xml index 50ec7cf..867894a 100644 --- a/sample-app-capitals/res/values/strings.xml +++ b/sample-app-capitals/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ - maps.me capitals - Show all capitals with maps.me - Open with maps.me + Organic Maps Capitals + Show all capitals with Organic Maps + Open with Organic Maps Name: Alternative names: Lat: diff --git a/sample-app-capitals/res/values/styles.xml b/sample-app-capitals/src/main/res/values/styles.xml similarity index 100% rename from sample-app-capitals/res/values/styles.xml rename to sample-app-capitals/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..95bd10c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "Organic Maps API" +include ':sample-app-capitals' +include ':lib'