Author: Adam Evyčędo <git@apiote.xyz>
resolve conflict
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/README.adoc b/README.adoc index e7a016ec8c4311770bdf147f2aa2e32af0c9dfd9..917f7ce88b210d5c32c0be1da012b2d8c3e464f8 100644 --- a/README.adoc +++ b/README.adoc @@ -27,6 +27,8 @@ == Contribute This project uses The Code of Merit, which is available as CODE_OF_CONDUCT file. +Bimba is translated using https://hosted.weblate.org/projects/bimba/[Weblate] + The roadmap is available in `CHANGELOG.adoc` file and—although it’s not set in stone—feature requests are highly discouraged. Contributions, however, are welcome as patches; please send them to `bimba@git.apiote.xyz` using `git send-email`. Patches must include a sign-off to certify agreement to https://developercertificate.org/[Developer Certificate of Origin]. All communication—questions, bugs, etc.—should go through the mailing list available at `bimba@git.apiote.xyz`. Note that all communication will be made public at https://asgard.apiote.xyz/. diff --git a/app/build.gradle b/app/build.gradle index 59611b3a33a2d44856100353599f03b1f76af98c..4b8987eea786c06b3fadaede92fd3866394315b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } -// note fixes reproducible builds +// NOTE fixes reproducible builds project.afterEvaluate { tasks.each { task -> if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) { diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/Structs.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/Structs.kt index 07668a3f7fd3633c06ffa568dccaf2f741f87b90..1dafc8cacf61a3b221df3fd18941b1e9a567089c 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/Structs.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/Structs.kt @@ -702,4 +702,4 @@ onDemand = reader.readBoolean() ) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt index c4d49ef61a9897968f31eb3b4b180cefeab14936..ea9d6279fd223e940cb9df6f90889e221c2e435d 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt @@ -10,7 +10,7 @@ import xyz.apiote.bimba.czwek.api.DepartureV2 import xyz.apiote.bimba.czwek.api.DepartureV3 import xyz.apiote.bimba.czwek.api.StopV1 import xyz.apiote.bimba.czwek.api.StopV2 -import xyz.apiote.bimba.czwek.api.UnknownResponseVersion +import xyz.apiote.bimba.czwek.api.responses.UnknownResponseVersion import xyz.apiote.fruchtfleisch.Reader import java.io.InputStream diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Feeds.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Feeds.kt index 0a97485008fca048b87d833ffac7d566189ab880..2db68ec32cf82ff44a86c514e5111cf2142f5c6f 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Feeds.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Feeds.kt @@ -4,7 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later package xyz.apiote.bimba.czwek.api.responses -import xyz.apiote.bimba.czwek.api.UnknownResponseVersion +import xyz.apiote.bimba.czwek.api.responses.UnknownResponseVersion import xyz.apiote.bimba.czwek.api.structs.FeedInfoV1 import xyz.apiote.bimba.czwek.api.structs.FeedInfoV2 import xyz.apiote.fruchtfleisch.Reader diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Line.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Line.kt index 180e5dd3f9cc6136c1f5258c367e836a6960cf62..1a4528959aac80bc5f0887ea98a32120318ce351 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Line.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Line.kt @@ -6,7 +6,7 @@ package xyz.apiote.bimba.czwek.api.responses import xyz.apiote.bimba.czwek.api.LineV1 import xyz.apiote.bimba.czwek.api.LineV2 -import xyz.apiote.bimba.czwek.api.UnknownResponseVersion +import xyz.apiote.bimba.czwek.api.responses.UnknownResponseVersion import xyz.apiote.fruchtfleisch.Reader import java.io.InputStream diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt index 6d28427763428a0927fbfbc80b8c2ef45b8375b8..f126d564f35d713d84edb60e202ef413e0622e4c 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt @@ -10,7 +10,7 @@ import xyz.apiote.bimba.czwek.api.LocatableV3 import xyz.apiote.bimba.czwek.api.StopV1 import xyz.apiote.bimba.czwek.api.StopV2 import xyz.apiote.bimba.czwek.api.UnknownResourceVersionException -import xyz.apiote.bimba.czwek.api.UnknownResponseVersion +import xyz.apiote.bimba.czwek.api.responses.UnknownResponseVersion import xyz.apiote.bimba.czwek.api.VehicleV1 import xyz.apiote.bimba.czwek.api.VehicleV2 import xyz.apiote.bimba.czwek.api.VehicleV3 diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt index c1eeb964a5f0912183246d752948d6b3b976527b..9e5d0a467f6b052d867a9777d3f7ce0e5a9a8a14 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt @@ -12,7 +12,7 @@ import xyz.apiote.bimba.czwek.api.QueryableV3 import xyz.apiote.bimba.czwek.api.StopV1 import xyz.apiote.bimba.czwek.api.StopV2 import xyz.apiote.bimba.czwek.api.UnknownResourceVersionException -import xyz.apiote.bimba.czwek.api.UnknownResponseVersion +import xyz.apiote.bimba.czwek.api.responses.UnknownResponseVersion import xyz.apiote.fruchtfleisch.Reader import java.io.InputStream diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Departure.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Departure.kt index 9a4133162d01892e012b447289494b38751ef7d0..78f926284ce92cc8eef07d35958d78a796e060e5 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Departure.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Departure.kt @@ -113,7 +113,7 @@ constructor(d: DepartureV3) : this( d.ID, d.time, - d.status, + d.status.ordinal.toULong(), // TODO VehicleStatus d.isRealtime, Vehicle(d.vehicle), d.boarding diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt index 7ed57bd29b474ef0c302c7d537ea72e1f10d6f7e..c255ef89be2df8238f0189d7befa70612336d1e9 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt @@ -238,4 +238,4 @@ else -> null } } } -} \ No newline at end of file +} diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml index d6c12cea9b10aba848e1ff9400e8cac9a36f4a4f..8827872ba662c58a92add175e1d0a29b0bc75c95 100644 --- a/app/src/main/res/xml/backup_rules.xml +++ b/app/src/main/res/xml/backup_rules.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?><!-- +<?xml version="1.0" encoding="utf-8"?> <!-- SPDX-FileCopyrightText: Adam Evyčędo @@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later --> +<!-- Sample backup rules file; uncomment and customize as necessary. See https://developer.android.com/guide/topics/data/autobackup for details. diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml index 9969d2a3ca978302701e25b6c699ec0e2146514b..982710c1b6c562febe90135c63f4d17c91883758 100644 --- a/app/src/main/res/xml/data_extraction_rules.xml +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?><!-- +<?xml version="1.0" encoding="utf-8"?> <!-- SPDX-FileCopyrightText: Adam Evyčędo @@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later --> +<!-- Sample data extraction rules file; uncomment and customize as necessary. See https://developer.android.com/about/versions/12/backup-restore#xml-changes for details.