Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flatten room list #121

Merged
merged 4 commits into from
Jun 30, 2022
Merged

Flatten room list #121

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b837986
#121 Flatten the room list
ismailgulek Jun 29, 2022
c9906f3
#121 Add changelog
ismailgulek Jun 29, 2022
a9eb68f
#121 UI tweaks for avatar and display name and preview
ismailgulek Jun 29, 2022
4d98c91
#121 Make avatar and label one button
ismailgulek Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,12 @@ struct HomeScreenViewState: BindableState {

var isLoadingRooms: Bool = false

var unencryptedDMs: [HomeScreenRoom] {
searchFilteredRooms.filter { $0.isDirect && !$0.isEncrypted }
var visibleDMs: [HomeScreenRoom] {
searchFilteredRooms.filter { $0.isDirect }
}

var encryptedDMs: [HomeScreenRoom] {
searchFilteredRooms.filter { $0.isDirect && $0.isEncrypted}
}

var unencryptedRooms: [HomeScreenRoom] {
searchFilteredRooms.filter { !$0.isDirect && !$0.isEncrypted }
}

var encryptedRooms: [HomeScreenRoom] {
searchFilteredRooms.filter { !$0.isDirect && $0.isEncrypted }

var visibleRooms: [HomeScreenRoom] {
stefanceriu marked this conversation as resolved.
Show resolved Hide resolved
searchFilteredRooms.filter { !$0.isDirect }
}

private var searchFilteredRooms: LazyFilterSequence<LazySequence<[HomeScreenRoom]>.Elements> {
Expand Down
111 changes: 50 additions & 61 deletions ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,43 +26,22 @@ struct HomeScreen: View {
VStack(spacing: 16.0) {
if context.viewState.isLoadingRooms {
VStack {
Text("Loading rooms")
Text(ElementL10n.loading)
ProgressView()
}
} else {
List {
Section("Rooms") {
ForEach(context.viewState.unencryptedRooms) { room in
Section(ElementL10n.rooms) {
ForEach(context.viewState.visibleRooms) { room in
RoomCell(room: room, context: context)
.listRowBackground(Color.clear)
}

let other = context.viewState.encryptedRooms

if other.count > 0 {
DisclosureGroup("Encrypted") {
ForEach(other) { room in
RoomCell(room: room, context: context)
}
}
.listRowBackground(Color.clear)
}
}

Section("People") {
ForEach(context.viewState.unencryptedDMs) { room in
Section(ElementL10n.bottomActionPeople) {
ForEach(context.viewState.visibleDMs) { room in
RoomCell(room: room, context: context)
}

let other = context.viewState.encryptedDMs

if other.count > 0 {
DisclosureGroup("Encrypted") {
ForEach(other) { room in
RoomCell(room: room, context: context)
}
}
.listRowBackground(Color.clear)
.listRowBackground(Color.clear)
}
}
}
Expand All @@ -77,41 +56,48 @@ struct HomeScreen: View {
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
HStack {
ZStack {
if let avatar = context.viewState.userAvatar {
Button { context.send(viewAction: .tapUserAvatar) } label: {
Image(uiImage: avatar)
.resizable()
.scaledToFill()
.frame(width: 40, height: 40, alignment: .center)
.mask(Circle())
}
} else {
EmptyView()
}
}
.animation(.default, value: context.viewState.userAvatar)
.transition(.opacity)

ZStack {
if let displayName = context.viewState.userDisplayName {
Button { context.send(viewAction: .tapUserAvatar) } label: {
Text("Hello, \(displayName)!")
.font(.subheadline)
.fontWeight(.bold)
.foregroundColor(.primary)
}
} else {
EmptyView()
}
}
.animation(.default, value: context.viewState.userDisplayName)
.transition(.opacity)
HStack(spacing: 0) {
ismailgulek marked this conversation as resolved.
Show resolved Hide resolved
userAvatarImage
.animation(.default, value: context.viewState.userAvatar)
.transition(.opacity)

userDisplayNameView
.animation(.default, value: context.viewState.userDisplayName)
.transition(.opacity)
}
}
}
}

@ViewBuilder
private var userAvatarImage: some View {
if let avatar = context.viewState.userAvatar {
Button { context.send(viewAction: .tapUserAvatar) } label: {
Image(uiImage: avatar)
.resizable()
.scaledToFill()
.frame(width: 32, height: 32, alignment: .center)
.clipShape(Circle())
.accessibilityIdentifier("userAvatarImage")
}
} else {
EmptyView()
}
}

@ViewBuilder
private var userDisplayNameView: some View {
if let displayName = context.viewState.userDisplayName {
Button { context.send(viewAction: .tapUserAvatar) } label: {
Text(displayName)
.font(.headline)
.fontWeight(.bold)
.foregroundColor(.primary)
}
} else {
EmptyView()
}
}
}

struct RoomCell: View {
Expand All @@ -129,7 +115,7 @@ struct RoomCell: View {
.resizable()
.scaledToFill()
.frame(width: 40, height: 40)
.mask(Circle())
.clipShape(Circle())
} else {
PlaceholderAvatarImage(text: room.displayName ?? room.id)
.clipShape(Circle())
Expand Down Expand Up @@ -192,11 +178,14 @@ struct HomeScreen_Previews: PreviewProvider {
MockRoomSummary(displayName: "Omega", lastMessage: eventBrief)]

viewModel.updateWithRoomSummaries(roomSummaries)
viewModel.updateWithUserDisplayName("username")

if let avatarImage = UIImage(systemName: "person.fill.questionmark") {
if let avatarImage = UIImage(systemName: "person.fill") {
viewModel.updateWithUserAvatar(avatarImage)
}

return HomeScreen(context: viewModel.context)
return NavigationView {
HomeScreen(context: viewModel.context)
}
}
}
1 change: 1 addition & 0 deletions changelog.d/pr-121.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Flatten the room list by removing the encrypted groups.