felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 23:48:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Separator fix

Browse Source
This commit is contained in:
Aleksandrs Proskurins
2022-10-27 15:57:10 +03:00
parent c4641f1f00
commit 807a18af6e
4 changed files with 50 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItem.swift
View File

@@ -17,19 +17,11 @@
import SwiftUI
struct UserSessionListItem: View {
private enum LayoutConstants {
static let horizontalPadding: CGFloat = 15
static let verticalPadding: CGFloat = 16
static let avatarWidth: CGFloat = 40
static let avatarRightMargin: CGFloat = 18
}
@Environment(\.theme) private var theme: ThemeSwiftUI
let viewData: UserSessionListItemViewData
var isSeparatorHidden = false
var isEditModeEnabled = false
var onBackgroundTap: ((String) -> Void)?
var onBackgroundLongPress: ((String) -> Void)?
@@ -42,38 +34,38 @@ struct UserSessionListItem: View {
.frame(maxWidth: .infinity, alignment: .leading)
.padding(4)
}
VStack(alignment: .leading, spacing: LayoutConstants.verticalPadding) {
HStack(spacing: LayoutConstants.avatarRightMargin) {
if isEditModeEnabled {
Image(viewData.isSelected ? Asset.Images.userSessionListItemSelected.name : Asset.Images.userSessionListItemNotSelected.name)
}
DeviceAvatarView(viewData: viewData.deviceAvatarViewData, isSelected: viewData.isSelected)
VStack(alignment: .leading, spacing: 2) {
Text(viewData.sessionName)
.font(theme.fonts.bodySB)
.foregroundColor(theme.colors.primaryContent)
.multilineTextAlignment(.leading)
HStack {
if let sessionDetailsIcon = viewData.sessionDetailsIcon {
Image(sessionDetailsIcon)
.padding(.leading, 2)
}
Text(viewData.sessionDetails)
.font(theme.fonts.caption1)
.foregroundColor(viewData.highlightSessionDetails ? theme.colors.alert : theme.colors.secondaryContent)
.multilineTextAlignment(.leading)
}
}
HStack {
if isEditModeEnabled {
Image(viewData.isSelected ? Asset.Images.userSessionListItemSelected.name : Asset.Images.userSessionListItemNotSelected.name)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, LayoutConstants.horizontalPadding)
// Separator
// Note: Separator leading is matching the text leading, we could use alignment guide in the future
SeparatorLine()
.padding(.leading, LayoutConstants.horizontalPadding + LayoutConstants.avatarRightMargin + LayoutConstants.avatarWidth)
DeviceAvatarView(viewData: viewData.deviceAvatarViewData, isSelected: viewData.isSelected)
VStack(alignment: .leading, spacing: 0) {
Text(viewData.sessionName)
.font(theme.fonts.bodySB)
.foregroundColor(theme.colors.primaryContent)
.multilineTextAlignment(.leading)
.padding(.top, 16)
.padding(.bottom, 2)
.padding(.trailing, 16)
HStack {
if let sessionDetailsIcon = viewData.sessionDetailsIcon {
Image(sessionDetailsIcon)
.padding(.leading, 2)
}
Text(viewData.sessionDetails)
.font(theme.fonts.caption1)
.foregroundColor(viewData.highlightSessionDetails ? theme.colors.alert : theme.colors.secondaryContent)
.multilineTextAlignment(.leading)
}
.padding(.bottom, 16)
.padding(.trailing, 16)
SeparatorLine()
.isHidden(isSeparatorHidden)
}
.padding(.leading, 7)
}
.padding(.top, LayoutConstants.verticalPadding)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.leading, 16)
}.onTapGesture {
onBackgroundTap?(viewData.sessionId)
}

4
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift
View File

@@ -151,7 +151,9 @@ struct UserSessionsOverview: View {
SwiftUI.Section {
LazyVStack(spacing: 0) {
ForEach(viewModel.viewState.otherSessionsViewData.prefix(maxOtherSessionsToDisplay)) { viewData in
UserSessionListItem(viewData: viewData, onBackgroundTap: { sessionId in
UserSessionListItem(viewData: viewData,
isSeparatorHidden: viewData == viewModel.viewState.otherSessionsViewData.last,
onBackgroundTap: { sessionId in
viewModel.send(viewAction: .tapUserSession(sessionId))
})
}