Skip to content

Commit 1c57e6b

Browse files
authored
Fixes issue where long line names were used on the timetable card (#415)
That broke parts of the UI if there were many of them, as that UI expects short names or numbers.
1 parent 81ba38b commit 1c57e6b

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

Sources/TripKit/model/CoreData/Service+CoreDataClass.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public class Service: NSManagedObject {
5454
[number, lineName].compactMap { $0 }.joined(separator: " ")
5555
}
5656

57+
@available(*, deprecated, message: "Use `.numer` or `.lineName` as appropriate instead.")
5758
public var shortIdentifier: String? {
5859
number ?? lineName
5960
}
6061

61-
6262
}
6363

6464
// MARK: - Insertions

Sources/TripKit/model/CoreData/StopVisits+CoreDataClass.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ extension StopVisits {
7575

7676
/// :nodoc:
7777
public var smsString: String? {
78-
guard let serviceId = service.shortIdentifier else {
79-
return nil
80-
}
81-
82-
var output = serviceId
78+
var output = service.title
8379

8480
switch timing {
8581
case .timetabled(let arrival, let departure):
@@ -304,15 +300,15 @@ extension StopVisits: TKRealTimeUpdatable {
304300
let departureTime = TKStyleManager.timeString(departure, for: timeZone)
305301
let format = NSLocalizedString("I'll take a %@ at %@ from %@.", tableName: "TripKit", bundle: .tripKit, comment: "Indication of an activity. (old key: ActivityIndication)")
306302
return String(format: format,
307-
service.shortIdentifier ?? "",
303+
service.title,
308304
departureTime,
309305
stop.name ?? stop.stopCode
310306
)
311307

312308
} else {
313309
let format = NSLocalizedString("I'll take a %@ from %@.", tableName: "TripKit", bundle: .tripKit, comment: "Indication of an activity.")
314310
return String(format: format,
315-
service.shortIdentifier ?? "",
311+
service.title,
316312
stop.name ?? stop.stopCode
317313
)
318314
}

Sources/TripKitUI/cards/TKUITimetableCard+Content.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extension TKUIDepartureCellContent {
3333
imageIsTemplate: service.modeImageIsTemplate,
3434
imageTintColor: TKUICustomization.shared.colorCodeTransitIcons ? serviceColor : nil,
3535
modeName: service.modeTitle ?? "",
36-
serviceShortName: service.shortIdentifier,
36+
serviceShortName: service.number,
3737
serviceColor: serviceColor,
3838
serviceIsCanceled: service.isCanceled,
3939
serviceOperatorName: TKUITimetableCard.config.showOperatorNames ? service.operatorName : nil,

Sources/TripKitUI/view model/TKUITimetableViewModel+Content.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ extension TKUITimetableViewModel {
159159
static func extractLines(from visits: [StopVisits]) -> [TKUITimetableAccessoryView.Line] {
160160
var lines: Set<TKUITimetableAccessoryView.Line> = []
161161
for visit in visits {
162-
guard let text = visit.service.shortIdentifier else { continue }
162+
guard let text = visit.service.number else { continue }
163163
let line = TKUITimetableAccessoryView.Line(text: text, color: visit.service.color)
164164
lines.insert(line)
165165
}

0 commit comments

Comments
 (0)