SHARED-5365

GetBetterApps · Dec 20, 2023 · a2ead0d · a2ead0d
1 parent 109bc64
commit a2ead0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -68,7 +68,6 @@
 		465EC4422B10899100444C9C /* ThemingMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 465EC4412B10899100444C9C /* ThemingMenuItem.swift */; };
 		465EC4452B108A0E00444C9C /* ThemingTabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 465EC4442B108A0E00444C9C /* ThemingTabs.swift */; };
 		4662502E2B32DCA70063F71A /* HintSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4662502D2B32DCA70063F71A /* HintSheet.swift */; };
-		466250312B32EC760063F71A /* SwiftUIModal in Frameworks */ = {isa = PBXBuildFile; productRef = 466250302B32EC760063F71A /* SwiftUIModal */; };
 		466250332B330D740063F71A /* HintButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 466250322B330D740063F71A /* HintButton.swift */; };
 		4667C9022AC585B000BAA9DD /* CreateNewAreaBottomSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4667C9012AC585B000BAA9DD /* CreateNewAreaBottomSheet.swift */; };
 		4667C9042AC589EC00BAA9DD /* SingleLineTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4667C9032AC589EC00BAA9DD /* SingleLineTextField.swift */; };
@@ -373,7 +372,6 @@
 				464478CC2B0A393000926899 /* CachedAsyncImage in Frameworks */,
 				464A42702AEA642C0019CB98 /* SwiftUIFlow in Frameworks */,
 				DD1CD8AC3CDFF9460475C5F4 /* Pods_iosApp.framework in Frameworks */,
-				466250312B32EC760063F71A /* SwiftUIModal in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1074,7 +1072,6 @@
 				469629C12AD9306200D41AF1 /* SwiftUIPager */,
 				464A426F2AEA642C0019CB98 /* SwiftUIFlow */,
 				464478CB2B0A393000926899 /* CachedAsyncImage */,
-				466250302B32EC760063F71A /* SwiftUIModal */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
@@ -1109,7 +1106,6 @@
 				469629C02AD9306200D41AF1 /* XCRemoteSwiftPackageReference "SwiftUIPager" */,
 				464A426E2AEA642C0019CB98 /* XCRemoteSwiftPackageReference "SwiftUIFlow" */,
 				464478CA2B0A393000926899 /* XCRemoteSwiftPackageReference "swiftui-cached-async-image" */,
-				4662502F2B32EC760063F71A /* XCRemoteSwiftPackageReference "SwiftUIModal" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -1600,14 +1596,6 @@
 				kind = branch;
 			};
 		};
-		4662502F2B32EC760063F71A /* XCRemoteSwiftPackageReference "SwiftUIModal" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/nonameplum/SwiftUIModal";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.3;
-			};
-		};
 		469629C02AD9306200D41AF1 /* XCRemoteSwiftPackageReference "SwiftUIPager" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/fermoya/SwiftUIPager.git";
@@ -1629,11 +1617,6 @@
 			package = 464A426E2AEA642C0019CB98 /* XCRemoteSwiftPackageReference "SwiftUIFlow" */;
 			productName = SwiftUIFlow;
 		};
-		466250302B32EC760063F71A /* SwiftUIModal */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4662502F2B32EC760063F71A /* XCRemoteSwiftPackageReference "SwiftUIModal" */;
-			productName = SwiftUIModal;
-		};
 		469629C12AD9306200D41AF1 /* SwiftUIPager */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 469629C02AD9306200D41AF1 /* XCRemoteSwiftPackageReference "SwiftUIPager" */;

diff --git a/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -18,15 +18,6 @@
         "revision" : "b300d3c0110116f3520066dfb8dcf3006cf593c3"
       }
     },
-    {
-      "identity" : "swiftuimodal",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/nonameplum/SwiftUIModal",
-      "state" : {
-        "revision" : "cd89b0f163843af3b621fc43e778cde918ebf977",
-        "version" : "1.0.3"
-      }
-    },
     {
       "identity" : "swiftuipager",
       "kind" : "remoteSourceControl",

diff --git a/iosApp/iosApp.xcworkspace/xcuserdata/velkonost.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcworkspace/xcuserdata/velkonost.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp/Features/AddArea/AddAreaScreen.swift b/iosApp/iosApp/Features/AddArea/AddAreaScreen.swift
@@ -26,7 +26,9 @@ struct AddAreaScreen: View {
                 Loader().frame(alignment: .center)
             } else {
                 VStack {
-                    AddAreaHeader()
+                    AddAreaHeader {
+                        viewModel.dispatch(action: AddAreaActionHintClick())
+                    }
 
                     ScrollView(showsIndicators: false) {
                         LazyVStack(spacing: 0) {

diff --git a/iosApp/iosApp/Features/AddArea/components/AddAreaHeader.swift b/iosApp/iosApp/Features/AddArea/components/AddAreaHeader.swift
@@ -14,6 +14,11 @@ struct AddAreaHeader: View {
 
     @Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
 
+    private let onHintClick: () -> Void
+    init( onHintClick: @escaping () -> Void) {
+        self.onHintClick = onHintClick
+    }
+
     var body: some View {
         HStack {
             Image(uiImage: SharedR.images().ic_arrow_back.toUIImage()!)
@@ -38,6 +43,9 @@ struct AddAreaHeader: View {
                 .foregroundColor(.textTitle)
                 .padding(.leading, 12)
             Spacer()
+
+            HintButton(onClick: onHintClick)
+                .padding(.leading, 12)
         }
     }
 }