From e2a836e7a82892c13d67f0767070c99007394186 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 16:28:24 -0600
Subject: Added fake close button to unit_map_fragment.xml

---
 androidApp/src/main/res/drawable/icon_close.xml    | 10 +++++
 .../src/main/res/layout/unit_map_fragment.xml      | 45 ++++++++++++++++------
 androidApp/src/main/res/values-es-rMX/strings.xml  |  3 +-
 androidApp/src/main/res/values/strings.xml         |  1 +
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 androidApp/src/main/res/drawable/icon_close.xml

diff --git a/androidApp/src/main/res/drawable/icon_close.xml b/androidApp/src/main/res/drawable/icon_close.xml
new file mode 100644
index 0000000..16d6d37
--- /dev/null
+++ b/androidApp/src/main/res/drawable/icon_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 8395013..e2bee95 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -30,20 +30,25 @@
         app:contentPaddingTop="@dimen/card_padding"
         app:contentPaddingLeft="@dimen/card_padding"
         app:contentPaddingRight="@dimen/card_padding"
-        android:visibility="gone">
+        android:animateLayoutChanges="true"
+        android:visibility="gone"
+        tools:visibility="visible">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:animateLayoutChanges="true">
+            android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/titleLayout"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toStartOf="@+id/closeButton"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
                     android:id="@+id/statusIcon"
@@ -58,24 +63,36 @@
                     android:id="@+id/engineStopIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     android:layout_marginEnd="5dp"
                     android:src="@drawable/device_unlocked"
+                    android:visibility="gone"
                     tools:ignore="ContentDescription" />
 
                 <TextView
                     android:id="@+id/unitName"
+                    style="@style/TextAppearance.AppCompat.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.AppCompat.Body2"
                     tools:text="1AAUTO" />
 
             </LinearLayout>
 
+            <ImageView
+                android:id="@+id/closeButton"
+                android:layout_width="14sp"
+                android:layout_height="14sp"
+                android:contentDescription="@string/shared_close"
+                android:src="@drawable/icon_close"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <GridLayout
                 android:id="@+id/gridLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/titleLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
             <LinearLayout
                 android:id="@+id/itemOptions"
@@ -84,7 +101,11 @@
                 android:layout_marginVertical="@dimen/padding"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:visibility="visible">
+                android:visibility="visible"
+                app:layout_constraintTop_toBottomOf="@id/gridLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/detailsButton"
@@ -118,7 +139,7 @@
 
             </LinearLayout>
 
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index f843c29..d228c28 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -2,7 +2,8 @@
 <resources>
     <!-- Shared strings -->
     <string name="shared_ok">OK</string>
-    <string name="shared_cancel">Cancel</string>
+    <string name="shared_cancel">Cancelar</string>
+    <string name="shared_close">Cerrar</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Nombre de usuario</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 60547d3..d2c6148 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <!-- Shared strings -->
     <string name="shared_ok">OK</string>
     <string name="shared_cancel">Cancel</string>
+    <string name="shared_close">Close</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Username</string>
-- 
cgit v1.2.3