Compare commits

...

2 Commits

Author SHA1 Message Date
Fin
b373fe15e2 修复分组页导航栏按钮显示问题 2025-10-20 10:49:04 +08:00
Fin
1a5a4d152a iPadOS26 适配 2025-10-14 10:48:59 +08:00
3 changed files with 18 additions and 6 deletions

View File

@ -100,7 +100,9 @@ class MessageListViewController: BaseViewController<MessageListViewModel> {
navigationItem.searchController?.obscuresBackgroundDuringPresentation = false
navigationItem.searchController?.delegate = self
navigationItem.setBarButtonItems(items: [deleteButton, groupButton], position: .right)
if #available(iOS 26.0, *) {
navigationItem.preferredSearchBarPlacement = .integratedButton
}
self.view.addSubview(tableView)
tableView.snp.makeConstraints { make in
@ -254,7 +256,14 @@ class MessageListViewController: BaseViewController<MessageListViewModel> {
}).disposed(by: rx.disposeBag)
output.groupToggleButtonHidden
.drive((groupButton.customView as! UIButton).rx.isHidden).disposed(by: rx.disposeBag)
.drive(onNext: { [weak self] isHidden in
guard let self else { return }
var items = [deleteButton]
if !isHidden {
items.append(groupButton)
}
navigationItem.setBarButtonItems(items: items, position: .right)
}).disposed(by: rx.disposeBag)
}
private func subscribeDeleteTap() {

View File

@ -53,7 +53,8 @@ class MessageSettingsViewController: BaseViewController<MessageSettingsViewModel
self.view.addSubview(tableView)
tableView.snp.makeConstraints { make in
make.edges.equalToSuperview()
make.top.bottom.equalToSuperview()
make.left.right.equalTo(self.view.safeAreaLayoutGuide)
}
// ViewModel

View File

@ -65,10 +65,12 @@ class NewServerViewController: BaseViewController<NewServerViewModel> {
self.navigationItem.largeTitleDisplayMode = .never
navigationItem.title = "AddServer".localized
self.view.layout(addressTextField)
.top(kNavigationHeight + 40).left(10).right(10)
self.view.addSubview(addressTextField)
self.view.addSubview(noticeLabel)
addressTextField.snp.makeConstraints { make in
make.top.equalTo(kNavigationHeight + 40)
make.left.right.equalTo(self.view.safeAreaLayoutGuide).inset(16)
}
noticeLabel.snp.makeConstraints { make in
make.top.equalTo(self.addressTextField.snp.bottom).offset(40)
make.left.equalTo(self.addressTextField)