升级版本0.3.0

CHANGELOG.md

+## [0.3.0]
+* TODO: 优化了键盘的使用方式
+
 ## [0.2.2]
 * TODO: 修复了有默认值时,键盘无法输入数据的问题
 

README.md

@@ -9,7 +9,7 @@ Usage Add this to your package's pubspec.yaml file:
 Flutter >=1.7
 ``` yaml
 dependencies:
-  cool_ui: "^0.2.1"
+  cool_ui: "^0.3.0"
 ```
 
 Flutter < 1.7

documents/custom_keyboard.md

@@ -42,12 +42,12 @@ class NumberKeyboard extends StatelessWidget{
 ```
 
 ## Step2
-注册键盘
+注册键盘,并且添加了KeyboardRootWidget
 
 ```dart
 void main(){
   NumberKeyboard.register(); //注册键盘
-  runApp(MyApp());
+  runApp(KeyboardRootWidget(child: MyApp())); //添加了KeyboardRootWidget
 }
 ```
 
@@ -58,10 +58,7 @@ void main(){
 @override
 Widget build(BuildContext context) {
   return KeyboardMediaQuery(//用于键盘弹出的时候页面可以滚动到输入框的位置
-      child: Builder(builder: (ctx) {
-        CoolKeyboard.init(ctx); //初始化键盘监听并且传递当前页面的context
-        return Page; //返回当前页面
-      })
+      child: Page
   );
 }
 ```
@@ -72,7 +69,7 @@ Widget build(BuildContext context) {
 ```dart
 TextField(
    ...
-   keyboardType: NumberKeyboard.inputType, 像平常一样设置键盘输入类型一样将Step2编写的inputType传递进去
+   keyboardType: NumberKeyboard.inputType, 像平常一样设置键盘输入类型一样将Step1编写的inputType传递进去
    ...
  )
 ```

example/ios/Flutter/flutter_export_environment.sh

+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=G:\flutter"
+export "FLUTTER_APPLICATION_PATH=G:\TestCode\cool_ui\cool_ui\example"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=G:\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"

example/lib/main.dart

@@ -8,36 +8,32 @@ import 'package:flutter/material.dart';
 
 import 'keyboards/test_keyboard.dart';
 
-void main(){
+void main() {
   NumberKeyboard.register();
   TestKeyboard.register();
-  runApp(MyApp());
+  runApp(KeyboardRootWidget(child: MyApp()));
+  // runApp(MyApp());
 }
 
-
 class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return WeuiToastConfig(
-      data: WeuiToastConfigData(
-        successText: '测试ConfigData'
-      ),
-      child:MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        // This is the theme of your application.
-        //
-        // Try running your application with "flutter run". You'll see the
-        // application has a blue toolbar. Then, without quitting the app, try
-        // changing the primarySwatch below to Colors.green and then invoke
-        // "hot reload" (press "r" in the console where you ran "flutter run",
-        // or press Run > Flutter Hot Reload in IntelliJ). Notice that the
-        // counter didn't reset back to zero; the application is not restarted.
-          primarySwatch: Colors.blue
-      ),
-      home: MyHomePage(title: 'Flutter Demo Home Page')
-    ));
+        data: WeuiToastConfigData(successText: '测试ConfigData'),
+        child: MaterialApp(
+            title: 'Flutter Demo',
+            theme: ThemeData(
+                // This is the theme of your application.
+                //
+                // Try running your application with "flutter run". You'll see the
+                // application has a blue toolbar. Then, without quitting the app, try
+                // changing the primarySwatch below to Colors.green and then invoke
+                // "hot reload" (press "r" in the console where you ran "flutter run",
+                // or press Run > Flutter Hot Reload in IntelliJ). Notice that the
+                // counter didn't reset back to zero; the application is not restarted.
+                primarySwatch: Colors.blue),
+            home: MyHomePage(title: 'Flutter Demo Home Page')));
   }
 }
 
