From 08e218697fc4a19d5a88e6f4bb74aac44500b9c7 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 14:05:57 +0200
Subject: [PATCH 01/20] inital commit

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index ee66b3fb0..38c8264a5 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.EditText
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -35,6 +36,7 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var snackbar: Snackbar
+    private lateinit var textGroup: EditText
 
     companion object {
         private const val SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE = 7865
@@ -94,7 +96,7 @@ class MainActivity : AppCompatActivity() {
                     .putString(getString(R.string.pref_key_current_group_id), it)
                     .apply()
         })
-
+        textGroup.setText("test")
         //TODO Get role of current search group
     }
 

From 4ed4b91206579c8677e2bcad732cdd0c99a981de Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 14:38:49 +0200
Subject: [PATCH 02/20] Create textfield

---
 .../main/java/ch/epfl/sdp/ui/MainActivity.kt   |  8 ++++++--
 app/src/main/res/layout/fragment_home.xml      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 38c8264a5..989715060 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -8,6 +8,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.EditText
+import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -36,7 +37,6 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var snackbar: Snackbar
-    private lateinit var textGroup: EditText
 
     companion object {
         private const val SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE = 7865
@@ -56,6 +56,7 @@ class MainActivity : AppCompatActivity() {
 
         configureNavigationView()
         loadActiveGroupFromPrefs()
+        setTextGroup()
     }
 
     private fun configureNavigationView() {
@@ -96,7 +97,6 @@ class MainActivity : AppCompatActivity() {
                     .putString(getString(R.string.pref_key_current_group_id), it)
                     .apply()
         })
-        textGroup.setText("test")
         //TODO Get role of current search group
     }
 
@@ -182,4 +182,8 @@ class MainActivity : AppCompatActivity() {
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
+    private fun setTextGroup(){
+        val groupText = findViewById<TextView>(R.id.current_group_text)
+        groupText.text = "test"
+    }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index c4f97bfbd..49c11f095 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,7 @@
     tools:context=".ui.home.HomeFragment">
 
     <LinearLayout
+        android:id="@+id/linearLayout3"
         android:layout_width="match_parent"
         android:layout_height="253dp"
         android:orientation="horizontal"
@@ -48,7 +49,24 @@
             android:text="@string/work_offline"
             android:textColor="@color/colorBlack"
             android:textSize="48sp" />
+
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/current_group_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="330dp"
+        android:layout_marginTop="27dp"
+        android:layout_marginEnd="330dp"
+        android:layout_marginBottom="10dp"
+        android:text="test"
+        android:textAlignment="center"
+        android:textSize="36sp"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b070501c100f3d22ff4d9f94fe71fdd2f4022976 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 15:03:29 +0200
Subject: [PATCH 03/20] Try to resolve bug

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 989715060..a4ea32874 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.EditText
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -184,6 +185,6 @@ class MainActivity : AppCompatActivity() {
     }
     private fun setTextGroup(){
         val groupText = findViewById<TextView>(R.id.current_group_text)
-        groupText.text = "test"
+        groupText.text="You current group is..."
     }
 }

