Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit c8f3d2c

Browse files
jheubuchjheubuch
authored
✨ Add vehicle no. + passenger rights tag (#309)
1 parent 3a537f3 commit c8f3d2c

File tree

5 files changed

+35
-3
lines changed

5 files changed

+35
-3
lines changed

‎app/src/main/kotlin/de/hbch/traewelling/api/models/status/Tag.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ enum class TagType {
4848
override val key = "trwl:locomotive_class"
4949
override val example = R.string.tag_locomotive_class_example
5050
},
51+
@SerializedName("trwl:vehicle_number")
52+
VEHICLE_NUMBER {
53+
override val icon = R.drawable.ic_vehicle_number
54+
override val title = R.string.tag_vehicle_number_title
55+
override val key = "trwl:vehicle_number"
56+
override val example = R.string.tag_vehicle_number_example
57+
},
5158
@SerializedName("trwl:wagon_class")
5259
WAGON_CLASS {
5360
override val icon = R.drawable.ic_wagon_class
@@ -62,6 +69,13 @@ enum class TagType {
6269
override val key = "trwl:role"
6370
override val example = R.string.tag_staff_role_example
6471
},
72+
@SerializedName("trwl:passenger_rights")
73+
PASSENGER_RIGHTS {
74+
override val icon = R.drawable.ic_passenger_claim
75+
override val title = R.string.tag_passenger_rights_title
76+
override val key = "trwl:passenger_rights"
77+
override val example = R.string.tag_passenger_rights_example
78+
},
6579
UNKNOWN {
6680
override val icon = R.drawable.ic_unknown
6781
override val title = R.string.unknown

‎app/src/main/res/drawable/ic_passenger_claim.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#FFFFFF"
2+
android:viewportHeight="24" android:viewportWidth="24"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="@android:color/white" android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8L14,2zM15,12h-4v1h3c0.55,0 1,0.45 1,1v3c0,0.55 -0.45,1 -1,1h-1v1h-2v-1H9v-2h4v-1h-3c-0.55,0 -1,-0.45 -1,-1v-3c0,-0.55 0.45,-1 1,-1h1V9h2v1h2V12zM13,8V3.5L17.5,8H13z"/>
5+
</vector>

‎app/src/main/res/drawable/ic_vehicle_number.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#FFFFFF"
2+
android:viewportHeight="24" android:viewportWidth="24"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="@android:color/white" android:pathData="M12,2C8,2 4,2.5 4,6v9.5C4,17.43 5.57,19 7.5,19L6,20v1h12v-1l-1.5,-1c1.93,0 3.5,-1.57 3.5,-3.5V6C20,2.5 16.42,2 12,2zM8.5,16C7.67,16 7,15.33 7,14.5S7.67,13 8.5,13s1.5,0.67 1.5,1.5S9.33,16 8.5,16zM11,10H6V7h5V10zM15.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S16.33,16 15.5,16zM18,10h-5V7h5V10z"/>
5+
</vector>

‎app/src/main/res/values-de-rDE/strings.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,17 @@
186186
<string name="tag_coach_example">z.B. 7</string>
187187
<string name="tag_seat_title">Platz</string>
188188
<string name="tag_seat_example">z.B. 142</string>
189-
<string name="tag_locomotive_class_title">Fahrzeug</string>
190-
<string name="tag_locomotive_class_example">z.B. BR 412, Tz 304 🌈, …</string>
189+
<string name="tag_locomotive_class_title">Baureihe</string>
190+
<string name="tag_locomotive_class_example">z.B. BR 412, 612, …</string>
191+
<string name="tag_vehicle_number_title">Fahrzeugnummer</string>
192+
<string name="tag_vehicle_number_example">z.B. Tz 304 🌈, 633 032/532, …</string>
191193
<string name="tag_wagon_class_title">Wagengattung</string>
192194
<string name="tag_wagon_class_example">z.B. Avmz, Bimmdzf, …</string>
193195
<string name="tag_unknown">Unbekannt</string>
194196
<string name="tag_staff_role_title">Funktion im Dienst</string>
195197
<string name="tag_staff_role_example">Tf, Zf, Gastro, …</string>
198+
<string name="tag_passenger_rights_title">Fahrgastrechte</string>
199+
<string name="tag_passenger_rights_example">z.B. Beantragt, Ausgezahlt, Fall-ID, …</string>
196200
<string name="add_tag">Tag hinzufügen</string>
197201
<string name="edit_tag">Tag bearbeiten</string>
198202
<string name="select_tag_type">Tagart auswählen</string>

‎app/src/main/res/values/strings.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,16 @@
192192
<string name="tag_seat_title">Seat</string>
193193
<string name="tag_seat_example">i.e. 142</string>
194194
<string name="tag_locomotive_class_title">Vehicle class</string>
195-
<string name="tag_locomotive_class_example">i.e. BR 412, Tz 304 🌈, …</string>
195+
<string name="tag_locomotive_class_example">i.e. BR 412, 101, …</string>
196+
<string name="tag_vehicle_number_title">Vehicle number</string>
197+
<string name="tag_vehicle_number_example">i.e. Tz 304 🌈, 633 032/532, …</string>
196198
<string name="tag_wagon_class_title">Wagon class</string>
197199
<string name="tag_wagon_class_example">i.e. Avmz, Bimmdzf, …</string>
198200
<string name="tag_unknown">Unknown</string>
199201
<string name="tag_staff_role_title">Staff role</string>
200202
<string name="tag_staff_role_example">Driver, conductor, …</string>
203+
<string name="tag_passenger_rights_title">Passenger rights claim</string>
204+
<string name="tag_passenger_rights_example">i.e. Requested, paid out, ID of claim, …</string>
201205
<string name="add_tag">Add tag</string>
202206
<string name="edit_tag">Edit tag</string>
203207
<string name="select_tag_type">Select tag type</string>

0 commit comments

Comments
 (0)