felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 14:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed OtherUserSessionsFilter to UserOtherSessionsFilter

Browse Source
This commit is contained in:
Aleksandrs Proskurins
2022-10-12 09:30:41 +03:00
parent 0a01a1ca9e
commit c031dbb4de
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
+2 -2
View File
@@ -127,7 +127,7 @@ final class UserSessionsFlowCoordinator: Coordinator, Presentable {
return UserSessionOverviewCoordinator(parameters: parameters)
}
private func openOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: OtherUserSessionsFilter) {
private func openOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: UserOtherSessionsFilter) {
let title = filter == .all ? VectorL10n.userSessionsOverviewOtherSessionsSectionTitle : VectorL10n.userOtherSessionSecurityRecommendationTitle
let coordinator = createOtherSessionsCoordinator(sessionInfos: sessionInfos,
filterBy: filter,
@@ -143,7 +143,7 @@ final class UserSessionsFlowCoordinator: Coordinator, Presentable {
}
private func createOtherSessionsCoordinator(sessionInfos: [UserSessionInfo],
filterBy filter: OtherUserSessionsFilter,
filterBy filter: UserOtherSessionsFilter,
title: String) -> UserOtherSessionsCoordinator {
let parameters = UserOtherSessionsCoordinatorParameters(sessionInfos: sessionInfos,
filter: filter,
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift
+1 -1
View File
@@ -19,7 +19,7 @@ import SwiftUI
struct UserOtherSessionsCoordinatorParameters {
let sessionInfos: [UserSessionInfo]
let filter: OtherUserSessionsFilter
let filter: UserOtherSessionsFilter
let title: String
}
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
+1 -1
View File
@@ -131,7 +131,7 @@ class UserOtherSessionsViewModelTests: XCTestCase {
}
private func createSUT(sessionInfos: [UserSessionInfo],
filter: OtherUserSessionsFilter,
filter: UserOtherSessionsFilter,
title: String = "Title") -> UserOtherSessionsViewModel {
UserOtherSessionsViewModel(sessionInfos: sessionInfos,
filter: filter,
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/OtherUserSessionsFilter.swift → RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsFilter.swift
+2 -2
View File
@@ -16,7 +16,7 @@
import Foundation
enum OtherUserSessionsFilter: Identifiable, Equatable, CaseIterable {
enum UserOtherSessionsFilter: Identifiable, Equatable, CaseIterable {
var id: Self { self }
case all
case verified
@@ -24,7 +24,7 @@ enum OtherUserSessionsFilter: Identifiable, Equatable, CaseIterable {
case inactive
}
extension OtherUserSessionsFilter {
extension UserOtherSessionsFilter {
var menuLocalizedName: String {
switch self {
case .all:
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
+1 -1
View File
@@ -37,7 +37,7 @@ struct UserOtherSessionsViewState: BindableState, Equatable {
}
struct UserOtherSessionsBindings: Equatable {
var filter: OtherUserSessionsFilter
var filter: UserOtherSessionsFilter
}
enum UserOtherSessionsSection: Hashable, Identifiable {
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
+5 -5
View File
@@ -23,7 +23,7 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
private let sessionInfos: [UserSessionInfo]
init(sessionInfos: [UserSessionInfo],
filter: OtherUserSessionsFilter,
filter: UserOtherSessionsFilter,
title: String) {
self.sessionInfos = sessionInfos
super.init(initialViewState: UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: filter),
@@ -64,7 +64,7 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
}
}
private func createSectionItems(sessionInfos: [UserSessionInfo], filter: OtherUserSessionsFilter) -> [UserSessionListItemViewData] {
private func createSectionItems(sessionInfos: [UserSessionInfo], filter: UserOtherSessionsFilter) -> [UserSessionListItemViewData] {
filterSessions(sessionInfos: sessionInfos, by: filter)
.map {
UserSessionListItemViewDataFactory().create(from: $0,
@@ -72,7 +72,7 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
}
}
private func filterSessions(sessionInfos: [UserSessionInfo], by filter: OtherUserSessionsFilter) -> [UserSessionInfo] {
private func filterSessions(sessionInfos: [UserSessionInfo], by filter: UserOtherSessionsFilter) -> [UserSessionInfo] {
switch filter {
case .all:
return sessionInfos.filter { !$0.isCurrent }
@@ -85,7 +85,7 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
}
}
private func createHeaderData(filter: OtherUserSessionsFilter) -> UserOtherSessionsHeaderViewData {
private func createHeaderData(filter: UserOtherSessionsFilter) -> UserOtherSessionsHeaderViewData {
switch filter {
case .all:
return UserOtherSessionsHeaderViewData(title: nil,
@@ -106,7 +106,7 @@ class UserOtherSessionsViewModel: UserOtherSessionsViewModelType, UserOtherSessi
}
}
private func noSessionsTitle(filter: OtherUserSessionsFilter) -> String {
private func noSessionsTitle(filter: UserOtherSessionsFilter) -> String {
switch filter {
case .all:
assertionFailure("The view is not intended to be displayed without any session")
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
+1 -1
View File
@@ -39,7 +39,7 @@ struct UserOtherSessions: View {
ToolbarItem(placement: .navigationBarTrailing) {
Menu {
Picker("Filter menu", selection: $viewModel.filter) {
ForEach(OtherUserSessionsFilter.allCases) { filter in
ForEach(UserOtherSessionsFilter.allCases) { filter in
Text(filter.menuLocalizedName).tag(filter)
}
}
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
+1 -1
View File
@@ -94,7 +94,7 @@ final class UserSessionsOverviewCoordinator: Coordinator, Presentable {
loadingIndicator = nil
}
private func showOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: OtherUserSessionsFilter) {
private func showOtherSessions(sessionInfos: [UserSessionInfo], filterBy filter: UserOtherSessionsFilter) {
completion?(.openOtherSessions(sessionInfos: sessionInfos, filter: filter))
}
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
+2 -2
View File
@@ -22,14 +22,14 @@ enum UserSessionsOverviewCoordinatorResult {
case renameSession(UserSessionInfo)
case logoutOfSession(UserSessionInfo)
case openSessionOverview(sessionInfo: UserSessionInfo)
case openOtherSessions(sessionInfos: [UserSessionInfo], filter: OtherUserSessionsFilter)
case openOtherSessions(sessionInfos: [UserSessionInfo], filter: UserOtherSessionsFilter)
case linkDevice
}
// MARK: View model
enum UserSessionsOverviewViewModelResult: Equatable {
case showOtherSessions(sessionInfos: [UserSessionInfo], filter: OtherUserSessionsFilter)
case showOtherSessions(sessionInfos: [UserSessionInfo], filter: UserOtherSessionsFilter)
case verifyCurrentSession
case renameSession(UserSessionInfo)
case logoutOfSession(UserSessionInfo)
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
+1 -1
View File
@@ -107,7 +107,7 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
}
}
private func showSessions(filteredBy filter: OtherUserSessionsFilter) {
private func showSessions(filteredBy filter: UserOtherSessionsFilter) {
completion?(.showOtherSessions(sessionInfos: userSessionsOverviewService.sessionInfos,
filter: filter))
}