Skip to content

Commit

Permalink
refactor: upgrade versions
Browse files Browse the repository at this point in the history
  • Loading branch information
clementgayvallet committed Jul 21, 2023
1 parent 399901f commit 5601ead
Show file tree
Hide file tree
Showing 57 changed files with 1,329 additions and 1,557 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Integrating Jawg Maps with MapLibre GL Android : Examples
# Integrating Jawg Maps with MapLibre GL Android: Examples

Welcome to our example repository to integrate Jawg with MapLibre GL Android.

Don't forget to set your access token in [strings.xml](./app/src/main/res/values/strings.xml).
If you don't have any access token yet, get one on [Jawg Lab](https://jawg.io/lab).

## Examples description :
## Examples description:

[SimpleMapActivity](./app/src/main/java/io/jawg/SimpleMapActivity.kt) : Displaying a simple dynamic map.
[SimpleMapActivity](./app/src/main/kotlin/io/jawg/example/maplibre/SimpleMapActivity.kt) : Displaying a simple dynamic map.

[MarkerMapActivity](./app/src/main/java/io/jawg/MarkerMapActivity.kt) : Adding a simple marker on a map.
[MarkerMapActivity](./app/src/main/kotlin/io/jawg/example/maplibre/MarkerMapActivity.kt) : Adding a simple marker on a map.

[PopupMapActivity](./app/src/main/java/io/jawg/PopupMapActivity.kt) : Adding a popup with markers on a map.
[PopupMapActivity](./app/src/main/kotlin/io/jawg/example/maplibre/PopupMapActivity.kt) : Adding a popup with markers on a map.

[GeometryMapActivity](./app/src/main/java/io/jawg/GeometryMapActivity.kt) : Adding geometry on your map with GeoJSON.
[GeometryMapActivity](./app/src/main/kotlin/io/jawg/example/maplibre/GeometryMapActivity.kt) : Adding geometry on your map with GeoJSON.

[SwitchLanguagesActivity](./app/src/main/java/io/jawg/SwitchLanguagesActivity.kt) : Changing your map's language.
[SwitchLanguagesActivity](./app/src/main/kotlin/io/jawg/example/maplibre/SwitchLanguagesActivity.kt) : Changing your map's language.

[DifferentStylesActivity](./app/src/main/java/io/jawg/DifferentStylesActivity.kt) : Changing your map style using our default styles.
[DifferentStylesActivity](./app/src/main/kotlin/io/jawg/example/maplibre/DifferentStylesActivity.kt) : Changing your map style using our default styles.

[CustomStyleActivity](./app/src/main/java/io/jawg/CustomStyleActivity.kt) : Using a custom style from [Jawg Lab](https://jawg.io/lab) on your map.
[CustomStyleActivity](./app/src/main/kotlin/io/jawg/example/maplibre/CustomStyleActivity.kt) : Using a custom style from [Jawg Lab](https://jawg.io/lab) on your map.

> You'll need to set a style ID in `CustomStyleActivity` to make this example work.
>
Expand Down
39 changes: 0 additions & 39 deletions app/build.gradle

This file was deleted.

49 changes: 49 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
}

android {
namespace = "io.jawg.example.maplibre"
compileSdk = 33

defaultConfig {
applicationId = "io.jawg.example.maplibre"
minSdk = 33
targetSdk = 33
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
}
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android.txt"),
"proguard-rules.pro"
)
}

}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

dependencies {
implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation("org.maplibre.gl:android-sdk:10.2.0")
implementation("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}
24 changes: 0 additions & 24 deletions app/src/androidTest/java/io/jawg/ExampleInstrumentedTest.kt

This file was deleted.

25 changes: 12 additions & 13 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.jawg">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
android:icon="@drawable/ic_jawg_gradient"
android:label="@string/app_name"
android:roundIcon="@drawable/ic_jawg_gradient"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".SimpleMapActivity"></activity>
<activity android:name=".DifferentStylesActivity"></activity>
<activity android:name=".GeometryMapActivity"></activity>
<activity android:name=".PopupMapActivity"></activity>
<activity android:name=".SwitchLanguagesActivity"></activity>
<activity android:name=".CustomStyleActivity"></activity>
<activity android:name=".MarkerMapActivity"></activity>
<activity android:name=".DataMapActivity"></activity>
<activity android:name=".SimpleMapActivity" />
<activity android:name=".DifferentStylesActivity" />
<activity android:name=".GeometryMapActivity" />
<activity android:name=".PopupMapActivity" />
<activity android:name=".SwitchLanguagesActivity" />
<activity android:name=".CustomStyleActivity" />
<activity android:name=".MarkerMapActivity" />
<activity android:name=".DataMapActivity" />

<meta-data
android:name="preloaded_fonts"
Expand Down
102 changes: 0 additions & 102 deletions app/src/main/java/io/jawg/CustomStyleActivity.kt

This file was deleted.

95 changes: 0 additions & 95 deletions app/src/main/java/io/jawg/DifferentStylesActivity.kt

This file was deleted.

Loading

0 comments on commit 5601ead

Please sign in to comment.