From af8883215fa823d3caba860174396840e7e63ce2 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 01:53:42 -0600 Subject: ETBSA branding --- androidApp/build.gradle.kts | 2 +- androidApp/src/main/ic_launcher-playstore.png | Bin 21873 -> 16687 bytes .../android/map/MarkerTransformations.kt | 3 ++ .../main/res/drawable/ic_launcher_foreground.xml | 60 +++++---------------- androidApp/src/main/res/drawable/map_backhoe.png | Bin 0 -> 45689 bytes androidApp/src/main/res/drawable/map_car.png | Bin 0 -> 43950 bytes androidApp/src/main/res/drawable/map_car.xml | 16 ------ androidApp/src/main/res/drawable/map_pickup.png | Bin 0 -> 33134 bytes androidApp/src/main/res/drawable/map_pickup.xml | 15 ------ androidApp/src/main/res/drawable/map_tractor.png | Bin 0 -> 61757 bytes androidApp/src/main/res/drawable/map_tractor.xml | 15 ------ androidApp/src/main/res/drawable/map_truck.png | Bin 0 -> 58791 bytes androidApp/src/main/res/drawable/map_truck.xml | 14 ----- .../main/res/layout/user_information_activity.xml | 1 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 4198 -> 0 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4198 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2642 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2642 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 5970 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 5970 -> 0 bytes .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 9518 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 9518 -> 0 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 13761 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 13761 -> 0 bytes androidApp/src/main/res/values-es-rMX/strings.xml | 6 +-- .../src/main/res/values/ic_launcher_background.xml | 2 +- androidApp/src/main/res/values/strings.xml | 12 ++--- .../mx/trackermap/TrackerMap/utils/MarkerType.kt | 2 +- 28 files changed, 30 insertions(+), 118 deletions(-) create mode 100644 androidApp/src/main/res/drawable/map_backhoe.png create mode 100644 androidApp/src/main/res/drawable/map_car.png delete mode 100644 androidApp/src/main/res/drawable/map_car.xml create mode 100644 androidApp/src/main/res/drawable/map_pickup.png delete mode 100644 androidApp/src/main/res/drawable/map_pickup.xml create mode 100644 androidApp/src/main/res/drawable/map_tractor.png delete mode 100644 androidApp/src/main/res/drawable/map_tractor.xml create mode 100644 androidApp/src/main/res/drawable/map_truck.png delete mode 100644 androidApp/src/main/res/drawable/map_truck.xml delete mode 100644 androidApp/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 androidApp/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 07fe740..6fe79ad 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -7,7 +7,7 @@ plugins { android { compileSdk = 31 defaultConfig { - applicationId = "mx.trackermap.TrackerMap" + applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 versionCode = 1 diff --git a/androidApp/src/main/ic_launcher-playstore.png b/androidApp/src/main/ic_launcher-playstore.png index f4a2c02..1390973 100644 Binary files a/androidApp/src/main/ic_launcher-playstore.png and b/androidApp/src/main/ic_launcher-playstore.png differ diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt index 933cd8a..63dd9ed 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MarkerTransformations.kt @@ -52,6 +52,7 @@ object MarkerTransformations { private fun categoryToMarkerType(category: String?): MarkerType { return when (category?.lowercase()) { "animal" -> MarkerType.ANIMAL + "backhoe" -> MarkerType.BACKHOE "bicycle" -> MarkerType.BICYCLE "boat" -> MarkerType.BOAT "bus" -> MarkerType.BUS @@ -78,6 +79,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: MarkerType): Int { return when (markerType) { MarkerType.ANIMAL -> R.drawable.map_animal + MarkerType.BACKHOE -> R.drawable.map_backhoe MarkerType.BICYCLE -> R.drawable.map_bicycle MarkerType.BOAT -> R.drawable.map_boat MarkerType.BUS -> R.drawable.map_bus @@ -108,6 +110,7 @@ object MarkerTransformations { fun markerTypeToStringId(markerType: MarkerType): Int { return when (markerType) { MarkerType.ANIMAL -> R.string.unit_category_animal + MarkerType.BACKHOE -> R.string.unit_category_backhoe MarkerType.BICYCLE -> R.string.unit_category_bicycle MarkerType.BOAT -> R.string.unit_category_boat MarkerType.BUS -> R.string.unit_category_bus diff --git a/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/androidApp/src/main/res/drawable/ic_launcher_foreground.xml index 3174b26..34d920c 100644 --- a/androidApp/src/main/res/drawable/ic_launcher_foreground.xml +++ b/androidApp/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,53 +1,21 @@ - - - - - - - - - - - - - - - - + + + + diff --git a/androidApp/src/main/res/drawable/map_backhoe.png b/androidApp/src/main/res/drawable/map_backhoe.png new file mode 100644 index 0000000..7347b06 Binary files /dev/null and b/androidApp/src/main/res/drawable/map_backhoe.png differ diff --git a/androidApp/src/main/res/drawable/map_car.png b/androidApp/src/main/res/drawable/map_car.png new file mode 100644 index 0000000..9865312 Binary files /dev/null and b/androidApp/src/main/res/drawable/map_car.png differ diff --git a/androidApp/src/main/res/drawable/map_car.xml b/androidApp/src/main/res/drawable/map_car.xml deleted file mode 100644 index 0837918..0000000 --- a/androidApp/src/main/res/drawable/map_car.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/androidApp/src/main/res/drawable/map_pickup.png b/androidApp/src/main/res/drawable/map_pickup.png new file mode 100644 index 0000000..60c005d Binary files /dev/null and b/androidApp/src/main/res/drawable/map_pickup.png differ diff --git a/androidApp/src/main/res/drawable/map_pickup.xml b/androidApp/src/main/res/drawable/map_pickup.xml deleted file mode 100644 index 8b92c06..0000000 --- a/androidApp/src/main/res/drawable/map_pickup.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/androidApp/src/main/res/drawable/map_tractor.png b/androidApp/src/main/res/drawable/map_tractor.png new file mode 100644 index 0000000..9eaa214 Binary files /dev/null and b/androidApp/src/main/res/drawable/map_tractor.png differ diff --git a/androidApp/src/main/res/drawable/map_tractor.xml b/androidApp/src/main/res/drawable/map_tractor.xml deleted file mode 100644 index 3ef45d2..0000000 --- a/androidApp/src/main/res/drawable/map_tractor.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/androidApp/src/main/res/drawable/map_truck.png b/androidApp/src/main/res/drawable/map_truck.png new file mode 100644 index 0000000..dc42323 Binary files /dev/null and b/androidApp/src/main/res/drawable/map_truck.png differ diff --git a/androidApp/src/main/res/drawable/map_truck.xml b/androidApp/src/main/res/drawable/map_truck.xml deleted file mode 100644 index c0b7fc1..0000000 --- a/androidApp/src/main/res/drawable/map_truck.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml index 0b4924a..cf5747b 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -193,6 +193,7 @@ android:id="@+id/sourceCodeButton" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:text="@string/source_code" /> Fecha y hora de la última posición Animal + Retro Bicicleta Bote Autobús @@ -128,10 +129,9 @@ Cerrar sesión Acerca de - Logo de TrackerMap + Logo de ETBSA - TrackerMap es una aplicación de software libre para rastrear y gestionar dispositivos GPS en servidores de Traccar. - \n\nEl código fuente de TrackerMap está disponible bajo la licencia GNU General Public License versión 3. + ETBSA Tracker es una aplicación para rastrear y gestionar unidades GPS. Versión Código fuente diff --git a/androidApp/src/main/res/values/ic_launcher_background.xml b/androidApp/src/main/res/values/ic_launcher_background.xml index c5d5899..276c9ab 100644 --- a/androidApp/src/main/res/values/ic_launcher_background.xml +++ b/androidApp/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF + #EFDB1E \ 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 5f9714e..58eb4f2 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ - TrackerMap + ETBSA - https://trackermap.mx/ - https://sr.ht/~avalos/trackermap/ + https://etbsa.net/ + https://git.avalos.me/etbsa-trackermap-mobile https://www.google.com/maps/place/%1$f,%2$f?z=19 @@ -57,6 +57,7 @@ Last position datetime Animal + Backhoe Bicycle Boat Bus @@ -151,10 +152,9 @@ Sign out About - TrackerMap logo + ETBSA logo - TrackerMap is a free (as in freedom) software app for tracking and managing GPS devices in Traccar servers. - \n\nTrackerMap source code is licensed under the GNU General Public License Version 3. + ETBSA Tracker is an app for tracking and managing GPS devices. Version Source code diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt index 65048ed..58d8d1c 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/MarkerType.kt @@ -1,7 +1,7 @@ package mx.trackermap.TrackerMap.utils enum class MarkerType { - ANIMAL, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, + ANIMAL, BACKHOE, BICYCLE, BOAT, BUS, CAR, CRANE, DEFAULT, HELICOPTER, MOTORCYCLE, OFFROAD, PERSON, PICKUP, PLANE, SCOOTER, SHIP, TRACTOR, TRAIN, TRAM, TROLLEYBUS, TRUCK, VAN, REPORT_POSITION, REPORT_START, REPORT_END -- cgit v1.2.3 From 13910db31a59625c074c4f55690460f7f0155495 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 01:55:09 -0600 Subject: More ETBSA branding --- androidApp/src/main/res/drawable/about_logo.xml | 86 +++++-------------------- 1 file changed, 17 insertions(+), 69 deletions(-) diff --git a/androidApp/src/main/res/drawable/about_logo.xml b/androidApp/src/main/res/drawable/about_logo.xml index d905fa7..b41f9af 100644 --- a/androidApp/src/main/res/drawable/about_logo.xml +++ b/androidApp/src/main/res/drawable/about_logo.xml @@ -1,71 +1,19 @@ - - - - - - - - - - - - - - + android:width="240dp" + android:height="64dp" + android:viewportWidth="240" + android:viewportHeight="64"> + + + -- cgit v1.2.3 From b7493235ef67b1cb0645eaafba625e0cb2dd64f3 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 02:17:47 -0600 Subject: More ETBSA branding --- androidApp/src/main/res/drawable/icon_notify.xml | 31 +++--------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/androidApp/src/main/res/drawable/icon_notify.xml b/androidApp/src/main/res/drawable/icon_notify.xml index c92915e..8bbfd73 100644 --- a/androidApp/src/main/res/drawable/icon_notify.xml +++ b/androidApp/src/main/res/drawable/icon_notify.xml @@ -1,28 +1,5 @@ - - - - + + -- cgit v1.2.3 From d2ab18cc01d2717bf46a378406ed1402381b3a40 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 14:53:15 -0600 Subject: Changed project name to ETBSA TrackerMap --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index f9dbd2f..c63c782 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,6 @@ pluginManagement { } } -rootProject.name = "TrackerMap" +rootProject.name = "ETBSA TrackerMap" include(":androidApp") include(":shared") \ No newline at end of file -- cgit v1.2.3 From 07d0d8b1171f5646f1c6795f1dfaab78aad06512 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 15 Jan 2022 20:11:21 -0600 Subject: Rebranded merge --- androidApp/src/main/res/layout/user_information_activity.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml index c409e98..df0a59f 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -186,7 +186,8 @@ android:id="@+id/sourceCodeButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/source_code" /> + android:text="@string/source_code" + android:visibility="gone" /> Date: Sun, 16 Jan 2022 04:26:31 -0600 Subject: Added Google Maps and Google Satellites layers --- .../TrackerMap/android/units/UnitsActivity.kt | 1 + androidApp/src/main/res/menu/map_layers.xml | 4 ++++ androidApp/src/main/res/values-es-rMX/map_layers.xml | 5 +++-- androidApp/src/main/res/values/map_layers.xml | 18 +++++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) 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 1bbcb80..f2ff30e 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 @@ -94,6 +94,7 @@ class UnitsActivity : AppCompatActivity() { val layer = resources.getStringArray( when (item.itemId) { R.id.layerStreets -> R.array.maps_streets_tile + R.id.layerGmaps -> R.array.maps_gmaps_tile R.id.layerSatellite -> R.array.maps_satellite_tile else -> R.array.maps_streets_tile } diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml index 334b9f9..46165da 100644 --- a/androidApp/src/main/res/menu/map_layers.xml +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -6,6 +6,10 @@ android:id="@+id/layerStreets" android:title="@string/layer_streets"/> + + diff --git a/androidApp/src/main/res/values-es-rMX/map_layers.xml b/androidApp/src/main/res/values-es-rMX/map_layers.xml index eff37d9..ef56b76 100644 --- a/androidApp/src/main/res/values-es-rMX/map_layers.xml +++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml @@ -1,5 +1,6 @@ - Calles - Satélite + OpenStreetMap + Google Calles + Google Satélite \ No newline at end of file diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml index bffceb9..59c6af5 100644 --- a/androidApp/src/main/res/values/map_layers.xml +++ b/androidApp/src/main/res/values/map_layers.xml @@ -1,7 +1,8 @@ - Streets - Satellite + OpenStreetMap + Google Streets + Google Satellite @@ -16,11 +17,18 @@ © OpenStreetMap France | © <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors + + https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga + 0 + 21 + © Google + + - https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x} + https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga 0 - 20 - Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community + 21 + © Google \ No newline at end of file -- cgit v1.2.3 From c8d423b0933b21c9e16475f9bf89160fc8861825 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 01:11:04 -0600 Subject: Branded merge --- .../TrackerMap/android/units/UnitsActivity.kt | 3 ++- androidApp/src/main/res/menu/map_layers.xml | 8 ++++---- androidApp/src/main/res/values-es-rMX/map_layers.xml | 4 ++-- androidApp/src/main/res/values/map_layers.xml | 5 +++-- .../mx/trackermap/TrackerMap/client/models/MapLayer.kt | 17 ++++++++++++----- 5 files changed, 23 insertions(+), 14 deletions(-) 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 e9b9010..475575e 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 @@ -96,7 +96,8 @@ class UnitsActivity : AppCompatActivity() { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } unitsViewModel.setMapLayerType(layer) diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml index 46165da..db0a813 100644 --- a/androidApp/src/main/res/menu/map_layers.xml +++ b/androidApp/src/main/res/menu/map_layers.xml @@ -7,11 +7,11 @@ android:title="@string/layer_streets"/> + android:id="@+id/layerGmapsStreets" + android:title="@string/layer_gmaps_streets"/> + android:id="@+id/layerGmapsSatellite" + android:title="@string/layer_gmaps_satellite"/> \ No newline at end of file diff --git a/androidApp/src/main/res/values-es-rMX/map_layers.xml b/androidApp/src/main/res/values-es-rMX/map_layers.xml index ef56b76..8afadc4 100644 --- a/androidApp/src/main/res/values-es-rMX/map_layers.xml +++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml @@ -1,6 +1,6 @@ OpenStreetMap - Google Calles - Google Satélite + Google Calles + Google Satélite \ No newline at end of file diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml index 034f3e5..50e1a7c 100644 --- a/androidApp/src/main/res/values/map_layers.xml +++ b/androidApp/src/main/res/values/map_layers.xml @@ -1,5 +1,6 @@ - Streets - Satellite + OpenStreetMap + Google Streets + Google Satellite \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt index ff0489e..4a48952 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt @@ -8,7 +8,8 @@ data class MapLayer( ) { enum class Type { STREETS, - SATELLITE + GMAPS_STREETS, + GMAPS_SATELLITE } companion object { @@ -19,11 +20,17 @@ data class MapLayer( maxZoom = 23, attribution = "© OpenStreetMap France | © OpenStreetMap contributors" ), - Type.SATELLITE to MapLayer( - url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + Type.GMAPS_STREETS to MapLayer( + url = "https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga", minZoom = 1, - maxZoom = 20, - attribution = "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community" + maxZoom = 23, + attribution = "© Google" + ), + Type.GMAPS_SATELLITE to MapLayer( + url = "https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga", + minZoom = 1, + maxZoom = 23, + attribution = "© Google" ) ) -- cgit v1.2.3 From 021e0618575d549d896d65948b2a66e4c56d65de Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 02:19:03 -0600 Subject: Updated strings.xml --- androidApp/src/main/res/values-es-rMX/strings.xml | 2 +- androidApp/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml index 3c1813f..c9bc820 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -75,7 +75,7 @@ Longitud Fecha y hora Protocolo - Abrir ubicación en navegador + Abrir en Google Maps Enviar comando diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 5f1eb02..0e947be 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ ETBSA - https://etbsa.net/ + https://etbsa.com.mx/ https://git.avalos.me/etbsa-trackermap-mobile @@ -88,7 +88,7 @@ Longitude Datetime Protocol - Open location in browser + Open in Google Maps Send Command -- cgit v1.2.3 From f9a92738a707c032cc71720756602832d50e9e00 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 04:37:11 -0600 Subject: Bumped version code to 1003 --- androidApp/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index a28a664..4b135ef 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -10,7 +10,7 @@ android { applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1 + versionCode = 1003 versionName = "1.0" ndk { abiFilters.clear() -- cgit v1.2.3 From 9ff880b37f3e44aa3edbd402c8c01aed5467e26a Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 17:14:38 -0600 Subject: Bumped version code and name --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 4b135ef..3947727 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -10,8 +10,8 @@ android { applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1003 - versionName = "1.0" + versionCode = 1105 + versionName = "1.0.1" ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") -- cgit v1.2.3 From 31af6d69a7bb8a513a7bb9b1633cc015088384d3 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 23:53:25 -0600 Subject: Branded merge --- .../src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt index 56a9167..004bcaa 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt @@ -14,7 +14,8 @@ class Utils { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } callback(layer) -- cgit v1.2.3 From 1cc7aee5c2ae7d587d9d2e09f0fea3f546ceb27a Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Tue, 18 Jan 2022 11:01:29 -0600 Subject: Bump version code --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 5e196ce..1dfb0e7 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1105 - versionName = "1.0.1" + versionCode = 1201 + versionName = "1.1.1" ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") -- cgit v1.2.3 From 0381ae0b930ceb7b43ef1e66950c9bd6f9dfcc56 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 20 Jan 2022 21:31:58 -0600 Subject: Bump version code (again) --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 1dfb0e7..f6de76e 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1201 - versionName = "1.1.1" + versionCode = 1202 + versionName = "1.1.2" ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") -- cgit v1.2.3 From 320602f12976c9ba25d079ce736abdaad32d7c36 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 24 Jan 2022 15:14:11 -0600 Subject: Made server URL fields invisible --- androidApp/src/main/res/layout/login.xml | 3 ++- androidApp/src/main/res/layout/user_information_activity.xml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/androidApp/src/main/res/layout/login.xml b/androidApp/src/main/res/layout/login.xml index 78c3e46..1de3f12 100644 --- a/androidApp/src/main/res/layout/login.xml +++ b/androidApp/src/main/res/layout/login.xml @@ -92,7 +92,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/passwordInputLayout" app:layout_constraintBottom_toTopOf="@id/signinButton" - android:layout_marginTop="@dimen/fields_spacing"> + android:layout_marginTop="@dimen/fields_spacing" + android:visibility="gone"> + android:textAppearance="@style/TextAppearance.AppCompat.Body2" + android:visibility="gone"/> + tools:text="@string/default_server_url" + android:visibility="gone"/> Date: Mon, 24 Jan 2022 15:25:28 -0600 Subject: Bumped version to 1.1.2 --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 4d21e69..42db9be 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "net.etbsa.etbsa" minSdk = 21 targetSdk = 31 - versionCode = 1202 - versionName = "1.1.2" + versionCode = 1203 + versionName = "1.1.3" ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") -- cgit v1.2.3