mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-06 23:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notifications: Swap container for a List + make mentions more prominent

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-29 16:06:46 +01:00
parent 426d2e15b2
commit 243cbcbc41
3 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View file

@ -32,6 +32,9 @@ struct NotificationRowView: View {
}
}
}
.alignmentGuide(.listRowSeparatorLeading) { viewDimensions in
return -100
}
}
private func makeAvatarView(type: Models.Notification.NotificationType) -> some View {

48
Packages/Notifications/Sources/Notifications/NotificationsListView.swift
View file

@ -19,14 +19,12 @@ public struct NotificationsListView: View {
}
public var body: some View {
ScrollView {
LazyVStack {
notificationsView
.frame(maxWidth: .maxColumnWidth)
}
.padding(.top, .layoutPadding + 16)
.background(theme.primaryBackgroundColor)
List {
topPaddingView
notificationsView
}
.environment(\.defaultMinListRowHeight, 1)
.listStyle(.plain)
.navigationTitle(lockedType?.menuTitle() ?? viewModel.selectedType?.menuTitle() ?? "notifications.navigation-title")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
@ -84,13 +82,12 @@ public struct NotificationsListView: View {
ForEach(ConsolidatedNotification.placeholders()) { notification in
NotificationRowView(notification: notification)
.redacted(reason: .placeholder)
.padding(.leading, .layoutPadding + 4)
.padding(.trailing, .layoutPadding)
.padding(.top, 6)
.padding(.bottom, 2)
.listRowInsets(.init(top: 12,
leading: .layoutPadding + 4,
bottom: 12,
trailing: .layoutPadding))
.listRowBackground(theme.primaryBackgroundColor)
.shimmering()
Divider()
.padding(.vertical, .dividerPadding)
}
case let .display(notifications, nextPageState):
@ -101,12 +98,12 @@ public struct NotificationsListView: View {
} else {
ForEach(notifications) { notification in
NotificationRowView(notification: notification)
.padding(.leading, .layoutPadding + 4)
.padding(.trailing, .layoutPadding)
.padding(.top, 6)
.padding(.bottom, 2)
Divider()
.padding(.vertical, .dividerPadding)
.listRowInsets(.init(top: 12,
leading: .layoutPadding + 4,
bottom: 12,
trailing: .layoutPadding))
.listRowBackground(notification.type == .mention && lockedType != .mention ?
theme.secondaryBackgroundColor : theme.primaryBackgroundColor)
}
}
@ -141,5 +138,18 @@ public struct NotificationsListView: View {
ProgressView()
Spacer()
}
.listRowInsets(.init(top: .layoutPadding,
leading: .layoutPadding + 4,
bottom: .layoutPadding,
trailing: .layoutPadding))
.listRowBackground(theme.primaryBackgroundColor)
}
private var topPaddingView: some View {
HStack { }
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
.listRowInsets(.init())
.frame(height: .layoutPadding)
}
}

1
Packages/Status/Sources/Status/Row/StatusActionsView.swift
View file

@ -70,6 +70,7 @@ struct StatusActionsView: View {
ShareLink(item: url) {
Image(systemName: action.iconName(viewModel: viewModel))
}
.buttonStyle(.borderless)
}
} else {
Button {