add loader

KopievDev · KopievDev · commit d157ffe7d9f1 · 2023-02-19T09:00:09.000+03:00
diff --git a/StudentTourism/Helpers/Loader.swift b/StudentTourism/Helpers/Loader.swift
@@ -97,7 +97,7 @@ class LoaderView: UIView {
     }()
     
     private lazy var blurView: BlurView = {
-        let view = BlurView(radius: 6, color: .fDarkGray, colorAlpha: 0.5)
+        let view = BlurView(radius: 6, color: Asset.Colors.sBlack.color, colorAlpha: 0.5)
         view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         view.frame = frame
         return view
diff --git a/StudentTourism/Screens/Main/Base.lproj/Main.storyboard b/StudentTourism/Screens/Main/Base.lproj/Main.storyboard
@@ -312,13 +312,24 @@
                                                                                 <constraint firstItem="71O-c5-b4E" firstAttribute="centerY" secondItem="Psg-oC-Cvv" secondAttribute="centerY" id="bx4-vT-E51"/>
                                                                             </constraints>
                                                                         </view>
+                                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I5X-ai-Pe6">
+                                                                            <rect key="frame" x="0.0" y="0.0" width="152" height="152"/>
+                                                                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                                            <connections>
+                                                                                <action selector="didTapTourWithButton:" destination="pzc-gm-IiC" eventType="touchUpInside" id="rB5-pD-Twc"/>
+                                                                            </connections>
+                                                                        </button>
                                                                     </subviews>
                                                                     <constraints>
+                                                                        <constraint firstItem="I5X-ai-Pe6" firstAttribute="width" secondItem="PjR-TP-fhF" secondAttribute="width" id="5rG-ib-U0U"/>
                                                                         <constraint firstItem="PjR-TP-fhF" firstAttribute="top" secondItem="3y4-Wd-qa2" secondAttribute="top" id="6l7-c0-IxU"/>
+                                                                        <constraint firstItem="I5X-ai-Pe6" firstAttribute="height" secondItem="PjR-TP-fhF" secondAttribute="height" id="BOE-AS-Isv"/>
+                                                                        <constraint firstItem="I5X-ai-Pe6" firstAttribute="centerX" secondItem="PjR-TP-fhF" secondAttribute="centerX" id="HvW-Ox-VfW"/>
                                                                         <constraint firstAttribute="bottom" secondItem="Mlz-w6-N1c" secondAttribute="bottom" constant="8" id="VNb-jJ-Bfo"/>
                                                                         <constraint firstItem="PjR-TP-fhF" firstAttribute="leading" secondItem="3y4-Wd-qa2" secondAttribute="leading" id="guR-g3-Kr3"/>
                                                                         <constraint firstItem="Mlz-w6-N1c" firstAttribute="leading" secondItem="3y4-Wd-qa2" secondAttribute="leading" id="hQo-dr-gB0"/>
                                                                         <constraint firstItem="Mlz-w6-N1c" firstAttribute="top" secondItem="PjR-TP-fhF" secondAttribute="bottom" constant="8" id="nZ6-zq-vLZ"/>
+                                                                        <constraint firstItem="I5X-ai-Pe6" firstAttribute="centerY" secondItem="PjR-TP-fhF" secondAttribute="centerY" id="vfD-of-n1t"/>
                                                                         <constraint firstAttribute="trailing" secondItem="PjR-TP-fhF" secondAttribute="trailing" id="wh8-r6-pjj"/>
                                                                         <constraint firstAttribute="trailing" secondItem="Mlz-w6-N1c" secondAttribute="trailing" id="xOD-ab-rjj"/>
                                                                     </constraints>
diff --git a/StudentTourism/Screens/Main/MainVC.swift b/StudentTourism/Screens/Main/MainVC.swift
@@ -32,7 +32,9 @@ private extension MainVC {
     
     @IBAction func didTapTour(button: UIButton) {
         Haptic.selection()
-        Router.showVC(type: TourViewVC.self)
+        Router.showVC(type: TourViewVC.self) {
+            $0.state[.image] = Asset.Assets.imgDacha.image
+        }
     }
     
 }
diff --git a/StudentTourism/Screens/TourView/TourView.storyboard b/StudentTourism/Screens/TourView/TourView.storyboard
@@ -1015,6 +1015,7 @@
                             <constraint firstItem="hli-oQ-qCx" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="oL5-mv-Smy"/>
                         </constraints>
                         <connections>
+                            <outlet property="imageView" destination="N8B-gM-ekO" id="Sf4-5u-gh0"/>
                             <outlet property="roomCollection" destination="des-iN-5yM" id="jFH-ix-Gb8"/>
                         </connections>
                     </view>
diff --git a/StudentTourism/Screens/TourView/TourViewVC.swift b/StudentTourism/Screens/TourView/TourViewVC.swift
@@ -26,6 +26,7 @@ class TourViewVC: BaseVC {
 //MARK: - Actions -
 private extension TourViewVC {
     @IBAction func didTapPay(button: UIButton) {
+        Loader.show(animation: .mastercard)
         Router.showVC(type: WebVC.self) {
             $0.state[s:.url] = "https://mustdev.ru/payment/index.html"
         }
diff --git a/StudentTourism/Screens/TourView/TourViewView.swift b/StudentTourism/Screens/TourView/TourViewView.swift
@@ -10,11 +10,17 @@ import UIKit
 class TourViewView: BaseView {
     
     @IBOutlet var roomCollection: RoomCollection!
+    @IBOutlet var imageView: UIImageView!
 
     
     override func customizeUI() {
         roomCollection.items = [Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell") ]
+    }
     
+    override func render() {
+        if let image = state[.image] as? UIImage {
+            imageView.image = image
+        }
     }
 }
 
diff --git a/StudentTourism/Screens/Web/WebVC.swift b/StudentTourism/Screens/Web/WebVC.swift
@@ -11,6 +11,8 @@ class WebVC: BaseVC {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        setAttributed(title: "Оплата".withAttr())
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2) { Loader.hide() }
     }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ private extension MainVC {`
`32`	`32`
`33`	`33`	`@IBAction func didTapTour(button: UIButton) {`
`34`	`34`	`Haptic.selection()`
`35`		`- Router.showVC(type: TourViewVC.self)`
	`35`	`+ Router.showVC(type: TourViewVC.self) {`
	`36`	`+ $0.state[.image] = Asset.Assets.imgDacha.image`
	`37`	`+ }`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ class TourViewVC: BaseVC {`
`26`	`26`	`//MARK: - Actions -`
`27`	`27`	`private extension TourViewVC {`
`28`	`28`	`@IBAction func didTapPay(button: UIButton) {`
	`29`	`+ Loader.show(animation: .mastercard)`
`29`	`30`	`Router.showVC(type: WebVC.self) {`
`30`	`31`	`$0.state[s:.url] = "https://mustdev.ru/payment/index.html"`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,17 @@ import UIKit`
`10`	`10`	`class TourViewView: BaseView {`
`11`	`11`
`12`	`12`	`@IBOutlet var roomCollection: RoomCollection!`
	`13`	`+ @IBOutlet var imageView: UIImageView!`
`13`	`14`
`14`	`15`
`15`	`16`	`override func customizeUI() {`
`16`	`17`	`roomCollection.items = [Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell"),Item(reuseId: "BannerCell") ]`
	`18`	`+ }`
`17`	`19`
	`20`	`+ override func render() {`
	`21`	`+ if let image = state[.image] as? UIImage {`
	`22`	`+ imageView.image = image`
	`23`	`+ }`
`18`	`24`	`}`
`19`	`25`	`}`
`20`	`26`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ class WebVC: BaseVC {`
`11`	`11`
`12`	`12`	`override func viewDidLoad() {`
`13`	`13`	`super.viewDidLoad()`
	`14`	`+ setAttributed(title: "Оплата".withAttr())`
	`15`	`+ DispatchQueue.main.asyncAfter(deadline: .now() + 2) { Loader.hide() }`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`}`