Skip to content

Commit 50a19f6

Browse files
authored
iOS 26: Increase SettingsMultiTextViewController insets (#24809)
* Remove unused editMultilineText * Increae insets inSettingsMultiTextViewController
1 parent 4286477 commit 50a19f6

File tree

2 files changed

+4
-33
lines changed

2 files changed

+4
-33
lines changed

WordPress/Classes/ViewRelated/Tools/SettingsCommon.swift

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ extension SettingsController {
1616
}
1717
}
1818

19-
func editMultilineText(_ changeType: @escaping AccountSettingsChangeWithString, hint: String? = nil, service: AccountSettingsService) -> (ImmuTableRow) -> SettingsMultiTextViewController {
20-
return { row in
21-
let editableRow = row as! EditableTextRow
22-
return self.controllerForEditableMultilineText(editableRow, changeType: changeType, hint: hint, service: service)
23-
}
24-
}
25-
2619
func editEmailAddress(_ changeType: @escaping AccountSettingsChangeWithString, hint: String? = nil, service: AccountSettingsService) -> (ImmuTableRow) -> SettingsTextViewController {
2720
return { row in
2821
let editableRow = row as! EditableTextRow
@@ -59,32 +52,6 @@ extension SettingsController {
5952
return controller
6053
}
6154

62-
func controllerForEditableMultilineText(_ row: EditableTextRow,
63-
changeType: @escaping AccountSettingsChangeWithString,
64-
hint: String? = nil,
65-
service: AccountSettingsService) -> SettingsMultiTextViewController {
66-
let title = row.title
67-
let value = row.value
68-
69-
let controller = SettingsMultiTextViewController(text: value, placeholder: "\(title)...", hint: hint, isPassword: false)
70-
71-
controller.title = title
72-
controller.onValueChanged = {
73-
newValue in
74-
guard value != newValue else { return }
75-
let change = changeType(newValue)
76-
service.saveChange(change)
77-
if change.isGravatarField {
78-
sendGravatarSyncNotice()
79-
}
80-
DDLogDebug("\(title) changed: \(newValue)")
81-
82-
trackChangeIfNeeded(row)
83-
}
84-
85-
return controller
86-
}
87-
8855
private func trackChangeIfNeeded(_ row: EditableTextRow) {
8956
// Don't track if the field name isn't specified
9057
guard let fieldName = row.fieldName else {

WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ - (UITableViewCell *)textViewCell
8282
UIEdgeInsets textInset = textView.textContainerInset;
8383
textInset.left = 0.0;
8484
textInset.right = 0.0;
85+
if (@available(iOS 26, *)) {
86+
textInset.top = 12;
87+
textInset.bottom = 12;
88+
}
8589
textView.textContainerInset = textInset;
8690
textView.textContainer.lineFragmentPadding = 0.0;
8791

0 commit comments

Comments
 (0)