Upgraded to Flutter dev 1.18

packages/zefyr/example/android/app/build.gradle

@@ -22,11 +22,16 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 28
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
     lintOptions {
         disable 'InvalidPackage'
     }
@@ -35,10 +40,10 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.zefyr.example"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,7 +60,8 @@ flutter {
 }
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }

packages/zefyr/example/android/app/src/main/AndroidManifest.xml

@@ -20,20 +20,19 @@
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 until Flutter renders its first frame. It can be removed if
-                 there is no splash screen (such as the default splash screen
-                 defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+            
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

packages/zefyr/example/android/app/src/main/java/com/zefyr/example/MainActivity.java

@@ -1,13 +0,0 @@
-package com.zefyr.example;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
-}

packages/zefyr/example/android/app/src/main/kotlin/com/zefyr/example/MainActivity.kt

@@ -3,6 +3,9 @@ package com.zefyr.example
 import android.os.Bundle
 
 import io.flutter.app.FlutterActivity
+import androidx.annotation.NonNull;
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
 
 class MainActivity: FlutterActivity() {
@@ -10,4 +13,7 @@ class MainActivity: FlutterActivity() {
     super.onCreate(savedInstanceState)
     GeneratedPluginRegistrant.registerWith(this)
   }
-}
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+    }
+}

packages/zefyr/example/android/build.gradle

@@ -1,4 +1,5 @@
 buildscript {
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
@@ -6,6 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

packages/zefyr/example/android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
-android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.enableJetifier=true

packages/zefyr/example/ios/Flutter/.last_build_id

@@ -0,0 +1 @@
+0c5c940fb5dd17aaeef542d93a77c9c0

packages/zefyr/example/ios/Runner.xcodeproj/project.pbxproj

@@ -313,7 +313,6 @@
 /* Begin XCBuildConfiguration section */
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -367,7 +366,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;

packages/zefyr/example/lib/src/images.dart

@@ -6,7 +6,6 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
-import 'package:image/image.dart' as Im;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -76,7 +75,8 @@ class CustomLinkDelegate implements ZefyrLinkDelegate {
   @override
   Future<ZefyrLinkEntity> fillLink(
       BuildContext context, ZefyrLinkEntity value) async {
-    TextEditingController _controller = TextEditingController();
+    TextEditingController _controller = TextEditingController(text: value.text);
+    TextEditingController _controller2 = TextEditingController(text: value.url);
     return showGeneralDialog<ZefyrLinkEntity>(
       context: context,
       pageBuilder: (BuildContext buildContext, Animation<double> animation,
@@ -96,9 +96,15 @@ class CustomLinkDelegate implements ZefyrLinkDelegate {
                   children: <Widget>[
                     TextField(
                       controller: _controller,
-                      inputFormatters: [
-                        WhitelistingTextInputFormatter.digitsOnly
-                      ],
+                      decoration: InputDecoration(
+                        hintText: '请填写链接文字',
+                      ),
+                    ),
+                    TextField(
+                      controller: _controller2,
+                      decoration: InputDecoration(
+                        hintText: '请填写链接',
+                      ),
                     ),
                     FlatButton(
                       onPressed: () {

packages/zefyr/lib/src/widgets/input.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 import 'package:flutter/services.dart';
+import 'package:flutter/src/services/autofill.dart';
 import 'package:flutter/widgets.dart';
 import 'package:zefyr/util.dart';
 
@@ -187,4 +188,12 @@ class InputConnectionController implements TextInputClient {
       _sentRemoteValues.clear();
     }
   }
+
+  @override
+  AutofillScope get currentAutofillScope => null;
+
+  @override
+  void showAutocorrectionPromptRect(int start, int end) {
+    
+  }
 }

packages/zefyr/lib/src/widgets/selection.dart

@@ -318,24 +318,24 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
     final position = box.getPositionForOffset(localPoint);
     var word = box.getWordBoundary(position);
     
-    if (box?.child is RenderZefyrParagraph) {
-      RenderZefyrParagraph paragraph = box.child;
-      if (_scope.controller.getStyleForSelection(TextSelection.collapsed(
-          offset: position.offset,
-          affinity: position.affinity,
-        )).contains(NotusAttribute.link)) {
-        // 当前点击的是link
-        var spanPosition = paragraph.getRenderBoxPositionForOffset(localPoint);
-        // // 第一个字符和最后一个字符将不触发onTap
-        final TextSpan span = paragraph.text.getSpanForPosition(TextPosition(
-          offset: spanPosition.offset == 0 ? spanPosition.offset - 1 : spanPosition.offset + 1,
-          affinity: spanPosition.affinity,
-        ));
-        if (span != null) {
-          word = paragraph.getRenderBoxWordBoundary(span.text.length);
-        }
-      }
-    }
+    // if (box?.child is RenderZefyrParagraph) {
+    //   RenderZefyrParagraph paragraph = box.child;
+    //   if (_scope.controller.getStyleForSelection(TextSelection.collapsed(
+    //       offset: position.offset,
+    //       affinity: position.affinity,
+    //     )).contains(NotusAttribute.link)) {
+    //     // 当前点击的是link
+    //     var spanPosition = paragraph.getRenderBoxPositionForOffset(localPoint);
+    //     // // 第一个字符和最后一个字符将不触发onTap
+    //     final TextSpan span = paragraph.text.getSpanForPosition(TextPosition(
+    //       offset: spanPosition.offset == 0 ? spanPosition.offset - 1 : spanPosition.offset + 1,
+    //       affinity: spanPosition.affinity,
+    //     ));
+    //     if (span != null) {
+    //       word = paragraph.getRenderBoxWordBoundary(span.text.length);
+    //     }
+    //   }
+    // }
     final selection = TextSelection(
       baseOffset: word.start,
       extentOffset: word.end,

packages/zefyr/lib/src/widgets/toolbar.dart

@@ -338,8 +338,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
           HeadingButton(),
           buildButton(context, ZefyrToolbarAction.emoji),
           if (editor.imageDelegate != null) ImageButton(),
-          // ImageButton(),
-          LinkButton(),
+          if (editor.linkDelegate != null) LinkButton(),
         ],
         physics: ClampingScrollPhysics(),
       ),),