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

Bug 1417864 - Don't use the URL keyboard in custom search title #3466

Closed
wants to merge 1 commit into from
Closed

Bug 1417864 - Don't use the URL keyboard in custom search title #3466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 39 additions & 20 deletions Client/Frontend/Settings/CustomSearchViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,25 +128,26 @@ class CustomSearchViewController: SettingsTableViewController {
return URL(string: string)
}

let titleField = CustomSearchEngineTextView(placeholder: Strings.SettingsAddCustomEngineTitlePlaceholder, settingIsValid: { text in
return text != nil && text != ""
}, settingDidChange: {fieldText in
guard let title = fieldText else {
return
let titleField = CustomSearchEngineTextView(
accessibilityIdentifier: "customEngineTitle",
autocapitalizationType: .words,
placeholder: Strings.SettingsAddCustomEngineTitlePlaceholder,
settingIsValid: { text in return text != nil && text != "" },
settingDidChange: { fieldText in
guard let title = fieldText else { return }
self.engineTitle = title
}
self.engineTitle = title
})
titleField.textField.accessibilityIdentifier = "customEngineTitle"

let urlField = CustomSearchEngineTextView(placeholder: Strings.SettingsAddCustomEngineURLPlaceholder, height: 133, settingIsValid: { text in
//Can check url text text validity here.
return true
}, settingDidChange: {fieldText in
self.urlString = fieldText
})

urlField.textField.autocapitalizationType = .none
urlField.textField.accessibilityIdentifier = "customEngineUrl"
)

let urlField = CustomSearchEngineTextView(
accessibilityIdentifier: "customEngineUrl",
autocapitalizationType: .none,
keyboardType: .URL,
placeholder: Strings.SettingsAddCustomEngineURLPlaceholder,
height: 133,
settingIsValid: { text in return true }, //Can check url text text validity here.
settingDidChange: { fieldText in self.urlString = fieldText }
)

let settings: [SettingSection] = [
SettingSection(title: NSAttributedString(string: Strings.SettingsAddCustomEngineTitleLabel), children: [titleField]),
Expand Down Expand Up @@ -174,6 +175,10 @@ class CustomSearchEngineTextView: Setting, UITextViewDelegate {
fileprivate let TextLabelHeight: CGFloat = 44
fileprivate var TextFieldHeight: CGFloat = 44

fileprivate let _accessibilityIdentifier: String?
override var accessibilityIdentifier: String? { return _accessibilityIdentifier }
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure if there's a better way to do this. I couldn't find one.

fileprivate let autocapitalizationType: UITextAutocapitalizationType
fileprivate let keyboardType: UIKeyboardType
fileprivate let defaultValue: String?
fileprivate let placeholder: String
fileprivate let settingDidChange: ((String?) -> Void)?
Expand All @@ -182,7 +187,19 @@ class CustomSearchEngineTextView: Setting, UITextViewDelegate {
let textField = UITextView()
let placeholderLabel = UILabel()

init(defaultValue: String? = nil, placeholder: String, height: CGFloat = 44, settingIsValid isValueValid: ((String?) -> Bool)? = nil, settingDidChange: ((String?) -> Void)? = nil) {
init(
accessibilityIdentifier: String? = nil,
autocapitalizationType: UITextAutocapitalizationType = .sentences,
defaultValue: String? = nil,
keyboardType: UIKeyboardType = .default,
placeholder: String,
height: CGFloat = 44,
settingIsValid isValueValid: ((String?) -> Bool)? = nil,
settingDidChange: ((String?) -> Void)? = nil
) {
self._accessibilityIdentifier = accessibilityIdentifier
self.autocapitalizationType = autocapitalizationType
self.keyboardType = keyboardType
self.defaultValue = defaultValue
self.TextFieldHeight = height
self.settingDidChange = settingDidChange
Expand All @@ -205,7 +222,9 @@ class CustomSearchEngineTextView: Setting, UITextViewDelegate {
textField.font = placeholderLabel.font

textField.textContainer.lineFragmentPadding = 0
textField.keyboardType = .URL
textField.accessibilityIdentifier = accessibilityIdentifier
textField.autocapitalizationType = autocapitalizationType
textField.keyboardType = keyboardType
textField.autocorrectionType = .no
textField.delegate = self
cell.isUserInteractionEnabled = true
Expand Down