Merge branch 'user_information'

1 files changed, 14 insertions, 25 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
index 409919a..e198ce0 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
@@ -1,5 +1,6 @@
 package mx.trackermap.TrackerMap.android.units
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
@@ -12,6 +13,8 @@ import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.databinding.UnitsActivityBinding
 import mx.trackermap.TrackerMap.android.devices.DevicesFragment
 import mx.trackermap.TrackerMap.android.map.UnitMapFragment
+import mx.trackermap.TrackerMap.android.session.LoginActivity
+import mx.trackermap.TrackerMap.android.session.UserInformationActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @DelicateCoroutinesApi
@@ -21,6 +24,12 @@ class UnitsActivity : AppCompatActivity() {
     private val binding get() = _binding!!
 
     private val unitsViewModel: UnitsViewModel by viewModel()
+    private val mapFragment: UnitMapFragment by lazy {
+        UnitMapFragment(unitsViewModel)
+    }
+    private val devicesFragment: DevicesFragment by lazy {
+        DevicesFragment(unitsViewModel)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,28 +47,9 @@ class UnitsActivity : AppCompatActivity() {
     }
 
     private fun setupEvents() {
-        binding.drawerButton.setOnClickListener {
-            binding.drawerLayout.openDrawer(binding.navigationView)
-        }
-        binding.navigationView.setNavigationItemSelectedListener {
-            when (it.itemId) {
-                R.id.nav_account -> {
-                    Toast.makeText(this, "Account button tapped!", Toast.LENGTH_SHORT).show()
-                    binding.drawerLayout.closeDrawers()
-                    false
-                }
-                R.id.nav_about -> {
-                    Toast.makeText(this, "About button tapped!", Toast.LENGTH_SHORT).show()
-                    binding.drawerLayout.closeDrawers()
-                    false
-                }
-                R.id.nav_logout -> {
-                    Toast.makeText(this, "Logout button tapped!", Toast.LENGTH_SHORT).show()
-                    binding.drawerLayout.closeDrawers()
-                    false
-                }
-                else -> false
-            }
+        binding.userButton.setOnClickListener {
+            val intent = Intent(applicationContext, UserInformationActivity::class.java)
+            startActivity(intent)
         }
         binding.displayModeToggle.setOnClickListener {
             unitsViewModel.toggleDisplayMode()
@@ -89,9 +79,8 @@ class UnitsActivity : AppCompatActivity() {
 
             val newFragment =
                 when (displayMode) {
-                    UnitsViewModel.UnitsDisplayMode.LIST -> DevicesFragment()
-                    UnitsViewModel.UnitsDisplayMode.MAP -> UnitMapFragment()
-                    else -> DevicesFragment()
+                    UnitsViewModel.UnitsDisplayMode.LIST -> devicesFragment
+                    UnitsViewModel.UnitsDisplayMode.MAP -> mapFragment
                 }
             supportFragmentManager.commit {
                 replace(R.id.displayContainer, newFragment)