From c48330dc35b1609dd44c3d4feb0821cdd3cb08f2 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sat, 3 Jul 2021 13:11:00 +0200
Subject: [PATCH] add button to explicitly close the layers menu (#50)

---
 .../net/vonforst/evmap/fragment/MapFragment.kt    |  3 +++
 app/src/main/res/layout/map_layers.xml            | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 7a1b24df..0b315cf2 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -291,6 +291,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.fabLayers.setOnClickListener {
             openLayersMenu()
         }
+        binding.layers.btnClose.setOnClickListener {
+            closeLayersMenu()
+        }
         binding.detailView.goingelectricButton.setOnClickListener {
             val charger = vm.charger.value?.data
             if (charger != null) {
diff --git a/app/src/main/res/layout/map_layers.xml b/app/src/main/res/layout/map_layers.xml
index a765bc1a..74430839 100644
--- a/app/src/main/res/layout/map_layers.xml
+++ b/app/src/main/res/layout/map_layers.xml
@@ -31,7 +31,7 @@
             android:layout_marginEnd="16dp"
             android:text="@string/map_type"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/btnClose"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -98,5 +98,18 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView23" />
+
+        <ImageButton
+            android:id="@+id/btnClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="12dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/close"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_close"
+            app:tint="?colorControlNormal" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file