diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm index 0ba83ef38090a..bb996706cb36e 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm @@ -975,10 +975,6 @@ - (void)flutterTextInputView:(FlutterTextInputView*)textInputView #pragma mark - FlutterViewEngineDelegate - (void)flutterTextInputView:(FlutterTextInputView*)textInputView showToolbar:(int)client { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() invokeMethod:@"TextInputClient.showToolbar" arguments:@[ @(client) ]]; [_scribbleChannel.get() invokeMethod:@"Scribble.showToolbar" arguments:@[ @(client) ]]; } @@ -986,13 +982,6 @@ - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin focusElement:(UIScribbleElementIdentifier)elementIdentifier atPoint:(CGPoint)referencePoint result:(FlutterResult)callback { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() - invokeMethod:@"TextInputClient.focusElement" - arguments:@[ elementIdentifier, @(referencePoint.x), @(referencePoint.y) ] - result:callback]; [_scribbleChannel.get() invokeMethod:@"Scribble.focusElement" arguments:@[ elementIdentifier, @(referencePoint.x), @(referencePoint.y) ] @@ -1002,55 +991,29 @@ - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin requestElementsInRect:(CGRect)rect result:(FlutterResult)callback { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 [_scribbleChannel.get() invokeMethod:@"Scribble.requestElementsInRect" arguments:@[ @(rect.origin.x), @(rect.origin.y), @(rect.size.width), @(rect.size.height) ] result:callback]; - [_textInputChannel.get() - invokeMethod:@"TextInputClient.requestElementsInRect" - arguments:@[ @(rect.origin.x), @(rect.origin.y), @(rect.size.width), @(rect.size.height) ] - result:callback]; } - (void)flutterTextInputViewScribbleInteractionBegan:(FlutterTextInputView*)textInputView { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() invokeMethod:@"TextInputClient.scribbleInteractionBegan" arguments:nil]; [_scribbleChannel.get() invokeMethod:@"Scribble.scribbleInteractionBegan" arguments:nil]; } - (void)flutterTextInputViewScribbleInteractionFinished:(FlutterTextInputView*)textInputView { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() invokeMethod:@"TextInputClient.scribbleInteractionFinished" - arguments:nil]; [_scribbleChannel.get() invokeMethod:@"Scribble.scribbleInteractionFinished" arguments:nil]; } - (void)flutterTextInputView:(FlutterTextInputView*)textInputView insertTextPlaceholderWithSize:(CGSize)size withClient:(int)client { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() invokeMethod:@"TextInputClient.insertTextPlaceholder" - arguments:@[ @(client), @(size.width), @(size.height) ]]; [_scribbleChannel.get() invokeMethod:@"Scribble.insertTextPlaceholder" arguments:@[ @(client), @(size.width), @(size.height) ]]; } - (void)flutterTextInputView:(FlutterTextInputView*)textInputView removeTextPlaceholder:(int)client { - // TODO(justinmc): Remove the TextInputClient usage when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - [_textInputChannel.get() invokeMethod:@"TextInputClient.removeTextPlaceholder" - arguments:@[ @(client) ]]; [_scribbleChannel.get() invokeMethod:@"Scribble.removeTextPlaceholder" arguments:@[ @(client) ]]; } diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm index 4ecdc6845e73a..fc4230015cd26 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm @@ -48,10 +48,6 @@ @"TextInput.setEditableSizeAndTransform"; static NSString* const kSetMarkedTextRectMethod = @"TextInput.setMarkedTextRect"; static NSString* const kFinishAutofillContextMethod = @"TextInput.finishAutofillContext"; -// TODO(justinmc): Remove the TextInput method constant when the framework has -// finished transitioning to using the Scribble channel. -// https://github.com/flutter/flutter/pull/104128 -static NSString* const kDeprecatedSetSelectionRectsMethod = @"TextInput.setSelectionRects"; static NSString* const kSetSelectionRectsMethod = @"Scribble.setSelectionRects"; static NSString* const kStartLiveTextInputMethod = @"TextInput.startLiveTextInput"; @@ -2174,12 +2170,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { } else if ([method isEqualToString:kFinishAutofillContextMethod]) { [self triggerAutofillSave:[args boolValue]]; result(nil); - // TODO(justinmc): Remove the TextInput method constant when the framework has - // finished transitioning to using the Scribble channel. - // https://github.com/flutter/flutter/pull/104128 - } else if ([method isEqualToString:kDeprecatedSetSelectionRectsMethod]) { - [self setSelectionRects:args]; - result(nil); } else if ([method isEqualToString:kSetSelectionRectsMethod]) { [self setSelectionRects:args]; result(nil);