mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 10:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-19 08:41:45 +01:00
parent 987a655227
commit 7506c33482
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -30,42 +30,40 @@ struct AccountDetailHeaderView: View {
}
private var headerImageView: some View {
GeometryReader { _ in
ZStack(alignment: .bottomTrailing) {
if reasons.contains(.placeholder) {
Rectangle()
.foregroundColor(.gray)
.frame(height: bannerHeight)
} else {
LazyImage(url: account.header) { state in
if let image = state.image {
image
.resizingMode(.aspectFill)
.overlay(.black.opacity(0.50))
} else if state.isLoading {
Color.gray
.frame(height: bannerHeight)
.shimmering()
} else {
Color.gray
.frame(height: bannerHeight)
}
}
ZStack(alignment: .bottomTrailing) {
if reasons.contains(.placeholder) {
Rectangle()
.foregroundColor(.gray)
.frame(height: bannerHeight)
} else {
LazyImage(url: account.header) { state in
if let image = state.image {
image
.resizingMode(.aspectFill)
.overlay(.black.opacity(0.50))
} else if state.isLoading {
Color.gray
.frame(height: bannerHeight)
.shimmering()
} else {
Color.gray
.frame(height: bannerHeight)
}
}
if viewModel.relationship?.followedBy == true {
Text("Follows You")
.font(.scaledFootnote)
.fontWeight(.semibold)
.padding(4)
.background(.ultraThinMaterial)
.cornerRadius(4)
.padding(8)
}
.frame(height: bannerHeight)
}
if viewModel.relationship?.followedBy == true {
Text("Follows You")
.font(.scaledFootnote)
.fontWeight(.semibold)
.padding(4)
.background(.ultraThinMaterial)
.cornerRadius(4)
.padding(8)
}
.background(Color.gray)
}
.background(Color.gray)
.frame(height: bannerHeight)
.offset(y: scrollOffset > 0 ? -scrollOffset : 0)
.contentShape(Rectangle())

8
Packages/Notifications/Sources/Notifications/NotificationsViewModel.swift
View file

@ -31,9 +31,11 @@ class NotificationsViewModel: ObservableObject {
@Published var state: State = .loading
@Published var selectedType: Models.Notification.NotificationType? {
didSet {
notifications = []
Task {
await fetchNotifications()
if oldValue != selectedType {
notifications = []
Task {
await fetchNotifications()
}
}
}
}