Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.1.0 #689

Merged
merged 3 commits into from
Aug 5, 2020
Merged

Release 2.1.0 #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af2bcdb
update test libs and PTE
ialokim Aug 2, 2020
3ebc503
update translations
ialokim Aug 4, 2020
e3da505
release 2.1.0
ialokim Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
buildToolsVersion "29.0.2"

defaultConfig {
versionCode 117
versionName "2.0.8"
versionCode 118
versionName "2.1.0"

applicationId "de.grobox.liberario"
minSdkVersion 16
Expand Down Expand Up @@ -139,14 +139,15 @@ dependencies {
implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"

implementation('com.gitlab.opentransitmap:public-transport-enabler:38b99f27') {
exclude module: 'service'
exclude group: 'com.google.guava', module: 'listenablefuture'
exclude group: 'com.google.guava', module: 'failureaccess'
implementation('com.google.guava:guava:29.0-android') {
exclude module: 'listenablefuture'
exclude module: 'failureaccess'
exclude group: 'com.google.j2objc'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can get rid of this again, eventually. Especially if it is just some annotations, we use.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think most (if not all) of them are used only in Java classes, so after finishing the migration to Kotlin, we might remove the dependency.

}
implementation('com.gitlab.opentransitmap:public-transport-enabler:f5c9f80d') {
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
exclude group: 'com.google.j2objc'
exclude group: 'junit'
}
debugImplementation 'org.slf4j:slf4j-api:1.7.30'
debugImplementation 'com.github.tony19:logback-android:1.1.1-12'
Expand All @@ -159,11 +160,11 @@ dependencies {
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation "androidx.test.ext:junit:1.1.1"
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0') {
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0') {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.google.code.findbugs'
}
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
androidTestImplementation('androidx.test.espresso:espresso-contrib:3.2.0') {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-v4'
exclude group: 'com.android.support', module: 'design'
Expand Down
8 changes: 4 additions & 4 deletions app/src/androidTest/java/de/grobox/transportr/ScreengrabTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ abstract class ScreengrabTest {
val networkId: NetworkId = when(getTestLocale()) {
Locale.FRANCE -> NetworkId.PARIS
Locale.US -> NetworkId.TLEM
Locale.forLanguageTag("pt-BR") -> NetworkId.BR
Locale.forLanguageTag("pt-BR") -> NetworkId.BRAZIL
else -> NetworkId.DB
}

val departureStation = when(networkId) {
NetworkId.PARIS -> "Gare De Lyon"
NetworkId.TLEM -> "Waterloo Station"
NetworkId.BR -> "Republica"
NetworkId.BRAZIL -> "Republica"
else -> "Berlin Hbf"
}

Expand All @@ -78,7 +78,7 @@ abstract class ScreengrabTest {
2 -> getLocation("Moorgate")
else -> throw RuntimeException()
}
NetworkId.BR -> when(i) {
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")
Expand All @@ -105,7 +105,7 @@ abstract class ScreengrabTest {
2 -> getLocation("Temple")
else -> throw RuntimeException()
}
NetworkId.BR -> when(i) {
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ú")
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,14 +693,14 @@ private val networks = arrayOf(
Country(
R.string.np_name_br, flag = "🇧🇷", networks = listOf(
TransportNetwork(
id = NetworkId.BR,
id = NetworkId.BRAZIL,
name = R.string.np_name_br,
description = R.string.np_desc_br,
agencies = R.string.np_desc_br_networks,
logo = R.drawable.network_br_logo,
status = ALPHA,
goodLineNames = true,
factory = { BrProvider(NAVITIA) }
factory = { BrazilProvider(NAVITIA) }
),
TransportNetwork(
id = NetworkId.BRFLORIPA,
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/res/values-ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]></string>
<string name="action_fav_trip">Marcar trajecte com a favorit</string>
<string name="action_unfav_trip">Desmarcar trajecte com a favorit</string>
<string name="action_switch_locations">Intercanvia Des de i Cap a</string>
<string name="trip_dep">de sortida</string>
<string name="trip_dep">de sortida</string>
<string name="trip_arr">d\'arribada</string>
<string name="action_refresh">Actualitzar</string>
<string name="action_navigation_expand">Mostrar via</string>
Expand Down Expand Up @@ -87,11 +87,11 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]></string>
<string name="network">Xarxa</string>
<string name="pick_network_activity">Triar àrea</string>
<string name="pick_network_first_run">Benvingut a Transportr!\n\n Selecciona la xarxa de transport de la teva zona per poder continuar. Pots canviar això en qualsevol moment.</string>
<string name="stations_searching_position">Cercant posició actual...</string>
<string name="stations_searching_position">Cercant posició actual…</string>
<string name="drawer_nearby_stations">Estacions properes</string>
<string name="find_nearby_stations">Trobar estacions properes</string>
<string name="find_departures">Trobar sortides</string>
<string name="share_trip_via">Compartir trajecte via...</string>
<string name="share_trip_via">Compartir trajecte via…</string>
<string name="more">Més</string>
<!--Shows a short(!) representation of how long you need to walk, e.g. "for 5 min"-->
<string name="for_x_min">per %dmin</string>
Expand Down Expand Up @@ -188,9 +188,9 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]></string>
<string name="product_cablecar">Telefèric</string>
<string name="product_on_demand">A demanda</string>
<!--ckChangeLog-->
<string name="changelog_full_title">Canvis</string>
<string name="changelog_title">Què hi ha de nou</string>
<string name="changelog_show_full">Més</string>
<string name="changelog_full_title" tools:ignore="UnusedResources">Canvis</string>
<string name="changelog_title" tools:ignore="UnusedResources">Què hi ha de nou</string>
<string name="changelog_show_full" tools:ignore="UnusedResources">Més…</string>
<string name="np_continent_europe">Europa</string>
<string name="np_continent_africa">Àfrica</string>
<string name="np_continent_north_america">Nordamèrica</string>
Expand Down Expand Up @@ -221,7 +221,6 @@ i sempre saber on ets per no perdre on baixar de l\'autobús. ]]></string>
<string name="np_desc_br_floripa">Vàries rutes, no \"executivos\"</string>
<string name="np_region_canada">Canadà</string>
<string name="np_name_ontario">Ontario</string>
<string name="np_desc_ontario">Ontario, Ottawa, Toronto, Mississauga, Regió de Waterloo</string>
<string name="np_name_quebec">Quebec</string>
<string name="np_desc_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</string>
<string name="np_name_britishcolumbia">Colúmbia Britànica</string>
Expand Down
15 changes: 7 additions & 8 deletions app/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen.
<string name="action_fav_trip">Marker Rejse som Favorit</string>
<string name="action_unfav_trip">Fjern Rejse som Favorit</string>
<string name="action_switch_locations">Skift Fra og Til</string>
<string name="trip_dep">Afgange</string>
<string name="trip_dep">Afgange</string>
<string name="trip_arr">Ankomst</string>
<string name="action_refresh">Genindlæs</string>
<string name="action_navigation_expand">Vis Via</string>
Expand Down Expand Up @@ -83,11 +83,11 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen.
<string name="network">Netværk</string>
<string name="pick_network_activity">Vælg Område</string>
<string name="pick_network_first_run">Velkommen til Transportr!\n\nVælg et transportnetværk fra dit område for at fortsætte. Du kan altid skifte dette.</string>
<string name="stations_searching_position">Søger efter nuværende position...</string>
<string name="stations_searching_position">Søger efter nuværende position…</string>
<string name="drawer_nearby_stations">Nærliggende Stationer</string>
<string name="find_nearby_stations">Find Nærliggende Stationer</string>
<string name="find_departures">Find Afgange</string>
<string name="share_trip_via">Del Rejse Via...</string>
<string name="share_trip_via">Del Rejse Via…</string>
<string name="more">Mere</string>
<!--Shows a short(!) representation of how long you need to walk, e.g. "for 5 min"-->
<string name="for_x_min">i %d min</string>
Expand Down Expand Up @@ -173,7 +173,7 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen.
<string name="warning_gps_off">Placering er slået fra. Slå den til i instillinger.</string>
<string name="onboarding_location_title">Træk op</string>
<string name="onboarding_location_message">Flere funktioner gemmer sig neden under</string>
<string name="select_products">Vælg Transporttype</string>
<string name="select_products">Vælg Transporttype</string>
<string name="product_high_speed_train">Højhastighedstog</string>
<string name="product_regional_train">Regional Tog</string>
<string name="product_suburban_train">Forstadstog</string>
Expand All @@ -184,9 +184,9 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen.
<string name="product_cablecar">Svævebane</string>
<string name="product_on_demand">Ved Behov</string>
<!--ckChangeLog-->
<string name="changelog_full_title">Ændringslog</string>
<string name="changelog_title">Nyheder</string>
<string name="changelog_show_full">Mere...</string>
<string name="changelog_full_title" tools:ignore="UnusedResources">Ændringslog</string>
<string name="changelog_title" tools:ignore="UnusedResources">Nyheder</string>
<string name="changelog_show_full" tools:ignore="UnusedResources">Mere…</string>
<string name="np_continent_europe">Europa</string>
<string name="np_continent_africa">Afrika</string>
<string name="np_continent_north_america">Nordamerika</string>
Expand Down Expand Up @@ -217,7 +217,6 @@ og ved altid hvor du er for ikke at glemme hvor du skal stige af bussen.
<string name="np_desc_br_floripa">Mange busruter, ingen ledere</string>
<string name="np_region_canada">Canada</string>
<string name="np_name_ontario">Ontario</string>
<string name="np_desc_ontario">Ontario, Ottawa, Toronto, Mississauga, Waterloo Regionen</string>
<string name="np_name_quebec">Quebec</string>
<string name="np_desc_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</string>
<string name="np_name_britishcolumbia">Britisk Columbia</string>
Expand Down
18 changes: 11 additions & 7 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ und weiß immer, wo man aussteigen muss.
<string name="action_fav_trip">Verbindung als Favorit markieren</string>
<string name="action_unfav_trip">Markierung der Verbindung als Favorit aufheben</string>
<string name="action_switch_locations">Von und Nach vertauschen</string>
<string name="trip_dep">Abfahrt</string>
<string name="trip_dep">Abfahrt</string>
<string name="trip_arr">Ankunft</string>
<string name="action_refresh">Aktualisieren</string>
<string name="action_navigation_expand">Über anzeigen</string>
Expand All @@ -69,7 +69,8 @@ und weiß immer, wo man aussteigen muss.
<string name="about_warning_text">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.</string>
<string name="about_contributions">Diese App ist Freie Software, so dass Sie sie frei benutzen, studieren, teilen und verbessern können. Beiträge sind erwünscht und willkommen. Wenn Sie einen Beitrag leisten möchten, besuchen Sie bitte die Homepage für weitere Informationen.</string>
<string name="about_visit_website">Zur Webseite</string>
<string name="open_navigation_drawer">Navigationsschuber öffnen</string>
<string name="map_attribution_improve">Diese Karte verbessern</string>
<string name="open_navigation_drawer">Navigationsbereich öffnen</string>
<string name="from">Von</string>
<string name="to">Nach</string>
<string name="via">Über</string>
Expand Down Expand Up @@ -109,6 +110,8 @@ und weiß immer, wo man aussteigen muss.
<string name="pref_theme_title">Thema</string>
<string name="pref_theme_light">Hell</string>
<string name="pref_theme_dark">Dunkel</string>
<string name="pref_theme_auto_battery">Einstellung durch Batteriesparmodus</string>
<string name="pref_theme_auto_system">Systemstandard</string>
<string name="pref_language_title">Sprache</string>
<string name="pref_directions_routing">Verbindungen und Routenkriterien</string>
<string name="pref_optimize">Optimiert für</string>
Expand Down Expand Up @@ -173,7 +176,7 @@ und weiß immer, wo man aussteigen muss.
<string name="warning_gps_off">Der Standort ist ausgeschaltet. Bitte schalte es in den Einstellungen ein.</string>
<string name="onboarding_location_title">Hochziehen</string>
<string name="onboarding_location_message">Weitere Funktionen verbergen sich weiter unten</string>
<string name="select_products">Wähle das Verkehrsmittel</string>
<string name="select_products">Wähle das Verkehrsmittel</string>
<string name="product_high_speed_train">Hochgeschwindigkeitszug</string>
<string name="product_regional_train">Regionalbahn</string>
<string name="product_suburban_train">S-Bahn</string>
Expand All @@ -184,9 +187,9 @@ und weiß immer, wo man aussteigen muss.
<string name="product_cablecar">Seilbahn</string>
<string name="product_on_demand">Auf Nachfrage</string>
<!--ckChangeLog-->
<string name="changelog_full_title">Änderungsprotokoll</string>
<string name="changelog_title">Was gibt\'s Neues</string>
<string name="changelog_show_full">Mehr…</string>
<string name="changelog_full_title" tools:ignore="UnusedResources">Änderungsprotokoll</string>
<string name="changelog_title" tools:ignore="UnusedResources">Was gibt\'s Neues</string>
<string name="changelog_show_full" tools:ignore="UnusedResources">Mehr…</string>
<string name="np_continent_europe">Europa</string>
<string name="np_continent_africa">Afrika</string>
<string name="np_continent_north_america">Nordamerika</string>
Expand Down Expand Up @@ -217,7 +220,7 @@ und weiß immer, wo man aussteigen muss.
<string name="np_desc_br_floripa">Viele Buslinien, keine Executivos</string>
<string name="np_region_canada">Kanada</string>
<string name="np_name_ontario">Ontario</string>
<string name="np_desc_ontario">Ontario, Ottawa, Toronto, Mississauga, Waterloo Region</string>
<string name="np_desc_ontario">Ontario, Ottawa, Toronto, Mississauga, Hamilton, Waterloo Region</string>
<string name="np_name_quebec">Québec</string>
<string name="np_desc_quebec">Deux-Montagnes, Laval, L\'Assomption, Outaouais, Sud-Ouest, Québec, 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</string>
<string name="np_name_britishcolumbia">British Columbia</string>
Expand Down Expand Up @@ -353,4 +356,5 @@ und weiß immer, wo man aussteigen muss.
<string name="taiwanese">Chinesisch (Taiwan)</string>
<string name="swedish">Schwedisch</string>
<string name="ukrainian">Ukrainisch</string>
<string name="danish">Dänisch</string>
</resources>
Loading