-
Notifications
You must be signed in to change notification settings - Fork 345
Adding Kiedybus rebranding flavour #1439
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.
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
Open
wkulesza
wants to merge
15
commits into
OneBusAway:main
Choose a base branch
from
goeuropa:kiedybus
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
98d8d09
adding KiedyBus project
wkulesza 3aa6cc6
adding translations and UI elements
wkulesza 1902cac
changes to suit own regions file in relevant xml file
wkulesza f2fa51a
added round icons for kiedybus
wkulesza 54e237d
added instructions for blue color of launcher icon in the colors xml …
wkulesza a562580
fixes
wkulesza ef09677
Merge branch 'OneBusAway:main' into kiedybus
wkulesza b9a1aba
Merge branch 'OneBusAway:main' into kiedybus
wkulesza 6430671
Merge branch 'OneBusAway:main' into kiedybus
wkulesza 10a7033
Merge branch 'OneBusAway:main' into kiedybus
wkulesza 8fe3305
Merge branch 'OneBusAway:main' into kiedybus
wkulesza be7af64
missede buildConfigField for 'kiedybus'
TsimurSh bd71d1b
Update onebusaway-android/src/kiedybus/res/values-pl/arrays.xml
wkulesza d3f8b8a
fix: the comment references KiedyBus instead of 'Agency X'
TsimurSh 4bbfd3b
Merge remote-tracking branch 'origin/kiedybus' into kiedybus
TsimurSh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -211,9 +211,45 @@ android { | |
| buildConfigField "String", "FIXED_REGION_PLAUSIBLE_ANALYTICS_SERVER_URL", "null" | ||
| buildConfigField "String", "ONESIGNAL_APP_ID", ONESIGNAL_APP_ID | ||
| } | ||
| /** | ||
| * Add more rebranding flavors here... | ||
| */ | ||
| kiedybus { | ||
| // "Agency X" rebranding OneBusAway as another app - see src/agencyX/res for branded resources | ||
| dimension "brand" | ||
| applicationId "pl.kiedybus.android" // Unique listing of this brand on app store | ||
| manifestPlaceholders = [databaseAuthority: applicationId.toString() + '.provider'] | ||
| buildConfigField "int", "ARRIVAL_INFO_STYLE", "1" // Defined in BuildFlavorConstants | ||
| buildConfigField "boolean", "USE_FIXED_REGION", "false" // Supports multi-region | ||
| buildConfigField "boolean", "USE_PELIAS_GEOCODING", "true" | ||
| buildConfigField "String", "PELIAS_API_KEY", "\"" + getPeliasKey(name) + "\"" | ||
| // Below fields need to be defined so flavor builds, but will not be used by app | ||
| buildConfigField "String", "FIXED_REGION_NAME", "\"KiedyBus\"" | ||
| buildConfigField "String", "FIXED_REGION_OBA_BASE_URL", "\"https://obaztmapi.iplaner.pl\"" | ||
| buildConfigField "String", "FIXED_REGION_SIRI_BASE_URL", "null" | ||
| buildConfigField "double", "FIXED_REGION_BOUNDS_LAT", "52.407014" | ||
| buildConfigField "double", "FIXED_REGION_BOUNDS_LON", "16.926709" | ||
| buildConfigField "double", "FIXED_REGION_BOUNDS_LAT_SPAN", "0.5424609999999994" | ||
| buildConfigField "double", "FIXED_REGION_BOUNDS_LON_SPAN", "0.576357999999999" | ||
| buildConfigField "String", "FIXED_REGION_LANG", "\"pl_PL\"" | ||
| buildConfigField "String", "FIXED_REGION_CONTACT_EMAIL", "\"[email protected]\"" | ||
| buildConfigField "boolean", "FIXED_REGION_SUPPORTS_OBA_DISCOVERY_APIS", "true" | ||
| buildConfigField "boolean", "FIXED_REGION_SUPPORTS_OBA_REALTIME_APIS", "true" | ||
| buildConfigField "boolean", "FIXED_REGION_SUPPORTS_SIRI_REALTIME_APIS", "false" | ||
| buildConfigField "String", "FIXED_REGION_TWITTER_URL", "null" | ||
| buildConfigField "String", "FIXED_REGION_STOP_INFO_URL", "null" | ||
| buildConfigField "String", "FIXED_REGION_OPEN311_JURISDICTION_ID", "null" | ||
| buildConfigField "String", "FIXED_REGION_OPEN311_API_KEY", "null" | ||
| buildConfigField "String", "FIXED_REGION_OPEN311_BASE_URL", "null" | ||
| buildConfigField "String", "FIXED_REGION_OTP_BASE_URL", "null" | ||
| buildConfigField "String", "FIXED_REGION_OTP_CONTACT_EMAIL", "null" | ||
| buildConfigField "boolean", "FIXED_REGION_SUPPORTS_OTP_BIKESHARE", "false" | ||
| buildConfigField "String", "FIXED_REGION_PAYMENT_ANDROID_APP_ID", "null" | ||
| buildConfigField "String", "FIXED_REGION_PAYMENT_WARNING_TITLE", "null" | ||
| buildConfigField "String", "FIXED_REGION_PAYMENT_WARNING_BODY", "null" | ||
| buildConfigField "boolean", "FIXED_REGION_TRAVEL_BEHAVIOR_DATA_COLLECTION", "false" | ||
| buildConfigField "boolean", "FIXED_REGION_ENROLL_PARTICIPANTS_IN_STUDY", "false" | ||
| buildConfigField "String", "FIXED_REGION_SIDECAR_BASE_URL", "null" | ||
| buildConfigField "String", "FIXED_REGION_PLAUSIBLE_ANALYTICS_SERVER_URL", "null" | ||
| buildConfigField "String", "ONESIGNAL_APP_ID", ONESIGNAL_APP_ID | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.39 KB
onebusaway-android/src/kiedybus/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.54 KB
onebusaway-android/src/kiedybus/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.79 KB
onebusaway-android/src/kiedybus/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+15.4 KB
onebusaway-android/src/kiedybus/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+19.1 KB
onebusaway-android/src/kiedybus/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright (C) 2010-2014 Paul Watts ([email protected]) | ||
| and individual contributors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <resources> | ||
| <string name="app_name">Agency Y</string> | ||
|
|
||
| <!-- Tutorial --> | ||
| <string name="tutorial_welcome_title">¡Bienvenido a Agency Y!</string> | ||
| <string name="tutorial_welcome_text">Toca una parada (punto azul en el mapa) para ver los tiempos | ||
| de llegada. | ||
| </string> | ||
| <string name="tutorial_arrival_header_arrival_info_text">¡Largo tiempo! El color de fondo te indica | ||
| si el bus esta adelantado (rojo) o va atrasado (azul oscuro). Si es azul claro se encuentra a tiempo. | ||
| Si nosotros no sabemos | ||
| donde se encuentra el bus, se muestra el tiempo planificado (gris). | ||
| </string> | ||
|
|
||
| <!-- See src/main/res/strings.xml for more strings you can override here --> | ||
| </resources> |
125 changes: 125 additions & 0 deletions
125
onebusaway-android/src/kiedybus/res/values-pl/arrays.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright (C) 2010-2014 Paul Watts ([email protected]) | ||
| and individual contributors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <resources> | ||
| <string-array name="main_help_options"> | ||
| <!--<item>Twitter</item>--> | ||
| <item>Poradnik</item> | ||
| <item>Nowości</item> | ||
| <item>Kontakt</item> | ||
| </string-array> | ||
| <string-array name="main_help_options_no_contact_us"> | ||
| <item>Twitter</item> | ||
| <item>Lista przewoźników</item> | ||
| <item>Nowości</item> | ||
| </string-array> | ||
| <string-array name="route_favorite_options"> | ||
| <item>Ten przystanek</item> | ||
| <item>Wszystkie przystanki</item> | ||
| </string-array> | ||
| <string-array name="sort_stops"> | ||
| <item>Nazwa</item> | ||
| <item>Najczęściej używane</item> | ||
| </string-array> | ||
| <string-array name="search_stop_options"> | ||
| <item>Pokaż przyjazdy</item> | ||
| <item>Pokaż na mapie</item> | ||
| </string-array> | ||
| <string-array name="search_route_options"> | ||
| <item>Pokaż listę przystanków</item> | ||
| <item>Pokaż na mapie</item> | ||
| </string-array> | ||
| <string-array name="reminder_time"> | ||
| <item>Bez powiadomienia</item> | ||
| <item>1 minuta</item> | ||
| <item>3 minuty</item> | ||
| <item>5 minut</item> | ||
| <item>10 minut</item> | ||
| <item>15 minut</item> | ||
| <item>20 minut</item> | ||
| <item>25 minut</item> | ||
| <item>30 minut</item> | ||
| </string-array> | ||
| <string-array name="reminder_days"> | ||
| <item>Poniedziałek</item> | ||
| <item>Wtorek</item> | ||
| <item>Środa</item> | ||
| <item>Czwartek</item> | ||
| <item>Piątek</item> | ||
| <item>Sobota</item> | ||
| <item>Niedziela</item> | ||
| </string-array> | ||
| <string-array name="report_stop_problem_code"> | ||
| <item>Wybierz</item> | ||
| <item>Nieprawidłowa nazwa przystanku</item> | ||
| <item>Nieprawidłowy numer przystanku</item> | ||
| <item>Zła lokalizacja</item> | ||
| <item>Brakuje linii lub kursu</item> | ||
| <item>Coś innego</item> | ||
| </string-array> | ||
| <string-array name="report_trip_problem_code_bus"> | ||
| <item>Wybierz</item> | ||
| <item>Wogóle nie przyjechał</item> | ||
| <item>Przyjechał wcześniej niż powinien</item> | ||
| <item>Przyjechał później niż powinien</item> | ||
| <item>Wyświetlał zły kierunek</item> | ||
| <item>Nie zatrzymuje się tutaj</item> | ||
| <item>Coś innego</item> | ||
| </string-array> | ||
| <string-array name="preferred_units_options"> | ||
| <item>@string/preferences_preferred_units_option_automatic</item> | ||
| <item>@string/preferences_preferred_units_option_metric</item> | ||
| <item>@string/preferences_preferred_units_option_imperial</item> | ||
| </string-array> | ||
| <string-array name="arrival_info_style_options"> | ||
| <item>@string/preferences_arrival_info_style_options_a</item> | ||
| <item>@string/preferences_arrival_info_style_options_b</item> | ||
| </string-array> | ||
|
|
||
| <!-- Spoken directions based on 16 compass points, but pointing from the user's current location | ||
| towards the selected bus stop instead of N/S/E/W. --> | ||
| <string-array name="spoken_compass_directions"> | ||
| <item>prosto</item> | ||
| <!-- North --> | ||
| <item>lekko w lewo</item> | ||
| <!-- NNE --> | ||
| <item>lekko w lewo</item> | ||
| <!-- NE --> | ||
| <item>w lewo</item> | ||
| <!-- ENE --> | ||
| <item>w lewo</item> | ||
| <!-- East --> | ||
| <item>za Tobą w lewo</item> | ||
| <!-- ESE --> | ||
| <item>za Tobą w lewo</item> | ||
| <!-- SE --> | ||
| <item>za Tobą w lewo</item> | ||
| <!-- SSE --> | ||
| <item>za Tobą prosto</item> | ||
| <!-- South --> | ||
| <item>za Tobą w prawo</item> | ||
| <!-- SSW --> | ||
| <item>za Tobą w prawo</item> | ||
| <!-- SW --> | ||
| <item>za Tobą w prawo</item> | ||
| <!-- WSW --> | ||
| <item>w prawo</item> | ||
| <!-- West --> | ||
| <item>w prawo</item> | ||
| <!-- WNW --> | ||
| <item>lekko w prawo</item> | ||
| <!-- NW --> | ||
| <item>lekko w prawo</item> | ||
| <!-- NNW --> | ||
| </string-array> | ||
| </resources> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.