From 1c0a21aaaeed45878624e8939f9f6756ec5bbe1a Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 15:34:42 +0200
Subject: [PATCH 04/20] Inflate layout to access fragment home

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt | 7 +++++--
 app/src/main/res/layout/nav_header_main.xml      | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index a4ea32874..f97c16431 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -184,7 +185,9 @@ class MainActivity : AppCompatActivity() {
         Auth.onActivityResult(requestCode, resultCode, data)
     }
     private fun setTextGroup(){
-        val groupText = findViewById<TextView>(R.id.current_group_text)
-        groupText.text="You current group is..."
+        val v = LayoutInflater.from(this).inflate(R.layout.fragment_home, null)
+        val groupText = v.findViewById<TextView>(R.id.current_group_text)
+        //groupText.text="You current group is..."
+        Toast.makeText(this, groupText.text, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index a8fb3e072..0852ff5f5 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -17,4 +17,5 @@
             android:name="ch.epfl.sdp.ui.home.LoginNavFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+
 </LinearLayout>

From a62d81708446444ffee22443d3fd130880d9fe9e Mon Sep 17 00:00:00 2001
From: AlexisTabin <alexis.tabin@gmail.com>
Date: Thu, 21 May 2020 17:08:37 +0200
Subject: [PATCH 05/20] Simple help to Nolan

---
 .../main/java/ch/epfl/sdp/ui/MainActivity.kt  | 11 --------
 .../java/ch/epfl/sdp/ui/home/HomeFragment.kt  |  7 ++++-
 app/src/main/res/layout/fragment_home.xml     | 28 ++++++++-----------
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index f97c16431..77e47a479 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -4,13 +4,9 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -58,7 +54,6 @@ class MainActivity : AppCompatActivity() {
 
         configureNavigationView()
         loadActiveGroupFromPrefs()
-        setTextGroup()
     }
 
     private fun configureNavigationView() {
@@ -184,10 +179,4 @@ class MainActivity : AppCompatActivity() {
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
-    private fun setTextGroup(){
-        val v = LayoutInflater.from(this).inflate(R.layout.fragment_home, null)
-        val groupText = v.findViewById<TextView>(R.id.current_group_text)
-        //groupText.text="You current group is..."
-        Toast.makeText(this, groupText.text, Toast.LENGTH_SHORT).show()
-    }
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index fac2acde6..9d815e765 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
+import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
 
 
@@ -18,7 +20,10 @@ class HomeFragment : Fragment() {
             container: ViewGroup?,
             savedInstanceState: Bundle?
     ): View? {
+        val v = inflater.inflate(R.layout.fragment_home, container, false)
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        return inflater.inflate(R.layout.fragment_home, container, false)
+        var groupText = v.findViewById<TextView>(R.id.current_group_text)
+        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, "82")
+        return v
     }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 49c11f095..ee1a847ff 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -30,8 +30,8 @@
 
         <Button
             android:id="@+id/start_mission_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="7"
             android:background="@color/colorPrimaryDark"
             android:onClick="startMission"
@@ -50,23 +50,17 @@
             android:textColor="@color/colorBlack"
             android:textSize="48sp" />
 
+        <TextView
+            android:id="@+id/current_group_text"
+            android:layout_width="137dp"
+            android:layout_height="90dp"
+            android:layout_gravity="center"
+            android:textColor="@color/colorBlack"
+            android:textSize="32sp"
+            app:layout_constraintBottom_toBottomOf="@id/start_mission_button" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/current_group_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="330dp"
-        android:layout_marginTop="27dp"
-        android:layout_marginEnd="330dp"
-        android:layout_marginBottom="10dp"
-        android:text="test"
-        android:textAlignment="center"
-        android:textSize="36sp"
-        app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7c4a4d29..9eb39e56f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,5 +94,6 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="group_name_main_activity">Group ID :  %1$s</string>
 
 </resources>

From f81ba96fcf77d908030b20eb724db4406f6baa2a Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 17:19:29 +0200
Subject: [PATCH 06/20] Correct typo in SEARCH_GROUP

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt              | 4 ++--
 .../ui/search_group/selection/SearchGroupSelectionActivity.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 77e47a479..9b027de70 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -24,7 +24,7 @@ import ch.epfl.sdp.database.data.Role
 import ch.epfl.sdp.drone.Drone
 import ch.epfl.sdp.ui.maps.MapActivity
 import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity
-import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity.Companion.SEARH_GROUP_ID_SELECTION_RESULT_TAG
+import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity.Companion.SEARCH_GROUP_ID_SELECTION_RESULT_TAG
 import ch.epfl.sdp.ui.settings.SettingsActivity
 import ch.epfl.sdp.utils.Auth
 import ch.epfl.sdp.utils.CentralLocationManager
@@ -174,7 +174,7 @@ class MainActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
-                currentGroupId.value = data!!.getStringExtra(SEARH_GROUP_ID_SELECTION_RESULT_TAG)
+                currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/ch/epfl/sdp/ui/search_group/selection/SearchGroupSelectionActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/search_group/selection/SearchGroupSelectionActivity.kt
index 3f44a088a..909971131 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/search_group/selection/SearchGroupSelectionActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/search_group/selection/SearchGroupSelectionActivity.kt
@@ -20,7 +20,7 @@ class SearchGroupSelectionActivity : AppCompatActivity(), Observer<List<SearchGr
     private val searchGroupManager = SearchGroupDataManager()
 
     companion object {
-        const val SEARH_GROUP_ID_SELECTION_RESULT_TAG = "search_group"
+        const val SEARCH_GROUP_ID_SELECTION_RESULT_TAG = "search_group"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -54,7 +54,7 @@ class SearchGroupSelectionActivity : AppCompatActivity(), Observer<List<SearchGr
 
     private fun joinGroup(searchGroupData: SearchGroupData) {
         val returnDataIntent = Intent()
-        returnDataIntent.putExtra(SEARH_GROUP_ID_SELECTION_RESULT_TAG, searchGroupData.uuid)
+        returnDataIntent.putExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG, searchGroupData.uuid)
         setResult(RESULT_OK, returnDataIntent)
         finish()
     }

From b32c699add20a73ef33a7d2f97f4598c7fbab3a9 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 17:24:08 +0200
Subject: [PATCH 07/20] Group now renders properly

---
 app/src/main/res/layout/fragment_home.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index ee1a847ff..d19c0a0d8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -30,8 +30,8 @@
 
         <Button
             android:id="@+id/start_mission_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_weight="7"
             android:background="@color/colorPrimaryDark"
             android:onClick="startMission"
@@ -50,16 +50,15 @@
             android:textColor="@color/colorBlack"
             android:textSize="48sp" />
 
-        <TextView
-            android:id="@+id/current_group_text"
-            android:layout_width="137dp"
-            android:layout_height="90dp"
-            android:layout_gravity="center"
-            android:textColor="@color/colorBlack"
-            android:textSize="32sp"
-            app:layout_constraintBottom_toBottomOf="@id/start_mission_button" />
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/current_group_text"
+        android:layout_width="137dp"
+        android:layout_height="90dp"
+        android:layout_gravity="center"
+        android:textColor="@color/colorBlack"
+        android:textSize="32sp" />
 
 
 

From 79649dab05b9975edd08b85aee9ed6a58c8e504d Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 19:34:11 +0200
Subject: [PATCH 08/20] Correct crash?

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt     |  3 +++
 .../main/java/ch/epfl/sdp/ui/home/HomeFragment.kt    | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 9b027de70..a45795d39 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -22,6 +22,7 @@ import androidx.preference.PreferenceManager
 import ch.epfl.sdp.R
 import ch.epfl.sdp.database.data.Role
 import ch.epfl.sdp.drone.Drone
+import ch.epfl.sdp.ui.home.HomeFragment
 import ch.epfl.sdp.ui.maps.MapActivity
 import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity
 import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity.Companion.SEARCH_GROUP_ID_SELECTION_RESULT_TAG
@@ -175,8 +176,10 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
+                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
+
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 9d815e765..3e2f7567f 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -9,21 +9,27 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
+import ch.epfl.sdp.ui.MainActivity
 
 
 class HomeFragment : Fragment() {
 
     private lateinit var homeViewModel: HomeViewModel
+    private lateinit var v : View
 
     override fun onCreateView(
             inflater: LayoutInflater,
             container: ViewGroup?,
             savedInstanceState: Bundle?
     ): View? {
-        val v = inflater.inflate(R.layout.fragment_home, container, false)
+         v = inflater.inflate(R.layout.fragment_home, container, false)
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        var groupText = v.findViewById<TextView>(R.id.current_group_text)
-        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, "82")
+        updateCurrentGroup("10")
+
         return v
     }
+    fun updateCurrentGroup(groupID: String){
+        var groupText = v.findViewById<TextView>(R.id.current_group_text)
+        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+    }
 }

From b1e09b7f4a4f2549d0ed2c0c75a749280fdf6295 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 19:45:22 +0200
Subject: [PATCH 09/20] Try to resolve crash bug

---
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 11 +++--------
 app/src/main/res/layout/fragment_home.xml             |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 3e2f7567f..01eed70f3 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -15,21 +15,16 @@ import ch.epfl.sdp.ui.MainActivity
 class HomeFragment : Fragment() {
 
     private lateinit var homeViewModel: HomeViewModel
-    private lateinit var v : View
 
     override fun onCreateView(
             inflater: LayoutInflater,
             container: ViewGroup?,
             savedInstanceState: Bundle?
     ): View? {
-         v = inflater.inflate(R.layout.fragment_home, container, false)
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        updateCurrentGroup("10")
-
-        return v
+        return inflater.inflate(R.layout.fragment_home, container, false)
     }
-    fun updateCurrentGroup(groupID: String){
-        var groupText = v.findViewById<TextView>(R.id.current_group_text)
-        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+    fun updateCurrentGroup(groupID:String){
+
     }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d19c0a0d8..971b140a0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -52,14 +52,14 @@
 
     </LinearLayout>
 
-    <TextView
+    <!--<TextView
         android:id="@+id/current_group_text"
         android:layout_width="137dp"
         android:layout_height="90dp"
         android:layout_gravity="center"
         android:textColor="@color/colorBlack"
         android:textSize="32sp" />
-
+-->
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4b7bee452cbd068c45e2e5455d0ad49a1633e35b Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 21:01:20 +0200
Subject: [PATCH 10/20] Can't reuse view from HomeFragment

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt      | 4 +++-
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 5 ++++-
 app/src/main/res/layout/fragment_home.xml             | 4 +---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index a45795d39..7c5e76859 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -176,10 +177,11 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
+
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
+        HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
     }
 
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 01eed70f3..690969136 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -24,7 +24,10 @@ class HomeFragment : Fragment() {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
         return inflater.inflate(R.layout.fragment_home, container, false)
     }
-    fun updateCurrentGroup(groupID:String){
 
+    
+    fun updateCurrentGroup(groupID: String){
+        var groupText = requireView().findViewById<TextView>(R.id.current_group_text)
+        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
     }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 971b140a0..23045aadd 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -52,14 +52,12 @@
 
     </LinearLayout>
 
-    <!--<TextView
+    <TextView
         android:id="@+id/current_group_text"
         android:layout_width="137dp"
         android:layout_height="90dp"
         android:layout_gravity="center"
         android:textColor="@color/colorBlack"
         android:textSize="32sp" />
--->
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 45bbdb6759018ab7c86ce861908d4d44f75e50bd Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 21:01:57 +0200
Subject: [PATCH 11/20] Place function call at the right place

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt      | 3 +--
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 7c5e76859..85fdfc8b3 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -177,11 +177,10 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-
+                HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
-        HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
     }
 
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 690969136..d00100f4e 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -25,7 +25,6 @@ class HomeFragment : Fragment() {
         return inflater.inflate(R.layout.fragment_home, container, false)
     }
 
-    
     fun updateCurrentGroup(groupID: String){
         var groupText = requireView().findViewById<TextView>(R.id.current_group_text)
         groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)

From 16cf297eedef32161f9dc8b94831453bea4e1879 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 21:10:42 +0200
Subject: [PATCH 12/20] Try to update the text

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt      |  6 ++++--
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 85fdfc8b3..bf01be930 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -177,10 +177,12 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-                HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
+                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
-
+    fun getGroup() : String{
+        return currentGroupId.value.toString()
+    }
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index d00100f4e..85a17253e 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -22,11 +22,13 @@ class HomeFragment : Fragment() {
             savedInstanceState: Bundle?
     ): View? {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        return inflater.inflate(R.layout.fragment_home, container, false)
+        val v = inflater.inflate(R.layout.fragment_home, container, false)
+        updateCurrentGroup(v)
+        return v
     }
 
-    fun updateCurrentGroup(groupID: String){
-        var groupText = requireView().findViewById<TextView>(R.id.current_group_text)
-        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+    private fun updateCurrentGroup(v : View){
+        var groupText = v.findViewById<TextView>(R.id.current_group_text)
+        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, MainActivity().getGroup())
     }
 }

From 13d7f3487dba91b90215e137042738ce07d8f5fc Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 21:30:55 +0200
Subject: [PATCH 13/20] Triyng to initalize the view

---
 .../main/java/ch/epfl/sdp/ui/MainActivity.kt  |  2 +-
 .../java/ch/epfl/sdp/ui/home/HomeFragment.kt  | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index bf01be930..eb538a4a8 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -177,7 +177,7 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
+                HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 85a17253e..5a8acf562 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -15,6 +15,7 @@ import ch.epfl.sdp.ui.MainActivity
 class HomeFragment : Fragment() {
 
     private lateinit var homeViewModel: HomeViewModel
+    private lateinit var v : View
 
     override fun onCreateView(
             inflater: LayoutInflater,
@@ -22,13 +23,37 @@ class HomeFragment : Fragment() {
             savedInstanceState: Bundle?
     ): View? {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        val v = inflater.inflate(R.layout.fragment_home, container, false)
-        updateCurrentGroup(v)
+        v = inflater.inflate(R.layout.fragment_home, container, false)
+        //updateCurrentGroup(v)
         return v
     }
 
+    override fun onResume() {
+        super.onResume()
+        v= requireView()
+        updateCurrentGroup(requireView())
+    }
+
+    override fun onStart() {
+        super.onStart()
+        v=requireView()
+        updateCurrentGroup(requireView())
+    }
+    override fun onStop(){
+        super.onStop()
+        v=requireView()
+        updateCurrentGroup(requireView())
+    }
+
     private fun updateCurrentGroup(v : View){
         var groupText = v.findViewById<TextView>(R.id.current_group_text)
+        this.v=v
         groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, MainActivity().getGroup())
+
+    }
+    fun updateCurrentGroup(group : String){
+        var groupText = v.findViewById<TextView>(R.id.current_group_text)
+        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, group)
+
     }
 }

From 6d656ef0408ec8fc4a0b1471d444c5c78d99b0a2 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Thu, 21 May 2020 21:36:14 +0200
Subject: [PATCH 14/20] Triyng to initalize the view

---
 .../main/java/ch/epfl/sdp/ui/home/HomeFragment.kt  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 5a8acf562..13b032028 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -24,24 +24,12 @@ class HomeFragment : Fragment() {
     ): View? {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
         v = inflater.inflate(R.layout.fragment_home, container, false)
-        //updateCurrentGroup(v)
+        updateCurrentGroup(v)
         return v
     }
 
     override fun onResume() {
         super.onResume()
-        v= requireView()
-        updateCurrentGroup(requireView())
-    }
-
-    override fun onStart() {
-        super.onStart()
-        v=requireView()
-        updateCurrentGroup(requireView())
-    }
-    override fun onStop(){
-        super.onStop()
-        v=requireView()
         updateCurrentGroup(requireView())
     }
 

From e186ced53d7b908b8491f5c5639d938d818a467f Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 10:21:44 +0200
Subject: [PATCH 15/20] Apply Alexis' help

---
 .../main/java/ch/epfl/sdp/ui/MainActivity.kt  |  5 +++-
 .../java/ch/epfl/sdp/ui/home/HomeFragment.kt  | 26 ++++++++-----------
 app/src/main/res/layout/fragment_home.xml     |  4 +--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index eb538a4a8..28392ea4d 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -177,12 +177,15 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-                HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
+                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
+    /*
     fun getGroup() : String{
         return currentGroupId.value.toString()
     }
+
+     */
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 13b032028..9ea5d5893 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
+import androidx.preference.PreferenceManager
 import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
 import ch.epfl.sdp.ui.MainActivity
@@ -15,7 +16,7 @@ import ch.epfl.sdp.ui.MainActivity
 class HomeFragment : Fragment() {
 
     private lateinit var homeViewModel: HomeViewModel
-    private lateinit var v : View
+    private lateinit var groupText: TextView
 
     override fun onCreateView(
             inflater: LayoutInflater,
@@ -23,25 +24,20 @@ class HomeFragment : Fragment() {
             savedInstanceState: Bundle?
     ): View? {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
-        v = inflater.inflate(R.layout.fragment_home, container, false)
-        updateCurrentGroup(v)
-        return v
+        val view = inflater.inflate(R.layout.fragment_home, container, false)
+        groupText = view.findViewById(R.id.current_group_text)
+        val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
+                .getString(getString(R.string.pref_key_current_group_id), "No group")
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+        return view
     }
 
-    override fun onResume() {
-        super.onResume()
-        updateCurrentGroup(requireView())
-    }
-
-    private fun updateCurrentGroup(v : View){
-        var groupText = v.findViewById<TextView>(R.id.current_group_text)
-        this.v=v
-        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, MainActivity().getGroup())
-
-    }
+    /*
     fun updateCurrentGroup(group : String){
         var groupText = v.findViewById<TextView>(R.id.current_group_text)
         groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, group)
 
     }
+
+     */
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 23045aadd..46d0dd8fb 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -54,8 +54,8 @@
 
     <TextView
         android:id="@+id/current_group_text"
-        android:layout_width="137dp"
-        android:layout_height="90dp"
+        android:layout_width="731dp"
+        android:layout_height="79dp"
         android:layout_gravity="center"
         android:textColor="@color/colorBlack"
         android:textSize="32sp" />

From e41d4141d0dbd94288f94bb7a9f41238dc3afd39 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 10:30:05 +0200
Subject: [PATCH 16/20] Add constraints for groupText

---
 app/src/main/res/layout/fragment_home.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 46d0dd8fb..8b3422dfc 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -54,10 +54,15 @@
 
     <TextView
         android:id="@+id/current_group_text"
-        android:layout_width="731dp"
-        android:layout_height="79dp"
+        android:layout_width="match_parent"
+        android:layout_height="77dp"
         android:layout_gravity="center"
         android:textColor="@color/colorBlack"
-        android:textSize="32sp" />
+        android:textSize="32sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 0e1ca6d63da1b52db51885ec67642935ea9022b0 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 11:04:31 +0200
Subject: [PATCH 17/20] group now correctly updates

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt     |  8 --------
 .../main/java/ch/epfl/sdp/ui/home/HomeFragment.kt    | 12 +++++-------
 app/src/main/res/layout/fragment_home.xml            |  1 -
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 28392ea4d..129b506c5 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -23,7 +22,6 @@ import androidx.preference.PreferenceManager
 import ch.epfl.sdp.R
 import ch.epfl.sdp.database.data.Role
 import ch.epfl.sdp.drone.Drone
-import ch.epfl.sdp.ui.home.HomeFragment
 import ch.epfl.sdp.ui.maps.MapActivity
 import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity
 import ch.epfl.sdp.ui.search_group.selection.SearchGroupSelectionActivity.Companion.SEARCH_GROUP_ID_SELECTION_RESULT_TAG
@@ -177,15 +175,9 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == SEARCH_GROUP_SELECTION_ACTIVITY_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
                 currentGroupId.value = data!!.getStringExtra(SEARCH_GROUP_ID_SELECTION_RESULT_TAG)
-                //HomeFragment().updateCurrentGroup(currentGroupId.value.toString())
             }
         }
         Auth.onActivityResult(requestCode, resultCode, data)
     }
