From a9ba6b1d5c3a149032cfbdc85aae1db9645c5cfe Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 1 Jan 2024 20:30:31 +0100 Subject: [PATCH 01/21] Add mesinger as contributor (#905) --- .clabot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 024f23401..72ee911fd 100644 --- a/.clabot +++ b/.clabot @@ -22,7 +22,8 @@ "thgoebel", "pt2121", "Jean-BaptisteC", - "Bnyro" + "Bnyro", + "mesinger" ], "label": "cla-signed ✔️", "message": "Thank you for your pull request and welcome to our community! We require contributors to sign our [Contributor License Agreement](https://github.com/grote/Transportr/blob/master/CLA.md), and we don't seem to have the user {{usersWithoutCLA}} on file. In order for your code to get reviewed and merged, please explicitly state that you accept the agreement. Alternatively, you can add a commit that adds yourself to https://github.com/grote/Transportr/blob/master/.clabot" From 07bde7f48b5968e8c216e8c9c2183ec43532d19d Mon Sep 17 00:00:00 2001 From: Altonss Date: Tue, 19 Dec 2023 00:35:25 +0100 Subject: [PATCH 02/21] Re-add VRS network --- .../transportr/networks/TransportNetworks.kt | 12 +- app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-eu/strings.xml | 1 + app/src/main/res/values-fa/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + artwork/networks/network_vrs_logo.svg | 147 ++++++++++++++++++ 24 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 artwork/networks/network_vrs_logo.svg diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index 0ee086545..b2c0e2cfb 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -20,6 +20,7 @@ package de.grobox.transportr.networks import android.annotation.SuppressLint +import android.util.Base64 import android.content.Context import de.grobox.transportr.R import de.grobox.transportr.networks.TransportNetwork.Status.ALPHA @@ -231,6 +232,12 @@ private val networks = arrayOf( logo = R.drawable.network_vgs_logo, factory = { VgsProvider("{\"type\":\"AID\",\"aid\":\"51XfsVqgbdA6oXzHrx75jhlocRg6Xe\"}", "HJtlubisvxiJxss".toByteArray(Charsets.UTF_8)) } ), + TransportNetwork( + id = NetworkId.VRS, + description = R.string.np_desc_vrs, + logo = R.drawable.network_vrs_logo, + factory = { VrsProvider(VRS) } + ), TransportNetwork( id = NetworkId.VMT, description = R.string.np_desc_vmt, @@ -578,7 +585,10 @@ private val networks = arrayOf( private const val NAVITIA = "87a37b95-913a-4cb4-ba52-eb0bc0b304ca" private const val VAO = "{\"aid\":\"hf7mcf9bv3nv8g5f\",\"pw\":\"87a6f8ZbnBih32\",\"type\":\"USER\",\"user\":\"mobile\"}" - +private val VRS: ByteArray = Base64.decode( + "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", + Base64.DEFAULT +) internal fun getContinentItems(context: Context): List { return List(networks.size) { i -> networks[i].getItem(context) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 29ffe0a46..e1bebe8e2 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -284,6 +284,7 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]> Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rhineland-Palatinate, Mannheim, Mainz, Trier Rin del Nord-Westfàlia, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Cologne, Bonn Swabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saxònia, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d581dbfc0..fb95e95b4 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -264,6 +264,7 @@ Tato aplikace využívá data různých místních dopravních agentur a poskytu Meklenbursko-Přední Pomořansko, Schwerin Bádensko-Württembersko, Porýní-Falc, Mannheim, Mohuč, Trier Severní Porýní-Vestfálsko, Kolín nad Rýnem, Bonn, Essen, Dortmund, Dusseldorf, Munster, Paderborn, Höxter + Kolín nad Rýnem, Bonn Švábsko, Střední Švábsko, Krumbach, Günzburg, Memmingen Sasko, Drážďany Bádensko-Württembersko, Stuttgart diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 36b055ae7..7b6b9c4f6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -269,6 +269,7 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen. Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rhineland-Palatinate, Mannheim, Mainz, Trier Nord Rhine-Westphalia, Cologne, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Cologne, Bonn Swabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saxony, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e143f9d39..314dd0dd6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -280,6 +280,7 @@ und weiß immer, wo man aussteigen muss. Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rheinland-Pfalz, Mannheim, Mainz, Trier Nordrhein-Westfalen, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Köln, Bonn Schwaben, Mittelschwaben, Krumbach, Günzburg, Memmingen Sachsen, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7daeb375b..cc27e3cab 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -257,6 +257,7 @@ Μεκλεμβούργο-Δυτικής Πομερανίας, Schwerin Μπάντεν-Βυρτεμβέργη, Ρηνανία-Παλατινάτο, Μανχάιμ, Mainz, Trier Βόρεια Ρηνανία-Βεστφαλία, Κολωνία, Βόνη, Έσσεν, Ντόρτμουντ, Ντίσελντορφ, Μόναχο, Πάντερμπορν, Χόκερ + Κολωνία, Βόνη Σβάμπα, Κεντρική Σβάμπα,, Krumbach, Günzburg, Memmingen Σαξονία, Δρέσδη Μπάντεν-Βυρτεμβέργη, Στουτγάρδη diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 3c850df4b..b65c18731 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -261,6 +261,7 @@ Tiu ĉi aplikaĵo uzas datumojn de diversaj lokaj firmaoj de publika transporto Meklenburg-Antaŭpomerio, Schwerin Baden-Virtembergo, Rejnland-Palatinato, Manhejmo, Majenco, Treviro Nordrejn-Vestfalujo, Kolonjo, Bonn, Essen, Dortmund, Duseldorfo, Münster, Paderborn, Höxter + Kolonjo, Bonn Ŝvabujo, Mittelschwaben, Krumbach, Günzburg, Memmingen Saksujo, Dresdeno Baden-Virtembergo, Stutgarto diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 24e3d2c97..d24870b89 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -268,6 +268,7 @@ Inténtelo de nuevo más tarde, por favor. Mecklemburgo-Antepomerania, Schwerin Baden-Wurtemberg, Renania-Palatinado, Mannheim, Maguncia, Tréveris Renania del Norte-Westfalia, Colonia, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Cologne, Bonn Suabia, Mittelschwaben, Krumbach, Gunzburgo, Memmingen Sajonia, Dresde Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6c8737ea0..065e838a3 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -275,6 +275,7 @@ eta beti daki non zauden autobusetik non jaitsi jakin dezazun. Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Renania-Palatinatua, Mannheim, Mainz, Trier Ipar Rhine-Westphalia, Kolonia, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Kolonia, Bonn Swabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saxonia, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0427bd9dc..99223068b 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -271,6 +271,7 @@ Transportr مکان ها و سفر های انجام شده متداول را ذ مکلنبورگ-فورپومرن، شورین بادن-وورتمبرگ، راینلاند-فالتس، مانهایم، ماینتس، تری‌یر نوردراین-وستفالن، کلن، بن، اسن، دورتموند، دوسلدورف، مونستر، پادربورن، هخستر + کلن، بن شوابن، میتلشوابن، کرومباخ، گونتسبورگ، ممینگن زاکسن، درسدن بادن-وورتمبرگ، اشتوتگارت diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fd33764b1..b12f36974 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -271,6 +271,7 @@ Elle n’utilise pas non plus des outils de suivi comme Google Analytics pour vo Mecklembourg-Poméranie antérieure, Schwerin Bade-Wurtemberg, Rhénanie-Palatinat, Mannheim, Mayence, Trèves Rhénanie-du-Nord-Westphalie, Cologne, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Cologne, Bonn Souabe, Souabe centrale, Krumbach, Guntzbourg, Memmingen Saxe, Dresden Bade-Wurtemberg, Stuttgart diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 94b4c9fbb..3f0c17918 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -284,6 +284,7 @@ hogy hol kell leszállnia a buszról… Mecklenburg-Elő-Pomeránia, Schwerin Baden-Württemberg, Rajna-vidék-Pfalz, Mannheim, Mainz, Trier Észak-Rajna-Vesztfália, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Köln, Bonn Svábia, Középső-Svábia, Krumbach, Günzburg, Memmingen Szászország, Drezda Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a1ab3031f..33f521959 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -277,6 +277,7 @@ Inoltre, non usa strumenti di tracciamento come Google Analytics per spiarti. Meclemburgo-Pomerania anteriore, Schwerin Baden-Württemberg, Renania-Palatinato, Mannheim, Magonza, Treviri Renania Settentrionale-Vestfalia, Colonia, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Colonia, Bonn Svevia, Medio Svevia, Krumbach, Günzburg, Memmingen Sassonia, Dresda Baden-Württemberg, Stoccarda diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8bd6d2400..cfdda5da6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -271,6 +271,7 @@ Transportr は頻繁に使用される場所や旅行を保存します。 メクレンブルク=フォアポンメルン州、シュヴェリーン バーデン・ヴュルテンベルク州、ラインランド・プファルツ州、マンハイム、マインツ、トリアー ノルトライン・ヴェストファーレン、ケルン、ボン、エッセン、ドルトムント、デュッセルドルフ、ミュンスター、パーダーボルン、ホクスター + ケルン、ボン シュヴァーベン、ミッテルシュヴァーベン、クルムバッハ、ギュンツブルク、メミンゲン ザクセン、ドレスデン バーデン=ヴュルテンベルク州、シュトゥットガルト diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c341f29d9..67d1a026d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -200,6 +200,7 @@ Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rheinland-Pfalz, Mannheim, Mainz, Trier Nordrhein-Westfalen, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Köln, Bonn Schwaben, Mittelschwaben, Krum, Günzburg, Memmingen Fristaten Saksen, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ecba0f27f..b3e6c0739 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -261,6 +261,7 @@ Deze app gebruikt de gegevens van verschillende lokale openbaar vervoersaanbiede Mecklenburg-Voor-Pommeren, Schwerin Baden-Württemberg, Rijnland-Palts, Mannheim, Mainz, Trier Noordrijn-Westfalen, Keulen, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Keulen, Bonn Zwaben, Mittelschwaben, Krumbach, Günzburg, Memmingen Saksen, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 49041e005..82bc504ce 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -255,6 +255,7 @@ Ta aplikacja korzysta z wielu dostawców danych transportu publicznego i dostarc Meklemburgia-Pomorze Przednie, Schwerin Badenia-Wirtembergia, Nadrenia-Palatynat, Mannheim, Moguncja, Trewir Nadrenia Północna-Westfalia, Kolonia, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Kolonia, Bonn Szwabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saksonia, Drezno Badenia-Wirtembergia, Stuttgart diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 838c3cb1a..8dbfac3e0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -216,6 +216,7 @@ Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Renânia-Palatinado, Mannheim, Mainz, Tréveris Renânia do Norte - Vestfália, Colônia, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Colônia, Bonn Suábia, Saxônia, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fb6e52a3b..ec545bb21 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -262,6 +262,7 @@ Transportr сохраняет часто используемые местопо Мекленбург-Передняя Померания, Шверин Баден-Вюртемберг, Rhineland-Palatinate, Мангейм, Майнц, Трир Северный Рейн-Вестфалия, Кельн, Бонн, Эссен, Дортмунд, Дюссельдорф, Мюнстер, Падерборн, Хекстер + Кельн, Бонн Швабия, центральная Швабия, Крумбах, Гюнцбург, Мемминген Саксония, Дрезден Баден-Вюртемберг, Штутгарт diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f5b4edb33..e13cf5586 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -273,6 +273,7 @@ och vet alltid var du inte ska missa var du ska gå av bussen. Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rheinland-Pfalz, Mannheim, Mainz, Trier Nordrhein-Westfalen, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Köln, Bonn Swabia, Mellersta Swabia, Krumbach, Günzburg, Memmingen Sachsen, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 25e161337..f3d1f9595 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -196,6 +196,7 @@ Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rhineland-Palatinate, Mannheim, Mainz, Trier Kuzey Rhine-Westphalia, Köln, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Köln, Bonn Swabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saksonya, Dresden Baden-Württemberg, Stuttgart diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2c5c7ce62..5561f44d3 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -268,6 +268,7 @@ Transportr зберігає часто використовувані місця Мекленбург-Передня Померанія, Шверін Баден-Вюртемберг, Рейнланд-Пфальц, Мангейм, Майнц, Трір Північний Рейн-Вестфалія, Кельн, Бонн, Ессен, Дортмунд, Дюссельдорф, Мюнстер, Падерборн, Хекстер + Кельн, Бонн Швабія, Центральна Швабія, Крумбах, Гюнцбург, Меммінген Саксонія, Дрезден Баден-Вюртемберг, Штутгарт diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1e1ca5c1..4aa62f124 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -349,6 +349,7 @@ and always knows where you are to not miss where to get off the bus. Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rhineland-Palatinate, Mannheim, Mainz, Trier North Rhine-Westphalia, Cologne, Bonn, Essen, Dortmund, Düsseldorf, Münster, Paderborn, Höxter + Cologne, Bonn Swabia, Mittelschwaben, Krumbach, Günzburg, Memmingen Saxony, Dresden Baden-Württemberg, Stuttgart diff --git a/artwork/networks/network_vrs_logo.svg b/artwork/networks/network_vrs_logo.svg new file mode 100644 index 000000000..fae8b2058 --- /dev/null +++ b/artwork/networks/network_vrs_logo.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + From 3d4097202c479fd2394785bf48e26cdda468c97e Mon Sep 17 00:00:00 2001 From: mesinger Date: Mon, 1 Jan 2024 16:44:48 +0100 Subject: [PATCH 03/21] Reenable Wiener Linien provider --- .../java/de/grobox/transportr/networks/TransportNetworks.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index b2c0e2cfb..b35e7bf7b 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -288,13 +288,13 @@ private val networks = arrayOf( logo = R.drawable.network_stv_logo, factory = { StvProvider() } ),*/ - /*TransportNetwork( + TransportNetwork( id = NetworkId.WIEN, name = R.string.np_name_wien, description = R.string.np_desc_wien, logo = R.drawable.network_wien_logo, factory = { WienProvider() } - ),*/ + ), // see https://github.com/grote/Transportr/issues/817 /*TransportNetwork( id = NetworkId.VMOBIL, From c9aaa931ef5ccbc4c5183e676295361460eaf439 Mon Sep 17 00:00:00 2001 From: Altonss Date: Wed, 6 Dec 2023 01:25:59 +0100 Subject: [PATCH 04/21] timePicker: fix minutes resetting to current hour --- .../java/de/grobox/transportr/ui/TimeDateFragment.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt b/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt index 0ded2f25e..a4e28a218 100755 --- a/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt +++ b/app/src/main/java/de/grobox/transportr/ui/TimeDateFragment.kt @@ -21,6 +21,7 @@ package de.grobox.transportr.ui import android.app.DatePickerDialog import android.app.DatePickerDialog.OnDateSetListener +import android.os.Build import android.os.Bundle import android.text.format.DateFormat.getDateFormat import android.view.LayoutInflater @@ -162,8 +163,15 @@ class TimeDateFragment : DialogFragment(), OnDateSetListener, OnTimeChangedListe @Suppress("DEPRECATION") private fun showTime(c: Calendar) { - timePicker.currentHour = c.get(HOUR_OF_DAY) - timePicker.currentMinute = c.get(MINUTE) + val hour = c.get(HOUR_OF_DAY) + val min = c.get(MINUTE) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + timePicker.hour = hour + timePicker.minute = min + } else { + timePicker.currentHour = hour + timePicker.currentMinute = min + } } private fun showDate(c: Calendar) { From 80a28e8d827dd30d40674af40c40d76f6ae28ba0 Mon Sep 17 00:00:00 2001 From: ialokim Date: Mon, 13 Nov 2023 00:17:27 +0100 Subject: [PATCH 05/21] update PTE, remove TFI (Ireland) --- app/build.gradle | 2 +- .../transportr/networks/TransportNetworks.kt | 10 ------- .../main/res/drawable/network_tfi_logo.xml | 26 ------------------- app/witness.gradle | 4 +-- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 app/src/main/res/drawable/network_tfi_logo.xml diff --git a/app/build.gradle b/app/build.gradle index 9a3565cd8..17c861c6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -142,7 +142,7 @@ dependencies { exclude module: 'failureaccess' exclude group: 'com.google.j2objc' } - implementation('com.gitlab.opentransitmap:public-transport-enabler:902b26d6') { + implementation('com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7') { exclude group: 'com.google.guava' // included above exclude group: 'org.json', module: 'json' // provided by Android exclude group: 'net.sf.kxml', module: 'kxml2' // provided by Android diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index b35e7bf7b..2bfec940d 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -419,16 +419,6 @@ private val networks = arrayOf( ) ) ), - Country( - R.string.np_region_ireland, flag = "🇮🇪", networks = listOf( - TransportNetwork( - id = NetworkId.TFI, - description = R.string.np_desc_tfi, - logo = R.drawable.network_tfi_logo, - factory = { TfiProvider() } - ) - ) - ), Country( R.string.np_name_it, flag = "🇮🇹", networks = listOf( TransportNetwork( diff --git a/app/src/main/res/drawable/network_tfi_logo.xml b/app/src/main/res/drawable/network_tfi_logo.xml deleted file mode 100644 index 2d10e1900..000000000 --- a/app/src/main/res/drawable/network_tfi_logo.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/witness.gradle b/app/witness.gradle index bcbc9cfeb..18fd0e421 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -85,7 +85,7 @@ dependencyVerification { 'androidx.viewpager:viewpager:1.0.0:viewpager-1.0.0.aar:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682', 'com.github.omadahealth:swipy:1.2.3:swipy-1.2.3.aar:63bff6e181742e3e243c29b595062ca65b4274bf7033c65460924f64f65c01e0', 'com.github.tony19:logback-android:1.1.1-12:logback-android-1.1.1-12.aar:3102228f0e408e3c003b34e96a604e9b9f59d314dcf8f03aa78d9d3648198932', - 'com.gitlab.opentransitmap:public-transport-enabler:902b26d6:public-transport-enabler-902b26d6.jar:a8b3e5ddae24d27e7713fc68dfa84da2288e48fbe7ccc90cf6ce40ef40b4a6bf', + 'com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7:public-transport-enabler-3a16b1e7.jar:b7bfd5c19990f019b9c785817ee89fe80329454ea6aeea33ecd0386d227442e5', 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', 'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', 'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7', @@ -181,7 +181,7 @@ dependencyVerification { 'org.ow2.asm:asm-tree:9.2:asm-tree-9.2.jar:aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011', 'org.ow2.asm:asm:9.2:asm-9.2.jar:b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5', 'org.slf4j:slf4j-api:1.7.32:slf4j-api-1.7.32.jar:3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be', - 'org.slf4j:slf4j-api:2.0.7:slf4j-api-2.0.7.jar:5d6298b93a1905c32cda6478808ac14c2d4a47e91535e53c41f7feeb85d946f4', + 'org.slf4j:slf4j-api:2.0.9:slf4j-api-2.0.9.jar:0818930dc8d7debb403204611691da58e49d42c50b6ffcfdce02dadb7c3c2b6c', 'org.xerial:sqlite-jdbc:3.25.2:sqlite-jdbc-3.25.2.jar:a45da61abed61568a533fdece125093180828edeb0d4b6f6d572e0cf457465f6', 'tools.fastlane:screengrab:2.1.1:screengrab-2.1.1.aar:5a02781c0986e71ddbc691263115c2db70bdebb4b48d5b6dcf06ab1cb547d62d', 'uk.co.samuelwall:material-tap-target-prompt:2.14.0:material-tap-target-prompt-2.14.0.aar:12ab447ba97019adbecb20e048921ca30ed7a9f72a37b83f39a4333bd759b518', From 13bb8801c1a8cb2905c58a61a33d6d866bd75ea5 Mon Sep 17 00:00:00 2001 From: ialokim Date: Fri, 15 Sep 2023 00:08:03 +0200 Subject: [PATCH 06/21] use default endpoint for VVO --- .../java/de/grobox/transportr/networks/TransportNetworks.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index 2bfec940d..3b859f482 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -160,7 +160,7 @@ private val networks = arrayOf( id = NetworkId.VVO, description = R.string.np_desc_vvo, logo = R.drawable.network_vvo_logo, - factory = { VvoProvider("http://efaproxy.fahrinfo.uptrade.de/standard/".toHttpUrlOrNull()) } + factory = { VvoProvider() } ), TransportNetwork( id = NetworkId.NASA, From 880b7b41095f382610a97d8c96235a2a008b50c2 Mon Sep 17 00:00:00 2001 From: ialokim Date: Tue, 14 Nov 2023 19:29:58 +0100 Subject: [PATCH 07/21] re-add SBB with new data source fixes #768 --- .../de/grobox/transportr/networks/TransportNetworks.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index 3b859f482..99e05e7b2 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -319,6 +319,13 @@ private val networks = arrayOf( ), Country( R.string.np_region_switzerland, flag = "🇨🇭", networks = listOf( + TransportNetwork( + id = NetworkId.SEARCHCH, + name = R.string.np_name_sbb, + description = R.string.np_desc_sbb, + logo = R.drawable.network_sbb_logo, + factory = { CHSearchProvider() } + ), TransportNetwork( id = NetworkId.VBL, description = R.string.np_desc_vbl, From a04386f2d7c4a0098839e6ea4e4e7e5fafc9382e Mon Sep 17 00:00:00 2001 From: ialokim Date: Tue, 14 Nov 2023 20:14:03 +0100 Subject: [PATCH 08/21] androidTest: add work-around for missing testLocale, remove unavailable networks --- .../de/grobox/transportr/ScreengrabTest.kt | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt b/app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt index 2d013f4b6..3675d7a4a 100644 --- a/app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt +++ b/app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt @@ -51,17 +51,13 @@ abstract class ScreengrabTest { Screengrab.setDefaultScreenshotStrategy(UiAutomatorScreenshotStrategy()) } - val networkId: NetworkId = when(Locale.forLanguageTag(getTestLocale())) { + val networkId: NetworkId = when(Locale.forLanguageTag(getTestLocale() ?: "de")) { Locale.FRANCE -> NetworkId.PARIS - Locale.US -> NetworkId.TLEM - Locale.forLanguageTag("pt-BR") -> NetworkId.BRAZIL else -> NetworkId.DB } val departureStation = when(networkId) { NetworkId.PARIS -> "Gare De Lyon" - NetworkId.TLEM -> "Waterloo Station" - NetworkId.BRAZIL -> "Republica" else -> "Berlin Hbf" } @@ -72,18 +68,6 @@ abstract class ScreengrabTest { 2 -> WrapLocation(STATION, "stop_area:OIF:SA:8727100", 48880372, 2356597, null, "Gare Du Nord", null) else -> throw RuntimeException() } - NetworkId.TLEM -> when(i) { - 0 -> WrapLocation(STATION, "1000119", 51503449, -152036, "London", "Hyde Park Corner", null) - 1 -> getLocation("Blackfriars Pier") - 2 -> getLocation("Moorgate") - else -> throw RuntimeException() - } - NetworkId.BRAZIL -> when(i) { - 0 -> WrapLocation(STATION, "stop_point:OSA:SP:2600672", -23555071, -46662131, "São Paulo", "Paulista", null) - 1 -> getLocation("Pinheiros") - 2 -> getLocation("Vila Madalena") - else -> throw RuntimeException() - } else -> when(i) { 0 -> WrapLocation(STATION, "8011155", 52521481, 13410962, null, "Berlin Alexanderplatz", null) 1 -> getLocation("Zoologischer Garten") @@ -99,18 +83,6 @@ abstract class ScreengrabTest { 2 -> WrapLocation(STATION, "stop_area:OIF:SA:59290", 48866800, 2334338, "Paris", "Pyramides", null) else -> throw RuntimeException() } - NetworkId.TLEM -> when(i) { - 0 -> WrapLocation(STATION, "1000238", 51509829, -76797, "London", "Tower Hill", null) - 1 -> getLocation("Westminster") - 2 -> getLocation("Temple") - else -> throw RuntimeException() - } - NetworkId.BRAZIL -> when(i) { - 0 -> WrapLocation(STATION, "stop_point:OSA:SP:18876", -23543118, -46589599, "São Paulo", "Belem", null) - 1 -> getLocation("Trianon Masp") - 2 -> getLocation("Anhangabaú") - else -> throw RuntimeException() - } else -> when(i) { 0 -> WrapLocation(STATION, "730874", 52507278, 13331992, null, "Checkpoint Charlie", null) 1 -> getLocation("Bundestag") From c1e947b0fdcbe526c8c06da0ad2eb1f7df52c869 Mon Sep 17 00:00:00 2001 From: ialokim Date: Tue, 14 Nov 2023 22:35:36 +0100 Subject: [PATCH 09/21] update translations --- app/src/main/res/values-ca/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 5 +--- app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 3 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 3 +- app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 3 +- app/src/main/res/values-ro/strings.xml | 2 -- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 34 ++++++++++++++++++++-- app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values/strings.xml | 3 -- 22 files changed, 35 insertions(+), 42 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e1bebe8e2..63ecc94da 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -67,7 +67,6 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]> Sortides Sobre Biblioteques - © 2013 – 2021 Torsten Grote\nFree Software License: GPLv3+ Transportr és un assistent de transport públic desenvolupat per persones de tot el món per fer que utilitzar el transport públic sigui el més fàcil possible allà on estiguis. Avís No es garanteix la correcció de les dades (donades externament). Utilitza aquesta aplicació només sota el teu propi risc. @@ -307,7 +306,6 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]> Nova Zelanda Nova Zelanda, Wellington, Auckland Polònia - Transports municipals de Polònia Espanya Madrid, Barcelona, Euskadi, Val ència, Alacant, Mallorca, Menorca, Tenerife, La Palma, Navarra diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index fb95e95b4..5d2804d16 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -45,7 +45,6 @@ Tato aplikace využívá data různých místních dopravních agentur a poskytu Odjezdy O aplikaci Knihovny - © 2013 – 2021 Torsten Grote\nSvobodná softwarová licence: GPLv3+ Transportr je společník veřejné dopravy vyvinutý všemi lidmi po celém světě, aby využil veřejnou dopravu co nejjednodušší, ať jste kdekoli. Upozornění Neexistuje žádná záruka správnosti údajů (externě poskytovaných). Použijte tuto aplikaci pouze na vlastní nebezpečí. @@ -287,7 +286,6 @@ Tato aplikace využívá data různých místních dopravních agentur a poskytu Nový Zéland Nový Zéland, Wellington, Auckland Polsko - Městská doprava Polska Španělsko Madrid, Barcelona, ​​Baskicko, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Maďarsko diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7b6b9c4f6..a59fe8659 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -63,7 +63,6 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen. Afgange Om Biblioteker - © 2013 – 2018 Torsten Grote\nGratis Software Licens: GPLv3+ Transportr er en offentlig transport ledsager udviklede af folk overalt fra jorden for at gøre brugen af offentlig transport så nemt så muligt hvor end du er. Advarsel Der er ingen garanti for rigtigheden af (ekstern leveret) data. Brug kun denne app på egen bekostning. @@ -292,7 +291,6 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen. New Zealand New-Zealand, Wellington, Auckland Polen - Municipal Transports of Poland Spanien Madrid, Barcelona, Basque Country, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Ungarn diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 314dd0dd6..26357dd51 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -63,7 +63,7 @@ und weiß immer, wo man aussteigen muss. Abfahrten Über Bibliotheken - © 2013 – 2021 Torsten Grote\nFree Software License: GPLv3+ + © 2013 – 2023 Torsten Grote\nFree Software License: GPLv3+ Transportr ist ein Begleiter im öffentlichen Verkehr, der von Menschen auf der ganzen Welt entwickelt wurde, um die Benutzung öffentlicher Verkehrsmittel so einfach wie möglich zu machen, egal wo Sie sich gerade befinden. Warnung Es wird keine Gewähr für die Richtigkeit der (extern zur Verfügung gestellten) Daten übernommen. Bitte benutzen Sie diese App nur auf eigene Gefahr. @@ -303,9 +303,6 @@ und weiß immer, wo man aussteigen muss. Neuseeland Neuseeland, Wellington, Auckland Polen - Stadtverkehr in Polen - Bromberg, Elk, Danzig, Gizycko, Gorzow, Krakau, Lodz, Lomza, Lublin, Posen, Przemysl, Radom, Rybnik, Rzeszow, Sanok, Stolp, Stettin, Swinemünde, Warschau, Breslau - A21 Długołęka, DLA Kąty Wrocławskie, DLA Miękinia, DLA Wisznia Mała, GZK Bystry, Koleje Małopolskie, Komunikacja Autobusowa w Świnoujściu, Komunikacja Gminy Tarnowo Podgórne TPBUS Sp. z o.o., Kórnickie Przedsiębiorstwo Autobusowe KOMBUS Sp. z o.o., KŁOSOK Długołęka, MKS Sanok, MPK Autobusy, MPK Przemyśl / Urząd Miasta Przemyśla, MPK S.A. w Krakowie, MPK Tramwaje, MPK ZB w Łomży, MPK-Łódź Spółka z o.o., MZDiK Radom, MZK Ełk, MZK Gorzów, Miejskie Przedsiębiorstwo Komunikacyjne Sp. z o.o. w Poznaniu, PKP Szybka Kolej Miejska w Trójmieście Sp. z o.o., Przedsiębiorstwo Transportowe Translub Sp. z o.o., Przedsiębiorstwo Usług Komunalnych Komorniki sp. z o.o., Przedsiębiorstwo Wielobranżowe TRANSKOM Sp. z o.o., Swarzędzkie Przedsiębiorstwo Komunalne Sp. z o.o., Urząd Gminy Dopiewo, Warszawski Transport Publiczny, ZDMiKP Bydgoszcz, ZDiTM Szczecin, ZKM Gdynia, ZTM Gdańsk, ZTM Lublin, ZTM Rzeszów, ZTP Kraków, ZTZ Rybnik, Zakład Komunalny w Kleszczewie Sp. z o.o., Zakład Komunikacji Publicznej Suchy Las Sp. z o.o., Zakład Usług Komunikacyjnych ROKBUS Sp. z o.o., Zarząd Infrastruktury Miejskiej, Zarząd Transportu Miejskiego w Gdańsku, Łódzka Kolej Aglomeracyjna Spanien Madrid, Barcelona, Baskenland, Valencia, Alicante, Mallorca, Menorca, Teneriffa, La Palma, Navarra Ungarn diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index cc27e3cab..63ff6e027 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -61,7 +61,6 @@ Αναχωρήσεις Σχετικά Βιβλιοθήκες - © 2013 – 2018 Torsten Grote\nFree Software License: GPLv3+\nΑρχική μετάφραση: Βαγγέλης Σκαρμούτσος Το Transportr είναι ένα εγχειρίδιο δημόσιων μεταφορών που αναπτύχθηκε από ανθρώπους σε όλο τον κόσμο για να κάνει τις δημόσιες μεταφορές όσο γίνεται πιο εύκολες όπου κι αν είστε. Προειδοποίηση Δεν υπάρχει εγγύηση για την ορθότητα των (εξωτερικώς παρεχόμενων) δεδομένων. Παρακαλώ χρησιμοποιήστε αυτή την εφαρμογή μόνο με δική σας ευθύνη. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index b65c18731..bfcce4341 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -44,7 +44,6 @@ Tiu ĉi aplikaĵo uzas datumojn de diversaj lokaj firmaoj de publika transporto Forveturoj Pri Bibliotekoj - © 2013 – 2021 Torsten GROTE\nProgramo laŭ la libera permesilo: GPLv3+ Transportr estas publik-transporta helpilo programita de homoj ĉirkaŭ la mondo por igi uzadon de publika transporto kiel eble facile, kie ajn vi estas. Averto Estas neniu garantio pri korekteco de (ekstere-provizataj) datumoj. Bonvolu uzi tiun ĉi aplikaĵon nur sub via risko. @@ -284,7 +283,6 @@ Tiu ĉi aplikaĵo uzas datumojn de diversaj lokaj firmaoj de publika transporto Nov-Zelando Nov-Zelando, Velingtono, Auckland Polujo - Urbaj transport-retoj en Polujo Hispanujo Madrido, Barcelono, Eŭskujo, Valencio, Alakanto, Majorko, Minorko, Tenerifo, La Palma, Navaro Hungarujo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d24870b89..0e90d5866 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -291,7 +291,6 @@ Inténtelo de nuevo más tarde, por favor. Nueva Zelanda Nueva Zelanda, Wellington, Auckland Polonia - Transportes municipales de Polonia España Madrid, Barcelona, Euskadi - País Vasco, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Hungría diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 065e838a3..7f4d32712 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -298,7 +298,6 @@ eta beti daki non zauden autobusetik non jaitsi jakin dezazun. Zeelanda Berria Zeelanda Berria, Wellington, Auckland Polonia - Poloniako garraio munizipalak Espainia Madril, Bartzelona, Euskadi, Nafarroa, Valentzia, Alacant, Mallorca, Menorca, Tenerife, La Palma Hungaria diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 99223068b..40e93a19f 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -61,8 +61,6 @@ Transportr مکان ها و سفر های انجام شده متداول را ذ حرکت ها درباره کتابخانه ها - © 2013 – 2018 تورستن گروت -لایسنس نرم افزار آزاد: +GPLv3 Transportr یک همران حمل و نقل عمومی است که توسط افرادی در سرتاسر دنیا ایجاد شده تا حمل و نقل عمومی را تا جای ممکن در هرجایی که هستید آسان کند. هشدار هیچ گارانتی برای درسی داده ها ( داده های از بیرون تامین شده ) وجود ندارد. لطفا با در نظر گرفتن ریسک از این برنامه استفاده کنید. @@ -294,7 +292,6 @@ Transportr مکان ها و سفر های انجام شده متداول را ذ نیوزلند نیوزیلند، ولینگتون، آوکلند لهستان - حمل و نقل های شهری لهستان اسپانیا مادرید، بارسلون، سرزمین باسک، والنسیا، آلیکانته، مایورکا، مینورکا، تنریف، لا پالما، نابارا مجارستان diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b12f36974..333aacc15 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -53,7 +53,6 @@ Elle n’utilise pas non plus des outils de suivi comme Google Analytics pour vo Départs À propos Bibliothèques - © 2013 à 2021 Torsten Grote\nLicence de logiciel libre : GPLv3+ Transportr est un compagnon de transports en commun développé par des personnes partout dans le monde afin de faciliter autant que possible l’utilisation des transports en commun où que vous soyez. Avertissement Il n’existe aucune garantie quant à l’exactitude des données (provenant de sources externes). Veuillez utiliser cette appli à vos propres risques. @@ -294,7 +293,6 @@ Elle n’utilise pas non plus des outils de suivi comme Google Analytics pour vo Nouvelle-Zélande Nouvelle-Zélande, Wellington, Auckland Pologne - Transports municipaux de Pologne Espagne Madrid, Barcelone, Pays basque, Valence, Alicante, Majorque, Minore, Tenerife, La Palma, Navarre Hongrie diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3f0c17918..9f31b6f92 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -67,7 +67,6 @@ hogy hol kell leszállnia a buszról… Indulások Névjegy Programkönyvtárak - © 2013 – 2021 Torsten Grote\nSzabad szoftver licenc: GPLv3+ A Transportr egy olyan tömegközlekedési segéd, amelyet az emberek a világ minden tájáról azért fejlesztenek, hogy a tömegközlekedést a lehető legegyszerűbbé tegyek, bárhol is legyen. Figyelmeztetés Nincs garancia a (kívülről érkező) adatok helyességére. Ezt az alkalmazást csak saját felelősségére használja! @@ -307,7 +306,6 @@ hogy hol kell leszállnia a buszról… Új-Zéland Új-Zéland, Welligton, Auckland Lengyelország - Lengyel városi közlekedés Spanyolország Madrid, Barcelona, Baszkföld, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Magyarország diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 33f521959..0129a8c9d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -59,7 +59,6 @@ Inoltre, non usa strumenti di tracciamento come Google Analytics per spiarti. Partenze Informazioni Librerie - © 2013 – 2021 Torsten Grote\nLicenza libera del software: GPLv3+ Transportr è un\'app di trasporto pubblico sviluppata da persone di tutto il mondo per rendere il trasporto pubblico il più semplice possibile ovunque tu sia. Attenzione Non c\'è alcuna garanzia per la correttezza dei dati (di terze parti). Usa quest\'app a tuo rischio. @@ -300,7 +299,6 @@ Inoltre, non usa strumenti di tracciamento come Google Analytics per spiarti. Nuova Zelanda Nuova Zelanda, Wellington, Auckland Polonia - Trasporti comunali della Polonia Spagna Madrid, Barcellona, Paesi Baschi, Valencia, Alicante, Maiorca, Menorca, Tenerife, La Palma, Navarra Ungheria diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cfdda5da6..6526367f6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -294,7 +294,6 @@ Transportr は頻繁に使用される場所や旅行を保存します。 ニュージーランド ニュージーランド、ウェリントン、オークランド ポーランド - ポーランドの都市交通 スペイン マドリード、バルセロナ、バスク地方、バレンシア、アリカンテ、マヨルカ、メノルカ、テネリフェ、ラ・パルマ、ナバラ ハンガリー diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b3e6c0739..ed900ec97 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -44,7 +44,7 @@ Deze app gebruikt de gegevens van verschillende lokale openbaar vervoersaanbiede Vertrekken Over Bibliotheken - © 2013 – 2021 Torsten Grote\nVrije softwarelicentie: GPLv3+ + © 2013 – 2023 Torsten Grote\nVrije softwarelicentie: GPLv3+ Transportr is een openbaar vervoer-hulpmiddel, ontwikkeld door mensen van over de hele wereld om het gebruik van openbaar vervoer zo makkelijk mogelijk te maken. Waarschuwing Wij geven geen garantie op de (extern aangeleverde) gegevens. Gebruik de app op eigen risico. @@ -284,7 +284,6 @@ Deze app gebruikt de gegevens van verschillende lokale openbaar vervoersaanbiede Nieuw-Zeeland Nieuw-Zeeland, Wellington, Auckland Polen - Gemeentelijk vervoer in Polen Spanje Madrid, Barcelona, Baskenland, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Hongarije diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 82bc504ce..4fbd4333a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -278,7 +278,6 @@ Ta aplikacja korzysta z wielu dostawców danych transportu publicznego i dostarc Nowa Zelandia Nowa Zelandia, Wellington, Auckland Polska - Transport miejski w Polsce Hiszpania Madryt, Barcelona, Kraj Basków, Walencja, Alicante, Majorka, Minorka, Teneryfa, La Palma, Nawarra Węgry diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8dbfac3e0..75560ca89 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -24,7 +24,6 @@ Partidas Sobre Bibliotecas - © 2013 – 2018 Torsten Grote\nLicença Software Livre: GPLv3+ Transportr é o seu companheiro de transporte público desenvolvido por pessoas ao redor do mundo para deixar o transporte público o mais simples possível, não importa onde você estiver. Aviso Não existem garantias para a exatidão dos dados (fornecidos por terceiros). Por favor, use este aplicativo por sua conta e risco. @@ -104,6 +103,7 @@ %d m %d Paradas + %d Paradas %d Paradas @@ -238,7 +238,6 @@ Nova Zelândia Nova Zelândia, Welligton, Auckland Polônia - Transportes Municipais da Polônia Espanha Hungria Budapeste, Miskolc diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e27e9a6e4..0fc846213 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -58,7 +58,6 @@ De asemenea nu foloseşte tool-uri precum Google Analytics pentru a te spiona. Plecări Despre Librării - © 2013 – 2021 Torsten Grote\nFree Software License: GPLv3+ Transportr este un companion pentru transportul în comun dezvoltat de multiple persoane din jurul lumii, cu scopul de a face transportul public cât se poate de ușor, oriunde te-ai afla. Avertisment Nu este nici-o garanție pentru corectitudinea datelor (ce sunt procurate din afara aplicației). Vă rugăm să folosiți această aplicație pe riscul propriu. @@ -298,7 +297,6 @@ De asemenea nu foloseşte tool-uri precum Google Analytics pentru a te spiona. Noua Zeelandă Noua Zeelandă, Wellington, Auckland Polonia - Transport municipal în Polonia Spania Madrid, Barcelona, Țara Bascilor, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra Ungaria diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ec545bb21..40603b11f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -63,7 +63,6 @@ Transportr сохраняет часто используемые местопо Отправление О приложении Библиотека - © 2013 – 2018 Torsten Grote\nFree Software License: GPLv3+ Transportr является помощником общественного транспорта, разработанный людьми по всему миру, чтобы сделать использование общественного транспорта как можно проще там, где вы находитесь. Предупреждение Нет никакой гарантии правильности (предоставленных) данных. Пожалуйста, используйте это приложение только на свой страх и риск. @@ -285,7 +284,6 @@ Transportr сохраняет часто используемые местопо Новая Зеландия Новая Зеландия, Веллингтон, Окленд Польша - Городской транспорт Польши Испания Мадрид, Барселона, Страна Басков, Валенсия, Аликанте, Майорка, Менорка, Тенерифе, Ла-Пальма, Наварра Венгрия diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e13cf5586..e9ca15263 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -296,7 +296,6 @@ och vet alltid var du inte ska missa var du ska gå av bussen. Nya Zeeland Nya Zeeland, Wellington, Auckland Polen - Kommunala transportmedel i Polen Spanien Madrid, Barcelona, Baskien, Valencia, Alicante, Mallorca, Menorca, Teneriffa, La Palma, Navarra Ungern diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f3d1f9595..b7f038053 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,5 +1,7 @@ + Transportr - Açık Kaynak Toplu Taşıma + Reklamlar veya Takip Etme olmaksızın Özgür ve Ücretsiz Toplu Taşıma Asistanı Ayarlar Sürüm Notları Hakkında @@ -20,10 +22,10 @@ Gelişler Hakkında Kütüphaneler - © 2013 – 2018 Torsten Grote\nÖzgür Yazılım Lisansı: GPLv3+ Uyarı Bu uygulama Özgür Yazılımdır, öyle ki özgürce kullanabilir, paylaşabilir ve geliştirebilirsiniz. Katkılar teşvik ve takdir edilir. Siz de katkınızı sunmak isterseniz lütfen daha fazla bilgi için ana sayfayı ziyaret ediniz. Websitesini Ziyaret Edin + Bu haritayı iyileştir Nereden Nereye İle @@ -63,11 +65,15 @@ Tema Açık Koyu + Sistem varsayılanı Dil - Hızlı Yürü + En Az Süre + En Az Yürüme + Yürüme Hızı Yavaş Normal Hızlı + Ekran kilitliyken bile geziyi göster Kilitli ekran üzerinde göster Hata İnternet bağlantısı gerekmektedir. Lütfen internet bağlantınızın çalıştığından emin olunuz. @@ -77,23 +83,31 @@ Yakın duraklar bulunamıyor Herhangi bir kalkış bulunamadı Takvim yüklenmedi :( + Harici harita yüklenmedi :( Konum bulunamadı. Lütfen farklı konumları kullanarak arama yapınız. \'Başlangıç\' ve \'Varış\' konumları birbirine çok yakın. \'Başlangıç\' konumu bulunamadı. Lütfen farklı bir konumu deneyiniz. + \'İle\' konumu bulunamadı. Lütfen farklı bir konumu deneyiniz. \'Varış\' konumu bulunamadı. Lütfen farklı bir konumu deneyiniz. Sağlanan adres bulunamadı. Lütfen farklı bir adres deneyiniz. Hiçbir bağlantı bulunamadı :( + Belirtilen arama tarihi veri sağlayıcı tarafından şu anda desteklenmemektedir. Lütfen başka bir tarih seçiniz. + Veri sağlayıcıya şu anda ulaşılamamakta :(\n Lütfen daha sonra tekrar deneyin. Bu hatayı bildirmek isterseniz lütfen %1$s \'e doğrudan bildiriniz. Bu bağlantı ile ilgili bir sorun olabilir. + İmkansız veya iptal edilmiş Tekrar Deneyiniz + %d m %d Durak %d Durak + (Platform %s) Sistem Varsayılanı Tarih: %s + (Dikkat: Zamanlar bildirilmiş gecikmeleri içerebilir) %s tarafından oluşturulmuştur Ev Ev Konumunu Ayarla @@ -103,8 +117,11 @@ Aramaya Ekle Dönüş turu ara Değiştir + Başlatıcı Kısayolunu Ekle Mevcut Konumu Kullan Bulunduğunuz yer henüz tespit edilemedi. + Konumunuza erişim izni vermediniz, dolayısıyla bu işlev çalışmayacaktır. Lütfen uygulama ayarlarından erişim izni veriniz. + Konum kapalı. Lütfen ayarlardan konum servisini açınız. Yüksek Hızlı Tren Bölgesel Tren Banliyö Treni @@ -147,9 +164,12 @@ Florianópolis Kanada Ontario + Ontario, Ottawa, Toronto, Mississauga, Hamilton, Waterloo Bölgesi Quebec Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Quebec, Haut-Saint-Laurent, Lanaudière, La Presqu\'Île, Laurentides, Montreal, Les Moulins, Vallée du Richelieu, Chambly-Richelieu-Carignan, Roussillon, Sorel-Varennes, Le Richelain, Sherbrooke, Sainte-Julie British Columbia + BC\'de toplu taşıma + Translink (Metro Vancouver) ve BC Transit (BC\'nin geri kalanı) Danimarka Danimarka, Kopenhag Avrupa @@ -173,6 +193,8 @@ Birmingham Almanya Augsburg + AVV + Aachen Bavarya, Würzburg, Regensburg Braunschweig, Wolfsburg Berlin @@ -189,9 +211,12 @@ Baden-Württemberg, Konstanz, Basel, Basel-Stadt, Reutlingen, Rottweil, Tübingen, Sigmaringen Hesse, Frankfurt am Main, Kassel Rostock + NAH.SH + Schleswig-Holstein, Kiel, Flensburg, Lübeck Brandenburg, Berlin Lower Saxony, Bremen, Bremerhaven, Oldenburg (Oldenburg), Osnabrück Nuremberg, Fürth, Erlangen, Bayreuth, Bamberg, Schwabach + saarVV Saarland, Saarbrücken Mecklenburg-Vorpommern, Schwerin Baden-Württemberg, Rhineland-Palatinate, Mannheim, Mainz, Trier @@ -209,6 +234,7 @@ İtalya Roma, Milan, Turin, Venedik, Palermo, Trento Lihtenştayn + VVV Lihtenştayn, Vorarlberg, Bregenz Lüksemburg Lüksemburg @@ -228,13 +254,17 @@ İsveç, Stockholm İsviçre + SBB İsviçre + Luzern Zürih Birleşik Arap Emirlikleri Dubai Birleşik Arap Emirlikleri, Dubai Amerika Birleşik Devletleri Chicago + San Francisco + Austin New York ve New-Jersey Eyaletleri Kaliforniya Kaliforniya\'da toplu taşıma (ABD) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5561f44d3..c69d00153 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -63,7 +63,6 @@ Transportr зберігає часто використовувані місця Відправлення Про Бібліотеки - © 2013 – 2018 Torsten Grote\nЛіцензія на вільне програмне забезпечення: GPLv3+ Transportr - супутник громадського транспорту, розроблений людьми по всьому світу, щоб зробити використання громадського транспорту якомога простішим, де б ви не знаходились. Попередження Немає гарантії правильності (наданих ззовні) даних. Користуйтеся цим додатком на свій страх і ризик. @@ -291,7 +290,6 @@ Transportr зберігає часто використовувані місця Нова Зеландія Нова Зеландія, Веллінгтон, Окленд Польща - Муніципальні перевезення Польщі Іспанія Мадрид, Барселона, Країна Басків, Валенсія, Аліканте, Майорка, Менорка, Тенеріфе, Ла Пальма, Наварра Угорщина diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4aa62f124..39e702d04 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -385,9 +385,6 @@ and always knows where you are to not miss where to get off the bus. Go Wellington, Tranz Metro, Auckland Transport Poland - Municipal Transports of Poland - Bydgoszcz, Ełk, Gdańsk, Giżycko, Gorzów, Kraków, Lódź, Łomża, Lublin, Poznań, Przemyśl, Radom, Rybnik, Rzeszów, Sanok, Słupsk, Szczecin, Świnoujscie, Warszawa, Wrocław - A21 Długołęka, DLA Kąty Wrocławskie, DLA Miękinia, DLA Wisznia Mała, GZK Bystry, Koleje Małopolskie, Komunikacja Autobusowa w Świnoujściu, Komunikacja Gminy Tarnowo Podgórne TPBUS Sp. z o.o., Kórnickie Przedsiębiorstwo Autobusowe KOMBUS Sp. z o.o., KŁOSOK Długołęka, MKS Sanok, MPK Autobusy, MPK Przemyśl / Urząd Miasta Przemyśla, MPK S.A. w Krakowie, MPK Tramwaje, MPK ZB w Łomży, MPK-Łódź Spółka z o.o., MZDiK Radom, MZK Ełk, MZK Gorzów, Miejskie Przedsiębiorstwo Komunikacyjne Sp. z o.o. w Poznaniu, PKP Szybka Kolej Miejska w Trójmieście Sp. z o.o., Przedsiębiorstwo Transportowe Translub Sp. z o.o., Przedsiębiorstwo Usług Komunalnych Komorniki sp. z o.o., Przedsiębiorstwo Wielobranżowe TRANSKOM Sp. z o.o., Swarzędzkie Przedsiębiorstwo Komunalne Sp. z o.o., Urząd Gminy Dopiewo, Warszawski Transport Publiczny, ZDMiKP Bydgoszcz, ZDiTM Szczecin, ZKM Gdynia, ZTM Gdańsk, ZTM Lublin, ZTM Rzeszów, ZTP Kraków, ZTZ Rybnik, Zakład Komunalny w Kleszczewie Sp. z o.o., Zakład Komunikacji Publicznej Suchy Las Sp. z o.o., Zakład Usług Komunikacyjnych ROKBUS Sp. z o.o., Zarząd Infrastruktury Miejskiej, Zarząd Transportu Miejskiego w Gdańsku, Łódzka Kolej Aglomeracyjna Spain Madrid, Barcelona, Basque Country, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra From 51ff10816e5dcd2c55ee600cdd95bae4c7b79b62 Mon Sep 17 00:00:00 2001 From: ialokim Date: Sun, 7 Jan 2024 21:37:41 +0100 Subject: [PATCH 10/21] update PTE again, change AVV Augsburg to new provider --- app/build.gradle | 2 +- .../java/de/grobox/transportr/networks/TransportNetworks.kt | 6 +++--- app/src/main/res/values/strings.xml | 3 ++- app/witness.gradle | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 17c861c6f..c86c6513c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -142,7 +142,7 @@ dependencies { exclude module: 'failureaccess' exclude group: 'com.google.j2objc' } - implementation('com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7') { + implementation('com.gitlab.opentransitmap:public-transport-enabler:c64494b1') { exclude group: 'com.google.guava' // included above exclude group: 'org.json', module: 'json' // provided by Android exclude group: 'net.sf.kxml', module: 'kxml2' // provided by Android diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt index 99e05e7b2..f59acbb7b 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -84,11 +84,11 @@ private val networks = arrayOf( factory = { BayernProvider() } ), TransportNetwork( - id = NetworkId.AVV, + id = NetworkId.AVV_AUGSBURG, + name = R.string.np_name_avv, description = R.string.np_desc_avv, logo = R.drawable.network_avv_logo, - status = BETA, - factory = { AvvProvider() } + factory = { AvvAugsburgProvider("{\"type\":\"AID\",\"aid\":\"jK91AVVZU77xY5oH\"}") } ), TransportNetwork( id = NetworkId.MVV, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39e702d04..31e90947f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -314,8 +314,9 @@ and always knows where you are to not miss where to get off the bus. Birmingham Germany + AVV Augsburg - AVV + AVV Aachen BEG Bavaria, Würzburg, Regensburg diff --git a/app/witness.gradle b/app/witness.gradle index 18fd0e421..cd8dc30dc 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -85,7 +85,7 @@ dependencyVerification { 'androidx.viewpager:viewpager:1.0.0:viewpager-1.0.0.aar:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682', 'com.github.omadahealth:swipy:1.2.3:swipy-1.2.3.aar:63bff6e181742e3e243c29b595062ca65b4274bf7033c65460924f64f65c01e0', 'com.github.tony19:logback-android:1.1.1-12:logback-android-1.1.1-12.aar:3102228f0e408e3c003b34e96a604e9b9f59d314dcf8f03aa78d9d3648198932', - 'com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7:public-transport-enabler-3a16b1e7.jar:b7bfd5c19990f019b9c785817ee89fe80329454ea6aeea33ecd0386d227442e5', + 'com.gitlab.opentransitmap:public-transport-enabler:c64494b1:public-transport-enabler-c64494b1.jar:d707f9556ed29102db596808fc1a18c8b458fd65e5e9d41d046afb1c830571a8', 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', 'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', 'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7', From 8d1afc4eb094ee41cf52028d8c6916bf146fa1a3 Mon Sep 17 00:00:00 2001 From: ialokim Date: Sun, 7 Jan 2024 22:31:54 +0100 Subject: [PATCH 11/21] release 2.2.0 --- app/build.gradle | 4 ++-- app/src/main/res/xml/changelog_master.xml | 11 +++++++++++ fastlane/metadata/android/en-US/changelogs/124.txt | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/124.txt diff --git a/app/build.gradle b/app/build.gradle index c86c6513c..ca49a772d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ apply from: 'witness.gradle' android { defaultConfig { - versionCode 123 - versionName "2.1.5" + versionCode 124 + versionName "2.2.0" applicationId "de.grobox.liberario" minSdkVersion 21 diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index ad6844712..5009ccd4e 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,6 +2,17 @@ + + Switch map library to MapLibre - finally bringing Transportr back to F-Droid! + Remember preferred means of transport for future searches (thanks Prat!) + Fix minor issues on About page and with the time picker (thanks Altonss!) + Fix and re-add formerly broken regions: SBB (thanks Tobias!), VVO, AVV (Augsburg), GVH, VRS + Remove regions where information is no longer available: VOR, STV, VVV, SNCB, 9292, TFI + Remove regions that are no longer served by Navitia: Finland, Portugal, Hungary, Czech Republic, Ghana, California, Oregon, New York, Ontario, Quebec, British Colombia, Costa Rica, Nicaragua, Florianópolis (Brazil), Brazil, New Zealand + + diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt new file mode 100644 index 000000000..ec24687e8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/124.txt @@ -0,0 +1,6 @@ +* Switch map library to MapLibre - finally bringing Transportr back to F-Droid! +* Remember preferred means of transport for future searches (thanks Prat!) +* Fix minor issues on About page and with the time picker (thanks Altonss!) +* Fix and re-add formerly broken regions: SBB (thanks Tobias!), VVO, AVV (Augsburg), GVH, VRS +* Remove regions where information is no longer available: VOR, STV, VVV, SNCB, 9292, TFI +* Remove a long list of regions that are no longer served by Navitia \ No newline at end of file From fedb131dcdd8c7561066d7a4dffdd229ef0b8036 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 9 Jun 2023 10:17:31 -0300 Subject: [PATCH 12/21] Google Play title is now limited to 30 chars --- fastlane/metadata/android/ca/title.txt | 2 +- fastlane/metadata/android/cs-CZ/title.txt | 2 +- fastlane/metadata/android/de-DE/title.txt | 2 +- fastlane/metadata/android/el-GR/title.txt | 2 +- fastlane/metadata/android/en-US/title.txt | 2 +- fastlane/metadata/android/es-ES/title.txt | 2 +- fastlane/metadata/android/eu-ES/title.txt | 2 +- fastlane/metadata/android/fr-FR/title.txt | 2 +- fastlane/metadata/android/hu-HU/title.txt | 2 +- fastlane/metadata/android/it-IT/title.txt | 2 +- fastlane/metadata/android/ja-JP/title.txt | 2 +- fastlane/metadata/android/nl-NL/title.txt | 2 +- fastlane/metadata/android/ru-RU/title.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fastlane/metadata/android/ca/title.txt b/fastlane/metadata/android/ca/title.txt index d22f23faf..e310907e9 100644 --- a/fastlane/metadata/android/ca/title.txt +++ b/fastlane/metadata/android/ca/title.txt @@ -1 +1 @@ -Transportr - Open Source Public Transit \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt index 1e37cae45..e310907e9 100644 --- a/fastlane/metadata/android/cs-CZ/title.txt +++ b/fastlane/metadata/android/cs-CZ/title.txt @@ -1 +1 @@ -Transportr - Open-source veřejná doprava \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt index eb16006e2..e310907e9 100644 --- a/fastlane/metadata/android/de-DE/title.txt +++ b/fastlane/metadata/android/de-DE/title.txt @@ -1 +1 @@ -Transportr - Freier öffentlicher Nahverkehr \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/el-GR/title.txt b/fastlane/metadata/android/el-GR/title.txt index 7210cd794..e310907e9 100644 --- a/fastlane/metadata/android/el-GR/title.txt +++ b/fastlane/metadata/android/el-GR/title.txt @@ -1 +1 @@ -Transportr - Δημόσιες μεταφορές ανοιχτού κώδικα \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt index d22f23faf..0d8b9ba98 100644 --- a/fastlane/metadata/android/en-US/title.txt +++ b/fastlane/metadata/android/en-US/title.txt @@ -1 +1 @@ -Transportr - Open Source Public Transit \ No newline at end of file +Transportr - Public Transit \ No newline at end of file diff --git a/fastlane/metadata/android/es-ES/title.txt b/fastlane/metadata/android/es-ES/title.txt index bab7e4e36..e310907e9 100644 --- a/fastlane/metadata/android/es-ES/title.txt +++ b/fastlane/metadata/android/es-ES/title.txt @@ -1 +1 @@ -Transportr - Transporte público de código abierto \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/eu-ES/title.txt b/fastlane/metadata/android/eu-ES/title.txt index f0ae612ab..e310907e9 100644 --- a/fastlane/metadata/android/eu-ES/title.txt +++ b/fastlane/metadata/android/eu-ES/title.txt @@ -1 +1 @@ -Transportr - Garraio publiko librea \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt index 533498839..e310907e9 100644 --- a/fastlane/metadata/android/fr-FR/title.txt +++ b/fastlane/metadata/android/fr-FR/title.txt @@ -1 +1 @@ -Transportr — Appli libre de transport en commun \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/hu-HU/title.txt b/fastlane/metadata/android/hu-HU/title.txt index eb6a77c10..e310907e9 100644 --- a/fastlane/metadata/android/hu-HU/title.txt +++ b/fastlane/metadata/android/hu-HU/title.txt @@ -1 +1 @@ -Transportr – Nyílt forráskódú tömegközlekedés \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt index 11e9450bf..e310907e9 100644 --- a/fastlane/metadata/android/it-IT/title.txt +++ b/fastlane/metadata/android/it-IT/title.txt @@ -1 +1 @@ -Transportr - trasporto pubblico open source \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/ja-JP/title.txt b/fastlane/metadata/android/ja-JP/title.txt index f2ae15493..e310907e9 100644 --- a/fastlane/metadata/android/ja-JP/title.txt +++ b/fastlane/metadata/android/ja-JP/title.txt @@ -1 +1 @@ -Transportr - オープンソース公共交通機関 \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/title.txt b/fastlane/metadata/android/nl-NL/title.txt index 09ceb8dd7..e310907e9 100644 --- a/fastlane/metadata/android/nl-NL/title.txt +++ b/fastlane/metadata/android/nl-NL/title.txt @@ -1 +1 @@ -Transportr - open-bron Openbaar Vervoer \ No newline at end of file +Transportr \ No newline at end of file diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt index 3a6a646f6..e310907e9 100644 --- a/fastlane/metadata/android/ru-RU/title.txt +++ b/fastlane/metadata/android/ru-RU/title.txt @@ -1 +1 @@ -Transportr - транспорт с открытым кодом \ No newline at end of file +Transportr \ No newline at end of file From 933b152d711fc5a2d05ebf4b9a151ee899a88420 Mon Sep 17 00:00:00 2001 From: Altonss <66519591+Altonss@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:10:30 +0100 Subject: [PATCH 13/21] Update target SDK to 33 (#910) --- .github/workflows/build.yml | 2 +- app/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d173d064..60349ea5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - api-level: [21, 29, 31] + api-level: [21, 29, 33] steps: - uses: actions/checkout@v3 diff --git a/app/build.gradle b/app/build.gradle index ca49a772d..6afcd2c35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "de.grobox.liberario" minSdkVersion 21 - compileSdkVersion 33 - targetSdkVersion 32 + compileSdk 33 + targetSdkVersion 33 testInstrumentationRunner 'de.grobox.transportr.MockTestRunner' javaCompileOptions { From 29821e4d1c443b3f45cb75a517f81ee536aa5b4c Mon Sep 17 00:00:00 2001 From: Altonss <66519591+Altonss@users.noreply.github.com> Date: Sat, 13 Jan 2024 15:33:10 +0100 Subject: [PATCH 14/21] Fix location provider (#912) Co-authored-by: ialokim --- .../java/de/grobox/transportr/map/PositionController.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/de/grobox/transportr/map/PositionController.kt b/app/src/main/java/de/grobox/transportr/map/PositionController.kt index fb24c483d..5459c9c54 100644 --- a/app/src/main/java/de/grobox/transportr/map/PositionController.kt +++ b/app/src/main/java/de/grobox/transportr/map/PositionController.kt @@ -80,16 +80,14 @@ import java.util.concurrent.TimeUnit @RequiresPermission(ACCESS_FINE_LOCATION) override fun onActive() { - for (provider in LOCATION_PROVIDERS) { + for (provider in LOCATION_PROVIDERS.filter(locationManager::isProviderEnabled)) { locationManager.requestLocationUpdates(provider, MIN_UPDATE_INTERVAL, MIN_UPDATE_DISTANCE, this, Looper.getMainLooper()) } } @RequiresPermission(ACCESS_FINE_LOCATION) override fun onInactive() { - for (provider in LOCATION_PROVIDERS) { - locationManager.removeUpdates(this) - } + locationManager.removeUpdates(this) } override fun onLocationChanged(location: Location) { From af5841b9f86cb7eadd5a8d90f1cc0b270e15a8e1 Mon Sep 17 00:00:00 2001 From: ialokim Date: Thu, 11 Jan 2024 23:57:38 +0100 Subject: [PATCH 15/21] fix some theming-related issues fixes #913, #909 --- .../grobox/transportr/settings/SettingsFragment.kt | 4 ++-- .../de/grobox/transportr/settings/SettingsManager.kt | 12 ++++++++++-- app/src/main/res/xml/preferences.xml | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt b/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt index f72f78c73..57a0cc0ff 100644 --- a/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt +++ b/app/src/main/java/de/grobox/transportr/settings/SettingsFragment.kt @@ -60,9 +60,9 @@ class SettingsFragment : PreferenceFragmentCompat() { // Fill in current transport network if available networkPref = findPreference("pref_key_network")!! - manager.transportNetwork.observe(this, Observer { + manager.transportNetwork.observe(this) { onTransportNetworkChanged(it) - }) + } networkPref.setOnPreferenceClickListener { if (activity == null || view == null) return@setOnPreferenceClickListener false diff --git a/app/src/main/java/de/grobox/transportr/settings/SettingsManager.kt b/app/src/main/java/de/grobox/transportr/settings/SettingsManager.kt index c1f9cc628..521a509d6 100644 --- a/app/src/main/java/de/grobox/transportr/settings/SettingsManager.kt +++ b/app/src/main/java/de/grobox/transportr/settings/SettingsManager.kt @@ -24,8 +24,10 @@ import android.content.SharedPreferences import android.content.res.Configuration import android.content.res.Resources import android.os.Build +import android.os.PowerManager import android.preference.PreferenceManager import androidx.appcompat.app.AppCompatDelegate.* +import androidx.core.content.ContextCompat import de.grobox.transportr.R import de.schildbach.pte.NetworkId import de.schildbach.pte.NetworkProvider.Optimize @@ -67,8 +69,14 @@ class SettingsManager @Inject constructor(private val context: Context) { val isDarkTheme: Boolean get() { - return (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) or - (theme == MODE_NIGHT_YES) + return when(theme) { + MODE_NIGHT_YES -> true + MODE_NIGHT_NO -> false + else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) + context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES + else + ContextCompat.getSystemService(context, PowerManager::class.java)?.isPowerSaveMode ?: false + } } val walkSpeed: WalkSpeed diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8dfa735f1..172952f0e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -49,7 +49,7 @@ app:iconSpaceReserved="false"> Date: Sat, 13 Jan 2024 16:50:15 +0100 Subject: [PATCH 16/21] release 2.2.1 --- app/build.gradle | 4 ++-- app/src/main/res/xml/changelog_master.xml | 7 +++++++ fastlane/metadata/android/en-US/changelogs/125.txt | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/125.txt diff --git a/app/build.gradle b/app/build.gradle index 6afcd2c35..269d5e217 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ apply from: 'witness.gradle' android { defaultConfig { - versionCode 124 - versionName "2.2.0" + versionCode 125 + versionName "2.2.1" applicationId "de.grobox.liberario" minSdkVersion 21 diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 5009ccd4e..ba2a41ccd 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,6 +2,13 @@ + + Fix app crash at startup when no network-backed location provider was available (thanks Altonss!) + Make sure all parts of the app follow theme settings consistently + + diff --git a/fastlane/metadata/android/en-US/changelogs/125.txt b/fastlane/metadata/android/en-US/changelogs/125.txt new file mode 100644 index 000000000..3163e1945 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/125.txt @@ -0,0 +1,2 @@ +* Fix app crash at startup when no network-backed location provider was available (thanks Altonss!) +* Make sure all parts of the app follow theme settings consistently From 2a7823aacd49eac12011c775ba1f24df67d810d6 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 15 Jan 2024 09:33:39 -0300 Subject: [PATCH 17/21] Fix fastlane publishing --- fastlane/Fastfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3e75066bf..9b39218c7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -54,6 +54,11 @@ platform :android do changelog = File.read("metadata/android/en-US/changelogs/#{version_code}.txt") puts "Changelog:\n" + changelog + # Build + gradle(task: "assemble", build_type: "Release") + apk = lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] + puts "APK: " + apk + # Tag release add_git_tag( tag: version_name, @@ -61,11 +66,6 @@ platform :android do sign: true ) - # Build - gradle(task: "assemble", build_type: "Release") - apk = lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] - puts "APK: " + apk - # Github: Ensure that tag exists and push it git_tag_exists(tag: version_name) push_git_tags(tag: version_name) @@ -88,8 +88,8 @@ platform :android do system "cp #{apk} #{fdroid_repo}/repo/#{package_name}_#{version_code}.apk" # F-Droid: set current version to releasae - system "sed -i 's/^Current Version:.*$/Current Version:#{version_name}/' #{fdroid_repo}/metadata/#{package_name}.yml" - system "sed -i 's/^Current Version Code:.*$/Current Version Code:#{version_code}/' #{fdroid_repo}/metadata/#{package_name}.yml" + system "sed -i 's/^CurrentVersion:.*$/CurrentVersion: #{version_name}/' #{fdroid_repo}/metadata/#{package_name}.yml" + system "sed -i 's/^CurrentVersionCode:.*$/CurrentVersionCode: #{version_code}/' #{fdroid_repo}/metadata/#{package_name}.yml" # F-Droid: publish repo update system "cd #{fdroid_repo} && fdroid update -v" From 0bf902071952c0a0d1c07bb7c3e450eb854ba82e Mon Sep 17 00:00:00 2001 From: Altonss <66519591+Altonss@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:02:43 +0100 Subject: [PATCH 18/21] Update .clabot (#930) --- .clabot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 72ee911fd..2758f6ec3 100644 --- a/.clabot +++ b/.clabot @@ -23,7 +23,8 @@ "pt2121", "Jean-BaptisteC", "Bnyro", - "mesinger" + "mesinger", + "newhinton" ], "label": "cla-signed ✔️", "message": "Thank you for your pull request and welcome to our community! We require contributors to sign our [Contributor License Agreement](https://github.com/grote/Transportr/blob/master/CLA.md), and we don't seem to have the user {{usersWithoutCLA}} on file. In order for your code to get reviewed and merged, please explicitly state that you accept the agreement. Alternatively, you can add a commit that adds yourself to https://github.com/grote/Transportr/blob/master/.clabot" From 4357696a03b3b2c1279ad8649452197c5b36d5d7 Mon Sep 17 00:00:00 2001 From: ialokim Date: Mon, 26 Feb 2024 22:09:39 +0100 Subject: [PATCH 19/21] README: thanks to JawgMaps for free vector map tile services --- README.md | 14 +++++++++++--- artwork/jawgmaps.png | Bin 0 -> 12265 bytes 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 artwork/jawgmaps.png diff --git a/README.md b/README.md index d838de12d..1fecb6491 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Transportr The public transport companion that respects your privacy and your freedom. Transportr is a non-profit app developed by people around the world to make using public transport as easy as possible wherever you are. -[![Transportr Logo](/app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://transportr.app) +[![Transportr Logo](./app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://transportr.app) [![Build and test](https://github.com/grote/Transportr/actions/workflows/build.yml/badge.svg)](https://github.com/grote/Transportr/actions/workflows/build.yml) Please **[visit the website](https://transportr.app)** for more information! @@ -18,8 +18,8 @@ The upstream repository is at: https://github.com/grote/Transportr Get Transportr -------------- -[![Available on F-Droid](/artwork/f-droid.png)](https://f-droid.org/repository/browse/?fdid=de.grobox.liberario) -[![Available on Google Play](/artwork/google-play.png)](https://play.google.com/store/apps/details?id=de.grobox.liberario) +[![Available on F-Droid](./artwork/f-droid.png)](https://f-droid.org/repository/browse/?fdid=de.grobox.liberario) +[![Available on Google Play](./artwork/google-play.png)](https://play.google.com/store/apps/details?id=de.grobox.liberario) Pre-releases and beta versions for advanced users are available via [a special F-Droid repository](http://grobox.de/fdroid/). @@ -57,3 +57,11 @@ will. Specifically you can redistribute and/or modify it under the terms of the [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + +Acknowledgements +---------------- + + + +[JawgMaps](https://www.jawg.io) is a provider of online custom maps, geocoding and routing based on OpenStreetMap data. We would like to thank them for providing their vector map tile service to Transportr free of charge. diff --git a/artwork/jawgmaps.png b/artwork/jawgmaps.png new file mode 100644 index 0000000000000000000000000000000000000000..57ce7a0b56fee97c087e025324de173f21d01b9a GIT binary patch literal 12265 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 Do{|^u literal 0 HcmV?d00001 From 3f635ae963fadda6b63a5bab88e7e8255c6b697e Mon Sep 17 00:00:00 2001 From: Altonss <66519591+Altonss@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:16:25 +0200 Subject: [PATCH 20/21] Fix CI (#945) --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60349ea5b..6f91b1848 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-latest # to be able to run Android emulator, see https://github.com/marketplace/actions/android-emulator-runner + runs-on: macos-13 # to be able to run Android emulator, see https://github.com/marketplace/actions/android-emulator-runner strategy: fail-fast: false @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 - name: Get AVD arch uses: ./.github/actions/get-avd-arch id: avd-arch From 5d9e1c8155db07826f767efeb69b6fab3d252edf Mon Sep 17 00:00:00 2001 From: Altonss <66519591+Altonss@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:37:39 +0200 Subject: [PATCH 21/21] Fix flexbox dependency (#951) --- app/build.gradle | 2 +- app/src/main/res/layout/list_item_trip.xml | 4 +++- app/witness.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 269d5e217..508fd8df8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,7 +124,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.12.13' implementation 'com.github.omadahealth:swipy:1.2.3' implementation 'de.cketti.library.changelog:ckchangelog:1.2.2' - implementation 'com.google.android:flexbox:0.3.2' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.mikepenz:materialdrawer:6.1.1' implementation 'com.mikepenz:aboutlibraries:6.2.0' implementation "com.mikepenz:fastadapter:$fastadapterVersion" diff --git a/app/src/main/res/layout/list_item_trip.xml b/app/src/main/res/layout/list_item_trip.xml index 1d14bc5a6..62e7dd2d6 100644 --- a/app/src/main/res/layout/list_item_trip.xml +++ b/app/src/main/res/layout/list_item_trip.xml @@ -88,7 +88,9 @@ app:flexWrap="wrap" app:layout_constraintStart_toStartOf="@+id/fromLocation" app:layout_constraintEnd_toEndOf="@+id/fromLocation" - app:layout_constraintTop_toBottomOf="@+id/fromLocation"> + app:layout_constraintTop_toBottomOf="@+id/fromLocation" + app:alignItems="stretch" + app:alignContent="stretch"> diff --git a/app/witness.gradle b/app/witness.gradle index cd8dc30dc..29acabf9c 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -89,7 +89,7 @@ dependencyVerification { 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', 'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', 'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7', - 'com.google.android:flexbox:0.3.2:flexbox-0.3.2.aar:610a6a00695e873b4b6b785b7dce1c60f6a5964044b6d093b4d1060cbf13c278', + 'com.google.android.flexbox:flexbox:3.0.0:flexbox-3.0.0.aar:5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574', 'com.google.auto.value:auto-value-annotations:1.6.3:auto-value-annotations-1.6.3.jar:0e951fee8c31f60270bc46553a8586001b7b93dbb12aec06373aa99a150392c0', 'com.google.auto:auto-common:0.10:auto-common-0.10.jar:b876b5fddaceeba7d359667f6c4fb8c6f8658da1ab902ffb79ec9a415deede5f', 'com.google.code.findbugs:jsr305:2.0.1:jsr305-2.0.1.jar:1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468',