From 50b332084a9a555ebb4c7066c75bd17275eb9c3b Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Wed, 9 Jun 2021 17:39:40 +0900
Subject: [PATCH 01/12] =?UTF-8?q?english=5Fwords=E3=81=AE=E3=83=91?=
 =?UTF-8?q?=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8=E3=81=AEnull=20safety?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                     | 12 +++++++++++-
 section_3/1_simple_app/1-2_pubspec.yaml |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 56fe341..3bc4aaa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="64ea7178-345d-45bf-b0cc-2fb622659799" name="Default Changelist" comment="" />
+    <list default="true" id="64ea7178-345d-45bf-b0cc-2fb622659799" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -35,9 +37,17 @@
     <servers />
   </component>
   <component name="WindowStateProjectService">
+    <state x="183" y="122" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1623227003356">
+      <screen x="0" y="23" width="1440" height="877" />
+    </state>
+    <state x="183" y="122" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.877@0.23.1440.877" timestamp="1623227003356" />
     <state x="307" y="210" key="IDE.errors.dialog" timestamp="1623056383279">
       <screen x="0" y="23" width="1440" height="877" />
     </state>
     <state x="307" y="210" key="IDE.errors.dialog/0.23.1440.877/1440.23.1920.1057@0.23.1440.877" timestamp="1623056383279" />
+    <state x="260" y="146" key="new project wizard" timestamp="1623227062554">
+      <screen x="0" y="23" width="1440" height="877" />
+    </state>
+    <state x="260" y="146" key="new project wizard/0.23.1440.877@0.23.1440.877" timestamp="1623227062554" />
   </component>
 </project>
\ No newline at end of file
diff --git a/section_3/1_simple_app/1-2_pubspec.yaml b/section_3/1_simple_app/1-2_pubspec.yaml
index 7acfe5f..d96af8b 100644
--- a/section_3/1_simple_app/1-2_pubspec.yaml
+++ b/section_3/1_simple_app/1-2_pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -29,7 +29,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.3
 
-  english_words: ^3.1.5  # 追記
+  english_words: ^4.0.0  # 追記
 
 dev_dependencies:
   flutter_test:

From 15db15cb08729e47ad0e549023fd770df076a4ff Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Wed, 9 Jun 2021 17:54:19 +0900
Subject: [PATCH 02/12] =?UTF-8?q?null=20safety=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_3/1_simple_app/exercise1.dart     | 4 ++--
 section_3/1_simple_app/model_answer1.dart | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/section_3/1_simple_app/exercise1.dart b/section_3/1_simple_app/exercise1.dart
index 359ca02..01001be 100644
--- a/section_3/1_simple_app/exercise1.dart
+++ b/section_3/1_simple_app/exercise1.dart
@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 
 void main() => runApp(MyApp()); // 引数のWidgetが画面いっぱいに表示される
 