-    /*
-    fun getGroup() : String{
-        return currentGroupId.value.toString()
-    }
 
-     */
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 9ea5d5893..d488b836e 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -10,7 +10,6 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
-import ch.epfl.sdp.ui.MainActivity
 
 
 class HomeFragment : Fragment() {
@@ -32,12 +31,11 @@ class HomeFragment : Fragment() {
         return view
     }
 
-    /*
-    fun updateCurrentGroup(group : String){
-        var groupText = v.findViewById<TextView>(R.id.current_group_text)
-        groupText?.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, group)
-
+    override fun onResume() {
+        super.onResume()
+        val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
+                .getString(getString(R.string.pref_key_current_group_id), "No group")
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
     }
 
-     */
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 8b3422dfc..1f59b0da9 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -64,5 +64,4 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 7c9662da71ba3e40f717a78520b9e935c9054475 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 11:50:47 +0200
Subject: [PATCH 18/20] GroupID works but not groupname

---
 app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt      | 3 +++
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
index 129b506c5..30c3cd27e 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/MainActivity.kt
@@ -180,4 +180,7 @@ class MainActivity : AppCompatActivity() {
         Auth.onActivityResult(requestCode, resultCode, data)
     }
 
+    fun getCurrentGroupID() : String{
+        return currentGroupId.value.toString()
+    }
 }
diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index d488b836e..a30f7b8e4 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -6,10 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
+import ch.epfl.sdp.database.data_manager.SearchGroupDataManager
+import ch.epfl.sdp.ui.MainActivity
 
 
 class HomeFragment : Fragment() {
@@ -27,7 +30,8 @@ class HomeFragment : Fragment() {
         groupText = view.findViewById(R.id.current_group_text)
         val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
                 .getString(getString(R.string.pref_key_current_group_id), "No group")
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+        //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID?.let { SearchGroupDataManager().getGroupById(it).value?.name })
         return view
     }
 
@@ -35,7 +39,8 @@ class HomeFragment : Fragment() {
         super.onResume()
         val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
                 .getString(getString(R.string.pref_key_current_group_id), "No group")
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID)
+        //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID?.let { SearchGroupDataManager().getGroupById(it).value?.name })
     }
 
 }

From 55bd1362d1a17b0480bd305eb8987a7b254964d5 Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 11:59:56 +0200
Subject: [PATCH 19/20] Use Firebase

---
 app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index a30f7b8e4..30e3b0270 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
+import ch.epfl.sdp.database.dao.FirebaseGroupDao
 import ch.epfl.sdp.database.data_manager.SearchGroupDataManager
 import ch.epfl.sdp.ui.MainActivity
 
@@ -31,7 +32,7 @@ class HomeFragment : Fragment() {
         val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
                 .getString(getString(R.string.pref_key_current_group_id), "No group")
         //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID?.let { SearchGroupDataManager().getGroupById(it).value?.name })
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,FirebaseGroupDao().getGroupById(groupID.toString()).value?.name )
         return view
     }
 
@@ -40,7 +41,7 @@ class HomeFragment : Fragment() {
         val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
                 .getString(getString(R.string.pref_key_current_group_id), "No group")
         //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, groupID?.let { SearchGroupDataManager().getGroupById(it).value?.name })
+        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,FirebaseGroupDao().getGroupById(groupID.toString()).value?.name )
     }
 
 }

From b397d590f1d8072b4e885ed788914b9fb5a47dbc Mon Sep 17 00:00:00 2001
From: Nolan Chappuis <nolanchappuis@hotmail.com>
Date: Fri, 22 May 2020 12:37:23 +0200
Subject: [PATCH 20/20] it works... finally

---
 .../java/ch/epfl/sdp/ui/home/HomeFragment.kt     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
index 30e3b0270..2a9c7ec8c 100644
--- a/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
+++ b/app/src/main/java/ch/epfl/sdp/ui/home/HomeFragment.kt
@@ -13,6 +13,7 @@ import ch.epfl.sdp.MainApplication
 import ch.epfl.sdp.R
 import ch.epfl.sdp.database.dao.FirebaseGroupDao
 import ch.epfl.sdp.database.data_manager.SearchGroupDataManager
