tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed SecondMapActivity to InfoWindowAdapterActivity

Browse Source
This commit is contained in:
Tobrun
2015-10-07 12:06:28 +02:00
committed by Brad Leege
parent d475b1cc0f
commit 0b23eb1204
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java → android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
View File

@@ -15,17 +15,17 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
/**
* Tests on SecondMapActivity.
* Tests on InfoWindowAdapterActivity.
*/
@RunWith(AndroidJUnit4.class)
@LargeTest
public class SecondMapActivityTest extends BaseTest {
public class InfoWindowAdapterActivityTest extends BaseTest {
@Rule
public ActivityTestRule<SecondMapActivity> mActivityRule = new ActivityTestRule<>(
SecondMapActivity.class);
public ActivityTestRule<InfoWindowAdapterActivity> mActivityRule = new ActivityTestRule<>(
InfoWindowAdapterActivity.class);
private SecondMapActivity mActivity = null;
private InfoWindowAdapterActivity mActivity = null;
@Before
public void setActivity() {

2
android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
View File

@@ -17,7 +17,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.mapbox.mapboxsdk.testapp.SecondMapActivity" android:label="@string/activity_second"/>
<activity android:name=".InfoWindowAdapterActivity" android:label="@string/activity_second"/>
<meta-data
android:name="io.fabric.ApiKey"
android:value="9724157045ff7d083492c6d9ae03e60e8609d461" />

6
android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java → android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
View File

@@ -19,9 +19,9 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
public class SecondMapActivity extends AppCompatActivity {
public class InfoWindowAdapterActivity extends AppCompatActivity {
private static final String TAG = "SecondMapActivity";
private static final String TAG = "InfoWindowAdapter";
private MapView mMapView;
@@ -58,7 +58,7 @@ public class SecondMapActivity extends AppCompatActivity {
@Override
public View getInfoWindow(Marker marker) {
TextView textView = new TextView(SecondMapActivity.this);
TextView textView = new TextView(InfoWindowAdapterActivity.this);
textView.setText(marker.getTitle());
textView.setBackgroundColor(Color.WHITE);
return textView;

4
android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
View File

@@ -4,7 +4,6 @@ import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.PointF;
import android.location.Location;
import android.os.Bundle;
import android.support.annotation.NonNull;
@@ -19,7 +18,6 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.GestureDetector;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
@@ -292,7 +290,7 @@ public class MainActivity extends AppCompatActivity {
return true;
case R.id.action_second_map_activity:
startActivity(new Intent(getApplicationContext(), SecondMapActivity.class));
startActivity(new Intent(getApplicationContext(), InfoWindowAdapterActivity.class));
return true;
/*

12
android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
View File

@@ -19,12 +19,6 @@
android:icon="@android:drawable/ic_menu_compass"
android:title="@string/action_compass" />
<item
android:id="@+id/action_second_map_activity"
android:checkable="false"
android:icon="@drawable/ic_looks_two_white_24dp"
android:title="@string/action_second_map_activity" />
<!--
<group android:id="@+id/locationFollowModesSeparator"/>
@@ -66,4 +60,10 @@
</group>
<item
android:id="@+id/action_second_map_activity"
android:checkable="false"
android:icon="@drawable/ic_looks_two_white_24dp"
android:title="@string/action_info_window_adapter" />
</menu>

2
android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
View File

@@ -12,7 +12,7 @@
<string name="action_compass">Toggle compass</string>
<string name="action_debug">Toggle debug mode</string>
<string name="action_point_annotations">Toggle point annotations</string>
<string name="action_second_map_activity">Launch 2nd Map</string>
<string name="action_info_window_adapter">InfoWindow Adapter</string>
<string name="label_fps">FPS:</string>