Bump sdk to 32 and update dependencies for MD3

.clabot

@@ -21,7 +21,8 @@
     "Altonss",
     "thgoebel",
     "pt2121",
-    "Jean-BaptisteC"
+    "Jean-BaptisteC",
+    "Bnyro"
   ],
   "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"

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 8
+          java-version: 11
       - name: Get AVD arch
         uses: ./.github/actions/get-avd-arch
         id: avd-arch

app/build.gradle

@@ -13,8 +13,8 @@ android {
 
 		applicationId "de.grobox.liberario"
 		minSdkVersion 21
-		compileSdkVersion 31
-		targetSdkVersion 31
+		compileSdkVersion 33
+		targetSdkVersion 32
 
 		testInstrumentationRunner 'de.grobox.transportr.MockTestRunner'
 		javaCompileOptions {
@@ -102,8 +102,8 @@ android {
 dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-	implementation 'com.google.android.material:material:1.3.0'
-	implementation 'androidx.appcompat:appcompat:1.3.0'
+	implementation 'com.google.android.material:material:1.5.0'
+	implementation 'androidx.appcompat:appcompat:1.3.1'
 	implementation 'androidx.activity:activity:1.2.3'
 	implementation('androidx.fragment:fragment:1.1.0!!') {
 		because 'issues with MapBox SDK onDestroy after upgrading to 1.2.0-alpha02 or newer versions'
@@ -140,7 +140,6 @@ dependencies {
 	kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
 	implementation('com.google.guava:guava:29.0-android') {
-		exclude module: 'listenablefuture'
 		exclude module: 'failureaccess'
 		exclude group: 'com.google.j2objc'
 	}
@@ -162,8 +161,6 @@ dependencies {
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 	androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-	androidTestImplementation('tools.fastlane:screengrab:1.1.0') {
-		exclude group: 'androidx.test.uiautomator' //requires minSDK >= 18
-	}
+	androidTestImplementation('tools.fastlane:screengrab:2.1.1')
 	kaptAndroidTestDebug "com.google.dagger:dagger-compiler:$daggerVersion"
 }

app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt

@@ -51,7 +51,7 @@ abstract class ScreengrabTest {
         Screengrab.setDefaultScreenshotStrategy(UiAutomatorScreenshotStrategy())
     }
 
-    val networkId: NetworkId = when(getTestLocale()) {
+    val networkId: NetworkId = when(Locale.forLanguageTag(getTestLocale())) {
         Locale.FRANCE -> NetworkId.PARIS
         Locale.US -> NetworkId.TLEM
         Locale.forLanguageTag("pt-BR") -> NetworkId.BRAZIL

app/src/main/java/de/grobox/transportr/about/ContributorFragment.kt

@@ -73,7 +73,7 @@ private class ContributorGroupAdapter(val groups: List<ContributorGroup>) : Recy
 
     override fun getItemCount(): Int = groups.size
 
-    private class ContributorGroupViewHolder(v: View) : RecyclerView.ViewHolder(v) {
+    class ContributorGroupViewHolder(v: View) : RecyclerView.ViewHolder(v) {
 
         val languageName: TextView = v.findViewById(R.id.languageName)
         val list: RecyclerView = v.findViewById(R.id.list)
@@ -102,7 +102,7 @@ private class ContributorAdapter(val contributors: List<Contributor>) : Recycler
     override fun getItemCount(): Int = contributors.size
 
 
-    private class ContributorViewHolder(v: View) : RecyclerView.ViewHolder(v) {
+    class ContributorViewHolder(v: View) : RecyclerView.ViewHolder(v) {
 
         val name: TextView = v.findViewById(R.id.name)
 

app/src/main/java/de/grobox/transportr/map/GpsController.kt

@@ -35,9 +35,9 @@ import de.schildbach.pte.dto.Location.coord
 import java.util.*
 import java.util.concurrent.TimeUnit
 
-internal data class GpsState(var hasFix: Boolean, var isOld: Boolean, var isTracking: Boolean)
+data class GpsState(var hasFix: Boolean, var isOld: Boolean, var isTracking: Boolean)
 
-internal class GpsController(val context: Context) : AbstractManager(), ReverseGeocoderCallback {
+class GpsController(val context: Context) : AbstractManager(), ReverseGeocoderCallback {
 
     companion object {
         internal val GPS_FIX_EXPIRY = TimeUnit.SECONDS.toMillis(3)

app/src/main/res/values-ca/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Open Source Public Transit</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Assistent de transport públic gratuït, sense anuncis ni rastrejadors</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr és una aplicació sense ànim de lucre desenvolupada per persones de tot el món en el seu temps lliure .
 Volen fer que l\'ús del transport públic sigui el més fàcil possible per a tothom.
 

app/src/main/res/values-cs/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Open-source veřejná doprava</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Bezplatný asistent pro veřejnou dopravu bez reklam a sledovacích prvků</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr je nezisková aplikace vyvinutá lidmi po celém světě ve volném čase.
 Chce všem co nejvíce usnadnit používání veřejné dopravy.
 

app/src/main/res/values-da/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Åben Kildekode Offentlig Transport</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Gratis Offentlig Transport Assistent uden Reklamer eller Sporing</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr er en non-profit app lavet af folkene omkring hele verden i deres fritid.
 De vil gerne gøre brug af offentlig transport så nemt så muligt for alle sammen.
 

app/src/main/res/values-de/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Freier öffentlicher Nahverkehr</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Freier Assistent für den öffentlichen Nahverkehr ohne Werbung und Tracking</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr ist eine nicht-kommerzielle App, die von Menschen auf der ganzen Welt in ihrer Freizeit entwickelt wurde.
 Sie wollen die Nutzung der öffentlichen Verkehrsmittel für alle so einfach wie möglich machen.
 

app/src/main/res/values-el/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Δημόσιες μεταφορές ανοιχτού κώδικα</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Δωρεάν βοηθός δημόσιων μεταφορών χωρίς διαφημίσεις ή παρακολούθηση</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Το Transportr είναι μία εφαρμογή μη-κερδοσκοπική που αναπτύσσεται από άτομα σε όλο τον κόσμο στον ελεύθερο τους χρόνο.
 Θέλουν να κάνουν την χρήση των δημόσιων μεταφορών όσο το δυνατό ευκολότερη για όλους.
 

app/src/main/res/values-eo/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Malfermkoda asistilo por publika transporto sen reklamoj kaj spurado</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr estas ne-profit-cela aplikaĵo evoluigata de homoj de la tuta mondo libertempe. Ili volas igi uzadon de publika transporto kiel eble plej facilan por ĉiu. 
 
 Tiu ĉi aplikaĵo uzas datumojn de diversaj lokaj firmaoj de publika transporto kaj liveras unuigitan fasadon por ilin. Oni ne povas verigi korektecon de datumoj do <i>estas nenia garantio</i> pri liverataj informoj.  Uzu nur sub via risko.

app/src/main/res/values-es/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Transporte público de código abierto</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Asistente de transporte libre y gratuito sin publicidad ni seguimiento</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr es una aplicación sin ánimo de lucro desarrollada por gente de todo el mundo en su tiempo libre. 
 Quieren hacer el uso del transporte público tan sencillo como sea posible para todo el mundo. 
 Esta app hace uso de datos de varias agencias de transporte público y provee una interfaz unificada para ellos. 

app/src/main/res/values-eu/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Garraio publiko librea</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Garraio publikoarentzako aplikazio lagungarria, iragarki eta tracker gabe</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr irabazi asmorik gabeko aplikazioa bat da, mundu osoko pertsonek bere denbora librean garatua.
 
 Garraio publikoa erabiltzea denontzat ahal beste erraztu nahi dute

app/src/main/res/values-fa/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - عبور و مرور عمومی متن باز</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">دستیار حمل و نقل عمومی رایگان بدون تبلیغات یا ردیابی</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr یک برنامه ناسودبر بوده که توسط افراد در سراسر جهان در اوقات فراغتشان توسعه داده شده است.
 آن ها قصد دارند تا استفاده از حمل و نقل عمومی را برای همگان به سادگی هر چه تمام تر کنند.
 

app/src/main/res/values-fr/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr — Appli libre de transport en commun</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Assistant gratuit de transport en commun sans publicité ni suivi à la trace</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr est une appli sans but lucratif développée par des personnes du monde entier pendant leur temps libre.
 Elles souhaitent faciliter autant que possible l’utilisation des transports en commun, pour tous.
 

app/src/main/res/values-hu/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr – Nyílt forráskódú tömegközlekedés</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Szabad tömegközlekedési segéd reklámok és követés nélkül</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 A Transportr egy nonprofit alkalmazás, amelyet emberek a szabadidejükben fejlesztenek
 a világ minden tájáról. Azt szeretnék, hogy a tömegközlekedés olyan könnyű legyen
 mindenki számára, amennyire csak lehetséges.

app/src/main/res/values-it/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - trasporto pubblico open source</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Assistente per il trasporto pubblico gratis e senza pubblicità o tracciatori</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr è un\'app non-profit sviluppata da persone di tutto il mondo nel loro tempo libero.
 Il loro obiettivo è quello di rendere l\'uso del trasporto pubblico il più semplice possibile per tutti.
 

app/src/main/res/values-ja/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - オープンソース公共交通機関</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">無料の公共交通機関アシスタント、広告や追跡はありません</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr は、世界中の人々が自由な時間に開発した非営利のアプリです。
 すべての人ができるだけ簡単に公共交通機関を利用したいと考えています。
 

app/src/main/res/values-nl/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - open-bron Openbaar Vervoer</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Gratis openbaarvervoerhulpmiddel zonder reclame of gevolgd te worden</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr is een niet-commerciële app ontwikkeld door mensen over de hele wereld in hun vrije tijd. Zij willen het gebruik van openbaar vervoer zo makkelijk mogelijk maken voor iedereen.
 
 Deze app gebruikt de gegevens van verschillende lokale openbaar vervoersaanbieders, zoals 9292, NS en Railteam, en geeft deze overzichtelijk weer. De app kan de correctheid van de gegevens niet verifiëren en <i>biedt daarom geen garanties</i> voor de weergegeven informatie. Gebruik op eigen risico.

app/src/main/res/values-pl/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Otwartoźródłowy asystent transportu publicznego bez reklam i śledzenia</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr jest aplikacją non-profit tworzoną hobbistycznie przez ludzi z całego świata. Celem jest jak najbardziej ułatwić wszystkim korzystanie z transportu publicznego.
 
 Ta aplikacja korzysta z wielu dostawców danych transportu publicznego i dostarcza dla nich wspólny interfejs. Nie jest możliwe sprawdzenie poprawności tych danych, więc <i>nie jest udzielana żadna gwarancja</i> na wyświetlane informacje i używasz jej na swoje własne ryzyko.

app/src/main/res/values-ro/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Transport Public cu sursă deschisă</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Asistent pentru transportul public gratuit, fără reclame sau tracking</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr este o aplicaţie non-profit dezvoltată de persoane din întreaga lume, în timpul lor liber.
 Aceştia doresc să facă folosirea transportului public cât mai uşor posibil pentru toată lumea.
 

app/src/main/res/values-ru/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - транспорт с открытым кодом</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Бесплатный ассистент общественного транспорта без рекламы и без отслеживания</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr это некоммерческое приложение, разработанное людьми со всего мира.
 Они хотят сделать использование общественного транспорта максимально доступным для всех.
 

app/src/main/res/values-sv/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="google_play_title" tools:keep="@string/google_play_title">Transportr - Kollektivtrafik med öppen källkod</string>
   <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">Gratis kollektivtrafikassistent utan annonser eller spårning</string>
-  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc"><![CDATA[
+  <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc" tools:ignore="StringFormatInvalid"><![CDATA[
 Transportr är en ideell app som utvecklats av personer runt om i världen på fritiden.
 De vill göra användningen av kollektivtrafiken så enkel som möjligt för alla.