diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0e7fd5..98d78af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,9 @@ jobs: working-directory: ./flutter_keyboard_visibility - run: flutter pub get working-directory: ./flutter_keyboard_visibility/example - - run: flutter pub get - working-directory: ./flutter_keyboard_visibility/example_old - - run: flutter test --no-sound-null-safety --coverage + - run: flutter test --coverage working-directory: ./flutter_keyboard_visibility - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./flutter_keyboard_visibility/coverage/lcov.info @@ -47,8 +45,6 @@ jobs: working-directory: ./flutter_keyboard_visibility - run: flutter pub get working-directory: ./flutter_keyboard_visibility/example - - run: flutter pub get - working-directory: ./flutter_keyboard_visibility/example_old - run: flutter analyze working-directory: ./flutter_keyboard_visibility_platform_interface - run: flutter analyze @@ -57,5 +53,3 @@ jobs: working-directory: ./flutter_keyboard_visibility - run: flutter analyze working-directory: ./flutter_keyboard_visibility/example - - run: flutter analyze - working-directory: ./flutter_keyboard_visibility/example_old diff --git a/.idea/runConfigurations/demo_with_provider.xml b/.idea/runConfigurations/demo_with_provider.xml deleted file mode 100644 index 7a6f1dd..0000000 --- a/.idea/runConfigurations/demo_with_provider.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ef62255 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2022 Jason Rai +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index 7602a16..d64dd4b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ # Flutter Keyboard Visibility [![pub package](https://img.shields.io/pub/v/flutter_keyboard_visibility.svg?label=flutter_keyboard_visibility&color=blue)](https://pub.dev/packages/flutter_keyboard_visibility) +![ci](https://github.com/MisterJimson/flutter_keyboard_visibility/actions/workflows/test.yml/badge.svg?branch=master) [![codecov](https://codecov.io/gh/MisterJimson/flutter_keyboard_visibility/branch/master/graph/badge.svg)](https://codecov.io/gh/MisterJimson/flutter_keyboard_visibility) React to keyboard visibility changes. -### Note about Flutter Web support +### Note about Flutter Web and Desktop support -Web support is an open issue [here](https://github.com/MisterJimson/flutter_keyboard_visibility/issues/10). Currently this library will just return `false` for keyboard visibility on web. +Web support is an open issue [here](https://github.com/MisterJimson/flutter_keyboard_visibility/issues/10), desktop support is an open issue [here](https://github.com/MisterJimson/flutter_keyboard_visibility/issues/124). Currently this library will just return `false` for keyboard visibility on web and desktop. ## Install [Install the package](https://pub.dev/packages/flutter_keyboard_visibility/install) @@ -20,11 +21,11 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; @override Widget build(BuildContext context) { return KeyboardVisibilityBuilder( - builder: (context, isKeyboardVisible) { - return Text( - 'The keyboard is: ${isKeyboardVisible ? 'VISIBLE' : 'NOT VISIBLE'}', - ); - } + builder: (context, isKeyboardVisible) { + return Text( + 'The keyboard is: ${isKeyboardVisible ? 'VISIBLE' : 'NOT VISIBLE'}', + ); + } ); ``` ### Option 2: Within your `Widget` tree using a provider @@ -59,6 +60,9 @@ Query and/or subscribe to keyboard visibility directly with the ```dart import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; +import 'dart:async'; + +late StreamSubscription keyboardSubscription; @override void initState() { @@ -69,10 +73,16 @@ void initState() { print('Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}'); // Subscribe - keyboardVisibilityController.onChange.listen((bool visible) { - print('Keyboard visibility update. Is visible: ${visible}'); + keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) { + print('Keyboard visibility update. Is visible: $visible'); }); } + +@override +void dispose() { + keyboardSubscription.cancel(); + super.dispose(); +} ``` ## Usage: Dismiss keyboard on tap Place a `KeyboardDismissOnTap` near the top of your `Widget` tree. When a user taps outside of the currently focused `Widget`, the `Widget` will drop focus and the keyboard will be dismissed. @@ -87,12 +97,62 @@ Widget build(BuildContext context) { ); } ``` +By default `KeyboardDismissOnTap` will only dismiss taps not captured by other interactive `Widget`s, like buttons. If you would like to dismiss the keyboard for any tap, including taps on interactive `Widget`s, set `dismissOnCapturedTaps` to true. +```dart +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; + +// Somewhere near the top of your tree... +@override +Widget build(BuildContext context) { + return KeyboardDismissOnTap( + dismissOnCapturedTaps: true, + child: MyDemoPage(), + ); +} +``` +The `IgnoreKeyboardDismiss` `Widget` can be used to further refine which taps do and do not dismiss the keyboard. Checkout the example app for more detail. ## Testing -Call `KeyboardVisibility.setVisibilityForTesting(value)` to set a custom value to use during `flutter test` +### Testing using mocks +`KeyboardVisibilityProvider` and `KeyboardVisibilityBuilder` accept a `controller` parameter that allow you to mock or replace the logic for reporting keyboard visibility updates. +```dart +@GenerateMocks([KeyboardVisibilityController]) +void main() { + testWidgets('It reports true when the keyboard is visible', (WidgetTester tester) async { + // Pretend that the keyboard is visible. + var mockController = MockKeyboardVisibilityController(); + when(mockController.onChange) + .thenAnswer((_) => Stream.fromIterable([true])); + when(mockController.isVisible).thenAnswer((_) => true); + + // Build a Widget tree and query KeyboardVisibilityProvider + // for the visibility of the keyboard. + bool? isKeyboardVisible; + + await tester.pumpWidget( + KeyboardVisibilityProvider( + controller: mockController, + child: Builder( + builder: (BuildContext context) { + isKeyboardVisible = + KeyboardVisibilityProvider.isKeyboardVisible(context); + return SizedBox(); + }, + ), + ), + ); + + // Verify that KeyboardVisibilityProvider reported that the + // keyboard is visible. + expect(isKeyboardVisible, true); + }); +} +``` +### Testing with a global override +Call `KeyboardVisibilityTesting.setVisibilityForTesting(false);` to set a custom value to use during `flutter test`. This is set globally and will override the standard logic of the native platform. ```dart void main() { testWidgets('My Test', (WidgetTester tester) async { - KeyboardVisibility.setVisibilityForTesting(true); + KeyboardVisibilityTesting.setVisibilityForTesting(true); await tester.pumpWidget(MyApp()); }); } diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..b7ab168 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,18 @@ +codecov: + require_ci_to_pass: yes + +coverage: + range: 55..100 + round: down + precision: 2 + status: + project: + default: + target: 70% + threshold: 5% + branches: + - master + patch: off + +comment: + layout: 'reach, diff, files' \ No newline at end of file diff --git a/flutter_keyboard_visibility/CHANGELOG.md b/flutter_keyboard_visibility/CHANGELOG.md index a28dcfc..212a285 100644 --- a/flutter_keyboard_visibility/CHANGELOG.md +++ b/flutter_keyboard_visibility/CHANGELOG.md @@ -1,3 +1,42 @@ +## [6.0.0] - December 19, 2023 +* 5.4.3 republished as a new major version. The Android Gradle changes were breaking for some users so 5.4.3 was unpublished. Using this version may require you to update your Android Gradle version. + +## [5.4.3] - May 20, 2023 +Thanks to fabricio-godoi for reporting this issue. + +* Fixed compatibility with Gradle 7 Android projects (support for Gradle 8 remains in place) + +## [5.4.2] - May 11, 2023 +Thanks to davidmartos96 for help with this release + +* Add compatibility with AGP 8 (Android Gradle Plugin). +* Removed implicit-casts lint warning as it's no longer supported + +## [5.4.1] - March 26, 2023 + +* Fixed `NSLocationWhenInUseUsageDescription` warning on iOS + +## [5.4.0] - October 4, 2022 +Thanks to cbenhagen for this feature + +* Add endorsed stubs for Linux, macOS, and Windows. + +## [5.3.0] - June 13, 2022 + +* Updated testing docs and made minor changes to allow to easier testing. See readme for details. + +## [5.2.0] - February 15, 2022 +Thanks to Andrflor for help with this feature release + +* Added `dismissOnCapturedTaps` option to KeyboardDismissOnTap +* Added `IgnoreKeyboardDismiss` Widget + +## [5.1.1] - January 13, 2022 +Thanks to jpeiffer for this fix + +* Updated Android tooling versions +* Replaced jcenter with mavenCentral + ## [5.1.0] - October 15, 2021 * Removed Android v1 Embedding Support. If you created your Android project before Flutter 1.12 you diff --git a/flutter_keyboard_visibility/LICENSE b/flutter_keyboard_visibility/LICENSE index d37a7e2..ef62255 100644 --- a/flutter_keyboard_visibility/LICENSE +++ b/flutter_keyboard_visibility/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2006-2018 +Copyright (c) 2022 Jason Rai All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/flutter_keyboard_visibility/README.md b/flutter_keyboard_visibility/README.md index 1e2973b..445deb1 100644 --- a/flutter_keyboard_visibility/README.md +++ b/flutter_keyboard_visibility/README.md @@ -4,6 +4,10 @@ React to keyboard visibility changes. +### Note about Flutter Web support + +Web support is an open issue [here](https://github.com/MisterJimson/flutter_keyboard_visibility/issues/10). Currently this library will just return `false` for keyboard visibility on web. + ## Install [Install the package](https://pub.dev/packages/flutter_keyboard_visibility/install) ## Usage: React to Keyboard Visibility Changes @@ -16,11 +20,11 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; @override Widget build(BuildContext context) { return KeyboardVisibilityBuilder( - builder: (context, isKeyboardVisible) { - return Text( - 'The keyboard is: ${isKeyboardVisible ? 'VISIBLE' : 'NOT VISIBLE'}', - ); - } + builder: (context, isKeyboardVisible) { + return Text( + 'The keyboard is: ${isKeyboardVisible ? 'VISIBLE' : 'NOT VISIBLE'}', + ); + } ); ``` ### Option 2: Within your `Widget` tree using a provider @@ -92,12 +96,62 @@ Widget build(BuildContext context) { ); } ``` +By default `KeyboardDismissOnTap` will only dismiss taps not captured by other interactive `Widget`s, like buttons. If you would like to dismiss the keyboard for any tap, including taps on interactive `Widget`s, set `dismissOnCapturedTaps` to true. +```dart +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; + +// Somewhere near the top of your tree... +@override +Widget build(BuildContext context) { + return KeyboardDismissOnTap( + dismissOnCapturedTaps: true, + child: MyDemoPage(), + ); +} +``` +The `IgnoreKeyboardDismiss` `Widget` can be used to further refine which taps do and do not dismiss the keyboard. Checkout the example app for more detail. ## Testing -Call `KeyboardVisibility.setVisibilityForTesting(value)` to set a custom value to use during `flutter test` +### Testing using mocks +`KeyboardVisibilityProvider` and `KeyboardVisibilityBuilder` accept a `controller` parameter that allow you to mock or replace the logic for reporting keyboard visibility updates. +```dart +@GenerateMocks([KeyboardVisibilityController]) +void main() { + testWidgets('It reports true when the keyboard is visible', (WidgetTester tester) async { + // Pretend that the keyboard is visible. + var mockController = MockKeyboardVisibilityController(); + when(mockController.onChange) + .thenAnswer((_) => Stream.fromIterable([true])); + when(mockController.isVisible).thenAnswer((_) => true); + + // Build a Widget tree and query KeyboardVisibilityProvider + // for the visibility of the keyboard. + bool? isKeyboardVisible; + + await tester.pumpWidget( + KeyboardVisibilityProvider( + controller: mockController, + child: Builder( + builder: (BuildContext context) { + isKeyboardVisible = + KeyboardVisibilityProvider.isKeyboardVisible(context); + return SizedBox(); + }, + ), + ), + ); + + // Verify that KeyboardVisibilityProvider reported that the + // keyboard is visible. + expect(isKeyboardVisible, true); + }); +} +``` +### Testing with a global override +Call `KeyboardVisibilityTesting.setVisibilityForTesting(false);` to set a custom value to use during `flutter test`. This is set globally and will override the standard logic of the native platform. ```dart void main() { testWidgets('My Test', (WidgetTester tester) async { - KeyboardVisibility.setVisibilityForTesting(true); + KeyboardVisibilityTesting.setVisibilityForTesting(true); await tester.pumpWidget(MyApp()); }); } diff --git a/flutter_keyboard_visibility/analysis_options.yaml b/flutter_keyboard_visibility/analysis_options.yaml index b4ab8c9..108d105 100644 --- a/flutter_keyboard_visibility/analysis_options.yaml +++ b/flutter_keyboard_visibility/analysis_options.yaml @@ -1,5 +1 @@ include: package:pedantic/analysis_options.yaml - -analyzer: - strong-mode: - implicit-casts: false diff --git a/flutter_keyboard_visibility/android/build.gradle b/flutter_keyboard_visibility/android/build.gradle index 8ac759e..96df462 100644 --- a/flutter_keyboard_visibility/android/build.gradle +++ b/flutter_keyboard_visibility/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.4.2' } } @@ -22,12 +22,23 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 30 + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'com.jrai.flutter_keyboard_visibility' + } + + compileSdkVersion 31 defaultConfig { minSdkVersion 16 } - lintOptions { + + lint { disable 'InvalidPackage' } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } diff --git a/flutter_keyboard_visibility/android/gradle/wrapper/gradle-wrapper.properties b/flutter_keyboard_visibility/android/gradle/wrapper/gradle-wrapper.properties index 01a286e..ceccc3a 100644 --- a/flutter_keyboard_visibility/android/gradle/wrapper/gradle-wrapper.properties +++ b/flutter_keyboard_visibility/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/flutter_keyboard_visibility/example/.gitignore b/flutter_keyboard_visibility/example/.gitignore index a9a6e5d..9e8ba18 100644 --- a/flutter_keyboard_visibility/example/.gitignore +++ b/flutter_keyboard_visibility/example/.gitignore @@ -43,3 +43,6 @@ app.*.map.json # Exceptions to above rules. !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages + +# Not supported yet +.macos/ \ No newline at end of file diff --git a/flutter_keyboard_visibility/example/analysis_options.yaml b/flutter_keyboard_visibility/example/analysis_options.yaml index b4ab8c9..108d105 100644 --- a/flutter_keyboard_visibility/example/analysis_options.yaml +++ b/flutter_keyboard_visibility/example/analysis_options.yaml @@ -1,5 +1 @@ include: package:pedantic/analysis_options.yaml - -analyzer: - strong-mode: - implicit-casts: false diff --git a/flutter_keyboard_visibility/example/android/app/build.gradle b/flutter_keyboard_visibility/example/android/app/build.gradle index ac0e5be..981474e 100644 --- a/flutter_keyboard_visibility/example/android/app/build.gradle +++ b/flutter_keyboard_visibility/example/android/app/build.gradle @@ -26,7 +26,9 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + namespace 'com.jrai.flutter_keyboard_visibility_example.example' + + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -45,7 +47,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.jrai.flutter_keyboard_visibility_example.example" minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/flutter_keyboard_visibility/example/android/app/src/debug/AndroidManifest.xml b/flutter_keyboard_visibility/example/android/app/src/debug/AndroidManifest.xml index 63c0a1f..f880684 100644 --- a/flutter_keyboard_visibility/example/android/app/src/debug/AndroidManifest.xml +++ b/flutter_keyboard_visibility/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/flutter_keyboard_visibility/example/android/app/src/main/AndroidManifest.xml b/flutter_keyboard_visibility/example/android/app/src/main/AndroidManifest.xml index 8fb0104..03c8f2f 100644 --- a/flutter_keyboard_visibility/example/android/app/src/main/AndroidManifest.xml +++ b/flutter_keyboard_visibility/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -9,7 +8,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/flutter_keyboard_visibility/example/android/build.gradle b/flutter_keyboard_visibility/example/android/build.gradle index 91c3537..9086fd0 100644 --- a/flutter_keyboard_visibility/example/android/build.gradle +++ b/flutter_keyboard_visibility/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.8.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:8.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/flutter_keyboard_visibility/example/android/gradle.properties b/flutter_keyboard_visibility/example/android/gradle.properties index 94adc3a..b9a9a24 100644 --- a/flutter_keyboard_visibility/example/android/gradle.properties +++ b/flutter_keyboard_visibility/example/android/gradle.properties @@ -1,3 +1,6 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/flutter_keyboard_visibility/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_keyboard_visibility/example/android/gradle/wrapper/gradle-wrapper.properties index e6df0b7..da1db5f 100644 --- a/flutter_keyboard_visibility/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/flutter_keyboard_visibility/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip diff --git a/flutter_keyboard_visibility/example/ios/Flutter/AppFrameworkInfo.plist b/flutter_keyboard_visibility/example/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f7..f2872cf 100644 --- a/flutter_keyboard_visibility/example/ios/Flutter/AppFrameworkInfo.plist +++ b/flutter_keyboard_visibility/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/flutter_keyboard_visibility/example/ios/Podfile.lock b/flutter_keyboard_visibility/example/ios/Podfile.lock index 915381a..2fe037c 100644 --- a/flutter_keyboard_visibility/example/ios/Podfile.lock +++ b/flutter_keyboard_visibility/example/ios/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/project.pbxproj index f5b703f..6fca510 100644 --- a/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -166,7 +166,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -333,7 +333,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -412,7 +412,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -461,7 +461,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..3db53b6 100644 --- a/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter_keyboard_visibility/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ _MyDemoPageState(); -} - -class _MyDemoPageState extends State { - @override - Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( - appBar: AppBar( - title: Text('Keyboard Visibility Example'), - ), - body: Center( - child: Padding( - padding: EdgeInsets.all(24.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text('This demo uses KeyboardVisibilityProvider.'), - TextField( - keyboardType: TextInputType.text, - decoration: InputDecoration( - labelText: 'Input box for keyboard test', - ), - ), - Container(height: 60.0), - Text( - 'The keyboard is: ${KeyboardVisibilityProvider.isKeyboardVisible(context) ? 'VISIBLE' : 'NOT VISIBLE'}', - ), - ], - ), - ), - ), - ), - ); - } -} diff --git a/flutter_keyboard_visibility/example/lib/keyboard_dismiss_demo.dart b/flutter_keyboard_visibility/example/lib/keyboard_dismiss_demo.dart new file mode 100644 index 0000000..acc77fd --- /dev/null +++ b/flutter_keyboard_visibility/example/lib/keyboard_dismiss_demo.dart @@ -0,0 +1,95 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; + +class KeyboardDismissDemo extends StatelessWidget { + const KeyboardDismissDemo({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('Keyboard Dismiss Demo'), + ), + body: SafeArea( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + KeyboardDismissOnTap( + child: Container( + height: 80, + width: double.infinity, + color: Colors.red, + child: Center(child: Text('Red dismisses on tap')), + ), + ), + KeyboardDismissOnTap( + child: Container( + height: 80, + width: double.infinity, + color: Colors.blue, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('Button does not dismiss, blue does'), + ElevatedButton( + onPressed: () {}, + child: Text('Button'), + ), + ], + ), + ), + ), + KeyboardDismissOnTap( + dismissOnCapturedTaps: true, + child: Container( + height: 80, + width: double.infinity, + color: Colors.green, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('Button and green both dismiss'), + ElevatedButton( + onPressed: () {}, + child: Text('Button'), + ), + ], + ), + ), + ), + KeyboardDismissOnTap( + child: Container( + height: 80, + width: double.infinity, + color: Colors.orange, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('Orange dismisses, black does not'), + IgnoreKeyboardDismiss( + child: Container( + margin: EdgeInsets.only(top: 4), + height: 40, + width: 40, + color: Colors.black, + ), + ), + ], + ), + ), + ), + Spacer(), + TextField( + keyboardType: TextInputType.text, + decoration: InputDecoration( + labelText: 'Input box for keyboard test', + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/flutter_keyboard_visibility/example/lib/main.dart b/flutter_keyboard_visibility/example/lib/main.dart index b666e2f..2429e19 100644 --- a/flutter_keyboard_visibility/example/lib/main.dart +++ b/flutter_keyboard_visibility/example/lib/main.dart @@ -1,39 +1,71 @@ import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; +import 'package:flutter_keyboard_visibility_example/keyboard_dismiss_demo.dart'; +import 'package:flutter_keyboard_visibility_example/provider_demo.dart'; void main() { - runApp(MyApp()); + runApp(App()); } -class MyApp extends StatelessWidget { +class App extends StatelessWidget { + const App({Key? key}) : super(key: key); + @override Widget build(BuildContext context) { return MaterialApp( - home: KeyboardDismissOnTap( - child: Scaffold( - appBar: AppBar( - title: Text('Keyboard Visibility Example'), - ), - body: Center( - child: Padding( - padding: EdgeInsets.all(24.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - TextField( - keyboardType: TextInputType.text, - decoration: InputDecoration( - labelText: 'Input box for keyboard test', - ), - ), - Container(height: 60.0), - KeyboardVisibilityBuilder(builder: (context, visible) { - return Text( - 'The keyboard is: ${visible ? 'VISIBLE' : 'NOT VISIBLE'}', + home: Demo(), + ); + } +} + +class Demo extends StatelessWidget { + @override + Widget build(BuildContext context) { + return KeyboardDismissOnTap( + child: Scaffold( + appBar: AppBar( + title: Text('Keyboard Visibility Example'), + ), + body: Center( + child: Padding( + padding: EdgeInsets.all(24.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ElevatedButton( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) => ProviderDemo()), + ); + }, + child: Text('Provider Demo'), + ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => KeyboardDismissDemo()), ); - }), - ], - ), + }, + child: Text('KeyboardDismiss Demo'), + ), + Spacer(), + TextField( + keyboardType: TextInputType.text, + decoration: InputDecoration( + labelText: 'Input box for keyboard test', + ), + ), + Container(height: 60.0), + KeyboardVisibilityBuilder(builder: (context, visible) { + return Text( + 'The keyboard is: ${visible ? 'VISIBLE' : 'NOT VISIBLE'}', + ); + }), + Spacer(), + ], ), ), ), diff --git a/flutter_keyboard_visibility/example/lib/provider_demo.dart b/flutter_keyboard_visibility/example/lib/provider_demo.dart new file mode 100644 index 0000000..0d7fb02 --- /dev/null +++ b/flutter_keyboard_visibility/example/lib/provider_demo.dart @@ -0,0 +1,46 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; + +class ProviderDemo extends StatelessWidget { + ProviderDemo({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return KeyboardVisibilityProvider( + child: MyDemoPage(), + ); + } +} + +class MyDemoPage extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('Keyboard Visibility Provider'), + ), + body: Center( + child: Padding( + padding: EdgeInsets.all(24.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('This demo uses KeyboardVisibilityProvider.'), + Container(height: 60.0), + TextField( + keyboardType: TextInputType.text, + decoration: InputDecoration( + labelText: 'Input box for keyboard test', + ), + ), + Container(height: 60.0), + Text( + 'The keyboard is: ${KeyboardVisibilityProvider.isKeyboardVisible(context) ? 'VISIBLE' : 'NOT VISIBLE'}', + ), + ], + ), + ), + ), + ); + } +} diff --git a/flutter_keyboard_visibility/example/linux/.gitignore b/flutter_keyboard_visibility/example/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/flutter_keyboard_visibility/example/linux/CMakeLists.txt b/flutter_keyboard_visibility/example/linux/CMakeLists.txt new file mode 100644 index 0000000..ea7361d --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "flutter_keyboard_visibility_example") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.jrai.flutter_keyboard_visibility_example.flutter_keyboard_visibility") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/flutter_keyboard_visibility/example/linux/flutter/CMakeLists.txt b/flutter_keyboard_visibility/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.cc b/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.h b/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/flutter_keyboard_visibility/example/linux/flutter/generated_plugins.cmake b/flutter_keyboard_visibility/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/flutter_keyboard_visibility/example/linux/main.cc b/flutter_keyboard_visibility/example/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/flutter_keyboard_visibility/example/linux/my_application.cc b/flutter_keyboard_visibility/example/linux/my_application.cc new file mode 100644 index 0000000..eee6612 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "flutter_keyboard_visibility_example"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "flutter_keyboard_visibility_example"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/flutter_keyboard_visibility/example/linux/my_application.h b/flutter_keyboard_visibility/example/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/flutter_keyboard_visibility/example/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/flutter_keyboard_visibility/example/macos/.gitignore b/flutter_keyboard_visibility/example/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Debug.xcconfig b/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Release.xcconfig b/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/flutter_keyboard_visibility/example/macos/Flutter/GeneratedPluginRegistrant.swift b/flutter_keyboard_visibility/example/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..cccf817 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/flutter_keyboard_visibility/example/macos/Podfile b/flutter_keyboard_visibility/example/macos/Podfile new file mode 100644 index 0000000..dade8df --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Podfile @@ -0,0 +1,40 @@ +platform :osx, '10.11' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/flutter_keyboard_visibility/example/macos/Podfile.lock b/flutter_keyboard_visibility/example/macos/Podfile.lock new file mode 100644 index 0000000..326f830 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Podfile.lock @@ -0,0 +1,16 @@ +PODS: + - FlutterMacOS (1.0.0) + +DEPENDENCIES: + - FlutterMacOS (from `Flutter/ephemeral`) + +EXTERNAL SOURCES: + FlutterMacOS: + :path: Flutter/ephemeral + +SPEC CHECKSUMS: + FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 + +PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c + +COCOAPODS: 1.11.3 diff --git a/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.pbxproj b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..9d8942a --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,614 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DBFAD35305CE538CF9994B75 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CD87D1A7F1B8BAAA3A69BDA /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 2CD87D1A7F1B8BAAA3A69BDA /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* flutter_keyboard_visibility_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutter_keyboard_visibility_example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 5A2E02C11C52B7326AB00398 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 5BE2E647E63413354E538339 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + C3EEA259A91961FC943FD809 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DBFAD35305CE538CF9994B75 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + B5C5607054626937F1C3877B /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* flutter_keyboard_visibility_example.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + B5C5607054626937F1C3877B /* Pods */ = { + isa = PBXGroup; + children = ( + 5A2E02C11C52B7326AB00398 /* Pods-Runner.debug.xcconfig */, + C3EEA259A91961FC943FD809 /* Pods-Runner.release.xcconfig */, + 5BE2E647E63413354E538339 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2CD87D1A7F1B8BAAA3A69BDA /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 09CB69D53AEF12B7E9EE47FE /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* flutter_keyboard_visibility_example.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 09CB69D53AEF12B7E9EE47FE /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..63a510a --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..21a3cc1 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner/AppDelegate.swift b/flutter_keyboard_visibility/example/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..d53ef64 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/flutter_keyboard_visibility/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/flutter_keyboard_visibility/example/macos/Runner/Base.lproj/MainMenu.xib b/flutter_keyboard_visibility/example/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner/Configs/AppInfo.xcconfig b/flutter_keyboard_visibility/example/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..a8528fb --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = flutter_keyboard_visibility_example + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.jrai.flutterkeyboardvisibilityexample.flutterKeyboardVisibilityExample + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2022 com.jrai.flutter_keyboard_visibility_example. All rights reserved. diff --git a/flutter_keyboard_visibility/example/macos/Runner/Configs/Debug.xcconfig b/flutter_keyboard_visibility/example/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/flutter_keyboard_visibility/example/macos/Runner/Configs/Release.xcconfig b/flutter_keyboard_visibility/example/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/flutter_keyboard_visibility/example/macos/Runner/Configs/Warnings.xcconfig b/flutter_keyboard_visibility/example/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/flutter_keyboard_visibility/example/macos/Runner/DebugProfile.entitlements b/flutter_keyboard_visibility/example/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/flutter_keyboard_visibility/example/macos/Runner/Info.plist b/flutter_keyboard_visibility/example/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/flutter_keyboard_visibility/example/macos/Runner/MainFlutterWindow.swift b/flutter_keyboard_visibility/example/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..2722837 --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/flutter_keyboard_visibility/example/macos/Runner/Release.entitlements b/flutter_keyboard_visibility/example/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/flutter_keyboard_visibility/example/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/flutter_keyboard_visibility/example/pubspec.yaml b/flutter_keyboard_visibility/example/pubspec.yaml index 5f7a1ff..1e2386a 100644 --- a/flutter_keyboard_visibility/example/pubspec.yaml +++ b/flutter_keyboard_visibility/example/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.0.0 publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ">=2.12.0 <3.0.0" + sdk: '>=2.12.0 <4.0.0' dependencies: flutter: diff --git a/flutter_keyboard_visibility/example/windows/.gitignore b/flutter_keyboard_visibility/example/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/flutter_keyboard_visibility/example/windows/CMakeLists.txt b/flutter_keyboard_visibility/example/windows/CMakeLists.txt new file mode 100644 index 0000000..f44f870 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/CMakeLists.txt @@ -0,0 +1,101 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(flutter_keyboard_visibility_example LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "flutter_keyboard_visibility_example") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/flutter_keyboard_visibility/example/windows/flutter/CMakeLists.txt b/flutter_keyboard_visibility/example/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..930d207 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.cc b/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.h b/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/flutter_keyboard_visibility/example/windows/flutter/generated_plugins.cmake b/flutter_keyboard_visibility/example/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/flutter_keyboard_visibility/example/windows/runner/CMakeLists.txt b/flutter_keyboard_visibility/example/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..17411a8 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/flutter_keyboard_visibility/example/windows/runner/Runner.rc b/flutter_keyboard_visibility/example/windows/runner/Runner.rc new file mode 100644 index 0000000..318cd58 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.jrai.flutter_keyboard_visibility_example" "\0" + VALUE "FileDescription", "flutter_keyboard_visibility_example" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "flutter_keyboard_visibility_example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 com.jrai.flutter_keyboard_visibility_example. All rights reserved." "\0" + VALUE "OriginalFilename", "flutter_keyboard_visibility_example.exe" "\0" + VALUE "ProductName", "flutter_keyboard_visibility_example" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/flutter_keyboard_visibility/example/windows/runner/flutter_window.cpp b/flutter_keyboard_visibility/example/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..b43b909 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/flutter_window.cpp @@ -0,0 +1,61 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/flutter_keyboard_visibility/example/windows/runner/flutter_window.h b/flutter_keyboard_visibility/example/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/flutter_keyboard_visibility/example/windows/runner/main.cpp b/flutter_keyboard_visibility/example/windows/runner/main.cpp new file mode 100644 index 0000000..e6b5b17 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.CreateAndShow(L"flutter_keyboard_visibility_example", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/flutter_keyboard_visibility/example/windows/runner/resource.h b/flutter_keyboard_visibility/example/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/flutter_keyboard_visibility/example/windows/runner/resources/app_icon.ico b/flutter_keyboard_visibility/example/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/flutter_keyboard_visibility/example/windows/runner/resources/app_icon.ico differ diff --git a/flutter_keyboard_visibility/example/windows/runner/runner.exe.manifest b/flutter_keyboard_visibility/example/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..a42ea76 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/flutter_keyboard_visibility/example/windows/runner/utils.cpp b/flutter_keyboard_visibility/example/windows/runner/utils.cpp new file mode 100644 index 0000000..f5bf9fa --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/flutter_keyboard_visibility/example/windows/runner/utils.h b/flutter_keyboard_visibility/example/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/flutter_keyboard_visibility/example/windows/runner/win32_window.cpp b/flutter_keyboard_visibility/example/windows/runner/win32_window.cpp new file mode 100644 index 0000000..c10f08d --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/win32_window.cpp @@ -0,0 +1,245 @@ +#include "win32_window.h" + +#include + +#include "resource.h" + +namespace { + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + FreeLibrary(user32_module); + } +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + return OnCreate(); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} diff --git a/flutter_keyboard_visibility/example/windows/runner/win32_window.h b/flutter_keyboard_visibility/example/windows/runner/win32_window.h new file mode 100644 index 0000000..17ba431 --- /dev/null +++ b/flutter_keyboard_visibility/example/windows/runner/win32_window.h @@ -0,0 +1,98 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates and shows a win32 window with |title| and position and size using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size to will treat the width height passed in to this function + // as logical pixels and scale to appropriate for the default monitor. Returns + // true if the window was created successfully. + bool CreateAndShow(const std::wstring& title, + const Point& origin, + const Size& size); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responsponds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/flutter_keyboard_visibility/example_old/android/app/src/main/res/drawable/launch_background.xml b/flutter_keyboard_visibility/example_old/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f..0000000 --- a/flutter_keyboard_visibility/example_old/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/flutter_keyboard_visibility/example_old/android/app/src/main/res/values/styles.xml b/flutter_keyboard_visibility/example_old/android/app/src/main/res/values/styles.xml deleted file mode 100644 index 00fa441..0000000 --- a/flutter_keyboard_visibility/example_old/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/flutter_keyboard_visibility/example_old/ios/Runner/AppDelegate.swift b/flutter_keyboard_visibility/example_old/ios/Runner/AppDelegate.swift deleted file mode 100644 index 70693e4..0000000 --- a/flutter_keyboard_visibility/example_old/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import UIKit -import Flutter - -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/flutter_keyboard_visibility/example_old/ios/Runner/Runner-Bridging-Header.h b/flutter_keyboard_visibility/example_old/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 7335fdf..0000000 --- a/flutter_keyboard_visibility/example_old/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" \ No newline at end of file diff --git a/flutter_keyboard_visibility/ios/Classes/FlutterKeyboardVisibilityPlugin.m b/flutter_keyboard_visibility/ios/Classes/FlutterKeyboardVisibilityPlugin.m index 31dd908..dfa894f 100644 --- a/flutter_keyboard_visibility/ios/Classes/FlutterKeyboardVisibilityPlugin.m +++ b/flutter_keyboard_visibility/ios/Classes/FlutterKeyboardVisibilityPlugin.m @@ -8,8 +8,6 @@ #import "FlutterKeyboardVisibilityPlugin.h" -@import CoreLocation; - @interface FlutterKeyboardVisibilityPlugin() @property (copy, nonatomic) FlutterEventSink flutterEventSink; diff --git a/flutter_keyboard_visibility/lib/flutter_keyboard_visibility.dart b/flutter_keyboard_visibility/lib/flutter_keyboard_visibility.dart index 7788673..6447339 100644 --- a/flutter_keyboard_visibility/lib/flutter_keyboard_visibility.dart +++ b/flutter_keyboard_visibility/lib/flutter_keyboard_visibility.dart @@ -1,6 +1,7 @@ library flutter_keyboard_visibility; export 'package:flutter_keyboard_visibility/src/keyboard_visibility_controller.dart'; -export 'package:flutter_keyboard_visibility/src/ui/keyboard_visibility_provider.dart'; -export 'package:flutter_keyboard_visibility/src/ui/keyboard_visibility_builder.dart'; +export 'package:flutter_keyboard_visibility/src/keyboard_visibility_test_util.dart'; export 'package:flutter_keyboard_visibility/src/ui/keyboard_dismiss_on_tap.dart'; +export 'package:flutter_keyboard_visibility/src/ui/keyboard_visibility_builder.dart'; +export 'package:flutter_keyboard_visibility/src/ui/keyboard_visibility_provider.dart'; diff --git a/flutter_keyboard_visibility/lib/src/keyboard_visibility_handler.dart b/flutter_keyboard_visibility/lib/src/keyboard_visibility_handler.dart index 9c5b270..7e9922e 100644 --- a/flutter_keyboard_visibility/lib/src/keyboard_visibility_handler.dart +++ b/flutter_keyboard_visibility/lib/src/keyboard_visibility_handler.dart @@ -1,4 +1,5 @@ import 'dart:async'; + import 'package:flutter_keyboard_visibility_platform_interface/flutter_keyboard_visibility_platform_interface.dart'; /// Provides access to the current keyboard visibility state and emits @@ -33,12 +34,11 @@ class KeyboardVisibilityHandler { /// reported exclusively by the `isVisible` getter. static bool? _testIsVisible; - /// Forces `KeyboardVisibility` to report `isKeyboardVisible` + /// Forces `KeyboardVisibilityHandler` to report `isKeyboardVisible` /// for testing purposes. /// - /// `KeyboardVisibility` will continue reporting `isKeyboardVisible` - /// until the value is changed again with this method. To stop - /// using fake values altogether, set `isKeyboardVisible` to null. + /// `KeyboardVisibilityHandler` will continue reporting `isKeyboardVisible` + /// until the value is changed again with this method. static void setVisibilityForTesting(bool isKeyboardVisible) { _updateValue(isKeyboardVisible); } diff --git a/flutter_keyboard_visibility/lib/src/keyboard_visibility_test_util.dart b/flutter_keyboard_visibility/lib/src/keyboard_visibility_test_util.dart new file mode 100644 index 0000000..68634ff --- /dev/null +++ b/flutter_keyboard_visibility/lib/src/keyboard_visibility_test_util.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_keyboard_visibility/src/keyboard_visibility_handler.dart'; + +@visibleForTesting +class KeyboardVisibilityTesting { + /// Forces this library to report a specific value for `isKeyboardVisible` + /// for testing purposes. + /// + /// `KeyboardVisibility` will continue reporting `isKeyboardVisible` + /// until the value is changed again with this method. + @visibleForTesting + static void setVisibilityForTesting(bool isKeyboardVisible) { + KeyboardVisibilityHandler.setVisibilityForTesting(isKeyboardVisible); + } +} diff --git a/flutter_keyboard_visibility/lib/src/ui/keyboard_dismiss_on_tap.dart b/flutter_keyboard_visibility/lib/src/ui/keyboard_dismiss_on_tap.dart index a1b56f1..8ca4442 100644 --- a/flutter_keyboard_visibility/lib/src/ui/keyboard_dismiss_on_tap.dart +++ b/flutter_keyboard_visibility/lib/src/ui/keyboard_dismiss_on_tap.dart @@ -6,29 +6,108 @@ import 'package:flutter/widgets.dart'; /// Place this widget somewhere near the top of your widget /// tree and when the user taps outside of a focused widget, /// the focus will be removed and the keyboard will be hidden. -class KeyboardDismissOnTap extends StatelessWidget { +class KeyboardDismissOnTap extends StatefulWidget { + /// Determines whether taps captures by other [Widget]s should dismiss the + /// keyboard. Defaults to false. + /// + /// A common example of this is buttons. By default buttons + /// capture the tap event and the keyboard won't be dismissed. + final bool dismissOnCapturedTaps; + const KeyboardDismissOnTap({ Key? key, required this.child, + this.dismissOnCapturedTaps = false, }) : super(key: key); final Widget child; - void _hideKeyboard(BuildContext context) { - final currentFocus = FocusScope.of(context); + @override + State createState() => _KeyboardDismissOnTapState(); + + /// Used internally by [IgnoreKeyboardDismiss] to notify this Widget to ignore + /// the next tap. + static void ignoreNextTap(BuildContext context) { + context + .dependOnInheritedWidgetOfExactType< + _KeyboardDismissOnTapInheritedWidget>()! + .ignoreNextTap(); + } +} + +class _KeyboardDismissOnTapState extends State { + bool ignoreNextTap = false; - if (!currentFocus.hasPrimaryFocus && currentFocus.hasFocus) { - FocusManager.instance.primaryFocus?.unfocus(); + void _hideKeyboard(BuildContext context) { + if (ignoreNextTap) { + ignoreNextTap = false; + } else { + final currentFocus = FocusScope.of(context); + if (!currentFocus.hasPrimaryFocus && currentFocus.hasFocus) { + FocusManager.instance.primaryFocus?.unfocus(); + } } } @override Widget build(BuildContext context) { - return GestureDetector( - onTap: () { - _hideKeyboard(context); + return _KeyboardDismissOnTapInheritedWidget( + ignoreNextTap: () { + ignoreNextTap = true; + }, + child: !widget.dismissOnCapturedTaps + ? GestureDetector( + onTap: () { + _hideKeyboard(context); + }, + child: widget.child, + ) + : Listener( + onPointerUp: (_) { + _hideKeyboard(context); + }, + behavior: HitTestBehavior.translucent, + child: widget.child, + ), + ); + } +} + +/// Used to ignore keyboard dismiss requests for a specific Widget or Widget +/// tree. +class IgnoreKeyboardDismiss extends StatelessWidget { + final Widget child; + + const IgnoreKeyboardDismiss({ + Key? key, + required this.child, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Listener( + onPointerUp: (_) { + KeyboardDismissOnTap.ignoreNextTap(context); }, + behavior: HitTestBehavior.translucent, child: child, ); } } + +/// Used internally by [KeyboardDismissOnTap] and [IgnoreKeyboardDismiss] to +/// communicate ignore requests. +class _KeyboardDismissOnTapInheritedWidget extends InheritedWidget { + _KeyboardDismissOnTapInheritedWidget({ + Key? key, + required this.ignoreNextTap, + required Widget child, + }) : super(key: key, child: child); + + final VoidCallback ignoreNextTap; + + @override + bool updateShouldNotify(_KeyboardDismissOnTapInheritedWidget oldWidget) { + return false; + } +} diff --git a/flutter_keyboard_visibility/lib/src/ui/keyboard_visibility_builder.dart b/flutter_keyboard_visibility/lib/src/ui/keyboard_visibility_builder.dart index ba0d12a..675617a 100644 --- a/flutter_keyboard_visibility/lib/src/ui/keyboard_visibility_builder.dart +++ b/flutter_keyboard_visibility/lib/src/ui/keyboard_visibility_builder.dart @@ -11,12 +11,14 @@ class KeyboardVisibilityBuilder extends StatelessWidget { KeyboardVisibilityController get _controller => controller ?? KeyboardVisibilityController(); - const KeyboardVisibilityBuilder({Key? key, required this.builder, this.controller}) - : super(key: key); + const KeyboardVisibilityBuilder({ + Key? key, + required this.builder, + this.controller, + }) : super(key: key); /// A builder method that exposes if the native keyboard is visible. - final Widget Function( - BuildContext, bool isKeyboardVisible) builder; + final Widget Function(BuildContext, bool isKeyboardVisible) builder; @override Widget build(BuildContext context) { diff --git a/flutter_keyboard_visibility/pubspec.yaml b/flutter_keyboard_visibility/pubspec.yaml index 2de7c99..314c2b4 100644 --- a/flutter_keyboard_visibility/pubspec.yaml +++ b/flutter_keyboard_visibility/pubspec.yaml @@ -1,22 +1,26 @@ name: flutter_keyboard_visibility description: Flutter plugin for discovering the state of the soft-keyboard visibility on Android and iOS. -version: 5.1.0 +version: 6.0.0 homepage: https://github.com/MisterJimson/flutter_keyboard_visibility repository: https://github.com/MisterJimson/flutter_keyboard_visibility environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' flutter: ">=1.20.0" dependencies: meta: ">=1.0.0 <2.0.0" flutter_keyboard_visibility_platform_interface: ^2.0.0 + flutter_keyboard_visibility_linux: ^1.0.0 + flutter_keyboard_visibility_macos: ^1.0.0 flutter_keyboard_visibility_web: ^2.0.0 + flutter_keyboard_visibility_windows: ^1.0.0 flutter: sdk: flutter dev_dependencies: - mockito: ^5.0.11 + build_runner: ^2.1.7 + mockito: ^5.0.17 pedantic: ^1.11.1 flutter_test: sdk: flutter @@ -30,4 +34,10 @@ flutter: ios: pluginClass: FlutterKeyboardVisibilityPlugin web: - default_package: flutter_keyboard_visibility_web \ No newline at end of file + default_package: flutter_keyboard_visibility_web + macos: + default_package: flutter_keyboard_visibility_macos + linux: + default_package: flutter_keyboard_visibility_linux + windows: + default_package: flutter_keyboard_visibility_windows \ No newline at end of file diff --git a/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.dart b/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.dart index 272b9b4..339e812 100644 --- a/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.dart +++ b/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.dart @@ -3,12 +3,12 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_test/flutter_test.dart'; -//ignore: import_of_legacy_library_into_null_safe +import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; -class MockKeyboardVisibilityController extends Mock - implements KeyboardVisibilityController {} +import 'flutter_keyboard_visibility_test.mocks.dart'; +@GenerateMocks([KeyboardVisibilityController]) void main() { group('KeyboardVisibilityProvider', () { testWidgets('It reports true when the keyboard is visible', @@ -205,6 +205,8 @@ void main() { }); }); + // TODO this test complains when ran because SizedBox is not hit testable + // since KeyboardDismissOnTap captures the hit with its GestureDetector group('KeyboardDismissOnTap', () { testWidgets('It removes focus when tapped', (WidgetTester tester) async { var focusNode = FocusNode(); @@ -217,6 +219,7 @@ void main() { SizedBox( key: Key('box'), height: 100, + width: 100, ), TextField( focusNode: focusNode, @@ -241,4 +244,59 @@ void main() { expect(focusNode.hasFocus, false); }); }); + + group('KeyboardVisibilityTesting', () { + testWidgets( + 'setVisibilityForTesting allows overriding of value to true for testing', + (WidgetTester tester) async { + // Pretend that the keyboard is visible. + KeyboardVisibilityTesting.setVisibilityForTesting(true); + + // Build a Widget tree and query KeyboardVisibilityProvider + // for the visibility of the keyboard. + bool? isKeyboardVisible; + + await tester.pumpWidget( + KeyboardVisibilityProvider( + child: Builder( + builder: (BuildContext context) { + isKeyboardVisible = + KeyboardVisibilityProvider.isKeyboardVisible(context); + return SizedBox(); + }, + ), + ), + ); + + // Verify that KeyboardVisibilityProvider reported that the + // keyboard is visible. + expect(isKeyboardVisible, true); + }); + testWidgets( + 'setVisibilityForTesting allows overriding of value to false for testing', + (WidgetTester tester) async { + // Pretend that the keyboard is not visible. + KeyboardVisibilityTesting.setVisibilityForTesting(false); + + // Build a Widget tree and query KeyboardVisibilityProvider + // for the visibility of the keyboard. + bool? isKeyboardVisible; + + await tester.pumpWidget( + KeyboardVisibilityProvider( + child: Builder( + builder: (BuildContext context) { + isKeyboardVisible = + KeyboardVisibilityProvider.isKeyboardVisible(context); + return SizedBox(); + }, + ), + ), + ); + + // Verify that KeyboardVisibilityProvider reported that the + // keyboard is visible. + expect(isKeyboardVisible, false); + }); + }); } diff --git a/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.mocks.dart b/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.mocks.dart new file mode 100644 index 0000000..f3d67aa --- /dev/null +++ b/flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.mocks.dart @@ -0,0 +1,37 @@ +// Mocks generated by Mockito 5.0.17 from annotations +// in flutter_keyboard_visibility/test/flutter_keyboard_visibility_test.dart. +// Do not manually edit this file. + +import 'dart:async' as _i3; + +import 'package:flutter_keyboard_visibility/src/keyboard_visibility_controller.dart' + as _i2; +import 'package:mockito/mockito.dart' as _i1; + +// ignore_for_file: avoid_redundant_argument_values +// ignore_for_file: avoid_setters_without_getters +// ignore_for_file: comment_references +// ignore_for_file: implementation_imports +// ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: prefer_const_constructors +// ignore_for_file: unnecessary_parenthesis +// ignore_for_file: camel_case_types + +/// A class which mocks [KeyboardVisibilityController]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockKeyboardVisibilityController extends _i1.Mock + implements _i2.KeyboardVisibilityController { + MockKeyboardVisibilityController() { + _i1.throwOnMissingStub(this); + } + + @override + _i3.Stream get onChange => + (super.noSuchMethod(Invocation.getter(#onChange), + returnValue: Stream.empty()) as _i3.Stream); + @override + bool get isVisible => + (super.noSuchMethod(Invocation.getter(#isVisible), returnValue: false) + as bool); +} diff --git a/flutter_keyboard_visibility_linux/.gitignore b/flutter_keyboard_visibility_linux/.gitignore new file mode 100644 index 0000000..60d5593 --- /dev/null +++ b/flutter_keyboard_visibility_linux/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +.dart_tool/ + +.packages +.pub/ + +pubspec.lock + +build/ + +*.iml + +.idea/ + +.flutter-plugins +.flutter-plugins-dependencies \ No newline at end of file diff --git a/flutter_keyboard_visibility_linux/CHANGELOG.md b/flutter_keyboard_visibility_linux/CHANGELOG.md new file mode 100644 index 0000000..078deac --- /dev/null +++ b/flutter_keyboard_visibility_linux/CHANGELOG.md @@ -0,0 +1,3 @@ +## [1.0.0] - October 4, 2022 + +* Initial support so Flutter apps that run on Linux won't encounter errors. Visibility is returned as false. \ No newline at end of file diff --git a/flutter_keyboard_visibility_linux/LICENSE b/flutter_keyboard_visibility_linux/LICENSE new file mode 100644 index 0000000..ef62255 --- /dev/null +++ b/flutter_keyboard_visibility_linux/LICENSE @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2022 Jason Rai +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/flutter_keyboard_visibility_linux/README.md b/flutter_keyboard_visibility_linux/README.md new file mode 100644 index 0000000..c94cb61 --- /dev/null +++ b/flutter_keyboard_visibility_linux/README.md @@ -0,0 +1,6 @@ +# Flutter Keyboard Visibility Linux +Linux support for Flutter Keyboard Visibility + +See the full plugin [here](https://pub.dev/packages/flutter_keyboard_visibility); +## Status +Currently just returns false for visibility. In the future we would like to offer virtual keyboard detection. \ No newline at end of file diff --git a/flutter_keyboard_visibility_linux/analysis_options.yaml b/flutter_keyboard_visibility_linux/analysis_options.yaml new file mode 100644 index 0000000..108d105 --- /dev/null +++ b/flutter_keyboard_visibility_linux/analysis_options.yaml @@ -0,0 +1 @@ +include: package:pedantic/analysis_options.yaml diff --git a/flutter_keyboard_visibility_linux/lib/flutter_keyboard_visibility_linux.dart b/flutter_keyboard_visibility_linux/lib/flutter_keyboard_visibility_linux.dart new file mode 100644 index 0000000..2094929 --- /dev/null +++ b/flutter_keyboard_visibility_linux/lib/flutter_keyboard_visibility_linux.dart @@ -0,0 +1,21 @@ +import 'package:flutter_keyboard_visibility_platform_interface/flutter_keyboard_visibility_platform_interface.dart'; + +/// The Linux implementation of the [FlutterKeyboardVisibilityPlatform] of the +/// FlutterKeyboardVisibility plugin. +class FlutterKeyboardVisibilityPluginLinux + extends FlutterKeyboardVisibilityPlatform { + + /// Factory method that initializes the FlutterKeyboardVisibility plugin + /// platform with an instance of the plugin for Linux. + static void registerWith() { + FlutterKeyboardVisibilityPlatform.instance = + FlutterKeyboardVisibilityPluginLinux(); + } + + /// Emits changes to keyboard visibility from the platform. Linux is not + /// implemented yet so false is returned. + @override + Stream get onChange async* { + yield false; + } +} diff --git a/flutter_keyboard_visibility_linux/pubspec.yaml b/flutter_keyboard_visibility_linux/pubspec.yaml new file mode 100644 index 0000000..9c51e8a --- /dev/null +++ b/flutter_keyboard_visibility_linux/pubspec.yaml @@ -0,0 +1,26 @@ +name: flutter_keyboard_visibility_linux +description: An implementation for the linux platform of `flutter_keyboard_visibility' +version: 1.0.0 +homepage: https://github.com/MisterJimson/flutter_keyboard_visibility +repository: https://github.com/MisterJimson/flutter_keyboard_visibility + +environment: + sdk: '>=2.12.0 <4.0.0' + flutter: '>=1.20.0' + +flutter: + plugin: + implements: flutter_keyboard_visibility + platforms: + linux: + dartPluginClass: FlutterKeyboardVisibilityPluginLinux + +dependencies: + flutter_keyboard_visibility_platform_interface: ^2.0.0 + flutter: + sdk: flutter + +dev_dependencies: + pedantic: ^1.11.0 + flutter_test: + sdk: flutter diff --git a/flutter_keyboard_visibility_macos/.gitignore b/flutter_keyboard_visibility_macos/.gitignore new file mode 100644 index 0000000..60d5593 --- /dev/null +++ b/flutter_keyboard_visibility_macos/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +.dart_tool/ + +.packages +.pub/ + +pubspec.lock + +build/ + +*.iml + +.idea/ + +.flutter-plugins +.flutter-plugins-dependencies \ No newline at end of file diff --git a/flutter_keyboard_visibility_macos/CHANGELOG.md b/flutter_keyboard_visibility_macos/CHANGELOG.md new file mode 100644 index 0000000..701d4ad --- /dev/null +++ b/flutter_keyboard_visibility_macos/CHANGELOG.md @@ -0,0 +1,3 @@ +## [1.0.0] - October 4, 2022 + +* Initial support so Flutter apps that run on macOS won't encounter errors. Visibility is returned as false. \ No newline at end of file diff --git a/flutter_keyboard_visibility_macos/LICENSE b/flutter_keyboard_visibility_macos/LICENSE new file mode 100644 index 0000000..ef62255 --- /dev/null +++ b/flutter_keyboard_visibility_macos/LICENSE @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2022 Jason Rai +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/flutter_keyboard_visibility_macos/README.md b/flutter_keyboard_visibility_macos/README.md new file mode 100644 index 0000000..f8c41e0 --- /dev/null +++ b/flutter_keyboard_visibility_macos/README.md @@ -0,0 +1,6 @@ +# Flutter Keyboard Visibility Web +macOS support for Flutter Keyboard Visibility + +See the full plugin [here](https://pub.dev/packages/flutter_keyboard_visibility); +## Status +Currently just returns false for visibility. In the future we would like to offer virtual keyboard detection. \ No newline at end of file diff --git a/flutter_keyboard_visibility_macos/analysis_options.yaml b/flutter_keyboard_visibility_macos/analysis_options.yaml new file mode 100644 index 0000000..108d105 --- /dev/null +++ b/flutter_keyboard_visibility_macos/analysis_options.yaml @@ -0,0 +1 @@ +include: package:pedantic/analysis_options.yaml diff --git a/flutter_keyboard_visibility_macos/lib/flutter_keyboard_visibility_macos.dart b/flutter_keyboard_visibility_macos/lib/flutter_keyboard_visibility_macos.dart new file mode 100644 index 0000000..56b387b --- /dev/null +++ b/flutter_keyboard_visibility_macos/lib/flutter_keyboard_visibility_macos.dart @@ -0,0 +1,21 @@ +import 'package:flutter_keyboard_visibility_platform_interface/flutter_keyboard_visibility_platform_interface.dart'; + +/// The macOS implementation of the [FlutterKeyboardVisibilityPlatform] of the +/// FlutterKeyboardVisibility plugin. +class FlutterKeyboardVisibilityPluginMacos + extends FlutterKeyboardVisibilityPlatform { + + /// Factory method that initializes the FlutterKeyboardVisibility plugin + /// platform with an instance of the plugin for macOS. + static void registerWith() { + FlutterKeyboardVisibilityPlatform.instance = + FlutterKeyboardVisibilityPluginMacos(); + } + + /// Emits changes to keyboard visibility from the platform. MacOS is not + /// implemented yet so false is returned. + @override + Stream get onChange async* { + yield false; + } +} diff --git a/flutter_keyboard_visibility_macos/pubspec.yaml b/flutter_keyboard_visibility_macos/pubspec.yaml new file mode 100644 index 0000000..e1217d3 --- /dev/null +++ b/flutter_keyboard_visibility_macos/pubspec.yaml @@ -0,0 +1,26 @@ +name: flutter_keyboard_visibility_macos +description: An implementation for the macOS platform of `flutter_keyboard_visibility' +version: 1.0.0 +homepage: https://github.com/MisterJimson/flutter_keyboard_visibility +repository: https://github.com/MisterJimson/flutter_keyboard_visibility + +environment: + sdk: '>=2.12.0 <4.0.0' + flutter: ">=1.20.0" + +flutter: + plugin: + implements: flutter_keyboard_visibility + platforms: + macos: + dartPluginClass: FlutterKeyboardVisibilityPluginMacos + +dependencies: + flutter_keyboard_visibility_platform_interface: ^2.0.0 + flutter: + sdk: flutter + +dev_dependencies: + pedantic: ^1.11.0 + flutter_test: + sdk: flutter \ No newline at end of file diff --git a/flutter_keyboard_visibility_platform_interface/LICENSE b/flutter_keyboard_visibility_platform_interface/LICENSE index 7a2f91e..ef62255 100644 --- a/flutter_keyboard_visibility_platform_interface/LICENSE +++ b/flutter_keyboard_visibility_platform_interface/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2006-2020 +Copyright (c) 2022 Jason Rai All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/flutter_keyboard_visibility_platform_interface/analysis_options.yaml b/flutter_keyboard_visibility_platform_interface/analysis_options.yaml index b4ab8c9..108d105 100644 --- a/flutter_keyboard_visibility_platform_interface/analysis_options.yaml +++ b/flutter_keyboard_visibility_platform_interface/analysis_options.yaml @@ -1,5 +1 @@ include: package:pedantic/analysis_options.yaml - -analyzer: - strong-mode: - implicit-casts: false diff --git a/flutter_keyboard_visibility_platform_interface/pubspec.yaml b/flutter_keyboard_visibility_platform_interface/pubspec.yaml index 9b072b2..4d8a3e5 100644 --- a/flutter_keyboard_visibility_platform_interface/pubspec.yaml +++ b/flutter_keyboard_visibility_platform_interface/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/MisterJimson/flutter_keyboard_visibility repository: https://github.com/MisterJimson/flutter_keyboard_visibility environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' flutter: ">=1.12.13+hotfix.6" dependencies: diff --git a/flutter_keyboard_visibility_web/LICENSE b/flutter_keyboard_visibility_web/LICENSE index 7a2f91e..ef62255 100644 --- a/flutter_keyboard_visibility_web/LICENSE +++ b/flutter_keyboard_visibility_web/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2006-2020 +Copyright (c) 2022 Jason Rai All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/flutter_keyboard_visibility_web/analysis_options.yaml b/flutter_keyboard_visibility_web/analysis_options.yaml index b4ab8c9..108d105 100644 --- a/flutter_keyboard_visibility_web/analysis_options.yaml +++ b/flutter_keyboard_visibility_web/analysis_options.yaml @@ -1,5 +1 @@ include: package:pedantic/analysis_options.yaml - -analyzer: - strong-mode: - implicit-casts: false diff --git a/flutter_keyboard_visibility_web/lib/flutter_keyboard_visibility_web.dart b/flutter_keyboard_visibility_web/lib/flutter_keyboard_visibility_web.dart index 611849b..e3f6ffb 100644 --- a/flutter_keyboard_visibility_web/lib/flutter_keyboard_visibility_web.dart +++ b/flutter_keyboard_visibility_web/lib/flutter_keyboard_visibility_web.dart @@ -4,16 +4,16 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart'; /// The web implementation of the [FlutterKeyboardVisibilityPlatform] of the /// FlutterKeyboardVisibility plugin. -class FlutterKeyboardVisibilityPlugin +class FlutterKeyboardVisibilityPluginWeb extends FlutterKeyboardVisibilityPlatform { - /// Constructs a [FlutterKeyboardVisibilityPlugin]. - FlutterKeyboardVisibilityPlugin(html.Navigator navigator); + /// Constructs a [FlutterKeyboardVisibilityPluginWeb]. + FlutterKeyboardVisibilityPluginWeb(html.Navigator navigator); /// Factory method that initializes the FlutterKeyboardVisibility plugin /// platform with an instance of the plugin for the web. static void registerWith(Registrar registrar) { FlutterKeyboardVisibilityPlatform.instance = - FlutterKeyboardVisibilityPlugin(html.window.navigator); + FlutterKeyboardVisibilityPluginWeb(html.window.navigator); } /// Emits changes to keyboard visibility from the platform. Web is not diff --git a/flutter_keyboard_visibility_web/pubspec.yaml b/flutter_keyboard_visibility_web/pubspec.yaml index ca216cd..88ea30a 100644 --- a/flutter_keyboard_visibility_web/pubspec.yaml +++ b/flutter_keyboard_visibility_web/pubspec.yaml @@ -5,14 +5,14 @@ homepage: https://github.com/MisterJimson/flutter_keyboard_visibility repository: https://github.com/MisterJimson/flutter_keyboard_visibility environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' flutter: ">=1.20.0" flutter: plugin: platforms: web: - pluginClass: FlutterKeyboardVisibilityPlugin + pluginClass: FlutterKeyboardVisibilityPluginWeb fileName: flutter_keyboard_visibility_web.dart dependencies: diff --git a/flutter_keyboard_visibility_windows/.gitignore b/flutter_keyboard_visibility_windows/.gitignore new file mode 100644 index 0000000..60d5593 --- /dev/null +++ b/flutter_keyboard_visibility_windows/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +.dart_tool/ + +.packages +.pub/ + +pubspec.lock + +build/ + +*.iml + +.idea/ + +.flutter-plugins +.flutter-plugins-dependencies \ No newline at end of file diff --git a/flutter_keyboard_visibility_windows/CHANGELOG.md b/flutter_keyboard_visibility_windows/CHANGELOG.md new file mode 100644 index 0000000..32a674a --- /dev/null +++ b/flutter_keyboard_visibility_windows/CHANGELOG.md @@ -0,0 +1,3 @@ +## [1.0.0] - October 4, 2022 + +* Initial support so Flutter apps that run on Windows won't encounter errors. Visibility is returned as false. \ No newline at end of file diff --git a/flutter_keyboard_visibility_windows/LICENSE b/flutter_keyboard_visibility_windows/LICENSE new file mode 100644 index 0000000..ef62255 --- /dev/null +++ b/flutter_keyboard_visibility_windows/LICENSE @@ -0,0 +1,22 @@ +The MIT License + +Copyright (c) 2022 Jason Rai +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/flutter_keyboard_visibility_windows/README.md b/flutter_keyboard_visibility_windows/README.md new file mode 100644 index 0000000..fcfcc6c --- /dev/null +++ b/flutter_keyboard_visibility_windows/README.md @@ -0,0 +1,6 @@ +# Flutter Keyboard Visibility Windows +Windows support for Flutter Keyboard Visibility + +See the full plugin [here](https://pub.dev/packages/flutter_keyboard_visibility); +## Status +Currently just returns false for visibility. In the future we would like to offer virtual keyboard detection. \ No newline at end of file diff --git a/flutter_keyboard_visibility_windows/analysis_options.yaml b/flutter_keyboard_visibility_windows/analysis_options.yaml new file mode 100644 index 0000000..108d105 --- /dev/null +++ b/flutter_keyboard_visibility_windows/analysis_options.yaml @@ -0,0 +1 @@ +include: package:pedantic/analysis_options.yaml diff --git a/flutter_keyboard_visibility_windows/lib/flutter_keyboard_visibility_windows.dart b/flutter_keyboard_visibility_windows/lib/flutter_keyboard_visibility_windows.dart new file mode 100644 index 0000000..5fc6e37 --- /dev/null +++ b/flutter_keyboard_visibility_windows/lib/flutter_keyboard_visibility_windows.dart @@ -0,0 +1,21 @@ +import 'package:flutter_keyboard_visibility_platform_interface/flutter_keyboard_visibility_platform_interface.dart'; + +/// The Windows implementation of the [FlutterKeyboardVisibilityPlatform] of the +/// FlutterKeyboardVisibility plugin. +class FlutterKeyboardVisibilityPluginWindows + extends FlutterKeyboardVisibilityPlatform { + + /// Factory method that initializes the FlutterKeyboardVisibility plugin + /// platform with an instance of the plugin for Windows. + static void registerWith() { + FlutterKeyboardVisibilityPlatform.instance = + FlutterKeyboardVisibilityPluginWindows(); + } + + /// Emits changes to keyboard visibility from the platform. Windows is not + /// implemented yet so false is returned. + @override + Stream get onChange async* { + yield false; + } +} diff --git a/flutter_keyboard_visibility_windows/pubspec.yaml b/flutter_keyboard_visibility_windows/pubspec.yaml new file mode 100644 index 0000000..d157ef0 --- /dev/null +++ b/flutter_keyboard_visibility_windows/pubspec.yaml @@ -0,0 +1,26 @@ +name: flutter_keyboard_visibility_windows +description: An implementation for the Windows platform of `flutter_keyboard_visibility' +version: 1.0.0 +homepage: https://github.com/MisterJimson/flutter_keyboard_visibility +repository: https://github.com/MisterJimson/flutter_keyboard_visibility + +environment: + sdk: '>=2.12.0 <4.0.0' + flutter: '>=1.20.0' + +flutter: + plugin: + implements: flutter_keyboard_visibility + platforms: + windows: + dartPluginClass: FlutterKeyboardVisibilityPluginWindows + +dependencies: + flutter_keyboard_visibility_platform_interface: ^2.0.0 + flutter: + sdk: flutter + +dev_dependencies: + pedantic: ^1.11.0 + flutter_test: + sdk: flutter diff --git a/pub_get.sh b/pub_get.sh index e817c7d..e91a1b2 100755 --- a/pub_get.sh +++ b/pub_get.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash (cd flutter_keyboard_visibility_platform_interface && flutter pub get) (cd flutter_keyboard_visibility_web && flutter pub get) +(cd flutter_keyboard_visibility_linux && flutter pub get) +(cd flutter_keyboard_visibility_macos && flutter pub get) +(cd flutter_keyboard_visibility_windows && flutter pub get) (cd flutter_keyboard_visibility && flutter pub get) -(cd flutter_keyboard_visibility/example_old && flutter pub get) +(cd flutter_keyboard_visibility/example && flutter pub get) diff --git a/test_lint.sh b/test_lint.sh index 27f33cb..2bf0aa4 100755 --- a/test_lint.sh +++ b/test_lint.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash (cd flutter_keyboard_visibility_platform_interface && flutter analyze) (cd flutter_keyboard_visibility_web && flutter analyze) +(cd flutter_keyboard_visibility_linux && flutter analyze) +(cd flutter_keyboard_visibility_macos && flutter analyze) +(cd flutter_keyboard_visibility_windows && flutter analyze) (cd flutter_keyboard_visibility && flutter analyze) (cd flutter_keyboard_visibility/example && flutter analyze) -(cd flutter_keyboard_visibility/example_old && flutter analyze) -(cd flutter_keyboard_visibility && flutter test --no-sound-null-safety --coverage) +(cd flutter_keyboard_visibility && flutter test --coverage)