Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Smart quote/dash configuration support in iOS #13863

Merged
merged 9 commits into from
Dec 12, 2019
Merged

Smart quote/dash configuration support in iOS #13863

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9179e76
Smart quote/dash configuration support in iOS
justinmc Nov 14, 2019
7360833
Formatting
justinmc Nov 15, 2019
e92ebe3
bool to enum
justinmc Dec 4, 2019
133bf65
Default to 'Yes' instead of 'Default'
justinmc Dec 5, 2019
0af712f
Formatting
justinmc Dec 5, 2019
d948698
Use an index instead of a string for the enum value
justinmc Dec 6, 2019
4d73a57
Formatting
justinmc Dec 6, 2019
63bbf3f
Merge branch 'master' into smart-quotes-dashes
justinmc Dec 10, 2019
1b574a4
Merge branch 'master' into smart-quotes-dashes
justinmc Dec 11, 2019
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
18 changes: 18 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ @interface FlutterTextInputView : UIView <UITextInput>
@property(nonatomic) UIKeyboardType keyboardType;
@property(nonatomic) UIReturnKeyType returnKeyType;
@property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry;
@property(nonatomic) UITextSmartQuotesType smartQuotesType API_AVAILABLE(ios(11.0));
@property(nonatomic) UITextSmartDashesType smartDashesType API_AVAILABLE(ios(11.0));

@property(nonatomic, assign) id<FlutterTextInputDelegate> textInputDelegate;

Expand Down Expand Up @@ -193,6 +195,10 @@ - (instancetype)init {
_keyboardType = UIKeyboardTypeDefault;
_returnKeyType = UIReturnKeyDone;
_secureTextEntry = NO;
if (@available(iOS 11.0, *)) {
_smartQuotesType = UITextSmartQuotesTypeYes;
_smartDashesType = UITextSmartDashesTypeYes;
}
}

return self;
Expand Down Expand Up @@ -764,6 +770,18 @@ - (void)setTextInputClient:(int)client withConfiguration:(NSDictionary*)configur
_activeView.keyboardType = ToUIKeyboardType(inputType);
_activeView.returnKeyType = ToUIReturnKeyType(configuration[@"inputAction"]);
_activeView.autocapitalizationType = ToUITextAutoCapitalizationType(configuration);
if (@available(iOS 11.0, *)) {
NSString* smartDashesType = configuration[@"smartDashesType"];
// This index comes from the SmartDashesType enum in the framework.
bool smartDashesIsDisabled = smartDashesType && [smartDashesType isEqualToString:@"0"];
_activeView.smartDashesType =
smartDashesIsDisabled ? UITextSmartDashesTypeNo : UITextSmartDashesTypeYes;
NSString* smartQuotesType = configuration[@"smartQuotesType"];
// This index comes from the SmartQuotesType enum in the framework.
bool smartQuotesIsDisabled = smartQuotesType && [smartQuotesType isEqualToString:@"0"];
_activeView.smartQuotesType =
smartQuotesIsDisabled ? UITextSmartQuotesTypeNo : UITextSmartQuotesTypeYes;
}
if ([keyboardAppearance isEqualToString:@"Brightness.dark"]) {
_activeView.keyboardAppearance = UIKeyboardAppearanceDark;
} else if ([keyboardAppearance isEqualToString:@"Brightness.light"]) {
Expand Down