Skip to content
Merged

V2.2.7 #1004

Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ apply from: 'witness.gradle'
android {

defaultConfig {
versionCode 130
versionName "2.2.6"
versionCode 131
versionName "2.2.7"

applicationId "de.grobox.liberario"
minSdkVersion 24
Expand Down Expand Up @@ -142,7 +142,7 @@ dependencies {
exclude module: 'failureaccess'
exclude group: 'com.google.j2objc'
}
implementation('com.gitlab.opentransitmap:public-transport-enabler:2713727d07df8408e064e5ffae2733862711a10b') {
implementation('com.gitlab.opentransitmap:public-transport-enabler:09b90d37bfe452f7845f73aac256fd7eb2ae978a') {
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,30 +443,13 @@ private val networks = arrayOf(
R.string.np_continent_north_america, R.drawable.continent_north_america, countries = listOf(
Country(
R.string.np_region_usa, "🇺🇸", networks = listOf(
TransportNetwork(
id = NetworkId.RTACHICAGO,
name = R.string.np_name_rtachicago,
description = R.string.np_desc_rtachicago,
agencies = R.string.np_desc_rtachicago_networks,
logo = R.drawable.network_rtachicago_logo,
status = BETA,
factory = { RtaChicagoProvider() }
),
TransportNetwork(
id = NetworkId.BART,
description = R.string.np_desc_bart,
logo = R.drawable.network_bart_logo,
status = BETA,
factory = { BartProvider("{\"type\":\"AID\",\"aid\":\"kEwHkFUCIL500dym\"}") }
),
TransportNetwork(
id = NetworkId.CMTA,
name = R.string.np_name_cmta,
description = R.string.np_desc_cmta,
logo = R.drawable.network_cmta_logo,
status = BETA,
factory = { CmtaProvider("{\"type\":\"AID\",\"aid\":\"web9j2nak29uz41irb\"}") }
),
)
),
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ und weiß immer, wo man aussteigen muss.
<string name="trip_error_service_down">Die Datenquelle ist momentan nicht erreichbar :(\nBitte versuche es später noch einmal.</string>
<string name="trip_error_pte">Wenn du diesen Fehler melden möchtest, kannst du ihn bitte direkt an %1$s melden.</string>
<string name="trip_issue">Es könnte ein Problem mit dieser Verbindung geben.</string>
<string name="trip_not_travelable">Unmöglich oder abgebrochen</string>
<string name="trip_not_travelable">Unmöglich oder fällt aus</string>
<string name="try_again">Noch einmal versuchen</string>
<!--This string shows the number of meters one has to walk. Please keep the translation short.-->
<string name="meter">%d m</string>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/xml/changelog_master.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<changelog xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedResources">

<release
version="2.2.7"
versioncode="131">
<change>Remove Chicago and Austin</change>
<change>Network API updates</change>
<change>Translation update</change>
</release>

<release
version="2.2.6"
versioncode="130">
Expand Down
2 changes: 1 addition & 1 deletion app/witness.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:2713727d07df8408e064e5ffae2733862711a10b:public-transport-enabler-2713727d07df8408e064e5ffae2733862711a10b.jar:92b389ac15f0dbc3a3f67bd7bb481deb15743ba5062c55fafece2b1d0c878d2e',
'com.gitlab.opentransitmap:public-transport-enabler:09b90d37bfe452f7845f73aac256fd7eb2ae978a:public-transport-enabler-09b90d37bfe452f7845f73aac256fd7eb2ae978a.jar:b5c7d131a2d7e0699d2d8ee4667f0140be01bb53532207e659d0a957e45b3228',
'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f',
'com.google.android.flexbox:flexbox:3.0.0:flexbox-3.0.0.aar:5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574',
'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc',
Expand Down
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/131.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* Remove Chicago and Austin
* Network API updates
* Translation update
Loading