From a7b6d1f1d8edaf3f88f296f2dc428d0bb935dacb Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 18 Apr 2018 10:46:56 -0500
Subject: [PATCH] Use native snackbar on map view

---
 .../ui/ShareLocationActivity.java             |  35 ++---
 .../res/layout/activity_share_location.xml    | 143 +++++++-----------
 2 files changed, 73 insertions(+), 105 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
index 7f970a2a0..afd5fde7a 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
@@ -8,11 +8,11 @@ import android.location.LocationListener;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.view.View;
 import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.util.GeoPoint;
@@ -25,7 +25,7 @@ import eu.siacs.conversations.ui.widget.MyLocation;
 
 public class ShareLocationActivity extends LocationActivity implements LocationListener {
 
-	private RelativeLayout snackBar;
+	private Snackbar snackBar;
 	private boolean marker_fixed_to_loc = false;
 	private static final String KEY_FIXED_TO_LOC = "fixed_to_loc";
 	private Boolean noAskAgain = false;
@@ -62,18 +62,19 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
 			finish();
 		});
 
-		// Setup the snackbar
-		this.snackBar = findViewById(R.id.snackbar);
-		final TextView snackbarAction = findViewById(R.id.snackbar_action);
-		snackbarAction.setOnClickListener(view -> {
-			if (isLocationEnabledAndAllowed()) {
-				updateUi();
-			} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !hasLocationPermissions()) {
-				requestPermissions(REQUEST_CODE_SNACKBAR_PRESSED);
-			} else if (!isLocationEnabled()) {
-				startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-			}
-		});
+		final CoordinatorLayout snackBarCoordinator = findViewById(R.id.snackbarCoordinator);
+		if (snackBarCoordinator != null) {
+			this.snackBar = Snackbar.make(snackBarCoordinator, R.string.location_disabled, Snackbar.LENGTH_INDEFINITE);
+			snackBar.setAction(R.string.enable, view -> {
+				if (isLocationEnabledAndAllowed()) {
+					updateUi();
+				} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !hasLocationPermissions()) {
+					requestPermissions(REQUEST_CODE_SNACKBAR_PRESSED);
+				} else if (!isLocationEnabled()) {
+					startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+				}
+			});
+		}
 
 		// Setup the share button
 		final Button shareButton = findViewById(R.id.share_button);
@@ -223,9 +224,9 @@ public class ShareLocationActivity extends LocationActivity implements LocationL
 	@Override
 	protected void updateUi() {
 		if (!hasLocationFeature || noAskAgain || isLocationEnabledAndAllowed()) {
-			this.snackBar.setVisibility(View.GONE);
+			this.snackBar.dismiss();
 		} else {
-			this.snackBar.setVisibility(View.VISIBLE);
+			this.snackBar.show();
 		}
 
 		// Setup the fab button
diff --git a/src/main/res/layout/activity_share_location.xml b/src/main/res/layout/activity_share_location.xml
index 96e605aa7..fe73ff86f 100644
--- a/src/main/res/layout/activity_share_location.xml
+++ b/src/main/res/layout/activity_share_location.xml
@@ -1,99 +1,66 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    android:id="@+id/snackbarCoordinator"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.ShareLocationActivity">
-
-    <include layout="@layout/toolbar" />
-
-    <org.osmdroid.views.MapView android:id="@+id/map"
+    android:layout_height="match_parent">
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/button_bar"/>
+        tools:context=".ui.ShareLocationActivity">
 
-    <RelativeLayout
-        android:id="@+id/snackbar"
-        android:layout_width="match_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="48dp"
-        android:visibility="visible">
+        <include layout="@layout/toolbar" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/snackbar_action"
-            android:paddingStart="24dp"
-            android:text="@string/location_disabled"
-            tools:ignore="RtlSymmetry"
-            android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark"/>
-        <TextView
-            android:id="@+id/snackbar_action"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
-            android:paddingLeft="24dp"
-            android:paddingRight="24dp"
-            android:paddingTop="16dp"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:text="@string/enable"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/button_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        tools:ignore="RtlHardcoded">
-
-        <Button
-            android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
-
-        <View
-            android:layout_width="1dp"
+        <org.osmdroid.views.MapView android:id="@+id/map"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/accent"/>
+            android:layout_above="@+id/button_bar"/>
 
-        <Button
-            android:id="@+id/share_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/button_bar"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/share_with"
-            android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
-    </LinearLayout>
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            tools:ignore="RtlHardcoded">
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:src="?attr/icon_gps_fixed"
-        android:layout_alignParentEnd="true"
-        android:layout_above="@+id/button_bar"
-        android:contentDescription="@string/action_unfix_from_location"
-        android:layout_margin="16dp" />
+            <Button
+                android:id="@+id/cancel_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/cancel"
+                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
-</RelativeLayout>
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="7dp"
+                android:layout_marginTop="7dp"
+                android:background="@color/accent"/>
+
+            <Button
+                android:id="@+id/share_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/share_with"
+                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+        </LinearLayout>
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:src="?attr/icon_gps_fixed"
+            android:layout_alignParentEnd="true"
+            android:layout_above="@+id/button_bar"
+            android:contentDescription="@string/action_unfix_from_location"
+            android:layout_margin="16dp" />
+
+    </RelativeLayout>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file