organicmaps/api-android
13
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity Actions

Rehydrate

Browse source 
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-03-24 10:40:18 +02:00
parent dcd09663de
commit 363d7f07d9
9 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build.gradle
View file

@ -1,16 +1,16 @@
// 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
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
}
project.ext {
minSdkVersion = 21
targetSdkVersion = 31
buildToolsVersion = '32.0.0'
targetSdkVersion = 33
buildToolsVersion = '33.0.2'
javaVersion = JavaVersion.VERSION_11
}
task clean(type: Delete) {
delete rootProject.buildDir
}
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Jun 06 09:48:49 TRT 2022
#Fri Mar 24 10:19:21 EET 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

12
lib/build.gradle
View file

@ -3,6 +3,7 @@ plugins {
}
android {
namespace 'app.organicmaps.api'
compileSdk project.targetSdkVersion
defaultConfig {
@ -25,8 +26,11 @@ android {
}
}
dependencies {
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
}
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
}

3
lib/src/main/AndroidManifest.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="app.organicmaps.api"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<queries>
<package android:name="app.organicmaps"/>
<package android:name="com.mapswithme.maps"/>

9
sample-app-capitals/build.gradle
View file

@ -3,6 +3,7 @@ plugins {
}
android {
namespace 'app.organicmaps.api.sample.capitals'
compileSdk project.targetSdkVersion
defaultConfig {
@ -26,8 +27,12 @@ android {
}
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation project(path: ':lib')
}

3
sample-app-capitals/src/main/AndroidManifest.xml
View file

@ -21,8 +21,7 @@
OF SUCH DAMAGE.
-->
<manifest package="app.organicmaps.api.sample.capitals"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

18
sample-app-capitals/src/main/java/app/organicmaps/api/sample/capitals/CityDetailsActivity.java
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2022, Organic Maps OÜ. All rights reserved.
Copyright (c) 2022-2023, 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,
@ -57,16 +57,16 @@ public class CityDetailsActivity extends Activity
super.onCreate(savedInstanceState);
setContentView(R.layout.city_details_activity);
mName = (TextView) findViewById(R.id.name);
mAltNames = (TextView) findViewById(R.id.altNames);
mCountry = (TextView) findViewById(R.id.cCode);
mName = findViewById(R.id.name);
mAltNames = findViewById(R.id.altNames);
mCountry = findViewById(R.id.cCode);
mLat = (TextView) findViewById(R.id.lat);
mLon = (TextView) findViewById(R.id.lon);
mElev = (TextView) findViewById(R.id.elevation);
mLat = findViewById(R.id.lat);
mLon = findViewById(R.id.lon);
mElev = findViewById(R.id.elevation);
mPopulation = (TextView) findViewById(R.id.population);
mTimeZone = (TextView) findViewById(R.id.timeZone);
mPopulation = findViewById(R.id.population);
mTimeZone = findViewById(R.id.timeZone);
findViewById(R.id.showOnMap).setOnClickListener(v -> {
final Intent intent = new MapRequest()

7
sample-pick-point/build.gradle
View file

@ -3,6 +3,7 @@ plugins {
}
android {
namespace 'app.organicmaps.api.sample.pick_point'
compileSdk project.targetSdkVersion
defaultConfig {
@ -26,7 +27,11 @@ android {
}
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
}
dependencies {
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation project(path: ':lib')
}

3
sample-pick-point/src/main/AndroidManifest.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="app.organicmaps.api.sample.pick_point"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"