Skip to content

Commit 4c85b5e

Browse files
broadybroady
committed
Move library to a "library" subproject, add a "demo" subproject
1 parent 41ae685 commit 4c85b5e

27 files changed

+191
-1
lines changed

‎demo/AndroidManifest.xml

Lines changed: 45 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.google.maps.android.utils"
4+
android:versionCode="1"
5+
android:versionName="1.0">
6+
7+
<uses-sdk
8+
android:minSdkVersion="8"
9+
android:targetSdkVersion="17"/>
10+
11+
<permission
12+
android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"
13+
android:protectionLevel="signature"/>
14+
<uses-permission android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"/>
15+
16+
<uses-permission android:name="android.permission.INTERNET"/>
17+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
18+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
19+
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
20+
21+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
22+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
23+
24+
<uses-feature
25+
android:glEsVersion="0x00020000"
26+
android:required="true"/>
27+
28+
<application
29+
android:label="@string/app_name">
30+
31+
<meta-data
32+
android:name="com.google.android.maps.v2.API_KEY"
33+
android:value="AIzaSyDCa5WRSMk3CrNSf3y5xbyQTvp1_zwuTtE"/>
34+
35+
<activity
36+
android:name="MainActivity"
37+
android:label="@string/app_name">
38+
<intent-filter>
39+
<action android:name="android.intent.action.MAIN"/>
40+
<category android:name="android.intent.category.LAUNCHER"/>
41+
</intent-filter>
42+
</activity>
43+
</application>
44+
45+
</manifest>

‎demo/build.gradle

Lines changed: 29 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:0.4.2'
8+
}
9+
}
10+
11+
apply plugin: 'android'
12+
13+
dependencies {
14+
compile project(':library')
15+
compile 'com.google.android.gms:play-services:3.1.36'
16+
}
17+
18+
android {
19+
compileSdkVersion 17
20+
buildToolsVersion "17.0"
21+
22+
sourceSets {
23+
main {
24+
manifest.srcFile 'AndroidManifest.xml'
25+
java.srcDirs = ['src']
26+
res.srcDirs = ['res']
27+
}
28+
}
29+
}

‎demo/demo.iml

Lines changed: 69 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.path="$MODULE_DIR$/../build.gradle" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android" name="Android">
5+
<configuration>
6+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
7+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
8+
</configuration>
9+
</facet>
10+
<facet type="android-gradle" name="Android-Gradle">
11+
<configuration>
12+
<option name="GRADLE_PROJECT_PATH" value=":demo" />
13+
</configuration>
14+
</facet>
15+
</component>
16+
<component name="NewModuleRootManager" inherit-compiler-output="false">
17+
<output url="file://$MODULE_DIR$/build/classes/debug" />
18+
<exclude-output />
19+
<content url="file://$MODULE_DIR$">
20+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
21+
<sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
22+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
23+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
24+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
25+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
26+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
27+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
28+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
29+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
30+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
31+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
32+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
33+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
35+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
51+
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
52+
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
53+
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
54+
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
55+
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
56+
<excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
57+
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
58+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
59+
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
60+
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
62+
</content>
63+
<orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
64+
<orderEntry type="sourceFolder" forTests="false" />
65+
<orderEntry type="library" name="support-v4-13.0.0" level="project" />
66+
<orderEntry type="library" name="library.aar" level="project" />
67+
</component>
68+
</module>
69+

‎demo/res/layout/main.xml

Lines changed: 7 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:map="http://schemas.android.com/apk/res-auto"
4+
android:id="@+id/map"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:name="com.google.android.gms.maps.SupportMapFragment"/>

‎demo/res/values/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">Maps Utils Demo</string>
4+
</resources>

‎demo/src/com/google/maps/android/utils/MainActivity.java

