Fix Flutter 3.7.9

longhoang2984 · Aug 19, 2024 · 3b9f8ff · 3b9f8ff
1 parent b5f08b7
commit 3b9f8ff
Show file tree

Hide file tree

Showing 15 changed files with 612 additions and 450 deletions.
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -38,4 +38,12 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
   end
+
+  installer.generated_projects.each do |project|
+    project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      end
+    end
+  end
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,29 +1,31 @@
 PODS:
   - connectivity_plus (0.0.1):
     - Flutter
-    - Reachability
+    - ReachabilitySwift
   - Flutter (1.0.0)
   - flutter_config (0.0.1):
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
-  - path_provider_ios (0.0.1):
+  - path_provider_foundation (0.0.1):
     - Flutter
-  - Reachability (3.2)
-  - shared_preferences (0.0.1):
+    - FlutterMacOS
+  - ReachabilitySwift (5.0.0)
+  - shared_preferences_foundation (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_config (from `.symlinks/plugins/flutter_config/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
-  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
 
 SPEC REPOS:
   trunk:
-    - Reachability
+    - ReachabilitySwift
 
 EXTERNAL SOURCES:
   connectivity_plus:
@@ -34,20 +36,20 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_config/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
-  shared_preferences:
-    :path: ".symlinks/plugins/shared_preferences/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
 
 SPEC CHECKSUMS:
-  connectivity_plus: 5f0eb61093bec56935f21a1699dd2758bc895587
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  flutter_config: 2226c1df19c78fe34a05eb7f1363445f18e76fc1
+  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_config: f48f0d47a284f1791aacce2687eabb3309ba7a41
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: 4d9242c0152fc168c5b1372c325daee548d482b4
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.14.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -200,6 +200,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -253,6 +254,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -340,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -414,7 +416,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -463,7 +465,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -41,5 +41,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/lib/presentation/home/widgets/note_list.dart b/lib/presentation/home/widgets/note_list.dart
@@ -27,84 +27,86 @@ class NotesList extends StatelessWidget {
           initial: (_) => Container(),
           loadInProgress: (_) => Container(),
           loadSuccess: (state) {
-            return Expanded(
-              child: ListView.separated(
-                separatorBuilder: (context, index) {
-                  return const SizedBox(
-                    height: 20.0,
-                  );
-                },
-                itemCount: state.notes.size,
-                // shrinkWrap: true,
-                itemBuilder: (context, index) {
-                  final note = state.notes[index];
-                  return GestureDetector(
-                    onTap: () {
-                      context.router.push(
-                        NoteFormPageRoute(
-                            note: note, onNoteChanged: onNoteChanged),
-                      );
-                    },
-                    onLongPress: () {
-                      _showDeletionDialog(
-                          context, context.read<NoteActorBloc>(), note);
-                    },
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Container(
-                          height: 24.0,
-                          padding: const EdgeInsets.symmetric(
-                            vertical: 4.0,
-                            horizontal: 16.0,
-                          ),
-                          decoration: BoxDecoration(
-                            color: ColorName.tertiaryLight.withAlpha(90),
-                            borderRadius: const BorderRadius.all(
-                              Radius.circular(12.0),
-                            ),
-                          ),
-                          child: Text(
-                            note.title.value.getOrElse(() => '').toUpperCase(),
-                            style: BaseTextStyle.style(
-                              color: Colors.white,
-                              fontSize: 12.0,
-                              style: FontStyle.dark,
-                            ),
+            return ListView.separated(
+              separatorBuilder: (context, index) {
+                return const SizedBox(
+                  height: 20.0,
+                );
+              },
+              itemCount: state.notes.size,
+              itemBuilder: (context, index) {
+                final note = state.notes[index];
+                return GestureDetector(
+                  onTap: () {
+                    context.router.push(
+                      NoteFormPageRoute(
+                        note: note,
+                        onNoteChanged: onNoteChanged,
+                      ),
+                    );
+                  },
+                  onLongPress: () {
+                    _showDeletionDialog(
+                      context,
+                      context.read<NoteActorBloc>(),
+                      note,
+                    );
+                  },
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        height: 24.0,
+                        padding: const EdgeInsets.symmetric(
+                          vertical: 4.0,
+                          horizontal: 16.0,
+                        ),
+                        decoration: BoxDecoration(
+                          color: ColorName.tertiaryLight.withAlpha(90),
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(12.0),
                           ),
                         ),
-                        Container(
-                          height: 8.0,
+                        child: Text(
+                          note.title.value.getOrElse(() => '').toUpperCase(),
+                          style: BaseTextStyle.style(
+                            color: Colors.white,
+                            fontSize: 12.0,
+                            style: FontStyle.dark,
+                          ),
                         ),
-                        getLinearGradientView(
-                          radius: 2.0,
-                          colors: [
-                            ColorName.tertiaryLight.withAlpha(60),
-                            ColorName.tertiaryExtraLight,
-                          ],
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(
-                              vertical: 16.0,
-                              horizontal: 24.0,
-                            ),
-                            child: Column(
-                              children: [
-                                // ignore: prefer_if_elements_to_conditional_expressions
-                                _getTagsList(note),
-                                const SizedBox(
-                                  height: 10,
-                                ),
-                                // ignore: prefer_if_elements_to_conditional_expressions
-                                _getNoteList(note),
-                              ],
-                            ),
+                      ),
+                      Container(
+                        height: 8.0,
+                      ),
+                      getLinearGradientView(
+                        radius: 2.0,
+                        colors: [
+                          ColorName.tertiaryLight.withAlpha(60),
+                          ColorName.tertiaryExtraLight,
+                        ],
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(
+                            vertical: 16.0,
+                            horizontal: 24.0,
+                          ),
+                          child: Column(
+                            children: [
+                              // ignore: prefer_if_elements_to_conditional_expressions
+                              _getTagsList(note),
+                              const SizedBox(
+                                height: 10,
+                              ),
+                              // ignore: prefer_if_elements_to_conditional_expressions
+                              _getNoteList(note),
+                            ],
                           ),
                         ),
-                      ],
-                    ),
-                  );
-                },
-              ),
+                      ),
+                    ],
+                  ),
+                );
+              },
             );
           },
           loadFailure: (_) => Container(),

diff --git a/lib/presentation/home/widgets/notes_body.dart b/lib/presentation/home/widgets/notes_body.dart
@@ -91,27 +91,29 @@ class NoteBody extends HookWidget {
             const SizedBox(
               height: 20,
             ),
-            BlocBuilder<NoteWatcherBloc, NoteWatcherState>(
-              builder: (context, state) {
-                return WidgetHUD(
-                  showHUD: state == const NoteWatcherState.loadInProgress(),
-                  hud: HUD(
-                    color: Colors.transparent,
-                    opacity: 0,
-                    progressIndicator: const LinearProgressIndicator(
-                      color: ColorName.primarySecond,
+            Expanded(
+              child: BlocBuilder<NoteWatcherBloc, NoteWatcherState>(
+                builder: (context, state) {
+                  return WidgetHUD(
+                    showHUD: state == const NoteWatcherState.loadInProgress(),
+                    hud: HUD(
+                      color: Colors.transparent,
+                      opacity: 0,
+                      progressIndicator: const LinearProgressIndicator(
+                        color: ColorName.primarySecond,
+                      ),
                     ),
-                  ),
-                  builder: (context) {
-                    return NotesList(
-                      onNoteChanged: () {
-                        toggleState.value = false;
-                        _onNoteChanged(context, toggleState.value);
-                      },
-                    );
-                  },
-                );
-              },
+                    builder: (BuildContext context, Widget? child) {
+                      return NotesList(
+                        onNoteChanged: () {
+                          toggleState.value = false;
+                          _onNoteChanged(context, toggleState.value);
+                        },
+                      );
+                    },
+                  );
+                },
+              ),
             ),
           ],
         ),

diff --git a/lib/presentation/note_form/widgets/note_form_body.dart b/lib/presentation/note_form/widgets/note_form_body.dart
@@ -67,7 +67,7 @@ class NoteFormBody extends StatelessWidget {
               color: ColorName.primary,
             ),
           ),
-          builder: (context) {
+          builder: (BuildContext context, Widget? child) {
             return MultiProvider(
               providers: [
                 ChangeNotifierProvider(