Bimba.git

commit 7aa914409fdd89ec7e4ae76b5c60e26a5680d672

Author: Adam Evyčędo <git@apiote.xyz>

merge develop into master for version 3.3.1
string,

%!v(PANIC=String method: strings: negative Repeat count)


diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 115cb1a406cd760a463bc2ee73f41809c5a42379..72326247cf9be610fb7cae767daeaf4e8c8bdeb3 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -14,6 +14,12 @@
 * Travel planning
 * Offline timetable
 
+== [3.3.1] – 2024-05-21
+
+=== Fixed
+
+* Limited map zoom leves so that markers scaling won’t crash
+
 == [3.3] – 2024-05-16
 
 === Added




diff --git a/README.adoc b/README.adoc
index d0ddcbe2c696355c6b278213be5538fd8556182e..91efdc01793aac246c4aca7e4e4ff100045e0923 100644
--- a/README.adoc
+++ b/README.adoc
@@ -4,7 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later
 
 = Bimba
 Adam Evyčędo <me@apiote.xyz>
-v3.3 2024-05-16
+v3.3.1 2024-05-21
 :toc:
 
 Bimba is a FLOSS public transport passenger companion; a timetable in your pocket.




diff --git a/app/build.gradle b/app/build.gradle
index 74c83573693cf4ef41816d56aaaf424ba0785c77..069d3f4fde4d6692dcf301afff255bfa62879fd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@     defaultConfig {
         applicationId "xyz.apiote.bimba.czwek"
         minSdk 21
         targetSdk 34
-        versionCode 25
-        versionName "3.3.0"
+        versionCode 26
+        versionName "3.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ["en", "pl", "it", "de"]




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapFragment.kt b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapFragment.kt
index bd2f1614e6497260be727826f03a5a6e3ccf2b9e..aa287e8248c16ec7c0ce60a753274cadb6ae0e17 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapFragment.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapFragment.kt
@@ -78,6 +78,8 @@ 		) {
 			binding.map.overlayManager.tilesOverlay.setColorFilter(TilesOverlay.INVERT_COLORS)
 		}
 		binding.map.zoomController.setVisibility(CustomZoomButtonsController.Visibility.NEVER)
+		binding.map.maxZoomLevel = 21.5
+		binding.map.minZoomLevel = 10.5
 		binding.map.setMultiTouchControls(true)
 		binding.map.overlays.add(RotationGestureOverlay(binding.map).apply { isEnabled = true })
 
@@ -247,4 +249,4 @@ 	override fun onDestroyView() {
 		super.onDestroyView()
 		maybeBinding = null
 	}
-}
\ No newline at end of file
+}




diff --git a/metadata/en-GB/changelogs/26.txt b/metadata/en-GB/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..50f483aa5ad8b7f0adfb9b83f258b1ed10982b0c
--- /dev/null
+++ b/metadata/en-GB/changelogs/26.txt
@@ -0,0 +1,14 @@
+Changes in version 3.3.1
+* Fixed crash when zooming map too close
+Changes in version 3.3
+* Added selecting date and filtering by time
+* Added filtering departures by line
+* Added alerts shown in stop and departures
+* Fixed landscape version of “about” screen
+* Fixed capabilities for vehicles on map
+* Changed cached localities to lower contrast
+* Fixed showing line directions for other than 2
+* Fixed saving localities cache
+* Updated dependencies
+* Updated deprecated methods in code
+




diff --git a/metadata/en-US/changelogs/26.txt b/metadata/en-US/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..50f483aa5ad8b7f0adfb9b83f258b1ed10982b0c
--- /dev/null
+++ b/metadata/en-US/changelogs/26.txt
@@ -0,0 +1,14 @@
+Changes in version 3.3.1
+* Fixed crash when zooming map too close
+Changes in version 3.3
+* Added selecting date and filtering by time
+* Added filtering departures by line
+* Added alerts shown in stop and departures
+* Fixed landscape version of “about” screen
+* Fixed capabilities for vehicles on map
+* Changed cached localities to lower contrast
+* Fixed showing line directions for other than 2
+* Fixed saving localities cache
+* Updated dependencies
+* Updated deprecated methods in code
+




diff --git a/metadata/pl-PL/changelogs/26.txt b/metadata/pl-PL/changelogs/26.txt
new file mode 100644
index 0000000000000000000000000000000000000000..05ccee7facb3b5c74faa6c783359e9460e446e22
--- /dev/null
+++ b/metadata/pl-PL/changelogs/26.txt
@@ -0,0 +1,14 @@
+Zmiany w wersji 3.3.1
+* Naprawniono błąd przy zbyt dużym powiększaniu mapy
+Zmiany w wersji 3.3
+* Dodano wybieranie daty i filtrowanie po czasie
+* Dodano filtrowanie po linii
+* Dodany alerty przy przystankach i odjazdach
+* Poprawiono horyzontalną wersję ekranu o Bimbie
+* Poprawiono cechy pojazdów na mapie
+* Zmieniono zapisane lokalizacje na mniejszy kontrast
+* Poprawiono kierunki linii dla innej liczby niż 2
+* Poprawiono zapisuwanie lokalizacji
+* Zaktualizowano zależności
+* Zaktualizowano przestarzałe metody w kodzie
+