From 512e01c0ca36b336b3dc6437c6fb326614d020d0 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 30 Dec 2021 18:13:49 -0600 Subject: Accessibility fixes and removed bindings from MapFragment --- .../trackermap/TrackerMap/android/devices/DevicesFragment.kt | 1 + .../java/mx/trackermap/TrackerMap/android/map/MapFragment.kt | 9 +-------- .../mx/trackermap/TrackerMap/android/units/UnitsActivity.kt | 9 ++++++++- androidApp/src/main/res/drawable/ic_baseline_menu_24.xml | 10 ++++++++++ androidApp/src/main/res/layout/units_activity.xml | 8 ++++++-- androidApp/src/main/res/values-es-rMX/strings.xml | 8 ++++++++ androidApp/src/main/res/values/strings.xml | 6 ++++++ 7 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 androidApp/src/main/res/drawable/ic_baseline_menu_24.xml 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 933316a..eb8dcbc 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 @@ -28,6 +28,7 @@ class DevicesFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { + super.onCreateView(inflater, container, savedInstanceState) _binding = DevicesFragmentBinding.inflate(inflater, container, false) return binding.root } diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt index f0ec769..289cc2d 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt @@ -19,8 +19,6 @@ import java.io.File @DelicateCoroutinesApi class MapFragment: GlobeMapFragment() { - private var _binding: MapFragmentBinding? = null - private val binding get() = _binding!! private val unitsViewModel: UnitsViewModel by viewModel() @@ -64,11 +62,6 @@ class MapFragment: GlobeMapFragment() { mapControl.animatePositionGeo(longitude, latitude, zoom, 1.0) } - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -133,7 +126,7 @@ class MapFragment: GlobeMapFragment() { val latitude = position.latitude!! * Math.PI / 180 val longitude = position.longitude!! * Math.PI / 180 val zoom = 0.000008 - mapControl.animatePositionGeo(longitude, latitude, zoom, 1.0) + mapControl.setPositionGeo(longitude, latitude, zoom) } } } 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 452ece7..ff8929e 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 @@ -66,12 +66,19 @@ class UnitsActivity : AppCompatActivity() { else -> R.drawable.ic_baseline_map_24 } ) + binding.displayModeToggle.contentDescription = getString( + when (displayMode) { + UnitsViewModel.UnitsDisplayMode.LIST -> R.string.toggle_map + UnitsViewModel.UnitsDisplayMode.MAP -> R.string.toggle_list + else -> R.string.toggle_map + } + ) val newFragment = when (displayMode) { UnitsViewModel.UnitsDisplayMode.LIST -> devicesFragment UnitsViewModel.UnitsDisplayMode.MAP -> mapFragment - else -> DevicesFragment() + else -> devicesFragment } supportFragmentManager.commit { replace(R.id.displayContainer, newFragment) diff --git a/androidApp/src/main/res/drawable/ic_baseline_menu_24.xml b/androidApp/src/main/res/drawable/ic_baseline_menu_24.xml new file mode 100644 index 0000000..4350ba9 --- /dev/null +++ b/androidApp/src/main/res/drawable/ic_baseline_menu_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml index f0d80ab..bff3789 100644 --- a/androidApp/src/main/res/layout/units_activity.xml +++ b/androidApp/src/main/res/layout/units_activity.xml @@ -1,6 +1,7 @@ @@ -26,7 +27,9 @@ app:fabSize="mini" android:layout_marginStart="@dimen/fab_margin" android:layout_marginTop="@dimen/fab_margin" - app:elevation="@dimen/fab_elevation"/> + app:elevation="@dimen/fab_elevation" + android:src="@drawable/ic_baseline_menu_24" + android:contentDescription="@string/open_drawer"/> + app:elevation="@dimen/fab_elevation" + tools:ignore="ContentDescription" /> \ No newline at end of file diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml index 0da9947..69ca1a8 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -7,6 +7,11 @@ Contraseña Iniciar sesión + + Cambiar a lista de dispositivos + Cambiar a mapa + Abrir menú lateral + Estatus encendido Estatus apagado @@ -23,4 +28,7 @@ Reportes Comandos Escribe para buscar + + Key + Value \ No newline at end of file diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 5692688..d68c68c 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -7,6 +7,11 @@ Password Login + + Switch to device list + Switch to map + Open drawer menu + Status on Status off @@ -23,6 +28,7 @@ Reports Commands Type to search + Key Value \ No newline at end of file -- cgit v1.2.3