Age | Commit message (Collapse) | Author |
|
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
|
|
for MapWrapperFragment, and refactored stuff
|
|
in reports view
|
|
|
|
|
|
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
androidApp/src/main/res/values/map_layers.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and changed default view to MAP
|
|
|
|
|
|
|
|
|
|
|
|
MarkerTransformations
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- Displays the user information
- Allows the user to sign out
|
|
|
|
code was refactored into UnitRenderData to be shared with UnitMapFragment.
|
|
|
|
|
|
|
|
and many fixes
|
|
|
|
|
|
open device location in map, minor UI tweaks and added translations.
|
|
removed unnecessary content description warnings.
|
|
|
|
- Now there's MapFragment, which is the map and is responsible for displaying markers and focusing on a particular point. This functionality will be extended.
- UnitMapFragment is the entity in charge of the subscriptions and converts UnitInformation entities to something MapFragment can handle.
|
|
# Conflicts:
# androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
# androidApp/src/main/res/values/strings.xml
|
|
|