Improved loading indicators, improved layout semantics, added translations and changed default view to MAP

3 files changed, 6 insertions, 5 deletions

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 fa6a37a..b56a403 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
@@ -35,6 +35,7 @@ class UnitCommandsFragment: Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.reportLoading.root.visibility = View.VISIBLE
         setupObservers()
         setupEvents()
     }
@@ -47,7 +48,7 @@ class UnitCommandsFragment: Fragment() {
     private fun setupObservers() {
         unitCommandsViewModel.commands.observe(viewLifecycleOwner) { commands ->
             Log.d("UnitCommandsFragment", "Device commands - $commands")
-            binding.reportLoading.visibility = View.GONE
+            binding.reportLoading.root.visibility = View.GONE
             val context = activity!!.applicationContext
             val adapter = ArrayAdapter<String>(context, R.layout.simple_list_item_checked)
             adapter.addAll(commands.map { it.description })
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 232b6e9..0c3577e 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,7 +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
+            binding.reportLoading.root.visibility = View.GONE
             unitInformation?.let {
                 displayInformation(it)
             }
@@ -65,7 +65,7 @@ class UnitInformationFragment : Fragment() {
         val name = arguments?.getString(UnitDetailsAdapter.DEVICE_NAME_ARG)
         unitInformationViewModel.fetchUnit(id ?: 0)
         binding.nameDetail.text = name
-        binding.reportLoading.visibility = View.VISIBLE
+        binding.reportLoading.root.visibility = View.VISIBLE
     }
 
     private fun displayInformation(unit: UnitInformation) {
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
index 957c6a7..20d2a48 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
@@ -248,7 +248,7 @@ class UnitReportsFragment : Fragment() {
     }
 
     private fun loading() {
-        binding.reportLoading.visibility = View.VISIBLE
+        binding.reportLoading.root.visibility = View.VISIBLE
         binding.eventsScroll.visibility = View.GONE
         binding.reportsMapContainer.visibility = View.GONE
 
@@ -258,7 +258,7 @@ class UnitReportsFragment : Fragment() {
     }
 
     private fun showMap(shouldShowMap: Boolean) {
-        binding.reportLoading.visibility = View.GONE
+        binding.reportLoading.root.visibility = View.GONE
         binding.eventsScroll.visibility = if (shouldShowMap) View.GONE else View.VISIBLE
         binding.reportsMapContainer.visibility = if (shouldShowMap) View.VISIBLE else View.GONE