From 9730c5e1cdfa7a380dd70419c84ef9e201233f1e Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 27 May 2016 20:51:28 +0200
Subject: rename share/show location layout files

---
 .../conversations/ui/ShareLocationActivity.java    |   2 +-
 .../conversations/ui/ShowLocationActivity.java     |   2 +-
 src/main/res/layout/activity_share_locaction.xml   | 124 +++++++++++++++++++++
 src/main/res/layout/activity_show_locaction.xml    |  23 ++++
 src/main/res/layout/share_locaction_activity.xml   | 124 ---------------------
 src/main/res/layout/show_locaction_activity.xml    |  23 ----
 6 files changed, 149 insertions(+), 149 deletions(-)
 create mode 100644 src/main/res/layout/activity_share_locaction.xml
 create mode 100644 src/main/res/layout/activity_show_locaction.xml
 delete mode 100644 src/main/res/layout/share_locaction_activity.xml
 delete mode 100644 src/main/res/layout/show_locaction_activity.xml

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
index 38d94f8c6..c7cb4fe7d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
@@ -55,7 +55,7 @@ public class ShareLocationActivity extends Activity implements OnMapReadyCallbac
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.share_locaction_activity);
+		setContentView(R.layout.activity_share_locaction);
 		MapFragment fragment = (MapFragment) getFragmentManager().findFragmentById(R.id.map_fragment);
 		fragment.getMapAsync(this);
 		mGoogleApiClient = new GoogleApiClient.Builder(this)
diff --git a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
index d5103de9b..f8f760aa3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
@@ -64,7 +64,7 @@ public class ShowLocationActivity extends Activity implements OnMapReadyCallback
 			actionBar.setDisplayHomeAsUpEnabled(true);
 		}
 
-		setContentView(R.layout.show_locaction_activity);
+		setContentView(R.layout.activity_show_locaction);
 		MapFragment fragment = (MapFragment) getFragmentManager().findFragmentById(R.id.map_fragment);
 		fragment.getMapAsync(this);
 	}
diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
new file mode 100644
index 000000000..b360b649c
--- /dev/null
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -0,0 +1,124 @@
+<?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">
+    <fragment
+        android:name="com.google.android.gms.maps.MapFragment"
+        android:id="@+id/map_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/snackbar"
+        map:mapType="normal"
+        map:uiCompass="false"
+        map:uiRotateGestures="false"
+        map:uiScrollGestures="true"
+        map:uiTiltGestures="false"
+        map:uiZoomControls="false"
+        map:uiZoomGestures="true"
+        tools:ignore="MissingPrefix"/>
+
+    <RelativeLayout
+        android:id="@+id/snackbar"
+        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="48dp"
+        android:visibility="visible" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/snackbar_action"
+            android:paddingLeft="24dp"
+            android:textColor="@color/grey50"
+            android:textSize="?attr/TextSizeBody"
+            android:text="@string/location_sharing_disabled"/>
+
+        <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:textColor="@color/grey50"
+            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" />
+
+    </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" >
+
+        <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:textColor="@color/primary" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="7dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/primary" />
+
+        <Button
+            android:id="@+id/share_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:enabled="false"
+            android:text="@string/share"
+            android:textColor="@color/secondary_text_disabled_material_light" />
+    </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
new file mode 100644
index 000000000..d22422015
--- /dev/null
+++ b/src/main/res/layout/activity_show_locaction.xml
@@ -0,0 +1,23 @@
+<?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">
+
+    <fragment
+
+        android:name="com.google.android.gms.maps.MapFragment"
+        android:id="@+id/map_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        map:mapType="normal"
+        map:uiCompass="false"
+        map:uiRotateGestures="false"
+        map:uiScrollGestures="true"
+        map:uiTiltGestures="false"
+        map:uiZoomControls="false"
+        map:uiZoomGestures="true"
+        tools:ignore="MissingPrefix"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/share_locaction_activity.xml b/src/main/res/layout/share_locaction_activity.xml
deleted file mode 100644
index b360b649c..000000000
--- a/src/main/res/layout/share_locaction_activity.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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">
-    <fragment
-        android:name="com.google.android.gms.maps.MapFragment"
-        android:id="@+id/map_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/snackbar"
-        map:mapType="normal"
-        map:uiCompass="false"
-        map:uiRotateGestures="false"
-        map:uiScrollGestures="true"
-        map:uiTiltGestures="false"
-        map:uiZoomControls="false"
-        map:uiZoomGestures="true"
-        tools:ignore="MissingPrefix"/>
-
-    <RelativeLayout
-        android:id="@+id/snackbar"
-        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="48dp"
-        android:visibility="visible" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/snackbar_action"
-            android:paddingLeft="24dp"
-            android:textColor="@color/grey50"
-            android:textSize="?attr/TextSizeBody"
-            android:text="@string/location_sharing_disabled"/>
-
-        <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:textColor="@color/grey50"
-            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" />
-
-    </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" >
-
-        <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:textColor="@color/primary" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="fill_parent"
-            android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/primary" />
-
-        <Button
-            android:id="@+id/share_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:enabled="false"
-            android:text="@string/share"
-            android:textColor="@color/secondary_text_disabled_material_light" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/show_locaction_activity.xml b/src/main/res/layout/show_locaction_activity.xml
deleted file mode 100644
index d22422015..000000000
--- a/src/main/res/layout/show_locaction_activity.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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">
-
-    <fragment
-
-        android:name="com.google.android.gms.maps.MapFragment"
-        android:id="@+id/map_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        map:mapType="normal"
-        map:uiCompass="false"
-        map:uiRotateGestures="false"
-        map:uiScrollGestures="true"
-        map:uiTiltGestures="false"
-        map:uiZoomControls="false"
-        map:uiZoomGestures="true"
-        tools:ignore="MissingPrefix"/>
-
-</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3