Fix security recommendations layout

This commit is contained in:
Alfonso Grillo
2022-12-15 21:47:36 +01:00
parent 6f8d4f3c97
commit b918c2ccd3
@@ -24,22 +24,19 @@ struct UserSessionsOverview: View {
private let maxOtherSessionsToDisplay = 5
var body: some View {
VStack(alignment: .leading, spacing: 0) {
ScrollView {
if hasSecurityRecommendations {
securityRecommendationsSection
}
currentSessionsSection
if !viewModel.viewState.otherSessionsViewData.isEmpty {
otherSessionsSection
}
ScrollView {
if hasSecurityRecommendations {
securityRecommendationsSection
}
currentSessionsSection
if !viewModel.viewState.otherSessionsViewData.isEmpty {
otherSessionsSection
}
.frame(maxWidth: .infinity)
}
.background(theme.colors.system.ignoresSafeArea())
.frame(maxHeight: .infinity)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.navigationTitle(VectorL10n.userSessionsOverviewTitle)
.navigationBarTitleDisplayMode(.inline)
.activityIndicator(show: viewModel.viewState.showLoadingIndicator)
@@ -51,17 +48,19 @@ struct UserSessionsOverview: View {
private var securityRecommendationsSection: some View {
SwiftUI.Section {
if !viewModel.viewState.unverifiedSessionsViewData.isEmpty {
SecurityRecommendationCard(style: .unverified,
sessionCount: viewModel.viewState.unverifiedSessionsViewData.count) {
viewModel.send(viewAction: .viewAllUnverifiedSessions)
VStack(spacing: 16) {
if !viewModel.viewState.unverifiedSessionsViewData.isEmpty {
SecurityRecommendationCard(style: .unverified,
sessionCount: viewModel.viewState.unverifiedSessionsViewData.count) {
viewModel.send(viewAction: .viewAllUnverifiedSessions)
}
}
}
if !viewModel.viewState.inactiveSessionsViewData.isEmpty {
SecurityRecommendationCard(style: .inactive,
sessionCount: viewModel.viewState.inactiveSessionsViewData.count) {
viewModel.send(viewAction: .viewAllInactiveSessions)
if !viewModel.viewState.inactiveSessionsViewData.isEmpty {
SecurityRecommendationCard(style: .inactive,
sessionCount: viewModel.viewState.inactiveSessionsViewData.count) {
viewModel.send(viewAction: .viewAllInactiveSessions)
}
}
}
} header: {