From d1fca66b4b27db2bb8afc16d2cdc0f1a968b2b05 Mon Sep 17 00:00:00 2001
From: maxxkim <maxxkim@ya.ru>
Date: Mon, 22 Apr 2024 14:47:03 +0300
Subject: [PATCH 1/2] feat(ios): Some fixed for iOS build

---
 ios/Flutter/AppFrameworkInfo.plist                         | 2 +-
 ios/Runner.xcodeproj/project.pbxproj                       | 7 +++++--
 .../project.xcworkspace/contents.xcworkspacedata           | 2 +-
 .../xcshareddata/xcschemes/Runner.xcscheme                 | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index f2872cf4..8c6e5614 100644
--- 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>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 36428fd8..37b6bff4 100644
--- 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 */
@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -185,6 +187,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a16..919434a6 100644
--- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a28140cf..b52b2e69 100644
--- 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 = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

From c486ee6b986431ef58ad5a5aa14176bb2fa13510 Mon Sep 17 00:00:00 2001
From: maxxkim <maxxkim@ya.ru>
Date: Mon, 22 Apr 2024 14:48:22 +0300
Subject: [PATCH 2/2] refactor(app): Dart fix applied

---
 lib/localization/app_localization.dart               |  1 -
 .../date_of_birth_screen/date_of_birth_screen.dart   | 12 +++++-------
 lib/theme/bloc/theme_bloc.dart                       |  1 -
 lib/theme/custom_text_style.dart                     |  1 -
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/localization/app_localization.dart b/lib/localization/app_localization.dart
index 4701a670..1405c02e 100644
--- a/lib/localization/app_localization.dart
+++ b/lib/localization/app_localization.dart
@@ -2,7 +2,6 @@ import 'ru/ru_translations.dart';
 //import 'en_us/en_us_translations.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/cupertino.dart';
-import '../core/app_export.dart';
 
 class AppLocalization {
   AppLocalization(this.locale);
diff --git a/lib/presentation/registration/date_of_birth_screen/date_of_birth_screen.dart b/lib/presentation/registration/date_of_birth_screen/date_of_birth_screen.dart
index df859872..7015d217 100644
--- a/lib/presentation/registration/date_of_birth_screen/date_of_birth_screen.dart
+++ b/lib/presentation/registration/date_of_birth_screen/date_of_birth_screen.dart
@@ -160,12 +160,10 @@ class _DateOfBirthScreenState extends State<DateOfBirthScreen> {
         DateTime.now().day,
       ),
     );
-    if (dateTime != null) {
-      if (mounted) {
-        setState(() {
-          selectedDate = dateTime;
-        });
-      }
+    if (mounted) {
+      setState(() {
+        selectedDate = dateTime;
+      });
+    }
     }
-  }
 }
diff --git a/lib/theme/bloc/theme_bloc.dart b/lib/theme/bloc/theme_bloc.dart
index 60f947d2..b80c4314 100644
--- a/lib/theme/bloc/theme_bloc.dart
+++ b/lib/theme/bloc/theme_bloc.dart
@@ -1,6 +1,5 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import '../../core/app_export.dart';
 part 'theme_event.dart';
 part 'theme_state.dart';
 
diff --git a/lib/theme/custom_text_style.dart b/lib/theme/custom_text_style.dart
index ff969f92..7565b69e 100644
--- a/lib/theme/custom_text_style.dart
+++ b/lib/theme/custom_text_style.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import '../core/app_export.dart';
 
 /// A collection of pre-defined text styles for customizing text appearance,
 /// categorized by different font families and weights.