diff --git a/flutter_hbb/build_ios.sh b/flutter_hbb/build_ios.sh index 6d0d627ac..eb8954165 100755 --- a/flutter_hbb/build_ios.sh +++ b/flutter_hbb/build_ios.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -flutter build ipa --release --obfuscate --split-debug-info=./split-debug-info +#flutter build ipa --release --obfuscate --split-debug-info=./split-debug-info +flutter build ipa --release diff --git a/flutter_hbb/ios_x64.sh b/flutter_hbb/ios_x64.sh new file mode 100755 index 000000000..455ef4199 --- /dev/null +++ b/flutter_hbb/ios_x64.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +cargo build --release --target x86_64-apple-ios diff --git a/flutter_hbb/lib/main.dart b/flutter_hbb/lib/main.dart index 70da191ff..32af66665 100644 --- a/flutter_hbb/lib/main.dart +++ b/flutter_hbb/lib/main.dart @@ -25,6 +25,7 @@ class App extends StatelessWidget { child: ChangeNotifierProvider.value( value: FFI.canvasModel, child: MaterialApp( + debugShowCheckedModeBanner: false, title: 'RustDesk', theme: ThemeData( primarySwatch: Colors.blue, diff --git a/flutter_hbb/lib/remote_page.dart b/flutter_hbb/lib/remote_page.dart index 3345d6219..afff9ab9d 100644 --- a/flutter_hbb/lib/remote_page.dart +++ b/flutter_hbb/lib/remote_page.dart @@ -357,29 +357,33 @@ class _RemotePageState extends State { } }, child: Container( - color: MyTheme.canvasColor, - child: Stack(children: [ - ImagePaint(), - CursorPaint(), - getHelpTools(), - SizedBox( - width: 0, - height: 0, - child: !_showKeyboard - ? Container() - : TextFormField( - textInputAction: TextInputAction.newline, - autocorrect: false, - enableSuggestions: false, - focusNode: _focusNode, - maxLines: null, - initialValue: - _value, // trick way to make backspace work always - keyboardType: TextInputType.multiline, - onChanged: handleInput, + color: Colors.black, + child: SafeArea( + child: Container( + color: MyTheme.canvasColor, + child: Stack(children: [ + ImagePaint(), + CursorPaint(), + getHelpTools(), + SizedBox( + width: 0, + height: 0, + child: !_showKeyboard + ? Container() + : TextFormField( + textInputAction: + TextInputAction.newline, + autocorrect: false, + enableSuggestions: false, + focusNode: _focusNode, + maxLines: null, + initialValue: + _value, // trick way to make backspace work always + keyboardType: TextInputType.multiline, + onChanged: handleInput, + ), ), - ), - ]))), + ]))))), )), ); } diff --git a/flutter_hbb/pubspec.yaml b/flutter_hbb/pubspec.yaml index da3cb00b0..7116743ab 100644 --- a/flutter_hbb/pubspec.yaml +++ b/flutter_hbb/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.7+10 +version: 1.1.7+11 environment: sdk: ">=2.7.0 <3.0.0"