Skip to content
Snippets Groups Projects
Commit c133850c authored by Charles Wright's avatar Charles Wright
Browse files

Update the Circles overview master view to use softer background color like the Groups overview

parent 94cfc059
No related branches found
No related tags found
1 merge request!209Draft: v1.1.0
...@@ -113,6 +113,7 @@ struct CirclesOverviewScreen: View { ...@@ -113,6 +113,7 @@ struct CirclesOverviewScreen: View {
} }
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.listRowBackground(selected == container.roomId ? Color.accentColor.opacity(0.20) : Color.greyCool200)
Section("My Circles") { Section("My Circles") {
ForEach(circles) { circle in ForEach(circles) { circle in
...@@ -132,6 +133,7 @@ struct CirclesOverviewScreen: View { ...@@ -132,6 +133,7 @@ struct CirclesOverviewScreen: View {
Label("Delete", systemImage: SystemImages.xmarkCircle.rawValue) Label("Delete", systemImage: SystemImages.xmarkCircle.rawValue)
} }
} }
.listRowBackground(selected == circle.roomId ? Color.accentColor.opacity(0.20) : Color.greyCool200)
} }
} }
...@@ -154,13 +156,12 @@ struct CirclesOverviewScreen: View { ...@@ -154,13 +156,12 @@ struct CirclesOverviewScreen: View {
Label("Delete", systemImage: SystemImages.xmarkCircle.rawValue) Label("Delete", systemImage: SystemImages.xmarkCircle.rawValue)
} }
} }
.listRowBackground(selected == room.roomId ? Color.accentColor.opacity(0.20) : Color.greyCool200)
} }
} }
} }
} }
.listStyle(.plain) .listStyle(.plain)
.accentColor(.secondaryBackground)
} }
} }
else { else {
...@@ -251,6 +252,7 @@ struct CirclesOverviewScreen: View { ...@@ -251,6 +252,7 @@ struct CirclesOverviewScreen: View {
container.objectWillChange.send() container.objectWillChange.send()
} }
} }
.background(Color.greyCool200)
} detail: { } detail: {
if let roomId = selected, if let roomId = selected,
let timeline = container.rooms[roomId] let timeline = container.rooms[roomId]
......
...@@ -63,7 +63,6 @@ struct GroupsOverviewScreen: View { ...@@ -63,7 +63,6 @@ struct GroupsOverviewScreen: View {
} }
} }
.listStyle(.plain) .listStyle(.plain)
//.accentColor(.secondaryBackground)
} }
} }
else { else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment