Author: Adam Evyčędo <git@apiote.xyz>
conflict
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/app/build.gradle b/app/build.gradle index 6370e1c6bf0f11de034c23770df76b158d6be31d..d8678df448f795c22513c41b198dc7245d6f9a36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ applicationId "xyz.apiote.bimba.czwek" minSdk 21 //noinspection EditedTargetSdkVersion targetSdk 34 - versionCode 22 - versionName "3.1.0" + versionCode 23 + versionName "3.1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resourceConfigurations += ["en", "pl", "it"] @@ -30,8 +30,8 @@ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } compileOptions { - sourceCompatibility = 17 - targetCompatibility = 17 + sourceCompatibility = 18 + targetCompatibility = 18 coreLibraryDesugaringEnabled true } buildFeatures { diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/ServerChooserActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/ServerChooserActivity.kt index d1d96616c5998e2ed5f21c1da8719658f57fe9b6..7eeea11e0764d396d27c032a8d9fa211e203a82b 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/settings/ServerChooserActivity.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/ServerChooserActivity.kt @@ -152,25 +152,22 @@ showDialog(R.string.error, R.string.error_traffic_spec, R.drawable.error_server, null) return@launch } - if (isSimple) { - updateServer(bimba.servers[0]["url"]!!) - moveOn(bimba, true) + if (preferences.getBoolean("shibboleet", false)) { + val validServers = bimba.servers.filter { !it.getOrDefault("url", null).isNullOrBlank() } + val servers = validServers.toTypedArray() + MaterialAlertDialogBuilder(this@ServerChooserActivity) + .setTitle(R.string.choose_server) + .setItems(servers.map { it["description"] }.toTypedArray()) { _, i -> + updateServer(servers[i]["url"].toString()) + moveOn(bimba, false) + } + .show() return@launch } - if (preferences.getBoolean("shibboleet", false)) { - val validServers = bimba.servers.filter { !it.getOrDefault("url", null).isNullOrBlank() } - if (validServers.size > 1) { - val servers = validServers.toTypedArray() - MaterialAlertDialogBuilder(this@ServerChooserActivity) - .setTitle(R.string.choose_server) - .setItems(servers.map { it["description"] }.toTypedArray()) { _, i -> - updateServer(servers[i]["url"].toString()) - moveOn(bimba, false) - } - .show() - } - } + updateServer(bimba.servers[0]["url"]!!) + moveOn(bimba, isSimple) + return@launch } } diff --git a/fruchtfleisch/build.gradle b/fruchtfleisch/build.gradle index 730e890c34aca32c1cf7c79d430c86a9f204929a..aaf4d52189cd87072a7cdef5902538afee6fcb81 100644 --- a/fruchtfleisch/build.gradle +++ b/fruchtfleisch/build.gradle @@ -7,6 +7,6 @@ dependencies { //implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10' } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_18 + targetCompatibility = JavaVersion.VERSION_18 } \ No newline at end of file diff --git a/metadata/en-GB/changelogs/20.txt b/metadata/en-GB/changelogs/20.txt new file mode 100644 index 0000000000000000000000000000000000000000..2c0537ce83578857e2b4b3254db15889c4a04654 --- /dev/null +++ b/metadata/en-GB/changelogs/20.txt @@ -0,0 +1,5 @@ +Version 3.0 is completely rewritten from scratch and features totally new architecture. + +* Favourites are removed +* Stops and vehicles are on map +* UI is now Material3 diff --git a/metadata/en-GB/changelogs/21.txt b/metadata/en-GB/changelogs/21.txt new file mode 100644 index 0000000000000000000000000000000000000000..2c0537ce83578857e2b4b3254db15889c4a04654 --- /dev/null +++ b/metadata/en-GB/changelogs/21.txt @@ -0,0 +1,5 @@ +Version 3.0 is completely rewritten from scratch and features totally new architecture. + +* Favourites are removed +* Stops and vehicles are on map +* UI is now Material3 diff --git a/metadata/en-GB/changelogs/22.txt b/metadata/en-GB/changelogs/22.txt new file mode 100644 index 0000000000000000000000000000000000000000..9a3dfaf104f264406ce5bf6e8a286c22cebe53dd --- /dev/null +++ b/metadata/en-GB/changelogs/22.txt @@ -0,0 +1,11 @@ +Version 3.1 features: +* monochrome launcher icon and predictive back gesture for Android 12, +* Material You theme with system colours, +* new search bar, +* searching by Open Location Code, +* gliding instead of jumping in minimap, +* Polish and Italian translations, +* multiple feeds handling, +* QR codes in Metropolis GZM, +* searching by line (and picking stops on graphs), +* dependency updates, bug fixes, and some code refactor. \ No newline at end of file diff --git a/metadata/en-GB/changelogs/23.txt b/metadata/en-GB/changelogs/23.txt new file mode 100644 index 0000000000000000000000000000000000000000..93d0379b04a2b1fe568419bb1a2afe16eb4aa67a --- /dev/null +++ b/metadata/en-GB/changelogs/23.txt @@ -0,0 +1 @@ +Version 3.1.1 fixes continue button in server selection diff --git a/metadata/en-GB/full_description.txt b/metadata/en-GB/full_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..59c7f7d483e460478aecde35f1dd49bdbb62062c --- /dev/null +++ b/metadata/en-GB/full_description.txt @@ -0,0 +1,8 @@ +Bimba lets you check public transport timetable with realtime departures in multiple cities. + +Current features: +* checking departures by stop, +* searching nearby stops, +* searching stops by QR code (in selected timetables), +* vehicle attributes for departures (depending on available information), +* vehicles and stops on map in real time diff --git a/metadata/en-GB/images/featureGraphic.png b/metadata/en-GB/images/featureGraphic.png new file mode 100644 index 0000000000000000000000000000000000000000..844a16c96d6c022afb07cdf727fa3230714650f9 Binary files /dev/null and b/metadata/en-GB/images/featureGraphic.png differ diff --git a/metadata/en-GB/images/icon.png b/metadata/en-GB/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..51de732e44c246bac252b581c3bb1b3c9aa345c6 Binary files /dev/null and b/metadata/en-GB/images/icon.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/Dash.png b/metadata/en-GB/images/phoneScreenshots/Dash.png new file mode 100644 index 0000000000000000000000000000000000000000..146004687039135fbf1128f123d9fbb96cfcb92d Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/Dash.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/StopActivity.png b/metadata/en-GB/images/phoneScreenshots/StopActivity.png new file mode 100644 index 0000000000000000000000000000000000000000..bd22a142e118239c447dd6a3f22f82b79f65f2c1 Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/StopActivity.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/map.png b/metadata/en-GB/images/phoneScreenshots/map.png new file mode 100644 index 0000000000000000000000000000000000000000..7e4c4ec3692bceb8a58ab7189f1182aa6393960a Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/map.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/mapBS.png b/metadata/en-GB/images/phoneScreenshots/mapBS.png new file mode 100644 index 0000000000000000000000000000000000000000..47b86f8176f5710a9b88a60e9eb65ca2a6897f8f Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/mapBS.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/modification.png b/metadata/en-GB/images/phoneScreenshots/modification.png new file mode 100644 index 0000000000000000000000000000000000000000..a838f5725c1cdcb0fe1328ab2815f62fc788b29d Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/modification.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/modification_more.png b/metadata/en-GB/images/phoneScreenshots/modification_more.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe8b805f78eb31aa4c8f6b777b0e41543cb6dad Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/modification_more.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/searchStop.png b/metadata/en-GB/images/phoneScreenshots/searchStop.png new file mode 100644 index 0000000000000000000000000000000000000000..72028597f2ee1f7372327cd2adb8c2c9b3ec65b2 Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/searchStop.png differ diff --git a/metadata/en-GB/images/phoneScreenshots/stopSpecify.png b/metadata/en-GB/images/phoneScreenshots/stopSpecify.png new file mode 100644 index 0000000000000000000000000000000000000000..015d5e1fcd1d71dfb1f5fc56162e9bb5b75ca12a Binary files /dev/null and b/metadata/en-GB/images/phoneScreenshots/stopSpecify.png differ diff --git a/metadata/en-GB/short_description.txt b/metadata/en-GB/short_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..f9a5d1ebda7eb2bd14aeea0f93880337150b5563 --- /dev/null +++ b/metadata/en-GB/short_description.txt @@ -0,0 +1 @@ +FLOSS public transport passenger companion; a timetable in your pocket. diff --git a/metadata/en-GB/title.txt b/metadata/en-GB/title.txt new file mode 100644 index 0000000000000000000000000000000000000000..038d5e6047bc863c8fd2210be761c396b834e447 --- /dev/null +++ b/metadata/en-GB/title.txt @@ -0,0 +1 @@ +Bimba diff --git a/metadata/en-US/changelogs/22.txt b/metadata/en-US/changelogs/22.txt index 9a3dfaf104f264406ce5bf6e8a286c22cebe53dd..a4a16611ea315ee5e128ae73e706e3e65de6ed3f 100644 --- a/metadata/en-US/changelogs/22.txt +++ b/metadata/en-US/changelogs/22.txt @@ -1,6 +1,6 @@ Version 3.1 features: * monochrome launcher icon and predictive back gesture for Android 12, -* Material You theme with system colours, +* Material You theme with system colors, * new search bar, * searching by Open Location Code, * gliding instead of jumping in minimap, diff --git a/metadata/en-US/changelogs/23.txt b/metadata/en-US/changelogs/23.txt new file mode 100644 index 0000000000000000000000000000000000000000..93d0379b04a2b1fe568419bb1a2afe16eb4aa67a --- /dev/null +++ b/metadata/en-US/changelogs/23.txt @@ -0,0 +1 @@ +Version 3.1.1 fixes continue button in server selection diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index 54e327510dec975d7740b2c1d4ee297ae751647b..594cb11475cd3d90aeb30b81ea8764c381b98a69 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -1,8 +1,8 @@ -Bimba lets you check public transport timetable with realtime departures. Currently Poznań agglomeration (ZTM Poznań) is supported but more feeds will be added in the future. +Bimba lets you check public transport timetable with realtime departures in multiple cities. Current features: * checking departures by stop, * searching nearby stops, -* (ZTM Poznań only) searching stops by QR code -* vehicle attributes for departures -* vehicles and stops on map in real time +* searching stops by QR code (in selected timetables), +* vehicle attributes for departures (depending on available information), +* vehicles and stops on map in real time, diff --git a/metadata/pl-PL/changelogs/23.txt b/metadata/pl-PL/changelogs/23.txt new file mode 100644 index 0000000000000000000000000000000000000000..6cf18e64638cc416e272f1910b99c6f152c99005 --- /dev/null +++ b/metadata/pl-PL/changelogs/23.txt @@ -0,0 +1 @@ +Wersja 3.1.1 naprawia przycisk Kontynuuj na wyborze serwera diff --git a/metadata/pl-PL/full_description.txt b/metadata/pl-PL/full_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..927783a04de7e79f54b1f47d954dc58743d69be7 --- /dev/null +++ b/metadata/pl-PL/full_description.txt @@ -0,0 +1,8 @@ +Bimba pozwala sprawdzić rozkład jazdy transportu publicznego z odjazdami na żywo w niejednym mieście. + +Aktualne funkcje: +* sprawdzanie rozładu wg przystanków, +* szukanie przystanków w pobliżu, +* szukanie przystanków po kodach QR (w wybranych rozkładach), +* atrybuty pojazdów (w zależności od udostępnianych informacji), +* przystanki i pojazdy na mapie w czasie rzeczywistym diff --git a/metadata/pl-PL/images/featureGraphic.png b/metadata/pl-PL/images/featureGraphic.png new file mode 100644 index 0000000000000000000000000000000000000000..844a16c96d6c022afb07cdf727fa3230714650f9 Binary files /dev/null and b/metadata/pl-PL/images/featureGraphic.png differ diff --git a/metadata/pl-PL/images/icon.png b/metadata/pl-PL/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..51de732e44c246bac252b581c3bb1b3c9aa345c6 Binary files /dev/null and b/metadata/pl-PL/images/icon.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/Dash.png b/metadata/pl-PL/images/phoneScreenshots/Dash.png new file mode 100644 index 0000000000000000000000000000000000000000..146004687039135fbf1128f123d9fbb96cfcb92d Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/Dash.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/StopActivity.png b/metadata/pl-PL/images/phoneScreenshots/StopActivity.png new file mode 100644 index 0000000000000000000000000000000000000000..bd22a142e118239c447dd6a3f22f82b79f65f2c1 Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/StopActivity.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/map.png b/metadata/pl-PL/images/phoneScreenshots/map.png new file mode 100644 index 0000000000000000000000000000000000000000..7e4c4ec3692bceb8a58ab7189f1182aa6393960a Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/map.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/mapBS.png b/metadata/pl-PL/images/phoneScreenshots/mapBS.png new file mode 100644 index 0000000000000000000000000000000000000000..47b86f8176f5710a9b88a60e9eb65ca2a6897f8f Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/mapBS.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/modification.png b/metadata/pl-PL/images/phoneScreenshots/modification.png new file mode 100644 index 0000000000000000000000000000000000000000..a838f5725c1cdcb0fe1328ab2815f62fc788b29d Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/modification.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/modification_more.png b/metadata/pl-PL/images/phoneScreenshots/modification_more.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe8b805f78eb31aa4c8f6b777b0e41543cb6dad Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/modification_more.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/searchStop.png b/metadata/pl-PL/images/phoneScreenshots/searchStop.png new file mode 100644 index 0000000000000000000000000000000000000000..72028597f2ee1f7372327cd2adb8c2c9b3ec65b2 Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/searchStop.png differ diff --git a/metadata/pl-PL/images/phoneScreenshots/stopSpecify.png b/metadata/pl-PL/images/phoneScreenshots/stopSpecify.png new file mode 100644 index 0000000000000000000000000000000000000000..015d5e1fcd1d71dfb1f5fc56162e9bb5b75ca12a Binary files /dev/null and b/metadata/pl-PL/images/phoneScreenshots/stopSpecify.png differ diff --git a/metadata/pl-PL/short_description.txt b/metadata/pl-PL/short_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..31f466c88b5a7951d99adda68b39dda9759adaa6 --- /dev/null +++ b/metadata/pl-PL/short_description.txt @@ -0,0 +1 @@ +Wolny i otwarty kompan w transporcie publicznym; rozkład jazdy w twojej kieszeni diff --git a/metadata/pl-PL/title.txt b/metadata/pl-PL/title.txt new file mode 100644 index 0000000000000000000000000000000000000000..038d5e6047bc863c8fd2210be761c396b834e447 --- /dev/null +++ b/metadata/pl-PL/title.txt @@ -0,0 +1 @@ +Bimba