Compare commits
1 commit
master
...
rt-locatio
Author | SHA1 | Date | |
---|---|---|---|
416c956549 |
|
@ -46,6 +46,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
|
|||
private static final String ERROR_LOADING_DIALOG_TAG = "error_loading_dialog";
|
||||
private static final int ERROR_LOADING_DIALOG_REQ_CODE = 234;
|
||||
|
||||
private static final int REQ_CODE_API_RESULT = 10;
|
||||
|
||||
public static final String EXTRA_COUNTRY = "country";
|
||||
|
||||
// Error codes, should match the same codes in JNI
|
||||
|
@ -394,13 +396,28 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
|
|||
intent.putExtra(MwmActivity.EXTRA_TASK, mMapTaskToForward);
|
||||
intent.putExtra(MwmActivity.EXTRA_LAUNCH_BY_DEEP_LINK, true);
|
||||
mMapTaskToForward = null;
|
||||
|
||||
// Wait for the result from MwmActivity for API callers
|
||||
startActivityForResult(intent, REQ_CODE_API_RESULT);
|
||||
return;
|
||||
}
|
||||
|
||||
startActivity(intent);
|
||||
|
||||
finish();
|
||||
}
|
||||
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data)
|
||||
{
|
||||
switch (requestCode)
|
||||
{
|
||||
case REQ_CODE_API_RESULT:
|
||||
setResult(resultCode, data);
|
||||
finish();
|
||||
default:
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
|
||||
private void finishFilesDownload(int result)
|
||||
{
|
||||
if (result == ERR_NO_MORE_FILES)
|
||||
|
|
|
@ -78,7 +78,6 @@ import com.mapswithme.maps.search.SearchFragment;
|
|||
import com.mapswithme.maps.settings.DrivingOptionsActivity;
|
||||
import com.mapswithme.maps.settings.RoadType;
|
||||
import com.mapswithme.maps.settings.SettingsActivity;
|
||||
import com.mapswithme.maps.settings.StoragePathManager;
|
||||
import com.mapswithme.maps.settings.UnitLocale;
|
||||
import com.mapswithme.maps.sound.TtsPlayer;
|
||||
import com.mapswithme.maps.widget.menu.MainMenu;
|
||||
|
@ -158,6 +157,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
|||
@SuppressWarnings("NullableProblems")
|
||||
@NonNull
|
||||
private View mPositionChooser;
|
||||
enum PositionChooserMode {
|
||||
NONE,
|
||||
EDITOR,
|
||||
API
|
||||
};
|
||||
@NonNull
|
||||
private PositionChooserMode mPositionChooserMode = PositionChooserMode.NONE;
|
||||
|
||||
private RoutingPlanInplaceController mRoutingPlanInplaceController;
|
||||
|
||||
|
@ -499,15 +505,34 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
|||
final Toolbar toolbar = mPositionChooser.findViewById(R.id.toolbar_position_chooser);
|
||||
UiUtils.extendViewWithStatusBar(toolbar);
|
||||
UiUtils.showHomeUpButton(toolbar);
|
||||
toolbar.setNavigationOnClickListener(v -> closePositionChooser());
|
||||
toolbar.setNavigationOnClickListener(v -> {
|
||||
closePositionChooser();
|
||||
if (mPositionChooserMode == PositionChooserMode.API)
|
||||
finish();
|
||||
});
|
||||
mPositionChooser.findViewById(R.id.done).setOnClickListener(
|
||||
v ->
|
||||
{
|
||||
switch (mPositionChooserMode)
|
||||
{
|
||||
case API:
|
||||
Intent apiResult = new Intent();
|
||||
double[] center = Framework.nativeGetScreenRectCenter();
|
||||
apiResult.putExtra("lat", center[0]);
|
||||
apiResult.putExtra("lon", center[1]);
|
||||
setResult(Activity.RESULT_OK, apiResult);
|
||||
finish();
|
||||
break;
|
||||
case EDITOR:
|
||||
if (Framework.nativeIsDownloadedMapAtScreenCenter())
|
||||
startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
|
||||
else
|
||||
DialogUtils.showAlertDialog(MwmActivity.this, R.string.message_invalid_feature_position);
|
||||
break;
|
||||
case NONE:
|
||||
throw new IllegalStateException("Unexpected mPositionChooserMode");
|
||||
}
|
||||
closePositionChooser();
|
||||
if (Framework.nativeIsDownloadedMapAtScreenCenter())
|
||||
startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
|
||||
else
|
||||
DialogUtils.showAlertDialog(MwmActivity.this, R.string.message_invalid_feature_position);
|
||||
});
|
||||
UiUtils.hide(mPositionChooser);
|
||||
}
|
||||
|
@ -536,8 +561,19 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
|||
mSearchController.show();
|
||||
}
|
||||
|
||||
public void showPositionChooser(boolean isBusiness, boolean applyPosition)
|
||||
public void showPositionChooserForAPI()
|
||||
{
|
||||
showPositionChooser(PositionChooserMode.API, false, false);
|
||||
}
|
||||
|
||||
public void showPositionChooserForEditor(boolean isBusiness, boolean applyPosition)
|
||||
{
|
||||
showPositionChooser(PositionChooserMode.EDITOR, isBusiness, applyPosition);
|
||||
}
|
||||
|
||||
private void showPositionChooser(PositionChooserMode mode, boolean isBusiness, boolean applyPosition)
|
||||
{
|
||||
mPositionChooserMode = mode;
|
||||
closeFloatingToolbarsAndPanels(false);
|
||||
UiUtils.show(mPositionChooser);
|
||||
setFullscreen(true);
|
||||
|
@ -549,6 +585,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
|||
UiUtils.hide(mPositionChooser);
|
||||
Framework.nativeTurnOffChoosePositionMode();
|
||||
setFullscreen(false);
|
||||
if (mPositionChooserMode == PositionChooserMode.API)
|
||||
finish();
|
||||
mPositionChooserMode = PositionChooserMode.NONE;
|
||||
}
|
||||
|
||||
private void initMap(boolean isLaunchByDeepLink)
|
||||
|
@ -2022,7 +2061,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
|
|||
public void onAddPlaceOptionSelected()
|
||||
{
|
||||
closeFloatingPanels();
|
||||
showPositionChooser(false, false);
|
||||
showPositionChooserForEditor(false, false);
|
||||
}
|
||||
|
||||
public void onDownloadMapsOptionSelected()
|
||||
|
|
|
@ -10,7 +10,6 @@ import androidx.annotation.NonNull;
|
|||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.StringRes;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import com.mapswithme.maps.base.BaseActivity;
|
||||
import com.mapswithme.maps.base.BaseActivityDelegate;
|
||||
|
@ -24,11 +23,13 @@ import com.mapswithme.util.concurrency.UiThread;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
public class SplashActivity extends AppCompatActivity implements BaseActivity
|
||||
public class SplashActivity extends Activity implements BaseActivity
|
||||
{
|
||||
private static final String EXTRA_ACTIVITY_TO_START = "extra_activity_to_start";
|
||||
public static final String EXTRA_INITIAL_INTENT = "extra_initial_intent";
|
||||
private static final int REQUEST_PERMISSIONS = 1;
|
||||
private static final int REQ_CODE_API_RESULT = 10;
|
||||
|
||||
private static final long DELAY = 100;
|
||||
|
||||
private boolean mCanceled = false;
|
||||
|
@ -190,12 +191,31 @@ public class SplashActivity extends AppCompatActivity implements BaseActivity
|
|||
input.getParcelableExtra(EXTRA_INITIAL_INTENT) :
|
||||
input;
|
||||
result.putExtra(EXTRA_INITIAL_INTENT, initialIntent);
|
||||
if (!initialIntent.hasCategory(Intent.CATEGORY_LAUNCHER))
|
||||
{
|
||||
// Wait for the result from MwmActivity for API callers
|
||||
startActivityForResult(result, REQ_CODE_API_RESULT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
Counters.setFirstStartDialogSeen(this);
|
||||
startActivity(result);
|
||||
finish();
|
||||
}
|
||||
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data)
|
||||
{
|
||||
switch (requestCode)
|
||||
{
|
||||
case REQ_CODE_API_RESULT:
|
||||
// Propagate the result to API callers
|
||||
setResult(resultCode, data);
|
||||
finish();
|
||||
default:
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@NonNull
|
||||
public Activity get()
|
||||
|
|
|
@ -8,8 +8,7 @@ import java.lang.annotation.RetentionPolicy;
|
|||
public class ParsingResult
|
||||
{
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
@IntDef({ TYPE_INCORRECT, TYPE_MAP, TYPE_ROUTE, TYPE_SEARCH, TYPE_LEAD, TYPE_CATALOGUE,
|
||||
TYPE_CATALOGUE_PATH, TYPE_SUBSCRIPTION})
|
||||
@IntDef({ TYPE_INCORRECT, TYPE_MAP, TYPE_ROUTE, TYPE_SEARCH, TYPE_LOCATION})
|
||||
public @interface UrlType {}
|
||||
|
||||
// Represents url_scheme::ParsedMapApi::UrlType from c++ part.
|
||||
|
@ -17,10 +16,11 @@ public class ParsingResult
|
|||
public static final int TYPE_MAP = 1;
|
||||
public static final int TYPE_ROUTE = 2;
|
||||
public static final int TYPE_SEARCH = 3;
|
||||
public static final int TYPE_LEAD = 4;
|
||||
public static final int TYPE_CATALOGUE = 5;
|
||||
public static final int TYPE_CATALOGUE_PATH = 6;
|
||||
public static final int TYPE_SUBSCRIPTION = 7;
|
||||
//public static final int TYPE_LEAD = 4;
|
||||
//public static final int TYPE_CATALOGUE = 5;
|
||||
//public static final int TYPE_CATALOGUE_PATH = 6;
|
||||
//public static final int TYPE_SUBSCRIPTION = 7;
|
||||
public static final int TYPE_LOCATION = 8;
|
||||
|
||||
private final int mUrlType;
|
||||
private final boolean mSuccess;
|
||||
|
|
|
@ -2,11 +2,9 @@ package com.mapswithme.maps.intent;
|
|||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Intent;
|
||||
import android.location.Location;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
@ -31,15 +29,10 @@ import com.mapswithme.maps.location.LocationHelper;
|
|||
import com.mapswithme.maps.routing.RoutingController;
|
||||
import com.mapswithme.maps.search.SearchActivity;
|
||||
import com.mapswithme.maps.search.SearchEngine;
|
||||
import com.mapswithme.util.CrashlyticsUtils;
|
||||
import com.mapswithme.util.KeyValue;
|
||||
import com.mapswithme.util.StorageUtils;
|
||||
import com.mapswithme.util.StringUtils;
|
||||
import com.mapswithme.util.UTM;
|
||||
import com.mapswithme.util.Utils;
|
||||
import com.mapswithme.util.concurrency.ThreadPool;
|
||||
import com.mapswithme.util.log.Logger;
|
||||
import com.mapswithme.util.log.LoggerFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
@ -326,9 +319,6 @@ public class Factory
|
|||
switch (result.getUrlType())
|
||||
{
|
||||
case ParsingResult.TYPE_INCORRECT:
|
||||
case ParsingResult.TYPE_CATALOGUE:
|
||||
case ParsingResult.TYPE_CATALOGUE_PATH:
|
||||
case ParsingResult.TYPE_SUBSCRIPTION:
|
||||
return false;
|
||||
|
||||
case ParsingResult.TYPE_MAP:
|
||||
|
@ -358,8 +348,9 @@ public class Factory
|
|||
}
|
||||
SearchActivity.start(target, request.mQuery, request.mLocale, request.mIsSearchOnMap);
|
||||
return true;
|
||||
case ParsingResult.TYPE_LEAD:
|
||||
return true;
|
||||
case ParsingResult.TYPE_LOCATION:
|
||||
target.showPositionChooserForAPI();
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
@ -1272,12 +1272,12 @@ public class PlacePageView extends NestedScrollViewClickFixed
|
|||
|
||||
private void addOrganisation()
|
||||
{
|
||||
getActivity().showPositionChooser(true, false);
|
||||
getActivity().showPositionChooserForEditor(true, false);
|
||||
}
|
||||
|
||||
private void addPlace()
|
||||
{
|
||||
getActivity().showPositionChooser(false, true);
|
||||
getActivity().showPositionChooserForEditor(false, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
15
api/example/android/.gitignore
vendored
Normal file
|
@ -0,0 +1,15 @@
|
|||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
1
api/example/android/app/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
/build
|
33
api/example/android/app/build.gradle
Normal file
|
@ -0,0 +1,33 @@
|
|||
plugins {
|
||||
id 'com.android.application'
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
|
||||
defaultConfig {
|
||||
applicationId "app.organicmaps.api.example"
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||
}
|
21
api/example/android/app/proguard-rules.pro
vendored
Normal file
|
@ -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
|
23
api/example/android/app/src/main/AndroidManifest.xml
Normal file
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest package="app.organicmaps.api.example"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<application
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
BIN
api/example/android/app/src/main/ic_launcher-playstore.png
Normal file
After Width: | Height: | Size: 21 KiB |
|
@ -0,0 +1,59 @@
|
|||
package app.organicmaps.api.example;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.widget.Toast;
|
||||
|
||||
import app.organicmaps.api.example.databinding.ActivityMainBinding;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class MainActivity extends Activity
|
||||
{
|
||||
private ActivityMainBinding binding;
|
||||
|
||||
private static final int REQ_CODE_LOCATION = 1;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState)
|
||||
{
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
binding = ActivityMainBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
|
||||
binding.locationTest.setOnClickListener(view -> {
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("om://location"));
|
||||
startActivityForResult(intent, REQ_CODE_LOCATION);
|
||||
});
|
||||
}
|
||||
|
||||
protected void onActivityResult(int requestCode,
|
||||
int resultCode,
|
||||
Intent data)
|
||||
{
|
||||
switch (requestCode)
|
||||
{
|
||||
case REQ_CODE_LOCATION:
|
||||
if (resultCode == RESULT_CANCELED)
|
||||
{
|
||||
Toast.makeText(this, "Cancelled", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
else if (resultCode != RESULT_OK)
|
||||
{
|
||||
throw new AssertionError("Unsupported resultCode: " + resultCode);
|
||||
}
|
||||
|
||||
double lat = data.getDoubleExtra("lat", 0.0);
|
||||
double lon = data.getDoubleExtra("lon", 0.0);
|
||||
String message = String.format(Locale.ENGLISH, "Result: lat=%.4f lon=%.4f", lat, lon);
|
||||
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
|
||||
break;
|
||||
default:
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,15 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108"
|
||||
android:tint="#006C35">
|
||||
<group android:scaleX="2.931552"
|
||||
android:scaleY="2.931552"
|
||||
android:translateX="18.821377"
|
||||
android:translateY="18.821377">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M14,12l-2,2l-2,-2l2,-2L14,12zM12,6l2.12,2.12l2.5,-2.5L12,1L7.38,5.62l2.5,2.5L12,6zM6,12l2.12,-2.12l-2.5,-2.5L1,12l4.62,4.62l2.5,-2.5L6,12zM18,12l-2.12,2.12l2.5,2.5L23,12l-4.62,-4.62l-2.5,2.5L18,12zM12,18l-2.12,-2.12l-2.5,2.5L12,23l4.62,-4.62l-2.5,-2.5L12,18z"/>
|
||||
</group>
|
||||
</vector>
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<Button
|
||||
android:id="@+id/location_test"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/location_test"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/textview" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textview"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/hello_first"
|
||||
app:layout_constraintBottom_toTopOf="@id/location_test"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
BIN
api/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 3.9 KiB |
BIN
api/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 2.5 KiB |
After Width: | Height: | Size: 5.3 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 8.8 KiB |
After Width: | Height: | Size: 5.7 KiB |
After Width: | Height: | Size: 13 KiB |
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#FFFFFF</color>
|
||||
</resources>
|
6
api/example/android/app/src/main/res/values/strings.xml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<resources>
|
||||
<string name="app_name">Organic Maps API Example</string>
|
||||
<string name="location_test">Location test</string>
|
||||
<string name="hello_first">Hello</string>
|
||||
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
|
||||
</resources>
|
9
api/example/android/build.gradle
Normal file
|
@ -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
|
||||
}
|
21
api/example/android/gradle.properties
Normal file
|
@ -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
|
BIN
api/example/android/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
6
api/example/android/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
|
@ -0,0 +1,6 @@
|
|||
#Sun Jun 05 09:30:45 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
|
185
api/example/android/gradlew
vendored
Executable file
|
@ -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" "$@"
|
89
api/example/android/gradlew.bat
vendored
Normal file
|
@ -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
|
16
api/example/android/settings.gradle
Normal file
|
@ -0,0 +1,16 @@
|
|||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
rootProject.name = "Organic Maps API Example"
|
||||
include ':app'
|
|
@ -92,6 +92,8 @@ ParsedMapApi::UrlType GetUrlType(url::Url const & url)
|
|||
return ParsedMapApi::UrlType::Route;
|
||||
if (type == "search")
|
||||
return ParsedMapApi::UrlType::Search;
|
||||
if (type == "location")
|
||||
return ParsedMapApi::UrlType::Location;
|
||||
|
||||
return ParsedMapApi::UrlType::Incorrect;
|
||||
}
|
||||
|
@ -203,6 +205,10 @@ bool ParsedMapApi::Parse(url::Url const & url, UrlType type)
|
|||
m_request = request;
|
||||
return true;
|
||||
}
|
||||
case UrlType::Location:
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
|
|
@ -50,10 +50,15 @@ class ParsedMapApi
|
|||
public:
|
||||
enum class UrlType
|
||||
{
|
||||
Incorrect,
|
||||
Map,
|
||||
Route,
|
||||
Search,
|
||||
Incorrect = 0,
|
||||
Map = 1,
|
||||
Route = 2,
|
||||
Search = 3,
|
||||
/* Lead = 4, */
|
||||
/* Catalogue = 5, */
|
||||
/* CataloguePath = 6, */
|
||||
/* Subscription = 7, */
|
||||
Location = 8,
|
||||
};
|
||||
|
||||
struct ParsingResult
|
||||
|
|