@@ -81,7 +77,7 @@ class _MyHomePageState extends State<MyHomePage> {
     // The Flutter framework has been optimized to make rerunning build methods
     // fast, so that you can just rebuild anything that needs updating rather
     // than having to individually change instances of widgets.
-    return  Scaffold(
+    return Scaffold(
         appBar: AppBar(
           // Here we take the value from the MyHomePage object that was created by
           // the App.build method, and use it to set our appbar title.
@@ -92,30 +88,33 @@ class _MyHomePageState extends State<MyHomePage> {
             ListTile(
               leading: Icon(CoolUIExampleIcon.popover),
               title: Text("Popover"),
-              onTap: (){
-                Navigator.of(context).push(MaterialPageRoute(builder: (context)=>PopoverDemo()));
+              onTap: () {
+                Navigator.of(context).push(
+                    MaterialPageRoute(builder: (context) => PopoverDemo()));
               },
             ),
             ListTile(
               title: Text("PaintEvent"),
-              onTap: (){
-                Navigator.of(context).push(MaterialPageRoute(builder: (context)=>PaintEventDemo()));
+              onTap: () {
+                Navigator.of(context).push(
+                    MaterialPageRoute(builder: (context) => PaintEventDemo()));
               },
             ),
             ListTile(
               title: Text("WeuiToastEvent"),
-              onTap: (){
-                Navigator.of(context).push(MaterialPageRoute(builder: (context)=>WeuiToastDemo()));
+              onTap: () {
+                Navigator.of(context).push(
+                    MaterialPageRoute(builder: (context) => WeuiToastDemo()));
               },
             ),
             ListTile(
               title: Text("CustomKeyboardEvent"),
-              onTap: (){
-                Navigator.of(context).push(MaterialPageRoute(builder: (context)=>CustomKeyboardDemo()));
+              onTap: () {
+                Navigator.of(context).push(MaterialPageRoute(
+                    builder: (context) => CustomKeyboardDemo()));
               },
             )
           ],
-        )
-    );
+        ));
   }
 }

example/lib/pages/custom_keyboard.dart

@@ -22,7 +22,7 @@ class CustomKeyboardDemoState extends State<CustomKeyboardDemo>{
     // TODO: implement build
     return KeyboardMediaQuery(
         child: Builder(builder: (ctx) {
-          CoolKeyboard.init(ctx);
+          // CoolKeyboard.init(ctx);
           return Scaffold(
               appBar: AppBar(
                 title: Text("Custom Keyboard Demo"),

lib/cool_ui.dart

@@ -25,4 +25,5 @@ part 'dialogs/weui_toast.dart';
 part 'keyboards/keyboard_manager.dart';
 part 'keyboards/number_keyboard.dart';
 part 'keyboards/keyboard_controller.dart';
-part 'keyboards/keyboard_media_query.dart';
+part 'keyboards/keyboard_media_query.dart';
\ No newline at end of file
+part 'keyboards/keyboard_root.dart';
\ No newline at end of file

lib/keyboards/keyboard_manager.dart

@@ -14,8 +14,7 @@ class CoolKeyboard {
   static GlobalKey<KeyboardPageState> _pageKey;
   static bool isInterceptor = false;
 
-  static double get keyboardHeight => _keyboardHeight;
-  static double _keyboardHeight;
+  static ValueNotifier<double> _keyboardHeightNotifier = ValueNotifier(null);
 
   static init(BuildContext context) {
     _context = context;
@@ -76,8 +75,12 @@ class CoolKeyboard {
                       _codec.encodeMethodCall(callbackMethodCall),
                       (data) {});
                 });
+              if (_pageKey != null) {
+                _pageKey.currentState.update();
+              }
             }
           });
+
           if (client != null) {
             await _sendPlatformMessage("flutter/textinput",
                 _codec.encodeMethodCall(MethodCall('TextInput.hide')));
@@ -119,21 +122,22 @@ class CoolKeyboard {
   static openKeyboard() {
     if (_keyboardEntry != null) return;
     _pageKey = GlobalKey<KeyboardPageState>();
-    _keyboardHeight = _currentKeyboard.getHeight(_context);
-    KeyboardMediaQueryState queryState = _context
-            .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
-        as KeyboardMediaQueryState;
-    queryState.update();
+    var keyboardHeight = _currentKeyboard.getHeight(_context);
+    _keyboardHeightNotifier.value = keyboardHeight;
+    // KeyboardMediaQueryState queryState = _context
+    //         .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
+    //     as KeyboardMediaQueryState;
+    // queryState.update();
 
     var tempKey = _pageKey;
     _keyboardEntry = OverlayEntry(builder: (ctx) {
-      if (_currentKeyboard != null && _keyboardHeight != null) {
+      if (_currentKeyboard != null && _keyboardHeightNotifier.value != null) {
         return KeyboardPage(
             key: tempKey,
-            child: Builder(builder: (ctx) {
-              return _currentKeyboard.builder(ctx, _keyboardController);
-            }),
-            height: _keyboardHeight);
+            builder: (ctx) {
+              return _currentKeyboard?.builder(ctx, _keyboardController);
+            },
+            height: _keyboardHeightNotifier.value);
       } else {
         return Container();
       }
@@ -150,7 +154,7 @@ class CoolKeyboard {
   static hideKeyboard({bool animation = true}) {
     BackButtonInterceptor.removeByName('CustomKeyboard');
     if (_keyboardEntry != null && _pageKey != null) {
-      _keyboardHeight = null;
+      _keyboardHeightNotifier.value = null;
       _pageKey.currentState.animationController
           .addStatusListener((AnimationStatus status) {
         if (status == AnimationStatus.dismissed ||
@@ -169,14 +173,12 @@ class CoolKeyboard {
       }
     }
     _pageKey = null;
-    try{
-      KeyboardMediaQueryState queryState = _context
-          .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
-      as KeyboardMediaQueryState;
-      queryState.update();
-    }catch(_){
-
-    }
+    try {
+      // KeyboardMediaQueryState queryState = _context
+      //     .ancestorStateOfType(const TypeMatcher<KeyboardMediaQueryState>())
+      // as KeyboardMediaQueryState;
+      // queryState.update();
+    } catch (_) {}
   }
 
   static clearKeyboard() {
@@ -321,9 +323,9 @@ class CKTextInputType extends TextInputType {
 }
 
 class KeyboardPage extends StatefulWidget {
-  final Widget child;
+  final WidgetBuilder builder;
   final double height;
-  const KeyboardPage({this.child, this.height, Key key}) : super(key: key);
+  const KeyboardPage({this.builder, this.height, Key key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() => KeyboardPageState();
@@ -334,6 +336,7 @@ class KeyboardPageState extends State<KeyboardPage>
   AnimationController animationController;
   Animation<double> doubleAnimation;
   double bottom;
+  Widget _lastBuildWidget;
 
   @override
   void initState() {
@@ -351,7 +354,15 @@ class KeyboardPageState extends State<KeyboardPage>
   @override
   Widget build(BuildContext context) {
     return Positioned(
-        child: IntrinsicHeight(child: widget.child),
+        child: IntrinsicHeight(child: Builder(
+          builder: (ctx) {
+            var result = widget.builder(ctx);
+            if (result != null) {
+              _lastBuildWidget = result;
+            }
+            return _lastBuildWidget;
+          },
+        )),
         bottom: (widget.height - doubleAnimation.value) * -1);
   }
 
@@ -368,4 +379,8 @@ class KeyboardPageState extends State<KeyboardPage>
   exitKeyboard() {
     animationController.reverse();
   }
+
+  update() {
+    this.setState(() {});
+  }
 }

lib/keyboards/keyboard_media_query.dart

@@ -12,19 +12,30 @@ class KeyboardMediaQuery extends StatefulWidget{
 }
 
 class KeyboardMediaQueryState extends State<KeyboardMediaQuery >{
+  double keyboardHeight;
+
+  @override
+  void initState(){
+    super.initState();
+    CoolKeyboard._keyboardHeightNotifier.addListener(onUpdateHeight);
+  }
+
   @override
   Widget build(BuildContext context) {
     
     // TODO: implement build
-    var data = MediaQuery.of(context);
+    var data = MediaQuery.of(context, nullOk: true);
+    if(data == null){
+      data = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+    }
     // TODO: implement build
     return MediaQuery(
         child: widget.child,
-        data:data.copyWith(viewInsets: data.viewInsets.copyWith(bottom: CoolKeyboard.keyboardHeight))
+        data:data.copyWith(viewInsets: data.viewInsets.copyWith(bottom: CoolKeyboard._keyboardHeightNotifier.value ?? data.viewInsets.bottom))
     );
   }
 
-  update(){
+  onUpdateHeight(){
     setState(()=>{});
   }
 }
\ No newline at end of file

lib/keyboards/keyboard_root.dart

+part of cool_ui;
+
+class KeyboardRootWidget extends StatefulWidget {
+  final Widget child;
+  /// The text direction for this subtree.
+  final TextDirection textDirection;
+
+  const KeyboardRootWidget({Key key, this.child, this.textDirection = TextDirection.ltr}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() {
+    // TODO: implement createState
+    return KeyboardRootState();
+  }
+}
+
+class KeyboardRootState extends State<KeyboardRootWidget> {
+  List<OverlayEntry> _initialEntries = [];
+
+  @override
+  void initState() {
+    super.initState();
+
+    _initialEntries.add(this.initChild());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Directionality(
+        textDirection: widget.textDirection,
+        child: KeyboardMediaQuery(
+            child: Overlay(
+          initialEntries: _initialEntries,
+        )));
+  }
+
+  OverlayEntry initChild() {
+    return OverlayEntry(builder: (ctx) {
+      CoolKeyboard.init(ctx);
+      return widget.child;
+    });
+  }
+}

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   back_button_interceptor:
     dependency: "direct main"
     description:
@@ -21,7 +21,7 @@ packages:
       name: boolean_selector
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -59,28 +59,28 @@ packages:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -113,7 +113,7 @@ packages:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:

pubspec.yaml

 name: cool_ui
 description: Some practical Widget for flutter,Popover,Weui,Custom Keyboard
-version: 0.2.2
+version: 0.3.0
 author: Kevin <liangkaikevin@gmail.com>
 homepage: https://github.com/Im-Kevin/cool_ui