From 7bb73ffb57e954e3a33520daf6dae0ba9f4c6665 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 23 May 2022 11:41:33 +0200
Subject: [PATCH] Making the layout file more generic

---
 .../location/live/map/LocationLiveMapViewFragment.kt   | 10 +++++-----
 ..._location_map.xml => fragment_simple_container.xml} |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename vector/src/main/res/layout/{fragment_live_location_map.xml => fragment_simple_container.xml} (80%)

diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
index 5020687ab9..32b87727d8 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
@@ -28,7 +28,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.addChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentLiveLocationMapBinding
+import im.vector.app.databinding.FragmentSimpleContainerBinding
 import im.vector.app.features.location.UrlMapProvider
 import javax.inject.Inject
 
@@ -36,15 +36,15 @@ import javax.inject.Inject
  * Screen showing a map with all the current users sharing their live location in room.
  */
 @AndroidEntryPoint
-class LocationLiveMapViewFragment : VectorBaseFragment<FragmentLiveLocationMapBinding>() {
+class LocationLiveMapViewFragment : VectorBaseFragment<FragmentSimpleContainerBinding>() {
 
     @Inject
     lateinit var urlMapProvider: UrlMapProvider
 
     private val args: LocationLiveMapViewArgs by args()
 
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLiveLocationMapBinding {
-        return FragmentLiveLocationMapBinding.inflate(layoutInflater, container, false)
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSimpleContainerBinding {
+        return FragmentSimpleContainerBinding.inflate(layoutInflater, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -67,7 +67,7 @@ class LocationLiveMapViewFragment : VectorBaseFragment<FragmentLiveLocationMapBi
                     ?: run {
                         val options = MapboxMapOptions.createFromAttributes(requireContext(), null)
                         SupportMapFragment.newInstance(options)
-                                .also { addChildFragment(R.id.liveLocationMapContainer, it, tag = MAP_FRAGMENT_TAG) }
+                                .also { addChildFragment(R.id.fragmentContainer, it, tag = MAP_FRAGMENT_TAG) }
                     }
 
     companion object {
diff --git a/vector/src/main/res/layout/fragment_live_location_map.xml b/vector/src/main/res/layout/fragment_simple_container.xml
similarity index 80%
rename from vector/src/main/res/layout/fragment_live_location_map.xml
rename to vector/src/main/res/layout/fragment_simple_container.xml
index 5238508d6f..fb9e6d38c5 100644
--- a/vector/src/main/res/layout/fragment_live_location_map.xml
+++ b/vector/src/main/res/layout/fragment_simple_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/liveLocationMapContainer"
+    android:id="@+id/fragmentContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />