Merge remote-tracking branch 'origin/main'

# Conflicts:
#	androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
#	androidApp/src/main/res/layout/unit_item.xml

1 files changed, 7 insertions, 0 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesFragment.kt
index a3ed7a8..6beacec 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesFragment.kt
@@ -1,5 +1,6 @@
 package mx.trackermap.TrackerMap.android.devices
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.coroutines.DelicateCoroutinesApi
 import mx.trackermap.TrackerMap.android.databinding.DevicesFragmentBinding
+import mx.trackermap.TrackerMap.android.details.DetailsActivity
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.models.UnitInformation
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -62,5 +64,10 @@ class DevicesFragment : Fragment() {
 
     private fun itemAction(unit: UnitInformation, action: Action) {
         Log.d("DevicesFragment", "Action: $action - Unit: $unit")
+        val activity = requireActivity()
+        val intent = Intent(activity.applicationContext, DetailsActivity::class.java)
+        intent.putExtra(DetailsActivity.DEVICE_ID_EXTRA, unit.device.id)
+        intent.putExtra(DetailsActivity.ACTION_EXTRA, action)
+        startActivity(intent)
     }
 }
\ No newline at end of file