+import ch.epfl.sdp.database.providers.SearchGroupRepositoryProvider
 import ch.epfl.sdp.ui.MainActivity
 
 
@@ -29,19 +30,22 @@ class HomeFragment : Fragment() {
         homeViewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
         val view = inflater.inflate(R.layout.fragment_home, container, false)
         groupText = view.findViewById(R.id.current_group_text)
-        val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
-                .getString(getString(R.string.pref_key_current_group_id), "No group")
-        //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,FirebaseGroupDao().getGroupById(groupID.toString()).value?.name )
+        updateGroupText()
         return view
     }
 
     override fun onResume() {
         super.onResume()
+        updateGroupText()
+    }
+
+    private fun updateGroupText(){
         val groupID = PreferenceManager.getDefaultSharedPreferences(MainApplication.applicationContext())
                 .getString(getString(R.string.pref_key_current_group_id), "No group")
         //groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(MainActivity().getCurrentGroupID()).value?.name)
-        groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,FirebaseGroupDao().getGroupById(groupID.toString()).value?.name )
+        SearchGroupDataManager().getGroupById(groupID.toString()).observeForever{group->
+            groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity, group.name)
+        }
+    //    groupText.text = MainApplication.applicationContext().getString(R.string.group_name_main_activity,SearchGroupDataManager().getGroupById(groupID.toString()).observe{})
     }
-
 }