From 9868e621899417e71e25783f56e40214e63a8a4a Mon Sep 17 00:00:00 2001 From: Liam Norman Date: Thu, 3 Jun 2021 18:06:09 -0400 Subject: [PATCH 1/4] Add Washington DC Provider and strings --- app/build.gradle | 2 +- .../de/grobox/transportr/networks/TransportNetworks.kt | 7 +++++++ app/src/main/res/values/strings.xml | 2 ++ app/witness.gradle | 7 ++++--- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2768c11a3..efa169151 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,7 +147,7 @@ dependencies { exclude module: 'failureaccess' exclude group: 'com.google.j2objc' } - implementation('com.gitlab.opentransitmap:public-transport-enabler:af50a14c') { + implementation('com.gitlab.opentransitmap:public-transport-enabler:35c48292') { 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 3c756bdeb..5ab8bec02 100644 --- a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt +++ b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt @@ -654,6 +654,13 @@ private val networks = arrayOf( description = R.string.np_desc_usny, status = ALPHA, factory = { NewyorkProvider(NAVITIA) } + ), + TransportNetwork( + id = NetworkId.WASHINGTONDC, + name = R.string.np_name_usdc, + description = R.string.np_desc_usdc, + status = ALPHA, + factory = { WashingtonDCProvider(NAVITIA) } ) ) ), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b4eb6955a..cbb260225 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -422,6 +422,8 @@ and always knows where you are to not miss where to get off the bus. Austin New York and New-Jersey States MTA, CDTA, Port Authority, Staten Island Ferry, NFTA, Rockland County, Rochester-Genesee Regional Transportation Authority + Washington, DC + Metro California Public transport in California (USA) Oregon diff --git a/app/witness.gradle b/app/witness.gradle index d71c88793..b7e102c48 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -84,6 +84,7 @@ dependencyVerification { 'com.android.tools.analytics-library:shared:27.1.3:shared-27.1.3.jar:10d2a51d8f89ff4ac849888e5a9c60b10e879c30d78545ec1da4d3df7bd56ae4', 'com.android.tools.analytics-library:tracker:27.1.3:tracker-27.1.3.jar:589b355a2ba796cbc0a2b2295737de6661f078262e5f87cd6f540b8d011e5ebb', 'com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524:aapt2-proto-4.1.0-alpha01-6193524.jar:17e75523e1e92dd4f222c7368ee41df9e964a508232f591e265d0c499baf9dca', + 'com.android.tools.build:aapt2:4.1.3-6503028:aapt2-4.1.3-6503028-osx.jar:6c57e78049706e57ff65ad8c5fef43ed840c086710aeafa701953d6abbc90724', 'com.android.tools.build:apksig:4.1.3:apksig-4.1.3.jar:a851980c678ff7a6785388b9a9e8cc094788ce3c4a985ad2b19c2028fd3c631a', 'com.android.tools.build:apkzlib:4.1.3:apkzlib-4.1.3.jar:475903065e7e83a8c1ba78d267c97a54dc5a04d768b535093850423d7b11f2c8', 'com.android.tools.build:builder-model:4.1.3:builder-model-4.1.3.jar:2624a1436c3ab39dd91d3ecf9409a594b0f89ea5cab255f2e9ff11f5ee03d274', @@ -112,7 +113,7 @@ dependencyVerification { 'com.android:zipflinger:4.1.3:zipflinger-4.1.3.jar:48569896c0497268308a8014c66eb0f2bace2b9e2fc9390f3012823fb86387d5', '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:af50a14c:public-transport-enabler-af50a14c.jar:d14f3ba2102650938b10d981d3a11465af25d11b7f6b8794a11504dfbde850dc', + 'com.gitlab.opentransitmap:public-transport-enabler:35c48292:public-transport-enabler-35c48292.jar:57ad507e980b59478f0ea026fc52c5ffe1d74ffdb7013c473b85947b2d1580d0', '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.3.0:material-1.3.0.aar:cbf1e7d69fc236cdadcbd1ec5f6c0a1a41aca6ad1ef7f8481058956270ab1f0a', @@ -146,9 +147,9 @@ dependencyVerification { 'com.mikepenz:iconics-core:3.1.0:iconics-core-3.1.0.aar:eac6d9a2983412dba7e7e9df82206e0d55c9708149d35d21a72479a8b32a8998', 'com.mikepenz:materialdrawer:6.1.1:materialdrawer-6.1.1.aar:01d2c1e3b9bb4dbeb9546630afb1494179ed5437443560e2a5159e0f7ed2765b', 'com.mikepenz:materialize:1.2.0:materialize-1.2.0.aar:9f676d602932398d2d79ef35127d1777baa91a042b8ad3068a0d647463dec1a7', - 'com.squareup.okhttp3:logging-interceptor:3.12.12:logging-interceptor-3.12.12.jar:dbf83bebfae07c7d9823eb0cd3a11d74e3b387f9fd98ce6438c6c12c1d9f870f', + 'com.squareup.okhttp3:logging-interceptor:3.12.13:logging-interceptor-3.12.13.jar:ee3cd10a2d667621143156f995d4d0fce1dca2b1f3280dd48d821f92afac580a', 'com.squareup.okhttp3:okhttp:3.10.0:okhttp-3.10.0.jar:4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66', - 'com.squareup.okhttp3:okhttp:3.12.12:okhttp-3.12.12.jar:36f1cd0798fb231e5be189d0bfe2634d5879f73082be5718ca30a73d1ee15e4b', + 'com.squareup.okhttp3:okhttp:3.12.13:okhttp-3.12.13.jar:508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82', 'com.squareup.okio:okio:1.14.0:okio-1.14.0.jar:4633c331f50642ebe795dc089d6a5928aff43071c9d17e7840a009eea2fe95a3', 'com.squareup.okio:okio:1.15.0:okio-1.15.0.jar:693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2', 'com.squareup:javawriter:2.1.1:javawriter-2.1.1.jar:f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e', From b1c37619f9a4fb0cc6e606e1407fe9d5e9fc38a0 Mon Sep 17 00:00:00 2001 From: Liam Norman Date: Thu, 3 Jun 2021 20:18:44 -0400 Subject: [PATCH 2/4] add Metrobus to string --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cbb260225..cd8189435 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -423,7 +423,7 @@ and always knows where you are to not miss where to get off the bus. New York and New-Jersey States MTA, CDTA, Port Authority, Staten Island Ferry, NFTA, Rockland County, Rochester-Genesee Regional Transportation Authority Washington, DC - Metro + Metro, Metrobus California Public transport in California (USA) Oregon From 6a54ece1b5d5a7364c9ddee3f076fc235c165542 Mon Sep 17 00:00:00 2001 From: Liam Norman Date: Thu, 3 Jun 2021 20:27:23 -0400 Subject: [PATCH 3/4] sign CLA --- .clabot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index e50407270..fb624db50 100644 --- a/.clabot +++ b/.clabot @@ -17,7 +17,8 @@ "brandsimon", "sideeffffect", "T0astBread", - "fgndev" + "fgndev", + "liamnorm" ], "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 99e905199180b5eda2974b5cd60e59e655a43852 Mon Sep 17 00:00:00 2001 From: Liam Norman Date: Thu, 3 Jun 2021 20:30:35 -0400 Subject: [PATCH 4/4] add Capital Bikeshare to string --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd8189435..c7eeb4f6b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -423,7 +423,7 @@ and always knows where you are to not miss where to get off the bus. New York and New-Jersey States MTA, CDTA, Port Authority, Staten Island Ferry, NFTA, Rockland County, Rochester-Genesee Regional Transportation Authority Washington, DC - Metro, Metrobus + Metro, Metrobus, Capital Bikeshare California Public transport in California (USA) Oregon