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

Map location info

Browse Source
This commit is contained in:
Alfonso Grillo
2022-11-02 15:25:46 +01:00
parent 3141c39cab
commit 8a5c5a7e07
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@ struct UserSessionListItem: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
let viewData: UserSessionListItemViewData
let showsLocationInfo: Bool
var isSeparatorHidden = false
var isEditModeEnabled = false
var onBackgroundTap: ((String) -> Void)?
@@ -76,6 +78,13 @@ struct UserSessionListItem: View {
.frame(maxWidth: .infinity, alignment: .leading)
.accessibilityIdentifier("UserSessionListItem_\(viewData.sessionId)")
}
private var ipText: String? {
guard let lastSeenIp = viewData.lastSeenIP, !lastSeenIp.isEmpty else {
return nil
}
return viewData.lastSeenIPLocation.map { "\(lastSeenIp) (\($0))" } ?? lastSeenIp
}
}
struct UserSessionListPreview: View {
@@ -86,7 +95,7 @@ struct UserSessionListPreview: View {
VStack(alignment: .leading, spacing: 0) {
ForEach(userSessionsOverviewService.otherSessions) { userSessionInfo in
let viewData = UserSessionListItemViewDataFactory().create(from: userSessionInfo)
UserSessionListItem(viewData: viewData, isEditModeEnabled: isEditModeEnabled, onBackgroundTap: { _ in
UserSessionListItem(viewData: viewData, showsLocationInfo: true, isEditModeEnabled: isEditModeEnabled, onBackgroundTap: { _ in
})
}
}

8
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
View File

@@ -25,14 +25,12 @@ struct UserSessionListItemViewData: Identifiable, Hashable {
}
let sessionId: SessionId
let sessionName: String
let sessionDetails: String
let highlightSessionDetails: Bool
let deviceAvatarViewData: DeviceAvatarViewData
let sessionDetailsIcon: String?
let isSelected: Bool
let lastSeenIP: String?
let lastSeenIPLocation: String?
}

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

@@ -29,7 +29,9 @@ struct UserSessionListItemViewDataFactory {
sessionDetails: sessionDetails,
deviceAvatarViewData: deviceAvatarViewData,
sessionDetailsIcon: getSessionDetailsIcon(isActive: sessionInfo.isActive),
isSelected: isSelected)
isSelected: isSelected,
lastSeenIP: sessionInfo.lastSeenIP,
lastSeenIPLocation: sessionInfo.lastSeenIPLocation)
}
private func buildSessionDetails(sessionInfo: UserSessionInfo) -> String {

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

@@ -38,11 +38,6 @@ struct UserSessionsOverview: View {
}
}
.readableFrame()
// if viewModel.viewState.linkDeviceButtonVisible {
// linkDeviceView
// .padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 20 : 36)
// }
}
}
.background(theme.colors.system.ignoresSafeArea())
@@ -155,6 +150,7 @@ struct UserSessionsOverview: View {
LazyVStack(spacing: 0) {
ForEach(viewModel.viewState.otherSessionsViewData.prefix(maxOtherSessionsToDisplay)) { viewData in
UserSessionListItem(viewData: viewData,
showsLocationInfo: false,
isSeparatorHidden: viewData == viewModel.viewState.otherSessionsViewData.last,
onBackgroundTap: { sessionId in viewModel.send(viewAction: .tapUserSession(sessionId)) })
}