Lines changed: 35 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.google.maps.android.utils;
2+
3+
import android.os.Bundle;
4+
import android.support.v4.app.FragmentActivity;
5+
import com.google.android.gms.maps.GoogleMap;
6+
import com.google.android.gms.maps.SupportMapFragment;
7+
8+
public class MainActivity extends FragmentActivity {
9+
private GoogleMap mMap;
10+
11+
@Override
12+
public void onCreate(Bundle savedInstanceState) {
13+
super.onCreate(savedInstanceState);
14+
setContentView(R.layout.main);
15+
setUpMapIfNeeded();
16+
}
17+
18+
@Override
19+
protected void onResume() {
20+
super.onResume();
21+
setUpMapIfNeeded();
22+
}
23+
24+
private void setUpMapIfNeeded() {
25+
if (mMap != null) {
26+
return;
27+
}
28+
mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap();
29+
if (mMap == null) {
30+
return;
31+
}
32+
// Initialize map options. For example:
33+
// mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
34+
}
35+
}

‎AndroidManifest.xml renamed to ‎library/AndroidManifest.xml

File renamed without changes.

‎build.gradle renamed to ‎library/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
16

16

17
android {
17
android {
18
compileSdkVersion 17
18
compileSdkVersion 17
19-
20
buildToolsVersion "17.0.0"
19
buildToolsVersion "17.0.0"
21

20

22
sourceSets {
21
sourceSets {

‎res/drawable-xhdpi/bubble_blue.9.png renamed to ‎library/res/drawable-xhdpi/bubble_blue.9.png

File renamed without changes.

‎res/drawable-xhdpi/bubble_green.9.png renamed to ‎library/res/drawable-xhdpi/bubble_green.9.png

File renamed without changes.

‎res/drawable-xhdpi/bubble_orange.9.png renamed to ‎library/res/drawable-xhdpi/bubble_orange.9.png

File renamed without changes.

‎res/drawable-xhdpi/bubble_purple.9.png renamed to ‎library/res/drawable-xhdpi/bubble_purple.9.png

File renamed without changes.

‎res/drawable-xhdpi/bubble_red.9.png renamed to ‎library/res/drawable-xhdpi/bubble_red.9.png

File renamed without changes.

‎res/drawable-xhdpi/bubble_white.9.png renamed to ‎library/res/drawable-xhdpi/bubble_white.9.png

File renamed without changes.

‎res/layout/text_bubble.xml renamed to ‎library/res/layout/text_bubble.xml

File renamed without changes.

‎res/values/ids.xml renamed to ‎library/res/values/ids.xml

File renamed without changes.

‎res/values/styles.xml renamed to ‎library/res/values/styles.xml

File renamed without changes.

‎src/com/google/maps/android/PolyUtil.java renamed to ‎library/src/com/google/maps/android/PolyUtil.java

File renamed without changes.

‎src/com/google/maps/android/SphericalUtil.java renamed to ‎library/src/com/google/maps/android/SphericalUtil.java

File renamed without changes.

‎src/com/google/maps/android/projection/Point.java renamed to ‎library/src/com/google/maps/android/projection/Point.java

File renamed without changes.

‎src/com/google/maps/android/projection/SphericalMercatorProjection.java renamed to ‎library/src/com/google/maps/android/projection/SphericalMercatorProjection.java

File renamed without changes.

‎src/com/google/maps/android/ui/BubbleIconFactory.java renamed to ‎library/src/com/google/maps/android/ui/BubbleIconFactory.java

File renamed without changes.

‎src/com/google/maps/android/ui/RotationLayout.java renamed to ‎library/src/com/google/maps/android/ui/RotationLayout.java

File renamed without changes.

‎test/com/google/maps/android/PolyUtilTest.java renamed to ‎library/test/com/google/maps/android/PolyUtilTest.java

File renamed without changes.

‎test/com/google/maps/android/SphericalUtilTest.java renamed to ‎library/test/com/google/maps/android/SphericalUtilTest.java

File renamed without changes.

‎res/drawable-xhdpi/.DS_Store

-6 KB
Binary file not shown.

‎settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberOriginal file lineDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include 'library'
2+
include 'demo'

0 commit comments

Comments
 (0)