reworked location services from GoogleMap to OSM

2 files changed, 18 insertions, 62 deletions

diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
index 7505e9b99..c9a146825 100644
--- a/src/main/res/layout/activity_share_locaction.xml
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/ripple_material_dark">
+    tools:context="ui.ShareLocationActivity">
 
-    <fragment
-        android:name="com.google.android.gms.maps.MapFragment"
-        android:id="@+id/map_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <WebView
+        android:id="@+id/webView"
         android:layout_above="@+id/snackbar"
-        map:mapType="normal"
-        map:uiCompass="true"
-        map:uiRotateGestures="false"
-        map:uiScrollGestures="true"
-        map:uiTiltGestures="false"
-        map:uiZoomControls="false"
-        map:uiZoomGestures="true"
-        tools:ignore="MissingPrefix" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </WebView>
 
     <RelativeLayout
         android:id="@+id/snackbar"
@@ -32,7 +23,7 @@
         android:layout_above="@+id/button_bar"
         android:background="@drawable/snackbar"
         android:minHeight="48dp"
-        android:visibility="visible">
+        android:visibility="visible" >
 
         <TextView
             android:layout_width="wrap_content"
@@ -41,9 +32,9 @@
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/snackbar_action"
             android:paddingLeft="24dp"
-            android:textColor="@color/grey50"
+            android:textColor="@color/white"
             android:textSize="?attr/TextSizeBody"
-            android:text="@string/location_sharing_disabled" />
+            android:text="@string/location_sharing_disabled"/>
 
         <TextView
             android:id="@+id/snackbar_action"
@@ -54,38 +45,13 @@
             android:paddingRight="24dp"
             android:paddingTop="16dp"
             android:textAllCaps="true"
-            android:textColor="@color/grey50"
+            android:textColor="@color/white"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold"
             android:text="@string/enable"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/snackbar_location"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_above="@+id/button_bar"
-        android:background="@drawable/snackbar"
-        android:minHeight="24dp"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@id/snackbar_location_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="24dp"
-            android:textColor="@color/grey50"
-            android:textSize="?attr/TextSizeBody"
-            android:layout_centerVertical="true" />
-
+            android:layout_alignParentEnd="true"/>
     </RelativeLayout>
 
     <LinearLayout
@@ -120,6 +86,6 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/share"
-            android:textColor="@color/secondary_text_disabled_material_light" />
+            android:textColor="@color/primary" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml
index 32e177b33..5e164b407 100644
--- a/src/main/res/layout/activity_show_locaction.xml
+++ b/src/main/res/layout/activity_show_locaction.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context="ui.ShowLocationActivity">
 
-    <fragment
-
-        android:name="com.google.android.gms.maps.MapFragment"
-        android:id="@+id/map_fragment"
+    <WebView
+        android:id="@+id/webView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        map:mapType="normal"
-        map:uiCompass="true"
-        map:uiRotateGestures="false"
-        map:uiScrollGestures="true"
-        map:uiTiltGestures="false"
-        map:uiZoomControls="false"
-        map:uiZoomGestures="true"
-        tools:ignore="MissingPrefix" />
-
+        android:layout_height="match_parent">
+    </WebView>
 </RelativeLayout>
\ No newline at end of file