diff --git a/IceCubesApp/Resources/Localization/Localizable.xcstrings b/IceCubesApp/Resources/Localization/Localizable.xcstrings index 397707be..3b52dfe3 100644 --- a/IceCubesApp/Resources/Localization/Localizable.xcstrings +++ b/IceCubesApp/Resources/Localization/Localizable.xcstrings @@ -31269,6 +31269,7 @@ } }, "iPad" : { + "extractionState" : "stale", "localizations" : { "be" : { "stringUnit" : { diff --git a/Packages/Timeline/Sources/Timeline/TimelineUnreadStatusesObserver.swift b/Packages/Timeline/Sources/Timeline/TimelineUnreadStatusesObserver.swift index d3ac2fa6..1ce4fac7 100644 --- a/Packages/Timeline/Sources/Timeline/TimelineUnreadStatusesObserver.swift +++ b/Packages/Timeline/Sources/Timeline/TimelineUnreadStatusesObserver.swift @@ -45,7 +45,6 @@ struct TimelineUnreadStatusesView: View { HStack(spacing: 8) { if observer.isLoadingNewStatuses { ProgressView() - .tint(theme.labelColor) } if observer.pendingStatusesCount > 0 { Text("\(observer.pendingStatusesCount)") @@ -54,7 +53,6 @@ struct TimelineUnreadStatusesView: View { .frame(minWidth: 16, minHeight: 16) .font(.footnote.monospacedDigit()) .fontWeight(.bold) - .foregroundStyle(theme.labelColor) } } } @@ -69,6 +67,7 @@ struct TimelineUnreadStatusesView: View { #endif .cornerRadius(8) #if !os(visionOS) + .foregroundStyle(.secondary) .overlay( RoundedRectangle(cornerRadius: 8) .stroke(theme.tintColor, lineWidth: 1) diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift index 407f687f..919bcf0f 100644 --- a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift +++ b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift @@ -396,7 +396,7 @@ extension TimelineViewModel: StatusesFetcher { do { while !Task.isCancelled, - var newStatuses: [Status] = + let newStatuses: [Status] = try await client.get(endpoint: timeline.endpoint(sinceId: nil, maxId: nil, minId: latestMinId, @@ -423,7 +423,7 @@ extension TimelineViewModel: StatusesFetcher { let statuses = await datasource.get() guard let lastId = statuses.last?.id else { return } statusesState = await .display(statuses: datasource.getFiltered(), nextPageState: .loadingNextPage) - var newStatuses: [Status] = try await client.get(endpoint: timeline.endpoint(sinceId: nil, + let newStatuses: [Status] = try await client.get(endpoint: timeline.endpoint(sinceId: nil, maxId: lastId, minId: nil, offset: statuses.count))