Skip to content

Added Hungary provider #451

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.

Sign up for GitHub

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

Merged
grote merged 2 commits into from
Jul 26, 2018
Merged

Added Hungary provider #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c9f161
Added Hungary provider
Jun 2, 2018
3e00926
Added Hungary logo in AndroidVectorDrawable format
Jul 26, 2018
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
13 changes: 13 additions & 0 deletions app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,19 @@ private val networks = arrayOf(
factory = { SpainProvider(NAVITIA) }
)
)
),
Country(
R.string.np_name_hungary, flag = "🇭🇺", networks = listOf(
TransportNetwork(
id = NetworkId.HUNGARY,
name = R.string.np_name_hungary,
description = R.string.np_desc_hungary,
agencies = R.string.np_desc_hungary_networks,
logo = R.drawable.network_hungary_logo,
Copy link
Owner

@grote grote Jul 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test this? Looks like this logo doesn't actually get added. You need to transform the SVG into an AndroidVectorDrawable, see #238

Copy link
Contributor Author

@urbalazs urbalazs Jul 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @grote
here is the Hungary logo in AndroidVectorDrawable format:

<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:viewportWidth="6"
    android:viewportHeight="3"
    android:width="64dp"
    android:height="64dp">
    <path
        android:pathData="M0 0L6 0 6 3 0 3Z"
        android:fillColor="#436f4d" />
    <path
        android:pathData="M0 0L6 0 6 2 0 2Z"
        android:fillColor="#ffffff" />
    <path
        android:pathData="M0 0L6 0 6 1 0 1Z"
        android:fillColor="#cd2a3e" />
</vector>

Copy link
Owner

@grote grote Jul 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Would you mind adding it to your pull request?
It needs to go to app/src/main/res/drawable/network_hungary_logo.xml.

Copy link
Contributor Author

@urbalazs urbalazs Jul 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

status = BETA,
factory = { HungaryProvider(NAVITIA) }
)
)
)
)
),
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/network_hungary_logo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="6"
android:viewportHeight="3"
android:width="64dp"
android:height="64dp">
<path
android:pathData="M0 0L6 0 6 3 0 3Z"
android:fillColor="#436f4d" />
<path
android:pathData="M0 0L6 0 6 2 0 2Z"
android:fillColor="#ffffff" />
<path
android:pathData="M0 0L6 0 6 1 0 1Z"
android:fillColor="#cd2a3e" />
</vector>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ and always knows where you are to not miss where to get off the bus.
<string name="np_desc_spain">Madrid, Barcelona, Basque Country, Valencia, Alicante, Mallorca, Menorca, Tenerife, La Palma, Navarra</string>
<string name="np_desc_spain_networks" translatable="false">CRTM, TMB, FGC, Moveuskadi, Metrovalencia, EMT Valencia, TRAM, CTM, EMT Palma, CIME, Tranvía, TITSA, TILP, Transporte Interurbano de Navarra</string>

<string name="np_name_hungary">Hungary</string>
<string name="np_desc_hungary">Budapest, Miskolc</string>
<string name="np_desc_hungary_networks" translatable="false">BKK, MKV</string>

<string name="np_region_sweden">Sweden</string>
<string name="np_desc_se">Sweden, Stockholm</string>

Expand Down
5 changes: 5 additions & 0 deletions artwork/networks/network_hungary_logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.