Merge pull request #24 from BlueBubblesApp/zach/flutter3/master-merge

Fixes compilation issues
BlueBubblesApp · May 14, 2022 · 1acea86 · 1acea86
2 parents 1cb1b53 + 969c474
commit 1acea86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/packages/flutter/lib/src/cupertino/text_field.dart b/packages/flutter/lib/src/cupertino/text_field.dart
@@ -270,7 +270,7 @@ class CupertinoTextField extends StatefulWidget {
     this.restorationId,
     this.scribbleEnabled = true,
     this.enableIMEPersonalizedLearning = true,
-    List<String> contentCommitMimeTypes = const <String>[],
+    this.contentCommitMimeTypes = const <String>[],
   }) : assert(textAlign != null),
        assert(readOnly != null),
        assert(autofocus != null),
@@ -311,16 +311,6 @@ class CupertinoTextField extends StatefulWidget {
        assert(contentCommitMimeTypes != null),
        keyboardType = keyboardType ?? (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
        enableInteractiveSelection = enableInteractiveSelection ?? (!readOnly || !obscureText),
-       contentCommitMimeTypes = contentCommitMimeTypes.isEmpty
-            ? onContentCommitted == null ? const <String>[] : const <String>[
-          'image/png',
-          'image/bmp',
-          'image/jpg',
-          'image/tiff',
-          'image/gif',
-          'image/jpeg',
-          'image/webp'
-       ] : contentCommitMimeTypes,
        toolbarOptions = toolbarOptions ??
            (obscureText
                ? (readOnly

diff --git a/packages/flutter/lib/src/material/text_field.dart b/packages/flutter/lib/src/material/text_field.dart
@@ -329,7 +329,7 @@ class TextField extends StatefulWidget {
     this.restorationId,
     this.scribbleEnabled = true,
     this.enableIMEPersonalizedLearning = true,
-    List<String> contentCommitMimeTypes = const <String>[],
+    this.contentCommitMimeTypes = const <String>[],
   }) : assert(textAlign != null),
        assert(readOnly != null),
        assert(autofocus != null),
@@ -368,16 +368,6 @@ class TextField extends StatefulWidget {
        assert(contentCommitMimeTypes != null),
        keyboardType = keyboardType ?? (maxLines == 1 ? TextInputType.text : TextInputType.multiline),
        enableInteractiveSelection = enableInteractiveSelection ?? (!readOnly || !obscureText),
-       contentCommitMimeTypes = contentCommitMimeTypes.isEmpty
-            ? (onContentCommitted == null ? const <String>[] : const <String>[
-          'image/png',
-          'image/bmp',
-          'image/jpg',
-          'image/tiff',
-          'image/gif',
-          'image/jpeg',
-          'image/webp'
-       ]) : contentCommitMimeTypes,
        toolbarOptions = toolbarOptions ??
            (obscureText
                ? (readOnly