Samples: reorganize Android / Java sample apps #724

build.gradle

@@ -46,7 +46,7 @@ subprojects {
 
 // Configuration for all plain Java projects
 
-project.ext.javaprojects = ["mapsforge-core", "mapsforge-map", "mapsforge-map-reader", "mapsforge-map-awt", "mapsforge-map-writer", "mapsforge-poi", "mapsforge-poi-awt", "mapsforge-poi-writer", "SwingMapViewer"]
+project.ext.javaprojects = ["mapsforge-core", "mapsforge-map", "mapsforge-map-reader", "mapsforge-map-awt", "mapsforge-map-writer", "mapsforge-poi", "mapsforge-poi-awt", "mapsforge-poi-writer", "mapsforge-samples-awt"]
 
 configure(filterProjects(project.javaprojects)) {
     apply plugin: 'java'
@@ -70,7 +70,7 @@ configure(filterProjects(project.javaprojects)) {
 
 // Configuration for Android projects
 project.ext.androidlibraryprojects = ["mapsforge-map-android", "mapsforge-map-android-extras", "sqlite3-android", "mapsforge-poi-android"]
-project.ext.androidapkprojects = ["Samples"]
+project.ext.androidapkprojects = ["mapsforge-samples-android"]
 project.ext.androidprojects = project.androidlibraryprojects + project.androidapkprojects
 
 // TODO get checkstyle and pmd working for android (right now it does not work out of the box, so better wait for official fix)

docs/Changelog.md

@@ -2,14 +2,15 @@
 
 ## New since 0.6.0
 
-- POI Search [#728](https://github.com/mapsforge/mapsforge/issues/728)
+- POI API [#728](https://github.com/mapsforge/mapsforge/issues/728)
 - Reverse Geocoding example [#727](https://github.com/mapsforge/mapsforge/issues/727)
-- LabelLayer improved implementation [#763](https://github.com/mapsforge/mapsforge/issues/763)
+- LabelLayer enhanced implementation [#763](https://github.com/mapsforge/mapsforge/issues/763)
 - Color filters in map rendering [#778](https://github.com/mapsforge/mapsforge/issues/778)
 - Night mode example [#777](https://github.com/mapsforge/mapsforge/issues/777)
 - Library integration [documentation](Integration.md) [#781](https://github.com/mapsforge/mapsforge/issues/781)
 - Jar with dependencies building [#767](https://github.com/mapsforge/mapsforge/issues/767)
-- Improve code formatting [#782](https://github.com/mapsforge/mapsforge/issues/782)
+- Sample applications reorganization [#724](https://github.com/mapsforge/mapsforge/issues/724)
+- Code formatting improvements [#782](https://github.com/mapsforge/mapsforge/issues/782)
 - Many other minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/mapsforge/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.6.1)
 

Applications/Android/Samples/AndroidManifest.xml → mapsforge-samples-android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mapsforge.applications.android.samples"
+    package="org.mapsforge.samples.android"
     android:installLocation="auto"
     android:versionCode="60"
     android:versionName="dev-SNAPSHOT">
@@ -97,10 +97,10 @@
             android:name=".ItemListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="Fragments Item List"
-            android:parentActivityName="org.mapsforge.applications.android.samples.Samples">
+            android:parentActivityName=".Samples">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.mapsforge.applications.android.samples.Samples" />
+                android:value=".Samples" />
         </activity>
         <activity
             android:name=".LabelLayerUsingLabelCacheMapViewer"