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

MESSENGER-4516 device manager anpassungen

Browse Source
This commit is contained in:
Arnfried Griesert
2023-04-28 06:28:47 +00:00
committed by Frank Rotermund
parent 280d19922f
commit d9f9798643
18 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
+2 -2
View File
@@ -27,8 +27,8 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
init(userSessionsOverviewService: UserSessionsOverviewServiceProtocol, settingsService: UserSessionSettingsProtocol) {
self.userSessionsOverviewService = userSessionsOverviewService
self.settingsService = settingsService
super.init(initialViewState: .init(showLocationInfo: settingsService.showIPAddressesInSessionsManager))
let showLocationInfo = BWIBuildSettings.shared.deviceManagerShowIPAddress && settingsService.showIPAddressesInSessionsManager
super.init(initialViewState: .init(showLocationInfo: showLocationInfo))
userSessionsOverviewService.overviewDataPublisher.sink { [weak self] overviewData in
self?.updateViewState(with: overviewData)
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/SecurityRecommendationCard.swift
+1 -1
View File
@@ -45,7 +45,7 @@ struct SecurityRecommendationCard: View {
Text(buttonTitle)
.font(theme.fonts.body)
.foregroundColor(theme.colors.accent)
.foregroundColor(Color(ThemeService.shared().theme.tintColor))
}
.frame(maxWidth: .infinity, alignment: .leading)
}
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsListViewAllView.swift
+2 -2
View File
@@ -30,9 +30,9 @@ struct UserSessionsListViewAllView: View {
Button(action: { onBackgroundTap?() }) {
VStack(spacing: 0) {
HStack {
Text("View all (\(count))")
Text(BWIL10n.userSessionButtonViewAll(count))
.font(theme.fonts.body)
.foregroundColor(theme.colors.accent)
.foregroundColor(Color(ThemeService.shared().theme.tintColor))
.frame(maxWidth: .infinity, alignment: .leading)
Image(Asset.Images.disclosureIcon.name)
.foregroundColor(theme.colors.tertiaryContent)
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift
+7 -6
View File
@@ -141,14 +141,15 @@ struct UserSessionsOverview: View {
private var otherSessionsMenu: some View {
Menu {
Button {
withAnimation {
viewModel.send(viewAction: .showLocationInfo)
if BWIBuildSettings.shared.deviceManagerShowIPAddress {
Button {
withAnimation {
viewModel.send(viewAction: .showLocationInfo)
}
} label: {
Label(showLocationInfo: viewModel.viewState.showLocationInfo)
}
} label: {
Label(showLocationInfo: viewModel.viewState.showLocationInfo)
}
DestructiveButton {
viewModel.send(viewAction: .logoutOtherSessions)
} label: {