diff --git a/app/build.gradle b/app/build.gradle index 538ba278..8809e4b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 @@ -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 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 dced67bf..df2425ac 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -443,15 +443,6 @@ 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, @@ -459,14 +450,6 @@ private val networks = arrayOf( 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\"}") } - ), ) ), ) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 11e15bf5..857d818b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -145,7 +145,7 @@ und weiß immer, wo man aussteigen muss. Die Datenquelle ist momentan nicht erreichbar :(\nBitte versuche es später noch einmal. Wenn du diesen Fehler melden möchtest, kannst du ihn bitte direkt an %1$s melden. Es könnte ein Problem mit dieser Verbindung geben. - Unmöglich oder abgebrochen + Unmöglich oder fällt aus Noch einmal versuchen %d m diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index eda25e81..e4ec92e5 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,6 +2,14 @@ + + Remove Chicago and Austin + Network API updates + Translation update + + diff --git a/app/witness.gradle b/app/witness.gradle index d2dd81d5..5558ecb6 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: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', diff --git a/fastlane/metadata/android/en-US/changelogs/131.txt b/fastlane/metadata/android/en-US/changelogs/131.txt new file mode 100644 index 00000000..9e493b07 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/131.txt @@ -0,0 +1,3 @@ +* Remove Chicago and Austin +* Network API updates +* Translation update