From 74aa997702a4315b574c5ee49cf0404ed8df7d0d Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 13 Jan 2022 01:01:54 -0600
Subject: Implemented ProgressBar for UnitInformationFragment

---
 .../details/information/UnitInformationFragment.kt        |  2 ++
 .../TrackerMap/android/devices/DevicesAdapter.kt          | 15 ---------------
 .../TrackerMap/android/devices/UnitRenderData.kt          | 12 ++++++------
 3 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap')

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt
index f5a1e13..dd8e202 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt
@@ -53,6 +53,7 @@ class UnitInformationFragment : Fragment() {
     private fun setupObservers() {
         unitInformationViewModel.unit.observe(viewLifecycleOwner) { unitInformation ->
             Log.d("UnitInformationFragment", "Unit Information Fetched - $unitInformation")
+            binding.reportLoading.visibility = View.GONE
             unitInformation?.let {
                 displayInformation(it)
             }
@@ -62,6 +63,7 @@ class UnitInformationFragment : Fragment() {
     private fun fetchInformation() {
         val id = arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG)
         unitInformationViewModel.fetchUnit(id ?: 0)
+        binding.reportLoading.visibility = View.VISIBLE
     }
 
     private fun displayInformation(unit: UnitInformation) {
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
index e1ccd0a..d42a8aa 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
@@ -1,24 +1,10 @@
 package mx.trackermap.TrackerMap.android.devices
 
-import android.graphics.Color
-import android.util.Size
-import android.util.TypedValue
-import android.view.Gravity
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.GridLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.mousebird.maply.ImageLoaderInterpreter
-import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.databinding.UnitItemBinding
-import mx.trackermap.TrackerMap.utils.Formatter
 import mx.trackermap.TrackerMap.client.models.UnitInformation
-import mx.trackermap.TrackerMap.utils.SpeedUnit
 
 enum class Action {
     CLICK, DETAILS, REPORTS, COMMANDS
@@ -46,7 +32,6 @@ class DevicesAdapter(
                     engineStopIcon = engineStopIcon,
                     gridLayout = gridLayout,
                     detailsButton = detailsButton,
-                    reportsButton = reportsButton,
                     commandsButton = commandsButton,
                     unitCard = unitCard,
                     swipeLayout = swipeLayout
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/UnitRenderData.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/UnitRenderData.kt
index f9b7a27..39ef472 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/UnitRenderData.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/UnitRenderData.kt
@@ -25,9 +25,9 @@ class UnitRenderData {
         val statusIcon: ImageView,
         val engineStopIcon: ImageView,
         val gridLayout: GridLayout,
-        val detailsButton: Button,
-        val reportsButton: Button,
-        val commandsButton: Button,
+        val detailsButton: Button? = null,
+        val reportsButton: Button? = null,
+        val commandsButton: Button? = null,
         val unitCard: CardView? = null,
         val swipeLayout: SwipeLayout? = null
     )
@@ -175,15 +175,15 @@ class UnitRenderData {
                         swipeLayout?.close()
                         callback(unit, Action.CLICK)
                     }
-                    detailsButton.setOnClickListener {
+                    detailsButton?.setOnClickListener {
                         swipeLayout?.close()
                         callback(unit, Action.DETAILS)
                     }
-                    reportsButton.setOnClickListener {
+                    reportsButton?.setOnClickListener {
                         swipeLayout?.close()
                         callback(unit, Action.REPORTS)
                     }
-                    commandsButton.setOnClickListener {
+                    commandsButton?.setOnClickListener {
                         swipeLayout?.close()
                         callback(unit, Action.COMMANDS)
                     }
-- 
cgit v1.2.3