vtm-android-gdx module, fix #435

vtm-android-gdx/AndroidManifest.xml

@@ -1,26 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.oscim.gdx"
-    android:installLocation="auto"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name">
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest package="org.oscim.gdx" />

vtm-android-gdx/build.gradle

@@ -1,11 +1,8 @@
-apply plugin: 'com.android.application'
+apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 dependencies {
-    api project(':vtm-android')
-    api project(':vtm-gdx')
-    implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
-    runtimeOnly 'com.noveogroup.android:android-logger:1.3.6'
+    api project(':vtm')
 }
 
 android {
@@ -29,14 +26,6 @@ android {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             resources.srcDirs = ['src']
-            aidl.srcDirs = ['src', 'assets']
-            renderscript.srcDirs = ['src', 'assets']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-            file('natives').eachDir() { dir ->
-                jniLibs.srcDirs += "${dir.path}/lib"
-                jniLibs.srcDirs += "${rootDir}/vtm-android/natives/${dir.name}/lib"
-            }
         }
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
@@ -45,7 +34,7 @@ android {
     lintOptions { abortOnError false }
 }
 
-android.applicationVariants.all { variant ->
+android.libraryVariants.all { variant ->
     def name = variant.buildType.name
     if (name == "debug")
         return
@@ -53,7 +42,6 @@ android.applicationVariants.all { variant ->
     def jar = project.tasks.create "jar${name.capitalize()}", Jar
     jar.dependsOn variant.javaCompiler
     jar.from variant.javaCompiler.destinationDir
-    jar.exclude 'android-logger.properties'
     artifacts.add('archives', jar)
 
     file('natives').eachDir() { dir ->
@@ -64,22 +52,6 @@ android.applicationVariants.all { variant ->
     }
 }
 
-afterEvaluate {
-    configurations.archives.artifacts.removeAll { it.file =~ 'apk' }
-}
-
-task run(dependsOn: 'installDebug') {
-    doFirst {
-        println(">> adb run...")
-        String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
-        String cmd = "${adb} shell am start -n org.oscim.gdx/.MainActivity"
-        def proc = cmd.execute()
-        proc.in.eachLine { line -> println line }
-        proc.err.eachLine { line -> System.err.println('ERROR: ' + line) }
-        proc.waitFor()
-    }
-}
-
 if (project.hasProperty("SONATYPE_USERNAME")) {
     afterEvaluate {
         project.apply from: "${rootProject.projectDir}/deploy.gradle"

vtm-android-gdx/res/layout/main.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-</LinearLayout>

vtm-android-gdx/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">VTM GDX</string>
-</resources>

vtm-android-gdx/src/android-logger.properties

@@ -1 +0,0 @@
-root=DEBUG:%logger

vtm-android-gdx/src/org/oscim/gdx/MainActivity.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2013 Hannes Janetzek
- * Copyright 2016-2017 devemux86
- *
- * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.oscim.gdx;
-
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-
-import com.badlogic.gdx.backends.android.AndroidApplication;
-import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-import com.badlogic.gdx.utils.SharedLibraryLoader;
-
-import org.oscim.android.canvas.AndroidGraphics;
-import org.oscim.backend.CanvasAdapter;
-import org.oscim.backend.GLAdapter;
-import org.oscim.core.Tile;
-import org.oscim.tiling.TileSource;
-import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
-
-public class MainActivity extends AndroidApplication {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        AndroidGraphics.init();
-        GdxAssets.init("");
-        GLAdapter.init(new AndroidGL());
-
-        DisplayMetrics metrics = getResources().getDisplayMetrics();
-        CanvasAdapter.dpi = (int) (metrics.scaledDensity * CanvasAdapter.DEFAULT_DPI);
-        Tile.SIZE = Tile.calculateTileSize();
-
-        AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
-        cfg.stencil = 8;
-        cfg.numSamples = 2;
-
-        new SharedLibraryLoader().load("vtm-jni");
-
-        initialize(new GdxMapAndroid(), cfg);
-    }
-
-    class GdxMapAndroid extends GdxMap {
-        @Override
-        public void createLayers() {
-            TileSource ts = new OSciMap4TileSource();
-            initDefaultLayers(ts, true, true, true, getResources().getDisplayMetrics().density);
-        }
-    }
-}