Skip to content

Rework input focus behaviours and shift files around #626

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

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Rework input focus behaviours and shift files around #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
097bb94
[WIP] Refactoring message composition box UI hierarchy
mpretty-cyro Oct 30, 2025
7d461da
Refactoring LinkPreview to work within SessionUIKit
mpretty-cyro Oct 30, 2025
1b863fd
Finished off changes
mpretty-cyro Nov 3, 2025
b49ec22
Merge remote-tracking branch 'upstream/dev' into fix/keyboard-avoidance
mpretty-cyro Nov 3, 2025
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
497 changes: 415 additions & 82 deletions Session.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,17 @@
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD9E26B72EA72D3E00404C7F"
BuildableName = "SessionUIKitTests.xctest"
BlueprintName = "SessionUIKitTests"
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
11 changes: 11 additions & 0 deletions Session.xcodeproj/xcshareddata/xcschemes/SessionNotificationServiceExtension.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD9E26B72EA72D3E00404C7F"
BuildableName = "SessionUIKitTests.xctest"
BlueprintName = "SessionUIKitTests"
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
11 changes: 11 additions & 0 deletions Session.xcodeproj/xcshareddata/xcschemes/SessionShareExtension.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD9E26B72EA72D3E00404C7F"
BuildableName = "SessionUIKitTests.xctest"
BlueprintName = "SessionUIKitTests"
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
13 changes: 13 additions & 0 deletions Session.xcodeproj/xcshareddata/xcschemes/Session_CompileLibSession.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@
default = "YES">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD9E26B72EA72D3E00404C7F"
BuildableName = "SessionUIKitTests.xctest"
BlueprintName = "SessionUIKitTests"
ReferencedContainer = "container:Session.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug_Compile_LibSession"
Expand Down
7 changes: 0 additions & 7 deletions Session/Calls/Call Management/SessionCallManager+Action.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ extension SessionCallManager {
else {
guard let presentingVC = dependencies[singleton: .appContext].frontMostViewController else { return } // FIXME: Handle more gracefully
let callVC = CallVC(for: call, using: dependencies)

if let conversationVC = presentingVC as? ConversationVC {
callVC.conversationVC = conversationVC
conversationVC.resignFirstResponder()
conversationVC.hideInputAccessoryView()
}

presentingVC.present(callVC, animated: true) {
call.answerSessionCall()
}
Expand Down
3 changes: 0 additions & 3 deletions Session/Calls/Call Management/SessionCallManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,6 @@ public final class SessionCallManager: NSObject, CallManagerProtocol {
conversationVC.viewModel.threadData.threadId == call.sessionId
{
let callVC = CallVC(for: call, using: dependencies)
callVC.conversationVC = conversationVC
conversationVC.resignFirstResponder()
conversationVC.hideInputAccessoryView()
currentFrontMostViewController.present(callVC, animated: true, completion: nil)
}
else if !Preferences.isCallKitSupported {
Expand Down
6 changes: 0 additions & 6 deletions Session/Calls/CallVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
var latestKnownAudioOutputDeviceName: String?
var durationTimer: Timer?
var shouldRestartCamera = true
weak var conversationVC: ConversationVC? = nil

lazy var cameraManager: CameraManager = {
let result = CameraManager()
Expand Down Expand Up @@ -702,8 +701,6 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel

@objc private func minimize() {
self.shouldRestartCamera = false
self.conversationVC?.becomeFirstResponder()
self.conversationVC?.showInputAccessoryView()

let miniCallView = MiniCallView(from: self, using: dependencies)
miniCallView.show()
Expand Down Expand Up @@ -936,9 +933,6 @@ final class CallVC: UIViewController, VideoPreviewDelegate, AVRoutePickerViewDel
guard self?.presentingViewController != nil else { return }

self?.dismiss(animated: true, completion: {
self?.conversationVC?.becomeFirstResponder()
self?.conversationVC?.showInputAccessoryView()

if presentCameraRequestDialog {
Permissions.showEnableCameraAccessInstructions(using: dependencies)
} else {
Expand Down
6 changes: 0 additions & 6 deletions Session/Calls/Views & Modals/IncomingCallBanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ final class IncomingCallBanner: UIView, UIGestureRecognizerDelegate {
}

let callVC = CallVC(for: self.call, using: dependencies)
if let conversationVC = (presentingVC as? TopBannerController)?.wrappedViewController() as? ConversationVC {
callVC.conversationVC = conversationVC
conversationVC.resignFirstResponder()
conversationVC.hideInputAccessoryView()
}

presentingVC.present(callVC, animated: true) { [weak self] in
guard answer else { return }

Expand Down
Loading