[android] - test fragment setupupstream/tvn-fragment-test

3 files changed, 89 insertions, 41 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
index 8f8a5af3cc..c26e5b6e4b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
@@ -1,66 +1,103 @@
 package com.mapbox.mapboxsdk.testapp.activity.maplayout;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
+import timber.log.Timber;
+
 /**
  * Test activity showcasing a simple MapView without any MapboxMap interaction.
  */
 public class SimpleMapActivity extends AppCompatActivity {
 
-  private MapView mapView;
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_map_simple);
-
-    mapView = (MapView) findViewById(R.id.mapView);
-    mapView.onCreate(savedInstanceState);
+    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+    transaction.add(R.id.fragment_container, new MapFragment());
+    transaction.commit();
   }
 
-  @Override
-  protected void onStart() {
-    super.onStart();
-    mapView.onStart();
-  }
+  public static class MapFragment extends Fragment{
 
-  @Override
-  protected void onResume() {
-    super.onResume();
-    mapView.onResume();
-  }
+    private MapView map;
 
-  @Override
-  protected void onPause() {
-    super.onPause();
-    mapView.onPause();
-  }
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+      super.onCreateView(inflater, container, savedInstanceState);
+      return inflater.inflate(R.layout.fragment_map, container, false);
+    }
 
-  @Override
-  protected void onStop() {
-    super.onStop();
-    mapView.onStop();
-  }
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+      super.onViewCreated(view, savedInstanceState);
+      FrameLayout mapFrameLayout = (FrameLayout) view.findViewById(R.id.mapview_container);
+      MapboxMapOptions mapboxMapOptions = new MapboxMapOptions();
+      mapFrameLayout.addView(map = new MapView(view.getContext(), mapboxMapOptions));
+      map.onCreate(savedInstanceState);
+      map.getMapAsync(new OnMapReadyCallback() {
+        @Override
+        public void onMapReady(MapboxMap mapboxMap) {
+          Timber.v("OnMapReady invoked");
+        }
+      });
+    }
 
-  @Override
-  public void onLowMemory() {
-    super.onLowMemory();
-    mapView.onLowMemory();
-  }
+    @Override
+    public void onStart() {
+      super.onStart();
+      map.onStart();
+    }
 
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.onDestroy();
-  }
+    @Override
+    public void onResume() {
+      super.onResume();
+      map.onResume();
+    }
 
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    mapView.onSaveInstanceState(outState);
+    @Override
+    public void onPause() {
+      super.onPause();
+      map.onPause();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+      super.onSaveInstanceState(outState);
+      map.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onStop() {
+      super.onStop();
+      map.onStop();
+    }
+
+    @Override
+    public void onLowMemory() {
+      super.onLowMemory();
+      map.onLowMemory();
+    }
+
+    @Override
+    public void onDestroyView() {
+      super.onDestroyView();
+      map.onDestroy();
+    }
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
index 96a3f5b046..af0831bf36 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml
@@ -7,8 +7,8 @@
     android:orientation="vertical"
     tools:context=".activity.maplayout.SimpleMapActivity">
 
-    <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@id/mapView"
+    <FrameLayout
+        android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_map.xml
new file mode 100644
index 0000000000..037bb2b539
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_map.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/mapview_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
\ No newline at end of file