Deleted temp activity with map

HabitatMap · Sep 9, 2020 · 11d8c18 · 11d8c18
1 parent b8ebb61
commit 11d8c18
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 672 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -67,7 +67,6 @@
     <activity android:label="@string/session_options" android:name=".screens.sessions.OpenFixedSessionActivity" android:theme="@style/Dialog"/>
 
     <activity android:name=".screens.stream.map.AirCastingMapActivity" android:theme="@style/AirCastingTheme" android:launchMode="singleTask" android:screenOrientation="portrait"/>
-    <activity android:name=".screens.stream.map.AirCastingMapActivity2" android:theme="@style/AirCastingTheme" android:launchMode="singleTask" android:screenOrientation="portrait"/>
 
     <activity android:name=".screens.about.AboutActivity" android:theme="@style/AirCastingTheme"/>
 

diff --git a/res/layout/heat_map2.xml b/res/layout/heat_map2.xml
diff --git a/res/layout/map.xml b/res/layout/map.xml
@@ -20,11 +20,13 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <pl.llp.aircasting.screens.stream.map.AirCastingMapView
+    <fragment xmlns:map="http://schemas.android.com/apk/res-auto"
         android:id="@+id/mapview"
-        style="@style/Fill"
-        android:layout_weight="1"
-        android:apiKey="@string/com.google.android.geo.MAPS_KEY"
+        android:name="com.google.android.libraries.maps.SupportMapFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        map:uiZoomControls="true"
+        map:uiZoomGestures="true"
         android:clickable="true" />
 
     <pl.llp.aircasting.screens.stream.TouchPane

diff --git a/src/main/java/pl/llp/aircasting/screens/dashboard/StreamOptionsActivity.java b/src/main/java/pl/llp/aircasting/screens/dashboard/StreamOptionsActivity.java
@@ -10,7 +10,6 @@
 import pl.llp.aircasting.screens.common.base.DialogActivity;
 import pl.llp.aircasting.screens.stream.graph.GraphActivity;
 import pl.llp.aircasting.screens.stream.map.AirCastingMapActivity;
-import pl.llp.aircasting.screens.stream.map.AirCastingMapActivity2;
 import roboguice.inject.InjectView;
 
 /**
@@ -39,7 +38,7 @@ public void onClick(View view) {
                 finish();
                 break;
             case R.id.map_button:
-                startActivity(new Intent(context, AirCastingMapActivity2.class));
+                startActivity(new Intent(context, AirCastingMapActivity.class));
                 finish();
                 break;
         }