Merge branch 'develop' into aleksandrs/6963_multi_session_logout

This commit is contained in:
paleksandrs
2022-11-02 14:02:52 +02:00
54 changed files with 451 additions and 160 deletions
@@ -63,8 +63,23 @@ struct UserSessionOverview: View {
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Menu {
Button { viewModel.send(viewAction: .renameSession) } label: {
Label(VectorL10n.manageSessionRename, systemImage: "pencil")
SwiftUI.Section {
Button { viewModel.send(viewAction: .renameSession) } label: {
Label(VectorL10n.manageSessionRename, systemImage: "pencil")
}
.accessibilityIdentifier(VectorL10n.manageSessionRename)
}
if #available(iOS 15, *) {
Button(role: .destructive) { viewModel.send(viewAction: .logoutOfSession) } label: {
Label(VectorL10n.signOut, systemImage: "rectangle.portrait.and.arrow.right.fill")
}
.accessibilityIdentifier(VectorL10n.signOut)
} else {
Button { viewModel.send(viewAction: .logoutOfSession) } label: {
Label(VectorL10n.signOut, systemImage: "rectangle.righthalf.inset.fill.arrow.right")
}
.accessibilityIdentifier(VectorL10n.signOut)
}
} label: {
Image(systemName: "ellipsis")
@@ -73,6 +88,7 @@ struct UserSessionOverview: View {
.padding(.vertical, 12)
}
.offset(x: 4) // Re-align the symbol after applying padding.
.accessibilityIdentifier("Menu")
}
}
.accentColor(theme.colors.accent)