reuse FlutterTextPosition/Range

Author: yjbanov

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h

@@ -25,4 +25,23 @@
 
 @end
 
+/** An indexed position in the buffer of a Flutter text editing widget. */
+@interface FlutterTextPosition : UITextPosition
+
+@property(nonatomic, readonly) NSUInteger index;
+
++ (instancetype)positionWithIndex:(NSUInteger)index;
+- (instancetype)initWithIndex:(NSUInteger)index;
+
+@end
+
+/** A range of text in the buffer of a Flutter text editing widget. */
+@interface FlutterTextRange : UITextRange<NSCopying>
+
+@property(nonatomic, readonly) NSRange range;
+
++ (instancetype)rangeWithNSRange:(NSRange)range;
+
+@end
+
 #endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm

@@ -41,16 +41,6 @@ static UITextAutocapitalizationType ToUITextAutocapitalizationType(NSString* inp
 
 #pragma mark - FlutterTextPosition
 
-/** An indexed position in the buffer of a Flutter text editing widget. */
-@interface FlutterTextPosition : UITextPosition
-
-@property(nonatomic, readonly) NSUInteger index;
-
-+ (instancetype)positionWithIndex:(NSUInteger)index;
-- (instancetype)initWithIndex:(NSUInteger)index;
-
-@end
-
 @implementation FlutterTextPosition
 
 + (instancetype)positionWithIndex:(NSUInteger)index {
@@ -69,15 +59,6 @@ - (instancetype)initWithIndex:(NSUInteger)index {
 
 #pragma mark - FlutterTextRange
 
-/** A range of text in the buffer of a Flutter text editing widget. */
-@interface FlutterTextRange : UITextRange<NSCopying>
-
-@property(nonatomic, readonly) NSRange range;
-
-+ (instancetype)rangeWithNSRange:(NSRange)range;
-
-@end
-
 @implementation FlutterTextRange
 
 + (instancetype)rangeWithNSRange:(NSRange)range {

shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm

@@ -7,71 +7,6 @@
 #include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h"
 
-@interface InactiveTextPosition : UITextPosition
-
-@property(nonatomic, readonly) NSUInteger index;
-
-+ (instancetype)positionWithIndex:(NSUInteger)index;
-- (instancetype)initWithIndex:(NSUInteger)index;
-
-@end
-
-@implementation InactiveTextPosition
-
-+ (instancetype)positionWithIndex:(NSUInteger)index {
-  return [[[InactiveTextPosition alloc] initWithIndex:index] autorelease];
-}
-
-- (instancetype)initWithIndex:(NSUInteger)index {
-  self = [super init];
-  if (self) {
-    _index = index;
-  }
-  return self;
-}
-
-@end
-
-@interface InactiveTextRange : UITextRange<NSCopying>
-
-@property(nonatomic, readonly) NSRange range;
-
-+ (instancetype)rangeWithNSRange:(NSRange)range;
-
-@end
-
-@implementation InactiveTextRange
-
-+ (instancetype)rangeWithNSRange:(NSRange)range {
-  return [[[InactiveTextRange alloc] initWithNSRange:range] autorelease];
-}
-
-- (instancetype)initWithNSRange:(NSRange)range {
-  self = [super init];
-  if (self) {
-    _range = range;
-  }
-  return self;
-}
-
-- (UITextPosition*)start {
-  return [InactiveTextPosition positionWithIndex:self.range.location];
-}
-
-- (UITextPosition*)end {
-  return [InactiveTextPosition positionWithIndex:self.range.location + self.range.length];
-}
-
-- (BOOL)isEmpty {
-  return self.range.length == 0;
-}
-
-- (id)copyWithZone:(NSZone*)zone {
-  return [[InactiveTextRange allocWithZone:zone] initWithNSRange:self.range];
-}
-
-@end
-
 @implementation FlutterInactiveTextInput {
 }
 
@@ -88,7 +23,7 @@ - (BOOL)hasText {
 }
 
 - (NSString*)textInRange:(UITextRange*)range {
-  NSRange textRange = ((InactiveTextRange*)range).range;
+  NSRange textRange = ((FlutterTextRange*)range).range;
   return [self.text substringWithRange:textRange];
 }
 
@@ -112,9 +47,9 @@ - (void)unmarkText {
 
 - (UITextRange*)textRangeFromPosition:(UITextPosition*)fromPosition
                            toPosition:(UITextPosition*)toPosition {
-  NSUInteger fromIndex = ((InactiveTextPosition*)fromPosition).index;
-  NSUInteger toIndex = ((InactiveTextPosition*)toPosition).index;
-  return [InactiveTextRange rangeWithNSRange:NSMakeRange(fromIndex, toIndex - fromIndex)];
+  NSUInteger fromIndex = ((FlutterTextPosition*)fromPosition).index;
+  NSUInteger toIndex = ((FlutterTextPosition*)toPosition).index;
+  return [FlutterTextRange rangeWithNSRange:NSMakeRange(fromIndex, toIndex - fromIndex)];
 }
 
 - (UITextPosition*)positionFromPosition:(UITextPosition*)position offset:(NSInteger)offset {