Skip to content

Commit

Permalink
migrate to flutter v3.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
licong committed Sep 28, 2022
1 parent ca2047c commit 8edd6b6
Show file tree
Hide file tree
Showing 13 changed files with 120 additions and 16 deletions.
39 changes: 37 additions & 2 deletions .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'
34 changes: 34 additions & 0 deletions 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
11 changes: 4 additions & 7 deletions 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"
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
13 changes: 13 additions & 0 deletions 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)
}
}
1 change: 1 addition & 0 deletions ios/Runner/Runner-Bridging-Header.h
@@ -0,0 +1 @@
#import "GeneratedPluginRegistrant.h"
2 changes: 1 addition & 1 deletion lib/component/iconpicker/icon_picker.dart
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/page/add_task_screen.dart
Expand Up @@ -119,7 +119,7 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
'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,
Expand Down
2 changes: 1 addition & 1 deletion lib/page/add_todo_screen.dart
Expand Up @@ -137,7 +137,7 @@ class _AddTodoScreenState extends State<AddTodoScreen> {
'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(
Expand Down
6 changes: 3 additions & 3 deletions lib/page/detail_screen.dart
Expand Up @@ -282,17 +282,17 @@ class SimpleAlertDialog extends StatelessWidget {
),
),
actions: <Widget>[
FlatButton(
TextButton(
child: Text('Delete'),
onPressed: () {
Navigator.of(context).pop();
Navigator.of(context).pop();
onActionPressed();
},
),
FlatButton(
TextButton(
child: Text('Cancel'),
textColor: Colors.grey,
style: TextButton.styleFrom(foregroundColor: Colors.grey),
onPressed: () {
Navigator.of(context).pop();
},
Expand Down
2 changes: 1 addition & 1 deletion lib/page/edit_task_screen.dart
Expand Up @@ -146,7 +146,7 @@ class _EditCardScreenState extends State<EditTaskScreen> {
'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(
Expand Down

0 comments on commit 8edd6b6

Please sign in to comment.