aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'androidApp/src/main/java')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt7
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt34
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsViewModel.kt50
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt8
4 files changed, 93 insertions, 6 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
index 7929832..f46a5c9 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
@@ -1,9 +1,11 @@
package mx.trackermap.TrackerMap.android
import android.app.Application
+import mx.trackermap.TrackerMap.android.details.commands.UnitCommandsViewModel
import mx.trackermap.TrackerMap.android.details.information.UnitInformationViewModel
import mx.trackermap.TrackerMap.android.session.LoginViewModel
import mx.trackermap.TrackerMap.android.units.UnitsViewModel
+import mx.trackermap.TrackerMap.client.apis.CommandsApi
import mx.trackermap.TrackerMap.client.apis.DevicesApi
import mx.trackermap.TrackerMap.client.apis.PositionsApi
import mx.trackermap.TrackerMap.client.apis.SessionApi
@@ -25,10 +27,13 @@ class TrackerApp : Application() {
single { SessionApi(get()) }
single { DevicesApi(get()) }
single { PositionsApi(get()) }
+ single { CommandsApi(get()) }
+
single { UnitsController(get(), get()) }
viewModel { LoginViewModel(get(), get()) }
- viewModel { UnitInformationViewModel() }
+ viewModel { UnitInformationViewModel(get()) }
+ viewModel { UnitCommandsViewModel(get()) }
single { UnitsViewModel(get()) }
}
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
index 0391c16..bb0da4f 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
@@ -1,17 +1,23 @@
package mx.trackermap.TrackerMap.android.details.commands
import android.os.Bundle
+import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
import androidx.fragment.app.Fragment
import mx.trackermap.TrackerMap.android.databinding.UnitDetailsCommandsBinding
import mx.trackermap.TrackerMap.android.details.UnitDetailsAdapter
+import org.koin.androidx.viewmodel.ext.android.viewModel
class UnitCommandsFragment: Fragment() {
private var _binding: UnitDetailsCommandsBinding? = null
private val binding get() = _binding!!
+ private val unitCommandsViewModel: UnitCommandsViewModel by viewModel()
+
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@@ -23,12 +29,36 @@ class UnitCommandsFragment: Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- val id = arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG)
- binding.unitCommandsText.text = "COMMANDS for ID - $id"
+
+ setupObservers()
+ setupEvents()
}
override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
+
+ private fun setupObservers() {
+ unitCommandsViewModel.commands.observe(this) { commands ->
+ Log.d("UnitCommandsFragment", "Device commands - $commands")
+ val context = activity!!.applicationContext
+ val adapter = ArrayAdapter<String>(context, android.R.layout.simple_list_item_1)
+ adapter.addAll(commands.map { it.description })
+ binding.commandsList.adapter = adapter
+ }
+
+ val id = arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG)
+ unitCommandsViewModel.fetchCommands(id)
+ }
+
+ private fun setupEvents() {
+ binding.commandsList.setOnItemClickListener { _, _, index, _ ->
+ Log.d("UnitCommandsFragment", "Selected item at index - $index")
+ unitCommandsViewModel.selectCommand(index)
+ }
+ binding.sendCommandButton.setOnClickListener {
+ unitCommandsViewModel.sendCommand()
+ }
+ }
} \ No newline at end of file
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsViewModel.kt
new file mode 100644
index 0000000..06c0439
--- /dev/null
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsViewModel.kt
@@ -0,0 +1,50 @@
+package mx.trackermap.TrackerMap.android.details.commands
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.launch
+import mx.trackermap.TrackerMap.client.apis.CommandsApi
+import mx.trackermap.TrackerMap.client.models.Command
+import org.koin.core.component.KoinComponent
+
+@DelicateCoroutinesApi
+class UnitCommandsViewModel(
+ private val commandsApi: CommandsApi
+) : ViewModel(), KoinComponent {
+
+ var commands = MutableLiveData<List<Command>>()
+ private var selectedCommand: Command? = null
+ private var deviceId: Int? = null
+
+ fun fetchCommands(deviceId: Int?) {
+ this.deviceId = deviceId
+ viewModelScope.launch {
+ val commands = commandsApi.commandsGet(deviceId = deviceId)
+ this@UnitCommandsViewModel.commands.value = commands.toList()
+ }
+ }
+
+ fun selectCommand(index: Int) {
+ val command = commands.value?.get(index)
+ Log.d("UnitCommandsVM", "Selected Command - $command")
+ command?.deviceId = this.deviceId
+
+ this.selectedCommand = command
+ }
+
+ fun sendCommand() {
+ if (selectedCommand == null) {
+ Log.d("UnitCommandsVM", "No Command Selection")
+ return
+ }
+
+ Log.d("UnitCommandsVM", "Sending command - $selectedCommand")
+ viewModelScope.launch {
+ val command = commandsApi.commandsSendPost(selectedCommand!!)
+ Log.d("UnitCommandsVM", "Command sent - $command")
+ }
+ }
+} \ No newline at end of file
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt
index e7100e1..11daaaf 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt
@@ -11,9 +11,11 @@ import mx.trackermap.TrackerMap.controllers.UnitsController
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
-class UnitInformationViewModel: ViewModel(), KoinComponent {
- @DelicateCoroutinesApi
- private val unitsController: UnitsController by inject()
+@DelicateCoroutinesApi
+class UnitInformationViewModel constructor(
+ private val unitsController: UnitsController
+) : ViewModel(), KoinComponent {
+
var unit = MutableLiveData<UnitInformation?>()
init {