From 8edd6b6beaed235f6bdeeaa2a9173432c80755d4 Mon Sep 17 00:00:00 2001 From: licong Date: Wed, 28 Sep 2022 18:27:47 +0800 Subject: [PATCH] migrate to flutter v3.3.2 --- .metadata | 39 ++++++++++++++++++- ios/.gitignore | 34 ++++++++++++++++ ios/Flutter/flutter_export_environment.sh | 11 ++---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++ ios/Runner/AppDelegate.swift | 13 +++++++ ios/Runner/Runner-Bridging-Header.h | 1 + lib/component/iconpicker/icon_picker.dart | 2 +- lib/page/add_task_screen.dart | 2 +- lib/page/add_todo_screen.dart | 2 +- lib/page/detail_screen.dart | 6 +-- lib/page/edit_task_screen.dart | 2 +- 13 files changed, 120 insertions(+), 16 deletions(-) create mode 100644 ios/.gitignore create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner/AppDelegate.swift create mode 100644 ios/Runner/Runner-Bridging-Header.h diff --git a/.metadata b/.metadata index 460bc20..e27f5cc 100644 --- a/.metadata +++ b/.metadata @@ -1,10 +1,45 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b + revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: android + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: ios + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: linux + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: macos + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: web + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + - platform: windows + create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index a9eeb48..bba908c 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,16 +1,13 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/sabin/Programs/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/sabin/Documents/startup/todo" +export "FLUTTER_ROOT=/home/hellojukay/dev/flutter" +export "FLUTTER_APPLICATION_PATH=/home/hellojukay/github/fluttery-todo" export "COCOAPODS_PARALLEL_CODE_SIGN=true" -export "FLUTTER_TARGET=/Users/sabin/Documents/startup/todo/lib/main.dart" +export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "FLUTTER_BUILD_NAME=1.1.1" export "FLUTTER_BUILD_NUMBER=20191101" -export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==" export "DART_OBFUSCATION=false" -export "EXTRA_FRONT_END_OPTIONS=--no-sound-null-safety" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=/Users/sabin/Documents/startup/todo/.dart_tool/package_config.json" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..70693e4 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +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/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/lib/component/iconpicker/icon_picker.dart b/lib/component/iconpicker/icon_picker.dart index d2e7c8f..839ec32 100644 --- a/lib/component/iconpicker/icon_picker.dart +++ b/lib/component/iconpicker/icon_picker.dart @@ -681,7 +681,7 @@ class IconPicker extends StatefulWidget { Icons.picture_in_picture, Icons.picture_in_picture_alt, Icons.pie_chart, - Icons.pie_chart_outlined, + Icons.pie_chart_outline_outlined, Icons.pin_drop, Icons.place, Icons.play_arrow, diff --git a/lib/page/add_task_screen.dart b/lib/page/add_task_screen.dart index b074359..76fffa1 100644 --- a/lib/page/add_task_screen.dart +++ b/lib/page/add_task_screen.dart @@ -119,7 +119,7 @@ class _AddTaskScreenState extends State { 'Ummm... It seems that you are trying to add an invisible task which is not allowed in this realm.'), backgroundColor: taskColor, ); - Scaffold.of(context).showSnackBar(snackBar); + ScaffoldMessenger.of(context).showSnackBar(snackBar); // _scaffoldKey.currentState.showSnackBar(snackBar); } else { model.addTask(Task(newTask, diff --git a/lib/page/add_todo_screen.dart b/lib/page/add_todo_screen.dart index d8ea384..92c4603 100644 --- a/lib/page/add_todo_screen.dart +++ b/lib/page/add_todo_screen.dart @@ -137,7 +137,7 @@ class _AddTodoScreenState extends State { 'Ummm... It seems that you are trying to add an invisible task which is not allowed in this realm.'), backgroundColor: _color, ); - Scaffold.of(context).showSnackBar(snackBar); + ScaffoldMessenger.of(context).showSnackBar(snackBar); // _scaffoldKey.currentState.showSnackBar(snackBar); } else { model.addTodo(Todo( diff --git a/lib/page/detail_screen.dart b/lib/page/detail_screen.dart index 6fe3ca1..0b1ce0d 100644 --- a/lib/page/detail_screen.dart +++ b/lib/page/detail_screen.dart @@ -282,7 +282,7 @@ class SimpleAlertDialog extends StatelessWidget { ), ), actions: [ - FlatButton( + TextButton( child: Text('Delete'), onPressed: () { Navigator.of(context).pop(); @@ -290,9 +290,9 @@ class SimpleAlertDialog extends StatelessWidget { onActionPressed(); }, ), - FlatButton( + TextButton( child: Text('Cancel'), - textColor: Colors.grey, + style: TextButton.styleFrom(foregroundColor: Colors.grey), onPressed: () { Navigator.of(context).pop(); }, diff --git a/lib/page/edit_task_screen.dart b/lib/page/edit_task_screen.dart index 5238a4c..79bd0d8 100644 --- a/lib/page/edit_task_screen.dart +++ b/lib/page/edit_task_screen.dart @@ -146,7 +146,7 @@ class _EditCardScreenState extends State { 'Ummm... It seems that you are trying to add an invisible task which is not allowed in this realm.'), backgroundColor: taskColor, ); - Scaffold.of(context).showSnackBar(snackBar); + ScaffoldMessenger.of(context).showSnackBar(snackBar); // _scaffoldKey.currentState.showSnackBar(snackBar); } else { model.updateTask(