Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: navigation bar layout when E2EI is enabled - WPB-11604 #2054

Merged
merged 3 commits into from
Oct 17, 2024
+6 −6
Merged

fix: navigation bar layout when E2EI is enabled - WPB-11604 #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e8a54
prevent setting the wrong navigation bar layout on iPad
caldrian Oct 17, 2024
82ea356
add TODOs
caldrian Oct 17, 2024
1efbc47
Merge branch 'epic/navigation-overhaul-WPB-6647' of github.com:wireap…
caldrian Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WireUI/Sources/WireMainNavigationUI/Protocols/Coordinator/MainCoordinatorProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public protocol MainCoordinatorProtocol: AnyObject {
@MainActor
func dismissPresentedViewController() async

// TODO: [WPB-6647] consider moving those methods out of the protocol
// TODO: [WPB-11651] Move theses methods out of the protocol. The `presentViewController(_:)` method should be used.

@MainActor
func showSelfProfile() async
Expand Down
6 changes: 3 additions & 3 deletions ...sationListViewController+NavigationBar/ConversationListViewController+NavigationBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ extension ConversationListViewController: ConversationListContainerViewModelDele
}

func conversationListViewControllerViewModelRequiresUpdatingLegalHoldIndictor(_ viewModel: ViewModel) {
// TODO: [WPB-11604] call this only for collapsed layout
setupLeftNavigationBarButtonItems()
// TODO: [WPB-11604] what to update for expanded layout?
if mainSplitViewState == .collapsed {
setupLeftNavigationBarButtonItems()
}
}

// MARK: - Navigation Bar Items
Expand Down
2 changes: 2 additions & 0 deletions .../Sources/UserInterface/MainController/MainCoordinator+SidebarViewControllerDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import WireMainNavigationUI
import WireSidebarUI

// TODO: [WPB-11651] Create a dedicated delegate type for the sidebar and let it use the main coordinator.

extension MainCoordinator: SidebarViewControllerDelegate where Dependencies.ConversationFilter == Wire.ConversationFilter {

@MainActor
Expand Down
2 changes: 0 additions & 2 deletions wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import WireSidebarUI
import WireSyncEngine

// TODO: [WPB-11602] after logging in and getting certificate, the account image is blank instead of showing initials
// TODO: [WPB-11604] after getting E2EI certificate the conversation list is shown in collapsed layout mode even on iPad (expanded)
// TODO: [WPB-11599] the E2EI green shield is sometimes not shown when it should (after starting the app)

final class ZClientViewController: UIViewController {

Expand Down
Loading