Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jgilfelt/android-mapviewballoons
base: 8710140e86
...
head fork: jgilfelt/android-mapviewballoons
compare: c17aec3312
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 2 contributors
View
4 android-mapviewballoons-example/AndroidManifest.xml
@@ -18,7 +18,7 @@
</activity>
<activity
android:label="@string/app_name"
- android:name=".MyMap"/>
+ android:name=".simple.SimpleMap"/>
<activity
android:label="@string/app_name"
android:name=".custom.CustomMap"/>
@@ -32,7 +32,7 @@
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="8" />
-
+
<uses-permission android:name="android.permission.INTERNET" >
</uses-permission>
View
19 android-mapviewballoons-example/src/mapviewballoons/Main.java
@@ -1,6 +1,21 @@
+/***
+ * Copyright (c) 2011 readyState Software Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
package mapviewballoons;
-import mapviewballoons.example.MyMap;
+import mapviewballoons.example.simple.SimpleMap;
import mapviewballoons.example.custom.CustomMap;
import mapviewballoons.example.tapcontrolled.TapControlledMap;
import android.app.ListActivity;
@@ -29,7 +44,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
Intent intent = null;
switch (position) {
case 0:
- intent = new Intent(this, MyMap.class);
+ intent = new Intent(this, SimpleMap.class);
startActivity(intent);
break;
case 1:
View
6 ...rc/mapviewballoons/example/MyItemizedOverlay.java → ...alloons/example/simple/SimpleItemizedOverlay.java
@@ -13,7 +13,7 @@
*
*/
-package mapviewballoons.example;
+package mapviewballoons.example.simple;
import java.util.ArrayList;
@@ -26,12 +26,12 @@
import com.readystatesoftware.mapviewballoons.BalloonItemizedOverlay;
-public class MyItemizedOverlay extends BalloonItemizedOverlay<OverlayItem> {
+public class SimpleItemizedOverlay extends BalloonItemizedOverlay<OverlayItem> {
private ArrayList<OverlayItem> m_overlays = new ArrayList<OverlayItem>();
private Context c;
- public MyItemizedOverlay(Drawable defaultMarker, MapView mapView) {
+ public SimpleItemizedOverlay(Drawable defaultMarker, MapView mapView) {
super(boundCenter(defaultMarker), mapView);
c = mapView.getContext();
}
View
14 ...ns-example/src/mapviewballoons/example/MyMap.java → ...src/mapviewballoons/example/simple/SimpleMap.java
@@ -13,10 +13,12 @@
*
*/
-package mapviewballoons.example;
+package mapviewballoons.example.simple;
import java.util.List;
+import mapviewballoons.example.R;
+
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.Menu;
@@ -29,14 +31,14 @@
import com.google.android.maps.Overlay;
import com.google.android.maps.OverlayItem;
-public class MyMap extends MapActivity {
+public class SimpleMap extends MapActivity {
MapView mapView;
List<Overlay> mapOverlays;
Drawable drawable;
Drawable drawable2;
- MyItemizedOverlay itemizedOverlay;
- MyItemizedOverlay itemizedOverlay2;
+ SimpleItemizedOverlay itemizedOverlay;
+ SimpleItemizedOverlay itemizedOverlay2;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -51,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) {
// first overlay
drawable = getResources().getDrawable(R.drawable.marker);
- itemizedOverlay = new MyItemizedOverlay(drawable, mapView);
+ itemizedOverlay = new SimpleItemizedOverlay(drawable, mapView);
GeoPoint point = new GeoPoint((int)(51.5174723*1E6),(int)(-0.0899537*1E6));
OverlayItem overlayItem = new OverlayItem(point, "Tomorrow Never Dies (1997)",
@@ -67,7 +69,7 @@ public void onCreate(Bundle savedInstanceState) {
// second overlay
drawable2 = getResources().getDrawable(R.drawable.marker2);
- itemizedOverlay2 = new MyItemizedOverlay(drawable2, mapView);
+ itemizedOverlay2 = new SimpleItemizedOverlay(drawable2, mapView);
GeoPoint point3 = new GeoPoint((int)(51.513329*1E6),(int)(-0.08896*1E6));
OverlayItem overlayItem3 = new OverlayItem(point3, "Sliding Doors (1998)", null);
View
10 android-mapviewballoons-example/src/mapviewballoons/example/tapcontrolled/TapControlledMap.java
@@ -17,7 +17,7 @@
import java.util.List;
-import mapviewballoons.example.MyItemizedOverlay;
+import mapviewballoons.example.simple.SimpleItemizedOverlay;
import mapviewballoons.example.R;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
@@ -37,8 +37,8 @@
List<Overlay> mapOverlays;
Drawable drawable;
Drawable drawable2;
- MyItemizedOverlay itemizedOverlay;
- MyItemizedOverlay itemizedOverlay2;
+ SimpleItemizedOverlay itemizedOverlay;
+ SimpleItemizedOverlay itemizedOverlay2;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -62,7 +62,7 @@ public boolean onSingleTap(MotionEvent e) {
// first overlay
drawable = getResources().getDrawable(R.drawable.marker);
- itemizedOverlay = new MyItemizedOverlay(drawable, mapView);
+ itemizedOverlay = new SimpleItemizedOverlay(drawable, mapView);
// set iOS behavior attributes for overlay
itemizedOverlay.setShowClose(false);
itemizedOverlay.setShowDisclosure(true);
@@ -82,7 +82,7 @@ public boolean onSingleTap(MotionEvent e) {
// second overlay
drawable2 = getResources().getDrawable(R.drawable.marker2);
- itemizedOverlay2 = new MyItemizedOverlay(drawable2, mapView);
+ itemizedOverlay2 = new SimpleItemizedOverlay(drawable2, mapView);
// set iOS behavior attributes for overlay
itemizedOverlay2.setShowClose(false);
itemizedOverlay2.setShowDisclosure(true);
View
1  android-mapviewballoons/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

No commit comments for this range

Something went wrong with that request. Please try again.