Skip to content

Commit aaf0492

Browse files
author
flyboy
authored
Merge pull request #1 from badboy-tian/master
fix ios errors
2 parents 05deb41 + fce4d2b commit aaf0492

File tree

7 files changed

+34
-16
lines changed

7 files changed

+34
-16
lines changed

example/.flutter-plugins-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"keyboard_utils_fork","path":"D:\\\\flutterProject\\\\keyboard_utils\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"keyboard_utils_fork","path":"D:\\\\flutterProject\\\\keyboard_utils\\\\","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"keyboard_utils_fork","dependencies":[]}],"date_created":"2022-12-21 17:11:44.730841","version":"3.0.5"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"keyboard_utils_fork","path":"/Users/tian/Documents/work/Android/keyboard_utils/","native_build":true,"dependencies":[]}],"android":[{"name":"keyboard_utils_fork","path":"/Users/tian/Documents/work/Android/keyboard_utils/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"keyboard_utils_fork","dependencies":[]}],"date_created":"2023-03-06 10:15:00.090690","version":"3.7.6"}

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

example/ios/Flutter/Flutter.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
Pod::Spec.new do |s|
77
s.name = 'Flutter'
88
s.version = '1.0.0'
9-
s.summary = 'High-performance, high-fidelity mobile apps.'
10-
s.homepage = 'https://flutter.io'
11-
s.license = { :type => 'MIT' }
9+
s.summary = 'A UI toolkit for beautiful and fast apps.'
10+
s.homepage = 'https://flutter.dev'
11+
s.license = { :type => 'BSD' }
1212
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
1313
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
14-
s.ios.deployment_target = '9.0'
14+
s.ios.deployment_target = '11.0'
1515
# Framework linking is handled by Flutter tooling, not CocoaPods.
1616
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
1717
s.vendored_frameworks = 'path/to/nothing'

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -164,7 +164,7 @@
164164
97C146E61CF9000F007C117D /* Project object */ = {
165165
isa = PBXProject;
166166
attributes = {
167-
LastUpgradeCheck = 1020;
167+
LastUpgradeCheck = 1300;
168168
ORGANIZATIONNAME = "The Chromium Authors";
169169
TargetAttributes = {
170170
97C146ED1CF9000F007C117D = {
@@ -209,6 +209,7 @@
209209
/* Begin PBXShellScriptBuildPhase section */
210210
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
211211
isa = PBXShellScriptBuildPhase;
212+
alwaysOutOfDate = 1;
212213
buildActionMask = 2147483647;
213214
files = (
214215
);
@@ -245,6 +246,7 @@
245246
};
246247
9740EEB61CF901F6004384FC /* Run Script */ = {
247248
isa = PBXShellScriptBuildPhase;
249+
alwaysOutOfDate = 1;
248250
buildActionMask = 2147483647;
249251
files = (
250252
);
@@ -365,13 +367,17 @@
365367
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
366368
CLANG_ENABLE_MODULES = YES;
367369
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
370+
DEVELOPMENT_TEAM = 8XM44745TJ;
368371
ENABLE_BITCODE = NO;
369372
FRAMEWORK_SEARCH_PATHS = (
370373
"$(inherited)",
371374
"$(PROJECT_DIR)/Flutter",
372375
);
373376
INFOPLIST_FILE = Runner/Info.plist;
374-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377+
LD_RUNPATH_SEARCH_PATHS = (
378+
"$(inherited)",
379+
"@executable_path/Frameworks",
380+
);
375381
LIBRARY_SEARCH_PATHS = (
376382
"$(inherited)",
377383
"$(PROJECT_DIR)/Flutter",
@@ -496,13 +502,17 @@
496502
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
497503
CLANG_ENABLE_MODULES = YES;
498504
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
505+
DEVELOPMENT_TEAM = 8XM44745TJ;
499506
ENABLE_BITCODE = NO;
500507
FRAMEWORK_SEARCH_PATHS = (
501508
"$(inherited)",
502509
"$(PROJECT_DIR)/Flutter",
503510
);
504511
INFOPLIST_FILE = Runner/Info.plist;
505-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
512+
LD_RUNPATH_SEARCH_PATHS = (
513+
"$(inherited)",
514+
"@executable_path/Frameworks",
515+
);
506516
LIBRARY_SEARCH_PATHS = (
507517
"$(inherited)",
508518
"$(PROJECT_DIR)/Flutter",
@@ -523,13 +533,17 @@
523533
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
524534
CLANG_ENABLE_MODULES = YES;
525535
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
536+
DEVELOPMENT_TEAM = 8XM44745TJ;
526537
ENABLE_BITCODE = NO;
527538
FRAMEWORK_SEARCH_PATHS = (
528539
"$(inherited)",
529540
"$(PROJECT_DIR)/Flutter",
530541
);
531542
INFOPLIST_FILE = Runner/Info.plist;
532-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
543+
LD_RUNPATH_SEARCH_PATHS = (
544+
"$(inherited)",
545+
"@executable_path/Frameworks",
546+
);
533547
LIBRARY_SEARCH_PATHS = (
534548
"$(inherited)",
535549
"$(PROJECT_DIR)/Flutter",

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/ios/Runner/Info.plist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4448
</dict>
4549
</plist>

ios/Classes/SwiftKeyboardUtilsPlugin.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ public class SwiftKeyboardUtilsPlugin: NSObject, FlutterPlugin ,FlutterStreamHan
4646
private func registerEvents() {
4747
NotificationCenter.default.addObserver(self,
4848
selector: #selector(keyboardWillShow),
49-
name: UIResponder.keyboardWillShowNotification,
49+
name: NSNotification.Name.UIKeyboardWillShow,
5050
object: nil)
5151

5252
NotificationCenter.default.addObserver(self,
5353
selector: #selector(keyboardWillHide),
54-
name: UIResponder.keyboardWillHideNotification,
54+
name: NSNotification.Name.UIKeyboardWillHide,
5555
object: nil)
5656

5757
NotificationCenter.default.addObserver(self,
5858
selector: #selector(keyboardDidShow),
59-
name: UIResponder.keyboardDidShowNotification,
59+
name: NSNotification.Name.UIKeyboardDidShow,
6060
object: nil)
6161
}
6262

@@ -70,7 +70,7 @@ public class SwiftKeyboardUtilsPlugin: NSObject, FlutterPlugin ,FlutterStreamHan
7070

7171
@objc private func checkIsKeyboardOpen(notification: Notification) {
7272
func keyboardHeight() -> Double? {
73-
if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
73+
if let keyboardFrame: NSValue = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? NSValue {
7474
let keyboardRectangle = keyboardFrame.cgRectValue
7575
return Double(keyboardRectangle.height)
7676
}

0 commit comments

Comments
 (0)