diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com')
4 files changed, 19 insertions, 20 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java index 5bd59507a9..eebd937497 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java @@ -85,6 +85,7 @@ public class PressForMarkerActivity extends AppCompatActivity { if (mapboxMap == null) { return; } + markerList.clear(); mapboxMap.removeAnnotations(); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt index f7569e5fae..c0f93fce1f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt @@ -14,18 +14,30 @@ import kotlinx.android.synthetic.main.activity_backstack_fragment.* */ class FragmentBackStackActivity : AppCompatActivity() { + companion object { + private const val FRAGMENT_TAG = "map_fragment" + } + private lateinit var mapFragment: SupportMapFragment override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_backstack_fragment) - mapFragment = SupportMapFragment.newInstance() - mapFragment.getMapAsync { initMap(it) } + if (savedInstanceState == null) { + mapFragment = SupportMapFragment.newInstance() + mapFragment.getMapAsync { initMap(it) } - supportFragmentManager.beginTransaction().apply { - add(R.id.container, mapFragment) - }.commit() + supportFragmentManager.beginTransaction().apply { + add(R.id.container, mapFragment, FRAGMENT_TAG) + }.commit() + } else { + supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)?.also { fragment -> + if (fragment is SupportMapFragment) { + fragment.getMapAsync { initMap(it) } + } + } + } button.setOnClickListener { handleClick() } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt index 8a8c8939a0..249c4e6ec8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DraggableMarkerActivity.kt @@ -104,7 +104,7 @@ class DraggableMarkerActivity : AppCompatActivity() { } draggableSymbolsManager = DraggableSymbolsManager( - mapView, mapboxMap, featureCollection, source, layerId, 0, actionBarHeight) + mapView, mapboxMap, featureCollection, source, layerId, actionBarHeight, 0) // Adding symbol drag listeners draggableSymbolsManager?.addOnSymbolDragListener(object : DraggableSymbolsManager.OnSymbolDragListener { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java index d2d527f6a7..08b3bce0b9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.testapp.activity.textureview; -import android.view.MenuItem; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.activity.maplayout.DebugModeActivity; @@ -19,19 +18,6 @@ public class TextureViewDebugModeActivity extends DebugModeActivity implements O } @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - // activity uses singleInstance for testing purposes - // code below provides a default navigation when using the app - onBackPressed(); - return true; - } - return super.onOptionsItemSelected(item); - } - - - @Override public void onBackPressed() { // activity uses singleInstance for testing purposes // code below provides a default navigation when using the app |