xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android samples: remove Android Support dependencies, #32

Browse Source
This commit is contained in:
Emux 2016-07-19 20:49:58 +03:00
parent 11f02128e6
commit 8b599dbf53
10 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm-android-example/AndroidManifest.xml
View File

@ -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>

2
vtm-android-example/build.gradle
View File

@ -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'
}

5
vtm-android-example/res/values/styles.xml
View File

@ -1,5 +0,0 @@
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light" />
</resources>

5
vtm-android-example/src/org/oscim/android/test/MapActivity.java
View File

@ -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());
}
}

6
vtm-android-gdx/AndroidManifest.xml
View File

@ -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" />

11
vtm-android-start/AndroidManifest.xml
View File

@ -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>

2
vtm-android-start/build.gradle
View File

@ -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'
}

4
vtm-android-start/res/values/strings.xml Normal file
View File

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

5
vtm-android-start/res/values/styles.xml
View File

@ -1,5 +0,0 @@
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light" />
</resources>

24
vtm-android-start/src/org/oscim/android/start/TestActivity.java
View File

@ -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());
}
}