mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-25 00:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI Fixes

Browse source
This commit is contained in:
Thomas Ricouard 2024-01-15 15:03:34 +01:00
parent d9f115ba67
commit ddaf4f9fde
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
IceCubesApp/Resources/Localization/Localizable.xcstrings
View file

@ -31269,6 +31269,7 @@
} }
}, },
"iPad" : { "iPad" : {
"extractionState" : "stale",
"localizations" : { "localizations" : {
"be" : { "be" : {
"stringUnit" : { "stringUnit" : {

3
Packages/Timeline/Sources/Timeline/TimelineUnreadStatusesObserver.swift
View file

@ -45,7 +45,6 @@ struct TimelineUnreadStatusesView: View {
HStack(spacing: 8) { HStack(spacing: 8) {
if observer.isLoadingNewStatuses { if observer.isLoadingNewStatuses {
ProgressView() ProgressView()
.tint(theme.labelColor)
} }
if observer.pendingStatusesCount > 0 { if observer.pendingStatusesCount > 0 {
Text("\(observer.pendingStatusesCount)") Text("\(observer.pendingStatusesCount)")
@ -54,7 +53,6 @@ struct TimelineUnreadStatusesView: View {
.frame(minWidth: 16, minHeight: 16) .frame(minWidth: 16, minHeight: 16)
.font(.footnote.monospacedDigit()) .font(.footnote.monospacedDigit())
.fontWeight(.bold) .fontWeight(.bold)
.foregroundStyle(theme.labelColor)
} }
} }
} }
@ -69,6 +67,7 @@ struct TimelineUnreadStatusesView: View {
#endif #endif
.cornerRadius(8) .cornerRadius(8)
#if !os(visionOS) #if !os(visionOS)
.foregroundStyle(.secondary)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(theme.tintColor, lineWidth: 1) .stroke(theme.tintColor, lineWidth: 1)

4
Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
View file

@ -396,7 +396,7 @@ extension TimelineViewModel: StatusesFetcher {
do { do {
while while
!Task.isCancelled, !Task.isCancelled,
var newStatuses: [Status] = let newStatuses: [Status] =
try await client.get(endpoint: timeline.endpoint(sinceId: nil, try await client.get(endpoint: timeline.endpoint(sinceId: nil,
maxId: nil, maxId: nil,
minId: latestMinId, minId: latestMinId,
@ -423,7 +423,7 @@ extension TimelineViewModel: StatusesFetcher {
let statuses = await datasource.get() let statuses = await datasource.get()
guard let lastId = statuses.last?.id else { return } guard let lastId = statuses.last?.id else { return }
statusesState = await .display(statuses: datasource.getFiltered(), nextPageState: .loadingNextPage) 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, maxId: lastId,
minId: nil, minId: nil,
offset: statuses.count)) offset: statuses.count))