Skip to content

E
em_call
Commit 41aaf885 authored by Дмитрий Гребенников's avatar Дмитрий Гребенников
Browse files
Options

28.04.2022 

28.04.2022
parent 6379588c
Hide whitespace changes
Inline Side-by-side
Showing with 904 additions and 185 deletions
Em-call.xcodeproj/project.pbxproj
View file @ 41aaf885
......@@ -17,6 +17,7 @@
D514860727BB7FD7006830A3 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D514860627BB7FD7006830A3 /* ChatViewController.swift */; };
D514861427BBEB76006830A3 /* ElectricTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D514861327BBEB76006830A3 /* ElectricTableViewController.swift */; };
D514861927BBEFC8006830A3 /* Track.swift in Sources */ = {isa = PBXBuildFile; fileRef = D514861827BBEFC8006830A3 /* Track.swift */; };
D515DFD1281854F500848CDD /* NotificationsTableVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D515DFD0281854F500848CDD /* NotificationsTableVC.swift */; };
D51D33FD27BF8836008D5065 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51D33FC27BF8836008D5065 /* MapViewController.swift */; };
D51D340227BF98B9008D5065 /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51D340127BF98B9008D5065 /* CalendarViewController.swift */; };
D52297C12805E45000064FE4 /* MainVCViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D52297C02805E45000064FE4 /* MainVCViewController.swift */; };
......@@ -34,6 +35,10 @@
D55E88F927DE124B00DB59E7 /* GlidingConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55E88EF27DE124B00DB59E7 /* GlidingConfig.swift */; };
D55E88FA27DE124B00DB59E7 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55E88F127DE124B00DB59E7 /* Collection.swift */; };
D55E88FB27DE124B00DB59E7 /* FileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55E88F227DE124B00DB59E7 /* FileManager.swift */; };
D562A29D2819A0D300BF416B /* ProfiGoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D562A29B2819A0D300BF416B /* ProfiGoVC.swift */; };
D562A29E2819A0D300BF416B /* ProfiGoVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = D562A29C2819A0D300BF416B /* ProfiGoVC.xib */; };
D562A2AA2819B4B700BF416B /* ProfiCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D562A2A82819B4B700BF416B /* ProfiCallViewController.swift */; };
D562A2AB2819B4B700BF416B /* ProfiCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D562A2A92819B4B700BF416B /* ProfiCallViewController.xib */; };
D569AB6127B8E27A0013DCFE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D569AB6027B8E27A0013DCFE /* AppDelegate.swift */; };
D569AB6327B8E27A0013DCFE /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D569AB6227B8E27A0013DCFE /* SceneDelegate.swift */; };
D569AB6827B8E27A0013DCFE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D569AB6627B8E27A0013DCFE /* Main.storyboard */; };
......@@ -108,6 +113,7 @@
D514860627BB7FD7006830A3 /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
D514861327BBEB76006830A3 /* ElectricTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElectricTableViewController.swift; sourceTree = "<group>"; };
D514861827BBEFC8006830A3 /* Track.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Track.swift; sourceTree = "<group>"; };
D515DFD0281854F500848CDD /* NotificationsTableVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsTableVC.swift; sourceTree = "<group>"; };
D51D33FC27BF8836008D5065 /* MapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewController.swift; sourceTree = "<group>"; };
D51D340127BF98B9008D5065 /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = "<group>"; };
D52297C02805E45000064FE4 /* MainVCViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainVCViewController.swift; sourceTree = "<group>"; };
......@@ -125,6 +131,10 @@
D55E88EF27DE124B00DB59E7 /* GlidingConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlidingConfig.swift; sourceTree = "<group>"; };
D55E88F127DE124B00DB59E7 /* Collection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = "<group>"; };
D55E88F227DE124B00DB59E7 /* FileManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = "<group>"; };
D562A29B2819A0D300BF416B /* ProfiGoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfiGoVC.swift; sourceTree = "<group>"; };
D562A29C2819A0D300BF416B /* ProfiGoVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfiGoVC.xib; sourceTree = "<group>"; };
D562A2A82819B4B700BF416B /* ProfiCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfiCallViewController.swift; sourceTree = "<group>"; };
D562A2A92819B4B700BF416B /* ProfiCallViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfiCallViewController.xib; sourceTree = "<group>"; };
D569AB5D27B8E27A0013DCFE /* Em-call.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Em-call.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D569AB6027B8E27A0013DCFE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D569AB6227B8E27A0013DCFE /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
......@@ -230,7 +240,6 @@
D558EA6027BE4C65003C4578 /* EmerHandViewController.swift */,
D51D33FC27BF8836008D5065 /* MapViewController.swift */,
D51D340127BF98B9008D5065 /* CalendarViewController.swift */,
D56E5D6C27C26F2500D0E4B9 /* StartViewController.swift */,
D5B0200F27C37BBE00C4BA4F /* MainViewController.swift */,
D5E2042327CE2DD90063A514 /* ProfileViewController.swift */,
D5E2042827CE30E20063A514 /* DataProfileViewController.swift */,
......@@ -270,6 +279,17 @@
path = Extensions;
sourceTree = "<group>";
};
D562A29A2819A06F00BF416B /* mainAddition */ = {
isa = PBXGroup;
children = (
D562A29B2819A0D300BF416B /* ProfiGoVC.swift */,
D562A29C2819A0D300BF416B /* ProfiGoVC.xib */,
D562A2A82819B4B700BF416B /* ProfiCallViewController.swift */,
D562A2A92819B4B700BF416B /* ProfiCallViewController.xib */,
);
path = mainAddition;
sourceTree = "<group>";
};
D569AB5427B8E27A0013DCFE = {
isa = PBXGroup;
children = (
......@@ -295,12 +315,11 @@
D569AB5F27B8E27A0013DCFE /* Em-call */ = {
isa = PBXGroup;
children = (
D573ED9328087DCD00FDAEA4 /* Menu */,
D562A29A2819A06F00BF416B /* mainAddition */,
D5E1EB26280730D900136353 /* SOTabBarController.swift */,
D5E1EB27280730DA00136353 /* SOTabBarSetting.swift */,
D5E1EB29280730DA00136353 /* SOTabBarItem.swift */,
D5E1EB28280730DA00136353 /* SOTabBar.swift */,
D5E1EB31280730E700136353 /* SO_tabBar */,
D5CB99E727ECCD09000F8500 /* Chat */,
D53F560927E62D7600C18B2A /* SmallListWorkVC.swift */,
D53F560A27E62D7600C18B2A /* SmallListWorkVC.xib */,
......@@ -348,18 +367,12 @@
name = Frameworks;
sourceTree = "<group>";
};
D573ED9328087DCD00FDAEA4 /* Menu */ = {
isa = PBXGroup;
children = (
);
path = Menu;
sourceTree = "<group>";
};
D5A9FBFA27DB92CB00AAB5EA /* Addition */ = {
isa = PBXGroup;
children = (
D5CF729D27DFB3500026392B /* ListWorkViewController.swift */,
D542183F27F25EAB00DA8F51 /* CustCellTableViewCell.swift */,
D515DFD0281854F500848CDD /* NotificationsTableVC.swift */,
);
path = Addition;
sourceTree = "<group>";
......@@ -392,16 +405,10 @@
path = Glide;
sourceTree = "<group>";
};
D5E1EB31280730E700136353 /* SO_tabBar */ = {
isa = PBXGroup;
children = (
);
path = SO_tabBar;
sourceTree = "<group>";
};
D5F0236027C4DA8E008F4146 /* EnterVC */ = {
isa = PBXGroup;
children = (
D56E5D6C27C26F2500D0E4B9 /* StartViewController.swift */,
D5F0236927C4DAC2008F4146 /* RegistrationViewController.swift */,
D5F0236E27C4DAD8008F4146 /* ChangePswViewController.swift */,
);
......@@ -533,10 +540,12 @@
buildActionMask = 2147483647;
files = (
D55E88F527DE124B00DB59E7 /* CollectionCell.xib in Resources */,
D562A2AB2819B4B700BF416B /* ProfiCallViewController.xib in Resources */,
D569AB7027B8E27B0013DCFE /* LaunchScreen.storyboard in Resources */,
D569AB6D27B8E27B0013DCFE /* Assets.xcassets in Resources */,
D569AB6827B8E27A0013DCFE /* Main.storyboard in Resources */,
D53F560C27E62D7600C18B2A /* SmallListWorkVC.xib in Resources */,
D562A29E2819A0D300BF416B /* ProfiGoVC.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -621,9 +630,11 @@
D57A2EBB28033CF200B8E910 /* NSArrayValueTransformer.swift in Sources */,
D5E31B2A27BCE16700F5B87D /* PlumViewController.swift in Sources */,
D55E88F627DE124B00DB59E7 /* GlidingLayout.swift in Sources */,
D562A2AA2819B4B700BF416B /* ProfiCallViewController.swift in Sources */,
D5CB9A2E27ECCE9A000F8500 /* Label.swift in Sources */,
D5CB9A3127ECCE9A000F8500 /* MessageInputView.swift in Sources */,
D569AB6127B8E27A0013DCFE /* AppDelegate.swift in Sources */,
D562A29D2819A0D300BF416B /* ProfiGoVC.swift in Sources */,
D53F560B27E62D7600C18B2A /* SmallListWorkVC.swift in Sources */,
D55E88F827DE124B00DB59E7 /* GlidingCollectionDelegate.swift in Sources */,
D5CB9A2F27ECCE9A000F8500 /* ChatRoomViewController+Table.swift in Sources */,
......@@ -659,6 +670,7 @@
D59E3CE527D3B37B008A7E0C /* Extensions.swift in Sources */,
D5D6F1A627E77D4A008106EE /* DoubleElectricVC.swift in Sources */,
D51D33FD27BF8836008D5065 /* MapViewController.swift in Sources */,
D515DFD1281854F500848CDD /* NotificationsTableVC.swift in Sources */,
D5C59AF127CFD1810013EFBB /* netwok.swift in Sources */,
D5E2042927CE30E20063A514 /* DataProfileViewController.swift in Sources */,
D514861427BBEB76006830A3 /* ElectricTableViewController.swift in Sources */,
......
Em-call.xcodeproj/xcuserdata/alexsh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 41aaf885
......@@ -46,8 +46,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "314"
endingLineNumber = "314"
startingLineNumber = "373"
endingLineNumber = "373"
landmarkName = "coordinateToAdress(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -190,8 +190,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "171"
endingLineNumber = "171"
startingLineNumber = "173"
endingLineNumber = "173"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
</BreakpointContent>
......
Em-call.xcworkspace/xcuserdata/alexsh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 41aaf885
......@@ -158,8 +158,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "206"
endingLineNumber = "206"
startingLineNumber = "237"
endingLineNumber = "237"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -222,8 +222,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "216"
endingLineNumber = "216"
startingLineNumber = "247"
endingLineNumber = "247"
landmarkName = "viewWillDisappear(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -238,8 +238,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "178"
endingLineNumber = "178"
startingLineNumber = "185"
endingLineNumber = "185"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -558,8 +558,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "105"
endingLineNumber = "105"
startingLineNumber = "107"
endingLineNumber = "107"
landmarkName = "longPress(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -590,8 +590,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "212"
endingLineNumber = "212"
startingLineNumber = "243"
endingLineNumber = "243"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -606,8 +606,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "308"
endingLineNumber = "308"
startingLineNumber = "367"
endingLineNumber = "367"
landmarkName = "tapGesture(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -622,8 +622,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "340"
endingLineNumber = "340"
startingLineNumber = "399"
endingLineNumber = "399"
landmarkName = "centerToLocation(_:regionRadius:)"
landmarkType = "7">
</BreakpointContent>
......@@ -638,8 +638,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "349"
endingLineNumber = "349"
startingLineNumber = "408"
endingLineNumber = "408"
landmarkName = "settingsDelegateClick(img:selRow:imgName:)"
landmarkType = "7">
</BreakpointContent>
......@@ -654,8 +654,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "269"
endingLineNumber = "269"
startingLineNumber = "328"
endingLineNumber = "328"
landmarkName = "textFieldShouldReturn(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -702,8 +702,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "301"
endingLineNumber = "301"
startingLineNumber = "360"
endingLineNumber = "360"
landmarkName = "mapView(_:viewFor:)"
landmarkType = "7">
</BreakpointContent>
......@@ -718,8 +718,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "300"
endingLineNumber = "300"
startingLineNumber = "359"
endingLineNumber = "359"
landmarkName = "mapView(_:viewFor:)"
landmarkType = "7">
</BreakpointContent>
......@@ -734,8 +734,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "275"
endingLineNumber = "275"
startingLineNumber = "334"
endingLineNumber = "334"
landmarkName = "mapView(_:viewFor:)"
landmarkType = "7">
</BreakpointContent>
......@@ -750,8 +750,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "274"
endingLineNumber = "274"
startingLineNumber = "333"
endingLineNumber = "333"
landmarkName = "mapView(_:viewFor:)"
landmarkType = "7">
</BreakpointContent>
......@@ -1051,8 +1051,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "164"
endingLineNumber = "164"
startingLineNumber = "166"
endingLineNumber = "166"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
......@@ -1069,8 +1069,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
landmarkName = "unknown"
landmarkType = "0">
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -1115,8 +1115,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "372"
endingLineNumber = "372"
startingLineNumber = "429"
endingLineNumber = "429"
landmarkName = "selectedMenuCell(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -1131,8 +1131,8 @@
filePath = "Em-call/Data/SettingsLauncher.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "363"
endingLineNumber = "363"
startingLineNumber = "364"
endingLineNumber = "364"
landmarkName = "tableView(_:didSelectRowAt:)"
landmarkType = "7">
</BreakpointContent>
......@@ -1147,8 +1147,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "375"
endingLineNumber = "375"
startingLineNumber = "431"
endingLineNumber = "431"
landmarkName = "selectedMenuCell(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -1163,8 +1163,8 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "364"
endingLineNumber = "364"
startingLineNumber = "423"
endingLineNumber = "423"
landmarkName = "selectedMenuCell(_:)"
landmarkType = "7">
<Locations>
......@@ -1664,7 +1664,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3D170203-5BDF-42F3-AA9C-074A03F0C1EB"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/CallProfiViewController.swift"
......@@ -1696,32 +1696,96 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3A0577B8-8EE0-407F-8710-63B7D10AF9EC"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainVCViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "51"
endingLineNumber = "51"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "46"
endingLineNumber = "46"
landmarkName = "initSecond()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CD1F00FB-B90E-4293-8F58-1988AF945C6E"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainVCViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "69"
endingLineNumber = "69"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "64"
endingLineNumber = "64"
landmarkName = "initSecond()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "327D88EA-2D72-4CCC-9A19-0C4D7727A554"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "425"
endingLineNumber = "425"
landmarkName = "selectedMenuCell(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "02B942CF-666C-4B0C-BA43-7964173FB6F6"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "426"
endingLineNumber = "426"
landmarkName = "selectedMenuCell(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "552011D6-D03E-4B3E-9A58-4B3C9E38CA3E"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "191"
endingLineNumber = "191"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "666FFA44-B776-4ACA-99F9-F62F728F6B20"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/mainAddition/ProfiGoVC.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "42"
endingLineNumber = "42"
landmarkName = "pressProfiGo(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
......
Em-call/Addition/CustCellTableViewCell.swift
View file @ 41aaf885
......@@ -13,6 +13,10 @@ class CustCellTableViewCell: UITableViewCell {
@IBOutlet weak var custCell2: UILabel!
@IBOutlet weak var imageCell: UIImageView!
@IBOutlet weak var labelTop: UILabel!
@IBOutlet weak var labelBot: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
......
Em-call/Addition/NotificationsTableVC.swift 0 → 100644
View file @ 41aaf885
//
// NotificationsTableVC.swift
// Em-call
//
// Created by Alex Sh on 26.04.2022.
//
import UIKit
class NotificationsTableVC: UITableViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Uncomment the following line to preserve selection between presentations
// self.clearsSelectionOnViewWillAppear = false
let item1 = setBarButtom(str: "black_arrow-left")
self.navigationItem.setLeftBarButtonItems([item1], animated: true)
let item2 = setBarButtomClose(str: "gg_close")
self.navigationItem.setRightBarButtonItems([item2], animated: true)
// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
self.navigationController?.setNavigationBarHidden(false, animated: animated)
// navigationController?.title = "NOTIFICATIONS"
self.navigationController?.navigationBar.topItem?.title = "NOTIFICATIONS"
title = "NOTIFICATIONS"
}
func setBarButtom(str:String)->UIBarButtonItem {
let btn1 = UIButton(type: .custom)
btn1.setImage(UIImage(named: str), for: .normal)
btn1.frame = CGRect(x: 0, y: 0, width: 60, height: 60)
btn1.addTarget(self, action: #selector(self.back), for: .touchUpInside)
let item1 = UIBarButtonItem(customView: btn1)
return item1
}
func setBarButtomClose(str:String)->UIBarButtonItem {
let btn1 = UIButton(type: .custom)
btn1.setImage(UIImage(named: str), for: .normal)
btn1.frame = CGRect(x: 0, y: 0, width: 60, height: 60)
btn1.addTarget(self, action: #selector(self.back), for: .touchUpInside)
let item1 = UIBarButtonItem(customView: btn1)
return item1
}
@objc
func back() {
// let firstVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "Logo")
navigationController?.popViewController( animated: true)
// navigationController?.
// navigationController?.popToRootViewController(animated: true)
}
/*
@objc
func backToMain() {
let firstVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "Logo")
navigationController?.pushViewController(firstVC, animated: true)
}*/
// MARK: - Table view data source
override func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection section: Int) {
// Создаём константу, именна через неё мы будем обращаться к свойствам и изменять их
let header = view as! UITableViewHeaderFooterView
// Установить цвет текста в label
header.textLabel?.textColor = .black
// Установить цвет фона для секции
header.tintColor = UIColor.white
// Установить шрифт и размер шрифта для label
// header.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 15)
}
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
let arrayTextCell:[String] = ["Job is done!","Work in progress","Calculation of the full cost of work","Our worker is here!",
"Our worker is on the way!","Worker assigned to your task","Your booking confirmated","Confirming your booking..."]
/* switch section { case 0: return ("Job is done!") case 1: return ("Work in progress")
case 2: return ("Calculation of the full cost of work") case 3: return ("Our worker is here!")
case 4: return ("Our worker is on the way!") case 5: return ("Worker assigned to your task")
case 6: return ("Your booking confirmated") case 7: return ("Confirming your booking...")
default: return "" }*/
return arrayTextCell[section]
}
override func numberOfSections(in tableView: UITableView) -> Int {
// #warning Incomplete implementation, return the number of sections
return 8
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
// let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)
let arrayTopTextCell:[String] = ["Would you mind taking a moment to rate our job","Our master set to work",
"The property will charge you the full amount for you booking",
"So our master evaluate th scale of the work and charged you a full amount",
"You will be charged service call free","Harry Johnson assigned to your order","Your worker will be appointed shortly",
"Your worker will be appointed shortly"]
let arrayBotTextCell:[String] = ["now","3 hours ago","3 hours ago","3 hours ago","3 hours ago","26 Jan;11:00","26 Jan;10:40","26 Jan;10:37"]
var cell:CustCellTableViewCell
let section = indexPath.section
cell = tableView.dequeueReusableCell(withIdentifier: "notifierCell") as! CustCellTableViewCell
cell.labelTop?.text = arrayTopTextCell[section]
cell.labelBot?.text = arrayBotTextCell[section]
// cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
// cell.textLabel?.font = UIFont(name: "Roboto", size: 13)
return cell
}
/*
*/
/*
// Override to support conditional editing of the table view.
override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
// Return false if you do not want the specified item to be editable.
return true
}
*/
/*
// Override to support editing the table view.
override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
if editingStyle == .delete {
// Delete the row from the data source
tableView.deleteRows(at: [indexPath], with: .fade)
} else if editingStyle == .insert {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
}
}
*/
/*
// Override to support rearranging the table view.
override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
}
*/
/*
// Override to support conditional rearranging of the table view.
override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
// Return false if you do not want the item to be re-orderable.
return true
}
*/
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
Em-call/Assets.xcassets/call_pro.imageset/Contents.json 0 → 100644
View file @ 41aaf885
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "call_pro.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/cansel_order.imageset/Contents.json 0 → 100644
View file @ 41aaf885
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "cansel_order.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/support_chat.imageset/Contents.json 0 → 100644
View file @ 41aaf885
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "support_chat.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Base.lproj/Main.storyboard
View file @ 41aaf885
......@@ -1416,75 +1416,6 @@
</objects>
<point key="canvasLocation" x="2001" y="1254"/>
</scene>
<!--ChangeCard-->
<scene sceneID="Bqg-PP-viG">
<objects>
<viewController title="ChangeCard" id="hfx-zQ-j0C" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="O3A-kI-ESr"/>
<viewControllerLayoutGuide type="bottom" id="jDM-e2-en2"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="dOU-Cu-KoT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="18" translatesAutoresizingMaskIntoConstraints="NO" id="8l3-rX-RsZ">
<rect key="frame" x="20" y="52" width="374" height="242"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter new card number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kEY-dI-BtH">
<rect key="frame" x="0.0" y="0.0" width="374" height="34"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="1234 5678 0987 6543" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="RU0-E6-RmQ">
<rect key="frame" x="0.0" y="52" width="374" height="34"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Retry new card number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hWh-tc-ETu">
<rect key="frame" x="0.0" y="104" width="374" height="34"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="1234 5678 0987 6543" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EF1-hJ-Die">
<rect key="frame" x="0.0" y="156" width="374" height="34"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JiQ-Tp-3GG">
<rect key="frame" x="0.0" y="208" width="374" height="34"/>
<color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Change and save card number">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="7"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailingMargin" secondItem="8l3-rX-RsZ" secondAttribute="trailing" id="J6y-E0-MvI"/>
<constraint firstItem="8l3-rX-RsZ" firstAttribute="top" secondItem="O3A-kI-ESr" secondAttribute="bottom" constant="8" symbolic="YES" id="p9S-gd-PgH"/>
<constraint firstItem="8l3-rX-RsZ" firstAttribute="leading" secondItem="dOU-Cu-KoT" secondAttribute="leadingMargin" id="q8N-xc-MiF"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="CHANGE CARD" id="F0s-hE-wib" userLabel="CHANGE CARD"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="wQO-Iy-nb6" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="369.56521739130437" y="1568.9732142857142"/>
</scene>
<!--MainVC View Controller-->
<scene sceneID="bJR-8k-bP2">
<objects>
......@@ -2565,6 +2496,63 @@
</objects>
<point key="canvasLocation" x="6121.739130434783" y="-64.285714285714278"/>
</scene>
<!--Notifications TableVC-->
<scene sceneID="w6Q-VY-k4b">
<objects>
<tableViewController storyboardIdentifier="Notifier" id="XOE-nO-i9L" customClass="NotificationsTableVC" customModule="Em_call" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="ZDC-MZ-7oD">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="notifierCell" rowHeight="91" id="E42-fp-t6K" customClass="CustCellTableViewCell" customModule="Em_call" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="414" height="91"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="E42-fp-t6K" id="eTe-2J-WyF">
<rect key="frame" x="0.0" y="0.0" width="414" height="91"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="label 1" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="none" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qko-1T-32t">
<rect key="frame" x="20" y="11" width="374" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label 2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0St-Cl-7c7">
<rect key="frame" x="20" y="49" width="374" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="qko-1T-32t" firstAttribute="trailing" secondItem="eTe-2J-WyF" secondAttribute="trailingMargin" id="1Ou-Tb-rkG"/>
<constraint firstItem="0St-Cl-7c7" firstAttribute="top" secondItem="qko-1T-32t" secondAttribute="bottom" constant="20" id="9EO-wj-eed"/>
<constraint firstItem="qko-1T-32t" firstAttribute="top" secondItem="eTe-2J-WyF" secondAttribute="topMargin" id="HUV-Ex-738"/>
<constraint firstAttribute="bottomMargin" secondItem="0St-Cl-7c7" secondAttribute="bottom" constant="13" id="RZf-dG-Kdi"/>
<constraint firstItem="0St-Cl-7c7" firstAttribute="leading" secondItem="eTe-2J-WyF" secondAttribute="leadingMargin" id="X3w-vA-YFz"/>
<constraint firstItem="0St-Cl-7c7" firstAttribute="top" secondItem="qko-1T-32t" secondAttribute="bottom" constant="20" id="bVl-q4-mif"/>
<constraint firstItem="0St-Cl-7c7" firstAttribute="trailing" secondItem="eTe-2J-WyF" secondAttribute="trailingMargin" id="oaD-7k-XP1"/>
<constraint firstItem="qko-1T-32t" firstAttribute="leading" secondItem="eTe-2J-WyF" secondAttribute="leadingMargin" id="vqr-hO-73L"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="labelBot" destination="0St-Cl-7c7" id="cGR-iE-60c"/>
<outlet property="labelTop" destination="qko-1T-32t" id="hYx-BM-Fiw"/>
</connections>
</tableViewCell>
</prototypes>
<sections/>
<connections>
<outlet property="dataSource" destination="XOE-nO-i9L" id="dvf-xF-5Z1"/>
<outlet property="delegate" destination="XOE-nO-i9L" id="6BM-a7-mra"/>
</connections>
</tableView>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qF4-mL-iQ3" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="31.884057971014496" y="-1529.4642857142856"/>
</scene>
<!--ELECTRICIAN-->
<scene sceneID="ezE-OL-3xD">
<objects>
Em-call/Data/Extensions.swift
View file @ 41aaf885
//
// Extensions.swift
// youtube
//
import UIKit
......
Em-call/Data/SettingsLauncher.swift
View file @ 41aaf885
......@@ -44,7 +44,7 @@ class SettingsLauncher : UIViewController, UITableViewDelegate, UITableViewDataS
var navController:UINavigationController? = nil
let frazes:[String] = [
"","Login/Signup","Get Support","Settings","Terms&Conditions","About Fixid",
"","Notifications","Get Support","Settings","Terms&Conditions","About Fixid",
"Select source", "Take Photo...", "Choose from Library...","Cancel",
"Electrician Emergency Departure",
"Entering electricity into the house",
......@@ -286,7 +286,7 @@ class SettingsLauncher : UIViewController, UITableViewDelegate, UITableViewDataS
func numberOfSections(in tableView: UITableView) -> Int {
return 1
} // Default is 1 if not implemented
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellId, for: indexPath)
......@@ -306,6 +306,7 @@ class SettingsLauncher : UIViewController, UITableViewDelegate, UITableViewDataS
case 0:
cell.textLabel?.text = frazes[row+6]
cell.textLabel?.textAlignment = .center
case 1:
cell.textLabel?.text = frazes[row+10]
cell.textLabel?.textAlignment = .center
......@@ -313,7 +314,7 @@ class SettingsLauncher : UIViewController, UITableViewDelegate, UITableViewDataS
cell.textLabel?.text = frazes[row]
cell.backgroundColor = .black
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
//cell.tintColor = UIColor.white
cell.selectionStyle = UITableViewCell.SelectionStyle.none
cell.textLabel?.textColor = .white
default:
break
......
Em-call/SmallListWorkVC.swift
View file @ 41aaf885
......@@ -43,11 +43,9 @@ class SmallListWorkVC: UIViewController {
let storyboard = UIStoryboard(name: "Main", bundle: nil)
let vc:UIViewController
if #available(iOS 13.0, *) {
vc = storyboard.instantiateViewController(identifier: "Electric") as! ElectricTableViewController
} else {
vc = storyboard.instantiateViewController(withIdentifier: "Electric")
}
navigationController?.pushViewController(vc, animated: true)
}
......
Em-call/VC/CallProfiViewController.swift
View file @ 41aaf885
......@@ -71,9 +71,9 @@ class CallProfiViewController: UIViewController, UITableViewDelegate, UITableVie
@IBAction func pressShowMap(_ sender: Any) {
guard let vc = storyboard?.instantiateViewController(withIdentifier: "MainVC")
let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "MainVC")
// guard let vc = storyboard?.instantiateViewController(withIdentifier: "Logo")
else { return }
// else { return }
// (vc as! MainViewController).showWorkerMap = 1
(vc as! MainVCViewController).initSecond()
((vc as! MainVCViewController).viewControllers[0] as! MainViewController).showWorkerMap = 1
......
Em-call/VC/MainVCViewController.swift
View file @ 41aaf885
......@@ -41,13 +41,8 @@ class MainVCViewController: SOTabBarController {
func initSecond() {
super.viewDidLoad()
self.delegate = self
/* firstVC.tabBarItem = nil
secondVC.tabBarItem = nil
thrVC.tabBarItem = nil
foVC.tabBarItem = nil
firstVC = nil
secondVC = nil*/
/* firstVC.tabBarItem = nil secondVC.tabBarItem = nil thrVC.tabBarItem = nil foVC.tabBarItem = nil
firstVC = nil secondVC = nil*/
if firstVC == nil {
firstVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "Logo")
}
......@@ -60,12 +55,12 @@ class MainVCViewController: SOTabBarController {
if foVC == nil {
foVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "ProfileVC")
}
/*
/*
firstVC!.tabBarItem = UITabBarItem(title: "Home", image: UIImage(named: "Home_white1"), selectedImage: UIImage(named: "Home_black"))
secondVC!.tabBarItem = UITabBarItem(title: "BookingVK", image: UIImage(named: "Bookings_white"), selectedImage: UIImage(named: "Bookings_black"))
thrVC!.tabBarItem = UITabBarItem(title: "Chat", image: UIImage(named: "Chat_white"), selectedImage: UIImage(named: "Chat_black"))
foVC!.tabBarItem = UITabBarItem(title: "Profile", image: UIImage(named: "profile_white2"), selectedImage: UIImage(named: "Profile_black2"))
*/
*/
if viewControllers == nil {
viewControllers = [firstVC!, secondVC!,thrVC!,foVC!]
}
......
Em-call/VC/MainViewController.swift
View file @ 41aaf885
......@@ -20,6 +20,8 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
var count:Int = 0
var settingsLauncher:SettingsLauncher = SettingsLauncher()
var bottomSheetVC:UIViewController? = nil
var profiGo_VC:UIViewController? = nil
var bigProfiGoVC:UIViewController? = nil
var selRow:Int = 0
var showWorkerMap = 0
......@@ -126,7 +128,7 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
present(newViewController, animated: false, completion: nil)
}*/
}
//----------------------------------------------------------------------------------------------------------
override func viewDidLoad() {
super.viewDidLoad()
//London coordinates
......@@ -163,9 +165,9 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
}
// tableView.tableFooterView = UIView()
self.settingsLauncher.delegateMenu = self
}
//----------------------------------------------------------------------------------------------------------
override func viewDidAppear(_ animated:Bool) {
super.viewDidAppear(animated)
locationManager.checkLocationEnable()
......@@ -175,14 +177,31 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
buttonEmerPlumber.isHidden = true
buttonEmerHandman.isHidden = true
self.navigationController?.setNavigationBarHidden(true, animated: animated)
if bigProfiGoVC != nil {
self.view.sendSubviewToBack(bigProfiGoVC!.view)
bigProfiGoVC!.removeFromParent()
}
if bottomSheetVC != nil {
//sendSubviewToBack(_ view: UIView)
self.view.sendSubviewToBack(bottomSheetVC!.view)
// self.view.willRemoveSubview(bottomSheetVC!.view)
bottomSheetVC!.removeFromParent()
}
if showWorkerMap == 1 //переход из CallProfiViewController
{
if profiGo_VC != nil {
//sendSubviewToBack(_ view: UIView)
self.view.sendSubviewToBack(profiGo_VC!.view)
// self.view.willRemoveSubview(bottomSheetVC!.view)
profiGo_VC!.removeFromParent()
}
switch showWorkerMap {
case 0:
bottomView.isHidden = false
text_Location.isHidden = false
buttonWhatDo.isHidden = false
buttonDoIt.isHidden = false
imgMicrophon.isHidden = false
case 1:
let annotations = CustomPointAnnotation()
let coord = arrayCoordMapWorker[3]
annotations.coordinate = CLLocationCoordinate2D(latitude: coord.0, longitude: coord.1)
......@@ -193,15 +212,27 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
buttonWhatDo.isHidden = true
buttonDoIt.isHidden = true
imgMicrophon.isHidden = true
} else {
text_Location.isHidden = false
buttonWhatDo.isHidden = false
buttonDoIt.isHidden = false
imgMicrophon.isHidden = false
bottomView.isHidden = true
profiGoView()
case 2:
let annotations = CustomPointAnnotation()
let coord = arrayCoordMapWorker[3]
annotations.coordinate = CLLocationCoordinate2D(latitude: coord.0, longitude: coord.1)
annotations.imageName = nameImageIconMap[3]
mapView.addAnnotation(annotations)
text_Location.isHidden = true
buttonWhatDo.isHidden = true
buttonDoIt.isHidden = true
imgMicrophon.isHidden = true
bottomView.isHidden = true
bigProfiGoView()
default:
break
}
// mapView.selectAnnotation(mapView.annotations[0], animated: true)
}
//----------------------------------------------------------------------------------------------------------
override func viewWillAppear(_ animated: Bool) {
/* self.navigationController?.navigationBar.titleTextAttributes = [.foregroundColor : UIColor.white]
self.navigationController?.navigationBar.barTintColor = UIColor.black
......@@ -211,17 +242,17 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
buttonDoIt.isHidden = false
self.navigationController?.setNavigationBarHidden(true, animated: animated)
}
//----------------------------------------------------------------------------------------------------------
override func viewWillDisappear(_ animated: Bool) {
self.view.alpha = 1.0
count = 0
showWorkerMap = 0
}
//----------------------------------------------------------------------------------------------------------
@IBAction func pressWhatDo(_ sender: Any) {
addBottomSheetView()
}
//----------------------------------------------------------------------------------------------------------
func removeSpecificAnnotation(titleAnnot:String) {
for annotation in self.mapView.annotations {
if let title = annotation.title, title == titleAnnot {
......@@ -229,7 +260,7 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
}
}
}
//----------------------------------------------------------------------------------------------------------
func findSpecificAnnotation(titleAnnot:String)->AnyObject? {
// var annot:MKAnnotation? = nil
for annotation in self.mapView.annotations {
......@@ -240,7 +271,35 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
}
return nil
}
//----------------------------------------------------------------------------------------------------------
func profiGoView() {
buttonDoIt.isHidden = true
profiGo_VC = ProfiGoVC()
if profiGo_VC != nil {
self.addChild(profiGo_VC!)
self.view.addSubview(profiGo_VC!.view)
profiGo_VC!.didMove(toParent: self)
// 3- Adjust bottomSheet frame and initial position.
let height = view.frame.height
let width = view.frame.width
profiGo_VC!.view.frame = CGRect(x: 0, y: self.view.frame.maxY, width: width, height: height)
}
}
//----------------------------------------------------------------------------------------------------------
func bigProfiGoView() {
buttonDoIt.isHidden = true
bigProfiGoVC = ProfiCallViewController()
if bigProfiGoVC != nil {
self.addChild(bigProfiGoVC!)
self.view.addSubview(bigProfiGoVC!.view)
bigProfiGoVC!.didMove(toParent: self)
// 3- Adjust bottomSheet frame and initial position.
let height = view.frame.height
let width = view.frame.width
bigProfiGoVC!.view.frame = CGRect(x: 0, y: self.view.frame.maxY, width: width, height: height)
}
}
//----------------------------------------------------------------------------------------------------------
func addBottomSheetView() {
buttonDoIt.isHidden = true
// 1- Init bottomSheetVC
......@@ -259,16 +318,16 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
}
// bottomSheetVC.view.frame = CGRect(x: 0, y: 0, width: width, height: height)
}
//----------------------------------------------------------------------------------------------------------
func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
/* let item = UIBarButtonItem(title: "LOGO", style: .plain, target: nil, action: nil)
viewController.navigationItem.backBarButtonItem = item*/
}
//----------------------------------------------------------------------------------------------------------
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
text_Location.resignFirstResponder()
}
//----------------------------------------------------------------------------------------------------------
//func mapView(mapViewAnnot: MKMapView!,ViewForAnnotation annotation: MKAnnotation!) ->MKAnnotationView{
func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) ->MKAnnotationView? {
if !(annotation is CustomPointAnnotation) {
......@@ -303,7 +362,7 @@ class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelega
}
return pinView!
}
//----------------------------------------------------------------------------------------------------------
@IBAction func tapGesture(_ sender: Any) {
view.endEditing(true)
}
......@@ -363,15 +422,12 @@ extension MainViewController: MenuViewControllerDelegate {
func selectedMenuCell(_ row: Int) {
switch row {
case 0: break
// Home
case 1: break
// Music
// self.showViewController(viewController: UINavigationController.self, storyboardId: "MusicNavID")
case 1:// break
self.showMenuViewController(viewController: NotificationsTableVC.self, storyboardId: "Notifier")
case 2: //break
// Movies
self.showMenuViewController(viewController: MapViewController.self, storyboardId: "Map")
case 3: //break
// Books
case 3: //break // Books
self.showMenuViewController(viewController: VKBookingViewController.self, storyboardId: "BookingVK")
case 4: break
// Profile
......
Em-call/mainAddition/ProfiCallViewController.swift 0 → 100644
View file @ 41aaf885
//
// ProfiCallViewController.swift
// Em-call
//
// Created by Alex Sh on 27.04.2022.
//
import UIKit
class ProfiCallViewController: UIViewController {
let fullView: CGFloat = 100.0
var partialView: CGFloat {
// return UIScreen.main.bounds.height - (400 + UIApplication.shared.statusBarFrame.height)
return 300.0 + UIApplication.shared.statusBarFrame.height
// return UIScreen.main.bounds.height - 200
}
override func viewDidLoad() {
super.viewDidLoad()
let gesture = UIPanGestureRecognizer.init(target: self, action: #selector(panGesture))
//gesture.delegate = self
view.addGestureRecognizer(gesture)
roundViews()
// Do any additional setup after loading the view.
}
override func viewDidAppear(_ animated: Bool) {
UIView.animate(withDuration: 0.6, animations: { [weak self] in
let frame = self?.view.frame
let yComponent = self?.partialView
self?.view.frame = CGRect(x: 0, y: yComponent!, width: frame!.width, height: frame!.height - 100)
})
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// prepareBackgroundView()
}
/* @IBAction func pressProfiGo(_ sender: Any) {
let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "MainVC")
(vc as! MainVCViewController).initSecond()
((vc as! MainVCViewController).viewControllers[0] as! MainViewController).showWorkerMap = 2
navigationController?.pushViewController(vc, animated: true)
}*/
@objc func panGesture(_ recognizer: UIPanGestureRecognizer) {
let translation = recognizer.translation(in: self.view)
let velocity = recognizer.velocity(in: self.view)
let y = self.view.frame.minY
if (y + translation.y >= fullView) && (y + translation.y <= partialView) {
self.view.frame = CGRect(x: 0, y: y + translation.y, width: view.frame.width, height: view.frame.height)
recognizer.setTranslation(CGPoint.zero, in: self.view)
}
if recognizer.state == .ended {
var duration = velocity.y < 0 ? Double((y - fullView) / -velocity.y) : Double((partialView - y) / velocity.y )
duration = duration > 1.3 ? 1 : duration
UIView.animate(withDuration: duration, delay: 0.0, options: [.allowUserInteraction], animations: {
if velocity.y >= 0 {
self.view.frame = CGRect(x: 0, y: self.partialView, width: self.view.frame.width, height: self.view.frame.height)
} else {
self.view.frame = CGRect(x: 0, y: self.fullView, width: self.view.frame.width, height: self.view.frame.height)
}
}, completion: { [weak self] _ in
if ( velocity.y < 0 ) {
}
})
}
}
func prepareBackgroundView(){
let blurEffect = UIBlurEffect.init(style: .dark)
let visualEffect = UIVisualEffectView.init(effect: blurEffect)
let bluredView = UIVisualEffectView.init(effect: blurEffect)
bluredView.contentView.addSubview(visualEffect)
visualEffect.frame = UIScreen.main.bounds
bluredView.frame = UIScreen.main.bounds
view.insertSubview(bluredView, at: 0)
}
func roundViews() {
view.layer.cornerRadius = 15
/* holdView.layer.cornerRadius = 3
left.layer.cornerRadius = 10
right.layer.cornerRadius = 10
// left.layer.borderColor = UIColor(colorLiteralRed: 0, green: 148/255, blue: 247.0/255.0, alpha: 1).cgColor
left.layer.borderWidth = 1*/
view.clipsToBounds = true
}
}
Em-call/mainAddition/ProfiCallViewController.xib 0 → 100644
View file @ 41aaf885
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ProfiCallViewController" customModule="Em_call" customModuleProvider="target">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your professional will arrive in ~ 20 min " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uui-7a-JCF">
<rect key="frame" x="93" y="75" width="228" height="41"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="VOr-Cs-IyP">
<rect key="frame" x="34" y="141" width="346" height="67"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="worker_map2" translatesAutoresizingMaskIntoConstraints="NO" id="8ay-yZ-bDl">
<rect key="frame" x="0.0" y="0.0" width="50" height="67"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="cBt-Sw-8KU"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Steve Peterson assigned to your order an electrician" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qb5-HD-Sh3">
<rect key="frame" x="80" y="0.0" width="266" height="67"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="8ay-yZ-bDl" firstAttribute="leading" secondItem="VOr-Cs-IyP" secondAttribute="leading" id="Chw-oP-5Lp"/>
<constraint firstItem="8ay-yZ-bDl" firstAttribute="top" secondItem="VOr-Cs-IyP" secondAttribute="top" id="K0f-T8-8g0"/>
<constraint firstAttribute="bottom" secondItem="8ay-yZ-bDl" secondAttribute="bottom" id="gRt-m9-ujh"/>
</constraints>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make another booking" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GIy-sC-Pff">
<rect key="frame" x="34" y="294" width="170" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwb-Tp-SCU">
<rect key="frame" x="34" y="335" width="346" height="30"/>
<state key="normal" title="What do want to do?">
<color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="6"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="17" translatesAutoresizingMaskIntoConstraints="NO" id="Tkb-rz-uWn">
<rect key="frame" x="148" y="216" width="137" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N8V-gG-E1L">
<rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="7ni-sV-zBl"/>
<constraint firstAttribute="height" constant="60" id="B1N-0c-Fwr"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="60" id="T88-3D-dh8"/>
</constraints>
<state key="normal" title="Button" image="call_pro"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k4O-fO-NAR">
<rect key="frame" x="77" y="0.0" width="60" height="60"/>
<state key="normal" title="Button" image="cansel_order"/>
</button>
</subviews>
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="Tkb-rz-uWn" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="148" id="1G3-Fo-4GH"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="GIy-sC-Pff" secondAttribute="trailing" constant="210" id="3Ho-c7-Txs"/>
<constraint firstItem="Uui-7a-JCF" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="31" id="6IN-9x-0BO"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="VOr-Cs-IyP" secondAttribute="trailing" constant="34" id="ADw-HK-EhI"/>
<constraint firstItem="GIy-sC-Pff" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="34" id="AX6-KL-Ota"/>
<constraint firstItem="kwb-Tp-SCU" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="34" id="AbF-z6-c4v"/>
<constraint firstItem="kwb-Tp-SCU" firstAttribute="top" secondItem="GIy-sC-Pff" secondAttribute="bottom" constant="20.5" id="Bn4-pJ-bWK"/>
<constraint firstItem="GIy-sC-Pff" firstAttribute="top" secondItem="Tkb-rz-uWn" secondAttribute="bottom" constant="18" id="F5Z-89-mFw"/>
<constraint firstItem="VOr-Cs-IyP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="34" id="Oq9-rN-1Cd"/>
<constraint firstItem="Uui-7a-JCF" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="93" id="XMm-ZZ-1Z9"/>
<constraint firstItem="Tkb-rz-uWn" firstAttribute="top" secondItem="VOr-Cs-IyP" secondAttribute="bottom" constant="8" symbolic="YES" id="Yej-EU-haL"/>
<constraint firstItem="GIy-sC-Pff" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="34" id="f6T-sT-mtf"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="kwb-Tp-SCU" secondAttribute="trailing" constant="34" id="gKM-gN-9nf"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Tkb-rz-uWn" secondAttribute="trailing" constant="129" id="gk1-CL-mW4"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Uui-7a-JCF" secondAttribute="trailing" constant="93" id="uMV-fQ-kah"/>
<constraint firstItem="VOr-Cs-IyP" firstAttribute="top" secondItem="Uui-7a-JCF" secondAttribute="bottom" constant="25" id="zrh-X7-wH6"/>
</constraints>
<point key="canvasLocation" x="140.57971014492756" y="75.669642857142847"/>
</view>
</objects>
<resources>
<image name="call_pro" width="35" height="35"/>
<image name="cansel_order" width="35" height="35"/>
<image name="worker_map2" width="63" height="67"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Em-call/mainAddition/ProfiGoVC.swift 0 → 100644
View file @ 41aaf885
//
// ProfiGoVC.swift
// Em-call
//
// Created by Alex Sh on 27.04.2022.
//
import UIKit
class ProfiGoVC: UIViewController {
let fullView: CGFloat = 100.0
var partialView: CGFloat {
// return UIScreen.main.bounds.height - (400 + UIApplication.shared.statusBarFrame.height)
// return 50.0 + UIApplication.shared.statusBarFrame.height
return UIScreen.main.bounds.height - 200
}
override func viewDidLoad() {
super.viewDidLoad()
let gesture = UIPanGestureRecognizer.init(target: self, action: #selector(panGesture))
//gesture.delegate = self
view.addGestureRecognizer(gesture)
roundViews()
// Do any additional setup after loading the view.
}
override func viewDidAppear(_ animated: Bool) {
UIView.animate(withDuration: 0.6, animations: { [weak self] in
let frame = self?.view.frame
let yComponent = self?.partialView
self?.view.frame = CGRect(x: 0, y: yComponent!, width: frame!.width, height: frame!.height - 100)
})
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// prepareBackgroundView()
}
@IBAction func pressProfiGo(_ sender: Any) {
let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "MainVC")
(vc as! MainVCViewController).initSecond()
((vc as! MainVCViewController).viewControllers[0] as! MainViewController).showWorkerMap = 2
navigationController?.pushViewController(vc, animated: true)
}
@objc func panGesture(_ recognizer: UIPanGestureRecognizer) {
let translation = recognizer.translation(in: self.view)
let velocity = recognizer.velocity(in: self.view)
let y = self.view.frame.minY
if (y + translation.y >= fullView) && (y + translation.y <= partialView) {
self.view.frame = CGRect(x: 0, y: y + translation.y, width: view.frame.width, height: view.frame.height)
recognizer.setTranslation(CGPoint.zero, in: self.view)
}
if recognizer.state == .ended {
var duration = velocity.y < 0 ? Double((y - fullView) / -velocity.y) : Double((partialView - y) / velocity.y )
duration = duration > 1.3 ? 1 : duration
UIView.animate(withDuration: duration, delay: 0.0, options: [.allowUserInteraction], animations: {
if velocity.y >= 0 {
self.view.frame = CGRect(x: 0, y: self.partialView, width: self.view.frame.width, height: self.view.frame.height)
} else {
self.view.frame = CGRect(x: 0, y: self.fullView, width: self.view.frame.width, height: self.view.frame.height)
}
}, completion: { [weak self] _ in
if ( velocity.y < 0 ) {
}
})
}
}
func prepareBackgroundView(){
let blurEffect = UIBlurEffect.init(style: .dark)
let visualEffect = UIVisualEffectView.init(effect: blurEffect)
let bluredView = UIVisualEffectView.init(effect: blurEffect)
bluredView.contentView.addSubview(visualEffect)
visualEffect.frame = UIScreen.main.bounds
bluredView.frame = UIScreen.main.bounds
view.insertSubview(bluredView, at: 0)
}
func roundViews() {
view.layer.cornerRadius = 15
/* holdView.layer.cornerRadius = 3
left.layer.cornerRadius = 10
right.layer.cornerRadius = 10
// left.layer.borderColor = UIColor(colorLiteralRed: 0, green: 148/255, blue: 247.0/255.0, alpha: 1).cgColor
left.layer.borderWidth = 1*/
view.clipsToBounds = true
}
}
Em-call/mainAddition/ProfiGoVC.xib 0 → 100644
View file @ 41aaf885
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ProfiGoVC" customModule="Em_call" customModuleProvider="target">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="Gkr-8P-M6g">
<rect key="frame" x="47" y="87" width="320" height="33"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Your professional will arrive in ~ 20 min ">
<color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="pressProfiGo:" destination="-1" eventType="touchUpInside" id="MGz-7w-adF"/>
</connections>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Gkr-8P-M6g" secondAttribute="trailing" constant="47" id="FH0-fU-vci"/>
<constraint firstItem="Gkr-8P-M6g" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="47" id="Ms1-CR-mDF"/>
<constraint firstItem="Gkr-8P-M6g" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="43" id="l9T-Bj-beH"/>
</constraints>
<point key="canvasLocation" x="140.57971014492756" y="63.616071428571423"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment