DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2b87bad87d18c178a9f739c9eae36f41a8f5d9b4 into 06df71c51446e96939c6a615b7c34ce9123806ba

Browse Source
This commit is contained in:
LongCatIsLooong 2026-02-19 14:16:17 -03:00 committed by GitHub
commit 840462baf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
View File

@ -50,7 +50,13 @@ using namespace flutter;
static void SetStatusBarHiddenForSharedApplication(BOOL hidden) {
UIApplication* flutterApplication = FlutterSharedApplication.application;
if (flutterApplication) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// -[UIApplication setStatusBarHidden] is deprecated in iOS9 in favor of
// delegating to the view controller. There's no UIScene equivalent for
// setting the value per UIScene.
flutterApplication.statusBarHidden = hidden;
#pragma clang diagnostic pop
} else {
[FlutterLogger logWarning:@"Application based status bar styling is not available in app "
"extension."];
@ -60,9 +66,13 @@ static void SetStatusBarHiddenForSharedApplication(BOOL hidden) {
static void SetStatusBarStyleForSharedApplication(UIStatusBarStyle style) {
UIApplication* flutterApplication = FlutterSharedApplication.application;
if (flutterApplication) {
// Note: -[UIApplication setStatusBarStyle] is deprecated in iOS9
// in favor of delegating to the view controller.
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// -[UIApplication setStatusBarStyle] is deprecated in iOS9 in favor of
// delegating to the view controller. There's no UIScene equivalent for
// setting the value per UIScene.
[flutterApplication setStatusBarStyle:style];
#pragma clang diagnostic pop
} else {
[FlutterLogger logWarning:@"Application based status bar styling is not available in app "
"extension."];
@ -197,7 +207,7 @@ static void SetStatusBarStyleForSharedApplication(UIStatusBarStyle style) {
[[UIActivityViewController alloc] initWithActivityItems:itemsToShare
applicationActivities:nil];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
// On iPad, the share screen is presented in a popover view, and requires a
// sourceView and sourceRect
FlutterTextInputPlugin* _textInputPlugin = [self.engine textInputPlugin];

10
engine/src/flutter/shell/platform/darwin/ios/framework/Source/TextInputSemanticsObject.mm
View File

@ -124,13 +124,13 @@ static const UIAccessibilityTraits kUIAccessibilityTraitUndocumentedEmptyLine =
return nil;
}
- (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition*)position
- (NSWritingDirection)baseWritingDirectionForPosition:(UITextPosition*)position
inDirection:(UITextStorageDirection)direction {
// Not editable. Does not apply.
return UITextWritingDirectionNatural;
return NSWritingDirectionNatural;
}
- (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection
- (void)setBaseWritingDirection:(NSWritingDirection)writingDirection
forRange:(UITextRange*)range {
// Not editable. Does not apply.
}
@ -422,12 +422,12 @@ static const UIAccessibilityTraits kUIAccessibilityTraitUndocumentedEmptyLine =
inDirection:direction];
}
- (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition*)position
- (NSWritingDirection)baseWritingDirectionForPosition:(UITextPosition*)position
inDirection:(UITextStorageDirection)direction {
return [[self textInputSurrogate] baseWritingDirectionForPosition:position inDirection:direction];
}
- (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection
- (void)setBaseWritingDirection:(NSWritingDirection)writingDirection
forRange:(UITextRange*)range {
[[self textInputSurrogate] setBaseWritingDirection:writingDirection forRange:range];
}