From 8b599dbf53dfafe02be8be80ed1e46dbd2067d23 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 19 Jul 2016 20:49:58 +0300
Subject: [PATCH] Android samples: remove Android Support dependencies, #32

---
 vtm-android-example/AndroidManifest.xml       |  4 +---
 vtm-android-example/build.gradle              |  2 --
 vtm-android-example/res/values/styles.xml     |  5 ----
 .../org/oscim/android/test/MapActivity.java   |  5 ++--
 vtm-android-gdx/AndroidManifest.xml           |  6 ++---
 vtm-android-start/AndroidManifest.xml         | 11 ++++-----
 vtm-android-start/build.gradle                |  2 --
 vtm-android-start/res/values/strings.xml      |  4 ++++
 vtm-android-start/res/values/styles.xml       |  5 ----
 .../org/oscim/android/start/TestActivity.java | 24 ++++++++++++++-----
 10 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 vtm-android-example/res/values/styles.xml
 create mode 100644 vtm-android-start/res/values/strings.xml
 delete mode 100644 vtm-android-start/res/values/styles.xml

diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
index caf598d7..e5d6b64d 100644
--- a/vtm-android-example/AndroidManifest.xml
+++ b/vtm-android-example/AndroidManifest.xml
@@ -17,14 +17,12 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:label="@string/app_name">
         <activity
             android:name=".Samples"
             android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
index b6d8379f..95936e38 100644
--- a/vtm-android-example/build.gradle
+++ b/vtm-android-example/build.gradle
@@ -6,8 +6,6 @@ dependencies {
     compile project(':vtm-jeo')
     compile project(':vtm-jts')
     compile project(':vtm-themes')
-    compile 'com.android.support:support-v4:24.0.0'
-    compile 'com.android.support:appcompat-v7:24.0.0'
     compile 'com.noveogroup.android:android-logger:1.3.6'
 }
 
diff --git a/vtm-android-example/res/values/styles.xml b/vtm-android-example/res/values/styles.xml
deleted file mode 100644
index 76c49238..00000000
--- a/vtm-android-example/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light" />
-
-</resources>
\ No newline at end of file
diff --git a/vtm-android-example/src/org/oscim/android/test/MapActivity.java b/vtm-android-example/src/org/oscim/android/test/MapActivity.java
index 0acb6421..55a88a03 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapActivity.java
@@ -16,14 +16,14 @@
  */
 package org.oscim.android.test;
 
+import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
 import org.oscim.android.MapPreferences;
 import org.oscim.android.MapView;
 import org.oscim.map.Map;
 
-public abstract class MapActivity extends AppCompatActivity {
+public class MapActivity extends Activity {
     MapView mMapView;
     Map mMap;
     MapPreferences mPrefs;
@@ -64,5 +64,4 @@ public abstract class MapActivity extends AppCompatActivity {
         mMapView.onPause();
         mPrefs.save(mMapView.map());
     }
-
 }
diff --git a/vtm-android-gdx/AndroidManifest.xml b/vtm-android-gdx/AndroidManifest.xml
index 078bc6e6..bb4f7d78 100644
--- a/vtm-android-gdx/AndroidManifest.xml
+++ b/vtm-android-gdx/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?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">
 
@@ -16,12 +17,9 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
-
         <activity
             android:name=".MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait">
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/vtm-android-start/AndroidManifest.xml b/vtm-android-start/AndroidManifest.xml
index d6fce553..87eb3f77 100644
--- a/vtm-android-start/AndroidManifest.xml
+++ b/vtm-android-start/AndroidManifest.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.oscim.android.start"
+    android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0">
 
@@ -15,14 +16,12 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="VTM Start"
-        android:theme="@style/AppTheme">
+        android:label="@string/app_name">
         <activity
-            android:name="org.oscim.android.start.TestActivity"
-            android:label="VTM Start">
+            android:name=".TestActivity"
+            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>
diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle
index 2cf1444d..ac005775 100644
--- a/vtm-android-start/build.gradle
+++ b/vtm-android-start/build.gradle
@@ -3,8 +3,6 @@ apply plugin: 'com.android.application'
 dependencies {
     compile project(':vtm-android')
     compile project(':vtm-themes')
-    compile 'com.android.support:support-v4:24.0.0'
-    compile 'com.android.support:appcompat-v7:24.0.0'
     compile 'com.noveogroup.android:android-logger:1.3.6'
 }
 
diff --git a/vtm-android-start/res/values/strings.xml b/vtm-android-start/res/values/strings.xml
new file mode 100644
index 00000000..ec18999d
--- /dev/null
+++ b/vtm-android-start/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">VTM Start</string>
+</resources>
\ No newline at end of file
diff --git a/vtm-android-start/res/values/styles.xml b/vtm-android-start/res/values/styles.xml
deleted file mode 100644
index 76c49238..00000000
--- a/vtm-android-start/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light" />
-
-</resources>
\ No newline at end of file
diff --git a/vtm-android-start/src/org/oscim/android/start/TestActivity.java b/vtm-android-start/src/org/oscim/android/start/TestActivity.java
index 1f7bd2cb..37ad0e25 100644
--- a/vtm-android-start/src/org/oscim/android/start/TestActivity.java
+++ b/vtm-android-start/src/org/oscim/android/start/TestActivity.java
@@ -1,7 +1,23 @@
+/*
+ * Copyright 2016 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.android.start;
 
+import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 
 import org.oscim.android.MapPreferences;
 import org.oscim.android.MapView;
@@ -11,11 +27,8 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.map.Map;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class TestActivity extends ActionBarActivity {
-    public static final Logger log = LoggerFactory.getLogger(TestActivity.class);
+public class TestActivity extends Activity {
     MapView mMapView;
     MapPreferences mPrefs;
 
@@ -48,5 +61,4 @@ public class TestActivity extends ActionBarActivity {
         mMapView.onPause();
         mPrefs.save(mMapView.map());
     }
-
 }