-List<String> generateHello({int start, int n}){
+List<String> generateHello({int? start, int? n}){
   var _hs = <String>[];
-  for (int i=start; i<start+n; i++){
+  for (int? i = start; i! < start! + n!; i++){
     _hs.add("Hello!" + i.toString());
   }
   return _hs;
diff --git a/section_3/1_simple_app/model_answer1.dart b/section_3/1_simple_app/model_answer1.dart
index 33247b8..4df511e 100644
--- a/section_3/1_simple_app/model_answer1.dart
+++ b/section_3/1_simple_app/model_answer1.dart
@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 
 void main() => runApp(MyApp()); // 引数のWidgetが画面いっぱいに表示される
 
-List<String> generateHello({int start, int n}){
+List<String> generateHello({int? start, int? n}){
   var _hs = <String>[];
-  for (int i=start; i<start+n; i++){
+  for (int? i = start; i! < start! + n!; i++){
     _hs.add("Hello!" + i.toString());
   }
   return _hs;

From 116fe6c7fef78332853fe47db75beb4a6cc43063 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Wed, 9 Jun 2021 18:18:18 +0900
Subject: [PATCH 03/12] =?UTF-8?q?FlatButton=E3=81=8B=E3=82=89Elevatedbutto?=
 =?UTF-8?q?n=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_3/3_interactive/3-1_main.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/section_3/3_interactive/3-1_main.dart b/section_3/3_interactive/3-1_main.dart
index 818f481..ea6ef7f 100644
--- a/section_3/3_interactive/3-1_main.dart
+++ b/section_3/3_interactive/3-1_main.dart
@@ -47,9 +47,11 @@ class _MyFormState extends State<MyForm> {
                 fontSize: 30.0,
               ),
             ),
-            FlatButton(  // 一番シンプルなボタン
+            ElevatedButton(  // 一番シンプルなボタン
               onPressed: _handlePressed,
-              color: Colors.blue,
+              style: ElevatedButton.styleFrom(
+                primary: Colors.blue,
+              ),
               child: Text(
                 "いいね!",
                 style: TextStyle(

From c40f512c763f038419661b3d5601c0c3f1ace7f5 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Fri, 18 Jun 2021 10:04:36 +0900
Subject: [PATCH 04/12] =?UTF-8?q?section3=E3=81=AEnull=20safety=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                  |  1 +
 section_3/4_transition/4-2_main.dart | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bc4aaa..eba58aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="64ea7178-345d-45bf-b0cc-2fb622659799" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_3/4_transition/4-2_main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/section_3/4_transition/4-2_main.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/section_3/4_transition/4-2_main.dart b/section_3/4_transition/4-2_main.dart
index 98b1391..6be4971 100644
--- a/section_3/4_transition/4-2_main.dart
+++ b/section_3/4_transition/4-2_main.dart
@@ -50,20 +50,20 @@ class _MainPageState extends State<MainPage> {
 
 class TabPage extends StatelessWidget {
 
-  final IconData icon;
-  final String title;
+  final IconData? icon;
+  final String? title;
 
-  const TabPage({Key key, this.icon, this.title}) : super(key: key);
+  const TabPage({Key? key, this.icon, this.title}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final TextStyle textStyle = Theme.of(context).textTheme.headline4;  // 文字のスタイル
+    final TextStyle? textStyle = Theme.of(context).textTheme.headline4;  // 文字のスタイル
     return Center(
       child:Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          Icon(icon, size: 72.0, color: textStyle.color),
-          Text(title, style: textStyle),
+          Icon(icon, size: 72.0, color: textStyle!.color),
+          Text(title!, style: textStyle),
         ],
       ),
     );

From 97a69b70305a30dbcc7e1d202d3ba4d13dca3150 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Fri, 18 Jun 2021 14:21:02 +0900
Subject: [PATCH 05/12] =?UTF-8?q?section4=E3=81=AEnull=5Fsafety=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml    | 3 ++-
 section_4/main_fb.dart | 4 ++--
 section_4/pubspec.yaml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bc4aaa..5043730 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="64ea7178-345d-45bf-b0cc-2fb622659799" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_4/main_fb.dart" beforeDir="false" afterPath="$PROJECT_DIR$/section_4/main_fb.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_4/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/section_4/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/section_4/main_fb.dart b/section_4/main_fb.dart
index 4cbbb4c..0f58b30 100644
--- a/section_4/main_fb.dart
+++ b/section_4/main_fb.dart
@@ -39,7 +39,7 @@ class _MyHomePageState extends State<MyHomePage> {
       stream: FirebaseFirestore.instance.collection("dogs").snapshots(),
       builder: (context, snapshot) {
         if (!snapshot.hasData) return LinearProgressIndicator();
-        return _buildList(snapshot.data.docs);
+        return _buildList(snapshot.data!.docs);
       },
     );
   }
@@ -55,7 +55,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Widget _buildListItem(DocumentSnapshot snap) {
-    Map<String, dynamic> data = snap.data();
+    final Map<String, dynamic> data = snap.data() as Map<String, dynamic>;
 
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical:9.0),
diff --git a/section_4/pubspec.yaml b/section_4/pubspec.yaml
index 1a0500c..5656b87 100644
--- a/section_4/pubspec.yaml
+++ b/section_4/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -28,9 +28,9 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.3
+  cloud_firestore: ^2.2.2 #追記
+  firebase_core: ^1.3.0 #追記
 
-  firebase_core : ^0.5.0  # 追記
-  cloud_firestore: ^0.14.0+1  # 追記
 
 dev_dependencies:
   flutter_test:

From bf5058390584818efc7b15a57db3d96aae01bb80 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Fri, 18 Jun 2021 16:37:33 +0900
Subject: [PATCH 06/12] =?UTF-8?q?section5=E3=81=AEnull=20safety=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml       |  4 ++++
 section_5/ios/Podfile     |  5 ++++-
 section_5/main_mlkit.dart | 21 ++++++++++-----------
 section_5/pubspec.yaml    | 10 +++++-----
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bc4aaa..e437498 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="64ea7178-345d-45bf-b0cc-2fb622659799" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_5/ios/Podfile" beforeDir="false" afterPath="$PROJECT_DIR$/section_5/ios/Podfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_5/main_mlkit.dart" beforeDir="false" afterPath="$PROJECT_DIR$/section_5/main_mlkit.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/section_5/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/section_5/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,6 +26,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="dart.analysis.tool.window.visible" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
diff --git a/section_5/ios/Podfile b/section_5/ios/Podfile
index 7b23028..f972513 100644
--- a/section_5/ios/Podfile
+++ b/section_5/ios/Podfile
@@ -1,6 +1,9 @@
 # Uncomment this line to define a global platform for your project
 # platform :ios, '9.0'
 
+# Override Firebase SDK Version
+$FirebaseSDKVersion = '7.11.0'
+
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
@@ -77,7 +80,7 @@ target 'Runner' do
     pod name, :path => File.join(symlink, 'ios')
   end
 
-  pod 'Firebase/MLVisionFaceModel'  # 追記
+  pod 'GoogleMLKit/FaceDetection'  # 追記
 end
 
 post_install do |installer|
diff --git a/section_5/main_mlkit.dart b/section_5/main_mlkit.dart
index ff10eae..bcd0281 100644
--- a/section_5/main_mlkit.dart
+++ b/section_5/main_mlkit.dart
@@ -1,8 +1,7 @@
 import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:firebase_ml_vision/firebase_ml_vision.dart';
+import 'package:google_ml_kit/google_ml_kit.dart';
 
 void main() {
   runApp(MyApp());
@@ -29,10 +28,10 @@ class FaceFinder extends StatefulWidget {
 }
 
 class _FaceFinderState extends State<FaceFinder> {
-  File _imageFile;
-  Size _imageSize;
-  List<Face> _faceResults;
-  final FaceDetector _faceDetector = FirebaseVision.instance.faceDetector();
+  File? _imageFile;
+  Size? _imageSize;
+  List<Face>? _faceResults;
+  final FaceDetector _faceDetector = GoogleMlKit.vision.faceDetector();
   final ImagePicker _picker = ImagePicker();
 
   void _getImageAndFindFace(ImageSource imageSource) async {
@@ -41,8 +40,8 @@ class _FaceFinderState extends State<FaceFinder> {
       _imageSize = null;
     });
 
-    final PickedFile pickedImage = await _picker.getImage(source: imageSource);
-    final File imageFile = File(pickedImage.path);
+    final PickedFile? pickedImage = await _picker.getImage(source: imageSource);
+    final File? imageFile = File(pickedImage!.path);
 
     if (imageFile != null) {
       _getImageSize(imageFile);
@@ -73,7 +72,7 @@ class _FaceFinderState extends State<FaceFinder> {
       _faceResults = null;
     });
 
-    final FirebaseVisionImage visionImage = FirebaseVisionImage.fromFile(imageFile);
+    final InputImage visionImage = InputImage.fromFile(imageFile);
 
     List<Face> results = await _faceDetector.processImage(visionImage);
     setState(() {
@@ -86,7 +85,7 @@ class _FaceFinderState extends State<FaceFinder> {
       constraints: BoxConstraints.expand(),
       decoration: BoxDecoration(
         image: DecorationImage(
-          image: Image.file(_imageFile).image,
+          image: Image.file(_imageFile!).image,
           fit: BoxFit.contain,
         ),
       ),
@@ -100,7 +99,7 @@ class _FaceFinderState extends State<FaceFinder> {
           ),
         ),
       )
-          : CustomPaint(painter: FaceBorderDrawer(_imageSize, _faceResults))
+          : CustomPaint(painter: FaceBorderDrawer(_imageSize!, _faceResults!))
     );
   }
 
diff --git a/section_5/pubspec.yaml b/section_5/pubspec.yaml
index e61f636..0def609 100644
--- a/section_5/pubspec.yaml
+++ b/section_5/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -28,11 +28,11 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.3
+  firebase_core: ^1.3.0 #追記
+  google_ml_kit: ^0.6.0 #追記
+  image_picker: ^0.8.0+3  # 追記
+  camera: ^0.8.1+3 #追記
 
-  firebase_core: ^0.5.0  # 追記
-  firebase_ml_vision: ^0.9.6+2  # 追記
-  image_picker: ^0.6.0  # 追記
-  camera: ^0.5.6+1  # 追記
 
 dev_dependencies:
   flutter_test:

From eaf603ee9ca82915d85378ceafa741b265989dae Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 21:45:53 +0900
Subject: [PATCH 07/12] =?UTF-8?q?pubspec.yaml=E3=81=AEsdk=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/section_6/pubspec.yaml b/section_6/pubspec.yaml
index 1f03455..8ea70a0 100644
--- a/section_6/pubspec.yaml
+++ b/section_6/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:

From 00391ebb900eb17eb45ed3b1ef381c4fd836f511 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 21:50:51 +0900
Subject: [PATCH 08/12] =?UTF-8?q?pub=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/pubspec.yaml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/section_6/pubspec.yaml b/section_6/pubspec.yaml
index 8ea70a0..1526771 100644
--- a/section_6/pubspec.yaml
+++ b/section_6/pubspec.yaml
@@ -27,16 +27,15 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.3
-
-  firebase_core: ^0.5.0  # 追記
-  firebase_ml_vision: ^0.9.6+2  # 追記
-  firebase_storage: ^4.0.0  # 追記
-  cloud_firestore: ^0.14.0+1  # 追記
-  image_picker: ^0.6.0  # 追記
-  camera: ^0.5.6+1  # 追記
-  uuid: ^2.2.2  # 追記
-  intl: ^0.16.1  # 追記
+  cupertino_icons: ^1.0.2
+  firebase_core: ^1.3.0  # 追記
+  google_ml_kit: ^0.6.0  # 追記
+  firebase_storage: ^8.1.3  # 追記
+  cloud_firestore: ^2.2.2  # 追記
+  image_picker: ^0.8.0+3  # 追記
+  camera: ^0.8.1+3 # 追記
+  uuid: ^3.0.4  # 追記
+  intl: ^0.17.0  # 追記
 
 dev_dependencies:
   flutter_test:

From 6c0763e70a736895c7f5b7c53b4716a3d9f61b50 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 21:53:12 +0900
Subject: [PATCH 09/12] =?UTF-8?q?import=E3=82=92=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/main.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/section_6/main.dart b/section_6/main.dart
index a9ed27e..2275d6e 100644
--- a/section_6/main.dart
+++ b/section_6/main.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
-
+//google_ml_kitのをimport
+import 'package:google_ml_kit/google_ml_kit.dart';
 import 'package:intl/intl.dart';
 import 'package:uuid/uuid.dart';
 import 'package:path/path.dart';
@@ -7,7 +8,6 @@ import 'package:image_picker/image_picker.dart';
 
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_ml_vision/firebase_ml_vision.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 

From 60b9480c1ea74e76f3be333a471e3dffd7ac94f1 Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 21:57:19 +0900
Subject: [PATCH 10/12] =?UTF-8?q?null-safety=E5=B0=8E=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/main.dart | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/section_6/main.dart b/section_6/main.dart
index 2275d6e..17a9aef 100644
--- a/section_6/main.dart
+++ b/section_6/main.dart
@@ -52,17 +52,16 @@ class _MainFormState extends State<MainForm> {
       _processingMessage = "Processing...";
     });
 
-    final PickedFile pickedImage = await _picker.getImage(source: imageSource);
-    final File imageFile = File(pickedImage.path);
+    final PickedFile? pickedImage = await _picker.getImage(source: imageSource);
+    final File imageFile = File(pickedImage!.path);
 
-    if (imageFile != null) {
-      final FirebaseVisionImage visionImage = FirebaseVisionImage.fromFile(imageFile);
+      final InputImage visionImage = InputImage.fromFile(imageFile);
       List<Face> faces = await _faceDetector.processImage(visionImage);
       if(faces.length > 0){
         String imagePath = "/images/" + Uuid().v1() + basename(pickedImage.path);
-        StorageReference ref = FirebaseStorage.instance.ref().child(imagePath);
-        final StorageTaskSnapshot storedImage = await ref.putFile(imageFile).onComplete;
-        if(storedImage.error == null){
+        Reference ref = FirebaseStorage.instance.ref().child(imagePath);
+        final TaskSnapshot storedImage = await ref.putFile(imageFile).onComplete;
+
           final String downloadUrl = await storedImage.ref.getDownloadURL();
           Face largestFace = findLargestFace(faces);
 
@@ -76,9 +75,9 @@ class _MainFormState extends State<MainForm> {
               context,
               MaterialPageRoute(builder: (context) => TimelinePage(),)
           );
-        }
+
       }
-    }
+
 
     setState(() {
       _processingMessage = "";
@@ -165,7 +164,7 @@ class TimelinePage extends StatelessWidget {
       stream: FirebaseFirestore.instance.collection("smiles").orderBy("date", descending: true).limit(10).snapshots(),
       builder: (context, snapshot) {
         if (!snapshot.hasData) return LinearProgressIndicator();
-        return _buildList(context, snapshot.data.docs);
+        return _buildList(context, snapshot.data!.docs);
       },
     );
   }
@@ -181,7 +180,7 @@ class TimelinePage extends StatelessWidget {
   }
 
   Widget _buildListItem(BuildContext context, DocumentSnapshot snap) {
-    Map<String, dynamic> _data = snap.data();
+    final Map<String, dynamic> _data =snap.data()! as Map<String, dynamic>;
     DateTime _datetime = _data["date"].toDate();
     var _formatter = DateFormat("MM/dd HH:mm");
     String postDate = _formatter.format(_datetime);

From 6a847b6d48136b97f0568aef48ec1c2c0e18bebd Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 23:07:29 +0900
Subject: [PATCH 11/12] =?UTF-8?q?FirebaseVision=E2=86=92GoogleMlKit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/main.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/section_6/main.dart b/section_6/main.dart
index 17a9aef..8ee1759 100644
--- a/section_6/main.dart
+++ b/section_6/main.dart
@@ -38,7 +38,7 @@ class MainForm extends StatefulWidget {
 class _MainFormState extends State<MainForm> {
   String _name ="";
   String _processingMessage = "";
-  final FaceDetector _faceDetector = FirebaseVision.instance.faceDetector(
+  final FaceDetector _faceDetector = GoogleMlKit.instance.faceDetector(
       FaceDetectorOptions(
           mode: FaceDetectorMode.accurate,
           enableLandmarks: true,
@@ -60,7 +60,7 @@ class _MainFormState extends State<MainForm> {
       if(faces.length > 0){
         String imagePath = "/images/" + Uuid().v1() + basename(pickedImage.path);
         Reference ref = FirebaseStorage.instance.ref().child(imagePath);
-        final TaskSnapshot storedImage = await ref.putFile(imageFile).onComplete;
+        final TaskSnapshot storedImage = await ref.putFile(imageFile);
 
           final String downloadUrl = await storedImage.ref.getDownloadURL();
           Face largestFace = findLargestFace(faces);

From 9dd4e4194c03fc1e131ae748dd5c95e78887001e Mon Sep 17 00:00:00 2001
From: tateshi <yarumaya0822@gmail.com>
Date: Tue, 29 Jun 2021 23:25:42 +0900
Subject: [PATCH 12/12] =?UTF-8?q?GoogleMlKit.instance=E2=86=92GoogleMlKit.?=
 =?UTF-8?q?vision=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 section_6/main.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/section_6/main.dart b/section_6/main.dart
index 8ee1759..cea0d73 100644
--- a/section_6/main.dart
+++ b/section_6/main.dart
@@ -38,7 +38,7 @@ class MainForm extends StatefulWidget {
 class _MainFormState extends State<MainForm> {
   String _name ="";
   String _processingMessage = "";
-  final FaceDetector _faceDetector = GoogleMlKit.instance.faceDetector(
+  final FaceDetector _faceDetector = GoogleMlKit.vision.faceDetector(
       FaceDetectorOptions(
           mode: FaceDetectorMode.accurate,
           enableLandmarks: true,