Merge nucleic/plucky-lunar-newt into dev
This commit is contained in:
@@ -74,7 +74,7 @@ struct ProjectDetailView: View {
|
|||||||
ForEach(sessions, id: \.sessionID) { summary in
|
ForEach(sessions, id: \.sessionID) { summary in
|
||||||
NavigationLink {
|
NavigationLink {
|
||||||
SessionDetailView(sessionID: summary.sessionID)
|
SessionDetailView(sessionID: summary.sessionID)
|
||||||
} label: { SessionRow(summary: summary) }
|
} label: { SessionRow(summary: summary, showProjectName: false) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,6 +81,9 @@ struct SessionsView: View {
|
|||||||
|
|
||||||
struct SessionRow: View {
|
struct SessionRow: View {
|
||||||
let summary: WireSessionSummary
|
let summary: WireSessionSummary
|
||||||
|
/// Show the project name as subtext. Suppressed when the row already lives inside
|
||||||
|
/// its project's own section (e.g. `ProjectDetailView`), where the name is redundant.
|
||||||
|
var showProjectName = true
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
HStack(spacing: 12) {
|
HStack(spacing: 12) {
|
||||||
@@ -95,7 +98,9 @@ struct SessionRow: View {
|
|||||||
}
|
}
|
||||||
Text(summary.title).font(.body.weight(.medium)).lineLimit(1)
|
Text(summary.title).font(.body.weight(.medium)).lineLimit(1)
|
||||||
}
|
}
|
||||||
Text(summary.projectName).font(.caption).foregroundStyle(.secondary)
|
if showProjectName {
|
||||||
|
Text(summary.projectName).font(.caption).foregroundStyle(.secondary)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Spacer()
|
Spacer()
|
||||||
VStack(alignment: .trailing, spacing: 2) {
|
VStack(alignment: .trailing, spacing: 2) {
|
||||||
|
|||||||
Reference in New Issue
Block a user