Android 15 (#1141)

mapsforge · Oct 15, 2024 · e5a1d66 · e5a1d66
1 parent 48c8c12
commit e5a1d66
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,11 +19,11 @@ allprojects {
     }
 }
 
-static def androidCompileSdk() { return 34 }
+static def androidCompileSdk() { return 35 }
 
 static def androidMinSdk() { return 21 }
 
-static def androidTargetSdk() { return 34 }
+static def androidTargetSdk() { return 35 }
 
 static def versionCode() { return 1 }
 

diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:theme="@style/AppThemeLight"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".Samples"

diff --git a/vtm-android-example/res/values/styles.xml b/vtm-android-example/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="AppThemeDark" parent="android:Theme.Material">
+        <item name="android:fitsSystemWindows" tools:targetApi="VANILLA_ICE_CREAM">true</item>
+    </style>
+
+    <style name="AppThemeLight" parent="android:Theme.Material.Light.DarkActionBar">
+        <item name="android:fitsSystemWindows" tools:targetApi="VANILLA_ICE_CREAM">true</item>
+    </style>
+
+</resources>
diff --git a/vtm-android-example/src/org/oscim/android/test/GettingStarted.java b/vtm-android-example/src/org/oscim/android/test/GettingStarted.java
@@ -52,8 +52,8 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Map view
-        mapView = new MapView(this);
-        setContentView(mapView);
+        setContentView(R.layout.activity_map);
+        mapView = findViewById(R.id.mapView);
 
         // Open map
         Intent intent = new Intent(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_GET_CONTENT);