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

Merge branch 'develop' into alfogrillo/learn_more_sheet

Browse Source 
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
This commit is contained in:
Alfonso Grillo
2022-11-03 18:18:08 +01:00
parent b4d5c3b904 b32fb14d1f
commit 092fe9ef59
34 changed files with 315 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
+4
View File
@@ -37,6 +37,7 @@ struct UserOtherSessions: View {
viewModel.send(viewAction: .viewSessionInfo)
}
)
.padding(.top)
}
}
if viewModel.isEditModeEnabled {
@@ -55,6 +56,8 @@ struct UserOtherSessions: View {
.toolbar {
UserOtherSessionsToolbar(isEditModeEnabled: $viewModel.isEditModeEnabled,
filter: $viewModel.filter,
isShowLocationEnabled: .init(get: { viewModel.viewState.showLocationInfo },
set: { _ in withAnimation { viewModel.send(viewAction: .showLocationInfo) } }),
allItemsSelected: viewModel.viewState.allItemsSelected,
sessionCount: viewModel.viewState.sessionItems.count,
onToggleSelection: { viewModel.send(viewAction: .toggleAllSelection) },
@@ -91,6 +94,7 @@ struct UserOtherSessions: View {
LazyVStack(spacing: 0) {
ForEach(viewModel.viewState.sessionItems) { viewData in
UserSessionListItem(viewData: viewData,
showsLocationInfo: viewModel.viewState.showLocationInfo,
isSeparatorHidden: viewData == viewModel.viewState.sessionItems.last,
isEditModeEnabled: viewModel.isEditModeEnabled,
onBackgroundTap: { sessionId in viewModel.send(viewAction: .userOtherSessionSelected(sessionId: sessionId)) },