Skip to content

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

commit 04.04.2022 

commit 04.04.2022
parent b03e1592
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1999 additions and 705 deletions
Em-call.xcodeproj/project.pbxproj
View file @ cfe684e0
......@@ -20,6 +20,7 @@
D53F55FC27E5D12700C18B2A /* SwipeableItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53F55FA27E5D12700C18B2A /* SwipeableItems.swift */; };
D53F560B27E62D7600C18B2A /* SmallListWorkVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53F560927E62D7600C18B2A /* SmallListWorkVC.swift */; };
D53F560C27E62D7600C18B2A /* SmallListWorkVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = D53F560A27E62D7600C18B2A /* SmallListWorkVC.xib */; };
D542184027F25EAB00DA8F51 /* CustCellTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D542183F27F25EAB00DA8F51 /* CustCellTableViewCell.swift */; };
D558EA5C27BE4A6C003C4578 /* HandmanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D558EA5B27BE4A6C003C4578 /* HandmanViewController.swift */; };
D558EA6127BE4C65003C4578 /* EmerHandViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D558EA6027BE4C65003C4578 /* EmerHandViewController.swift */; };
D55E88F327DE124B00DB59E7 /* GlidingCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55E88E727DE124A00DB59E7 /* GlidingCollection.swift */; };
......@@ -103,6 +104,7 @@
D53F55FA27E5D12700C18B2A /* SwipeableItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwipeableItems.swift; path = "../../../../GoldCode/MaterialsColdCode/SwipeableView-master/SwipeableView/SwipeableView/SwipeableItems.swift"; sourceTree = "<group>"; };
D53F560927E62D7600C18B2A /* SmallListWorkVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallListWorkVC.swift; sourceTree = "<group>"; };
D53F560A27E62D7600C18B2A /* SmallListWorkVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SmallListWorkVC.xib; sourceTree = "<group>"; };
D542183F27F25EAB00DA8F51 /* CustCellTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustCellTableViewCell.swift; sourceTree = "<group>"; };
D558EA5B27BE4A6C003C4578 /* HandmanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandmanViewController.swift; sourceTree = "<group>"; };
D558EA6027BE4C65003C4578 /* EmerHandViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmerHandViewController.swift; sourceTree = "<group>"; };
D55E88E727DE124A00DB59E7 /* GlidingCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlidingCollection.swift; sourceTree = "<group>"; };
......@@ -334,6 +336,7 @@
isa = PBXGroup;
children = (
D5CF729D27DFB3500026392B /* ListWorkViewController.swift */,
D542183F27F25EAB00DA8F51 /* CustCellTableViewCell.swift */,
);
path = Addition;
sourceTree = "<group>";
......@@ -604,6 +607,7 @@
D5F0236F27C4DAD8008F4146 /* ChangePswViewController.swift in Sources */,
D5057F9D27BA5E940015C0DC /* VKBookingViewController.swift in Sources */,
D5F0236A27C4DAC2008F4146 /* RegistrationViewController.swift in Sources */,
D542184027F25EAB00DA8F51 /* CustCellTableViewCell.swift in Sources */,
D558EA6127BE4C65003C4578 /* EmerHandViewController.swift in Sources */,
D514860727BB7FD7006830A3 /* ChatViewController.swift in Sources */,
D5CB9A2827ECCE9A000F8500 /* StringExtension.swift in Sources */,
......
Em-call.xcodeproj/xcshareddata/xcschemes/Em-call.xcscheme 0 → 100644
View file @ cfe684e0
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D569AB5C27B8E27A0013DCFE"
BuildableName = "Em-call.app"
BlueprintName = "Em-call"
ReferencedContainer = "container:Em-call.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D569AB7527B8E27B0013DCFE"
BuildableName = "Em-callTests.xctest"
BlueprintName = "Em-callTests"
ReferencedContainer = "container:Em-call.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D569AB8027B8E27B0013DCFE"
BuildableName = "Em-callUITests.xctest"
BlueprintName = "Em-callUITests"
ReferencedContainer = "container:Em-call.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D569AB5C27B8E27A0013DCFE"
BuildableName = "Em-call.app"
BlueprintName = "Em-call"
ReferencedContainer = "container:Em-call.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D569AB5C27B8E27A0013DCFE"
BuildableName = "Em-call.app"
BlueprintName = "Em-call"
ReferencedContainer = "container:Em-call.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Em-call.xcodeproj/xcuserdata/alexsh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ cfe684e0
......@@ -14,10 +14,10 @@
filePath = "Em-call/VC/ElectricTableViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "42"
endingLineNumber = "42"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "43"
endingLineNumber = "43"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -46,10 +46,10 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "214"
endingLineNumber = "214"
landmarkName = "coordinateToAdress(_:)"
landmarkType = "7">
startingLineNumber = "278"
endingLineNumber = "278"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -62,8 +62,8 @@
filePath = "Em-call/VC/HandmanViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "227"
endingLineNumber = "227"
startingLineNumber = "265"
endingLineNumber = "265"
landmarkName = "delegateClick(text:)"
landmarkType = "7">
</BreakpointContent>
......@@ -78,8 +78,8 @@
filePath = "Em-call/VC/HandmanViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "236"
endingLineNumber = "236"
startingLineNumber = "274"
endingLineNumber = "274"
landmarkName = "calendarDelegateClick(text:flagData:)"
landmarkType = "7">
</BreakpointContent>
......@@ -180,22 +180,6 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "05ED9425-8429-42D9-B62E-7BDF0B14420F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "91"
endingLineNumber = "91"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
......@@ -206,10 +190,10 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "113"
endingLineNumber = "113"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
startingLineNumber = "134"
endingLineNumber = "134"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -302,10 +286,10 @@
filePath = "Em-call/VC/ElectricTableViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "224"
endingLineNumber = "224"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "235"
endingLineNumber = "235"
landmarkName = "ElectricTableViewController"
landmarkType = "21">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......
Em-call.xcodeproj/xcuserdata/alexsh.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ cfe684e0
......@@ -10,5 +10,23 @@
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>D569AB5C27B8E27A0013DCFE</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>D569AB7527B8E27B0013DCFE</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>D569AB8027B8E27B0013DCFE</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Em-call.xcworkspace/xcuserdata/alexsh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ cfe684e0
......@@ -14,8 +14,8 @@
filePath = "Em-call/VC/ProfileViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "56"
endingLineNumber = "56"
startingLineNumber = "59"
endingLineNumber = "59"
landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)"
landmarkType = "7">
</BreakpointContent>
......@@ -24,14 +24,14 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "928501E6-B75F-4FD2-BD11-2133648FF1DA"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ProfileViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58"
startingLineNumber = "61"
endingLineNumber = "61"
landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)"
landmarkType = "7">
</BreakpointContent>
......@@ -148,22 +148,6 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "961D3D3C-3B31-4E3B-A6DA-64F7E35755EC"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "83"
endingLineNumber = "83"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
......@@ -174,10 +158,10 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
endingLineNumber = "129"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
startingLineNumber = "169"
endingLineNumber = "169"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -212,38 +196,6 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5B6BEC96-DAB7-4B10-AA15-EDB231A59C47"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/Addition/BananaViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "217"
endingLineNumber = "217"
landmarkName = "scrollViewTapped(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0B5DDEC8-2549-483F-97AA-7CB3471CFBAE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/Addition/BananaViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "192"
endingLineNumber = "192"
landmarkName = "assignTouchGesture()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
......@@ -270,73 +222,10 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "138"
endingLineNumber = "138"
landmarkName = "viewWillDisappear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "01B8D3CA-59D2-4306-A206-96990A93A494"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
landmarkName = "MainViewController"
landmarkType = "3">
<Locations>
<Location
uuid = "01B8D3CA-59D2-4306-A206-96990A93A494 - 487273fd74c401e5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Em_call.MainViewController.locationManager.getter : Em_call.LocationMng"
moduleName = "Em-call"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/alexsh/Documents/GitHub/Em-call/Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
offsetFromSymbolStart = "56">
</Location>
<Location
uuid = "01B8D3CA-59D2-4306-A206-96990A93A494 - a5f75be4f7611e4c"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Em_call.MainViewController.init(nibName: Swift.Optional&lt;Swift.String&gt;, bundle: Swift.Optional&lt;__C.NSBundle&gt;) -&gt; Em_call.MainViewController"
moduleName = "Em-call"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/alexsh/Documents/GitHub/Em-call/Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
offsetFromSymbolStart = "1249">
</Location>
<Location
uuid = "01B8D3CA-59D2-4306-A206-96990A93A494 - fb416bcacc6445ed"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Em_call.MainViewController.init(coder: __C.NSCoder) -&gt; Swift.Optional&lt;Em_call.MainViewController&gt;"
moduleName = "Em-call"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/alexsh/Documents/GitHub/Em-call/Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
offsetFromSymbolStart = "1184">
</Location>
</Locations>
startingLineNumber = "178"
endingLineNumber = "178"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -349,10 +238,10 @@
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "120"
endingLineNumber = "120"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
startingLineNumber = "141"
endingLineNumber = "141"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -439,14 +328,14 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "113CF7DA-1BA8-4DC9-B113-0398D7502652"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "49"
endingLineNumber = "49"
startingLineNumber = "52"
endingLineNumber = "52"
landmarkName = "viewWillDisappear(_:)"
landmarkType = "7">
</BreakpointContent>
......@@ -455,7 +344,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7BF1837A-022E-4B94-8149-74E8C96B61FB"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/Chat/MessageInputView.swift"
......@@ -487,14 +376,14 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BA59213A-9BDF-4BF9-A03E-9486BE8EF9CE"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "69"
endingLineNumber = "69"
startingLineNumber = "85"
endingLineNumber = "85"
landmarkName = "sendWasTapped(message:)"
landmarkType = "7">
</BreakpointContent>
......@@ -519,7 +408,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9EDCFC4A-C54C-4AFA-888D-CB16510E1436"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/Chat/MessageInputView.swift"
......@@ -599,14 +488,14 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3EB9BD12-531C-41D8-9CC5-1CA726900CF0"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "75"
endingLineNumber = "75"
startingLineNumber = "91"
endingLineNumber = "91"
landmarkName = "received(message:)"
landmarkType = "7">
</BreakpointContent>
......@@ -659,5 +548,229 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "87B2AA50-8EC0-4A30-B22D-99B39FE056AD"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "89"
endingLineNumber = "89"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "02CC8BF3-1CD9-4F1C-AE0F-3D6E50EA022B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "73"
endingLineNumber = "73"
landmarkName = "hideKeyboardWhenTappedAround()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C08BBF9C-0E30-4D97-943B-ED013C8D8888"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "174"
endingLineNumber = "174"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5855786F-FEEF-46EE-A9EC-AA4DB0FFD8C2"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "272"
endingLineNumber = "272"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C0F3CBC7-79E8-4CC3-B2B5-566BF5CA794B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "304"
endingLineNumber = "304"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "518F8619-D98B-4F40-BEC8-420473AEC4BD"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "312"
endingLineNumber = "312"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C1DF042B-F53E-42BC-ABB9-A85FCFA09B67"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "233"
endingLineNumber = "233"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7F039346-648C-456E-BB8A-6E53D79B1D2E"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "209"
endingLineNumber = "209"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F33A9E3E-136F-4F4C-994C-9B7D684117AE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "79"
endingLineNumber = "79"
landmarkName = "dismissKeyboard()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9A3BDEB0-DA5E-4BF6-837A-EF1BE86E4ED5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/ChatViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "37"
endingLineNumber = "37"
landmarkName = "call_Method()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D14255FD-00B8-49F8-89F4-31CCA9440383"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "265"
endingLineNumber = "265"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F9F78669-CAFD-43DB-9C08-A95B0ECB38C3"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "264"
endingLineNumber = "264"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "26D9CD1F-5C59-47D4-9391-5981FEB9EBA9"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "239"
endingLineNumber = "239"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "FDCC0BC9-8637-4973-85FC-CAA34EF0FC6F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Em-call/VC/MainViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
endingLineNumber = "238"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Em-call/Addition/CustCellTableViewCell.swift 0 → 100644
View file @ cfe684e0
//
// CustCellTableViewCell.swift
// Em-call
//
// Created by Alex Sh on 29.03.2022.
//
import UIKit
class CustCellTableViewCell: UITableViewCell {
@IBOutlet weak var custCell: UILabel!
@IBOutlet weak var custCell2: UILabel!
@IBOutlet weak var imageCell: UIImageView!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
Em-call/Assets.xcassets/Union.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Union.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/Vector.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Vector.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/electric_map.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "electric_map.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/electric_map2.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "electric_map2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/eva_pin-fill_red.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "eva_pin-fill_red.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/eva_pin-fill_red3.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "eva_pin-fill_red3.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/handyman_map.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "handyman_map.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/handyman_map2.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "handyman_map2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/plumber_map.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "plumber_map.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/plumber_map2.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "plumber_map2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/uil_calendar-alt.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "uil_calendar-alt.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/worker_map.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "worker_map.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Assets.xcassets/worker_map2.imageset/Contents.json 0 → 100644
View file @ cfe684e0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "worker_map2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Em-call/Base.lproj/Main.storyboard
View file @ cfe684e0
This diff is collapsed.
Em-call/Chat/Layouts.swift
View file @ cfe684e0
......@@ -41,7 +41,7 @@ extension ChatViewController {
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillChange(notification:)), name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
// loadViews()
hideKeyboardWhenTappedAround()
}
@objc func keyboardWillChange(notification: NSNotification) {
......
Em-call/Data/SettingsLauncher.swift
View file @ cfe684e0
......@@ -86,7 +86,7 @@ class SettingsLauncher : UIViewController, UITableViewDelegate, UITableViewDataS
}, completion: nil)
}
}
//не используется
func selectWork() {
if let window = UIApplication.shared.keyWindow {
blackView.backgroundColor = UIColor(white: 0, alpha: 0.5)
......
Em-call/VC/CallProfiViewController.swift
View file @ cfe684e0
......@@ -7,23 +7,128 @@
import UIKit
class CallProfiViewController: UIViewController {
class KeyValueCell: UITableViewCell {
var keyLabel: UILabel? = nil
// var valueLabel: UILabel? = nil
}
class CallProfiViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
@IBOutlet weak var tableView: UITableView!
let cellReuseIdentifier = "cell"
var address = "Unknow address"
var dateAndTime = "2022/02/23"
var contact = "+1 123 112 11 22"
var card = "**** **** **** 1234"
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
tableView.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
//tableView.rowHeight = 45
tableView.estimatedRowHeight = 44
tableView.rowHeight = UITableView.automaticDimension
tableView.delegate = self
tableView.dataSource = self
let item1 = setBarButtom(str: "akar-icons_arrow-left")
self.navigationItem.setLeftBarButtonItems([item1], animated: true)
let item2 = setBarButtom(str: "gg_close")
self.navigationItem.setRightBarButtonItems([item2], animated: true)
}
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
}
@objc
func back() {
navigationController?.popViewController( animated: true)
}
@IBAction func pressShowMap(_ sender: Any) {
guard let vc = storyboard?.instantiateViewController(withIdentifier: "Logo")
else { return }
(vc as! MainViewController).showWorkerMap = 1
// (vc as! CalendarViewController).delegate = self
navigationController?.pushViewController(vc, animated: true)
// self.present(vc, animated: true, completion: nil)
}
/*
// 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.
func numberOfSections(in tableView: UITableView) -> Int {
return 4
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
// let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
// let cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell", for: indexPath)
// let cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
//let track = trackList[indexPath.row]
var cell:CustCellTableViewCell
let section = indexPath.section
switch section {
case 0:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = address
case 1:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2.text = dateAndTime
// cell.imageCell.isHidden = true
case 2:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
case 3:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell?.text = card
cell.imageCell?.image = UIImage(named: "Vector")
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
// default: break
default:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
}
// cell.textLabel?.textColor = UIColor.darkGray
//cell.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 13)
return cell
}
func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
switch section {
case 0: return ("Work location")
case 1: return ("Date and Time")
case 2: return ("Your contacts")
case 3: return ("Payment")
default: return ("")
}
}
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: 12)
}
*/
}
Em-call/VC/ChatViewController.swift
View file @ cfe684e0
......@@ -27,8 +27,11 @@ class ChatViewController: UIViewController {
var flagStartChat = 0
//debug
let SERVER_NO = 1
/*
override func viewDidLoad() {
super.viewDidLoad()
self.hideKeyboardWhenTappedAround()
}*/
@objc func call_Method () {
print("Click")
......@@ -63,6 +66,19 @@ class ChatViewController: UIViewController {
}
// Put this piece of code anywhere you like
extension UIViewController {
//Now in every UIViewController, all you have to do is call this function:
func hideKeyboardWhenTappedAround() {
let tap = UITapGestureRecognizer(target: self, action: #selector(UIViewController.dismissKeyboard))
tap.cancelsTouchesInView = false
view.addGestureRecognizer(tap)
}
@objc func dismissKeyboard() {
view.endEditing(true)
}
}
//MARK - Message Input Bar
extension ChatViewController: MessageInputDelegate {
func sendWasTapped(message: String) {
......
Em-call/VC/ElectricTableViewController.swift
View file @ cfe684e0
......@@ -30,9 +30,10 @@ class ElectricTableViewController:UIViewController,UITableViewDataSource, UITabl
fileprivate var images: [UIImage?] = []
//let cellReuseIdentifier = "cell"
@IBOutlet weak var tableView: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -105,12 +106,10 @@ class ElectricTableViewController:UIViewController,UITableViewDataSource, UITabl
else { return }
settingsLauncher.showSettings(navigVC: navVC,dispatcher:0)
glidingView.isHidden = false
addPhotoTopConstraint.constant = 98
addPhotoTopConstraint.constant = 102
}
func loadImages() {
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
descTextView.resignFirstResponder()
......@@ -135,11 +134,11 @@ class ElectricTableViewController:UIViewController,UITableViewDataSource, UITabl
// Создаём константу, именна через неё мы будем обращаться к свойствам и изменять их
let header = view as! UITableViewHeaderFooterView
// Установить цвет текста в label
header.textLabel?.textColor = .darkGray
header.textLabel?.textColor = .black
// Установить цвет фона для секции
header.tintColor = UIColor.white
// Установить шрифт и размер шрифта для label
header.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 15)
// header.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 15)
}
......@@ -155,18 +154,30 @@ class ElectricTableViewController:UIViewController,UITableViewDataSource, UITabl
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
//let track = trackList[indexPath.row]
// let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
var cell:CustCellTableViewCell
let section = indexPath.section
switch section {
case 0: cell.textLabel?.text = address
case 1: cell.textLabel?.text = dateAndTime
case 2: cell.textLabel?.text = contact
case 3: cell.textLabel?.text = card
default: break
case 0:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = address
case 1:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = dateAndTime // cell.imageCell.isHidden = true
cell.imageCell?.image = UIImage(named: "uil_calendar-alt")
case 2:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
case 3:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell?.text = card
cell.imageCell?.image = UIImage(named: "Vector")
default:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
}
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
cell.textLabel?.font = UIFont(name: "Roboto", size: 13)
// cell.textLabel?.font = UIFont(name: "Roboto", size: 13)
return cell
}
......
Em-call/VC/EmerHandViewController.swift
View file @ cfe684e0
......@@ -13,7 +13,7 @@ class EmerHandViewController: UIViewController, UITableViewDataSource,
@IBOutlet weak var tableView: UITableView!
@IBOutlet weak var addressView: UIView!
let trackList = Track.getTrackList()
// let trackList = Track.getTrackList()
let cellReuseIdentifier = "cell"
var address = "Unknow address"
var dateAndTime = "2022/02/23"
......
Em-call/VC/HandmanViewController.swift
View file @ cfe684e0
......@@ -13,6 +13,9 @@ class HandmanViewController: UIViewController, UITableViewDataSource,
UITableViewDelegate, UITextViewDelegate
{
var settingsLauncher:SettingsLauncher = SettingsLauncher()
@IBOutlet weak var addPhotoTopConstraint: NSLayoutConstraint!
@IBOutlet weak var tableView: UITableView!
@IBOutlet weak var descTextView: UITextView!
......@@ -45,19 +48,42 @@ class HandmanViewController: UIViewController, UITableViewDataSource,
settingsLauncher.delegate = self
setup()
glidingView.isHidden = true
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
collectionView.reloadData()
collectionView.collectionViewLayout.invalidateLayout()
navigationController?.navigationBar.titleTextAttributes = [.foregroundColor:UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1.0)]
title = "Handyman"
let item1 = setBarButtom(str: "akar-icons_arrow-left")
self.navigationItem.setLeftBarButtonItems([item1], animated: true)
let item2 = setBarButtom(str: "gg_close")
self.navigationItem.setRightBarButtonItems([item2], animated: true)
}
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
}
@objc
func back() {
navigationController?.popViewController( animated: true)
}
@IBAction func pressAddPhoto(_ sender: Any) {
guard let navVC = self.navigationController
else { return }
settingsLauncher.showSettings(navigVC: navVC,dispatcher:0)
glidingView.isHidden = false
addPhotoTopConstraint.constant = 102
}
@IBAction func BOOK_NOW_Click(_ sender: Any) {
......@@ -84,7 +110,7 @@ class HandmanViewController: UIViewController, UITableViewDataSource,
// Установить цвет фона для секции
header.tintColor = UIColor.white
// Установить шрифт и размер шрифта для label
header.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 15)
// header.textLabel?.font = UIFont(name: "Helvetica-Regular", size: 15)
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
......@@ -106,15 +132,27 @@ class HandmanViewController: UIViewController, UITableViewDataSource,
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
//let track = trackList[indexPath.row]
// let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
var cell:CustCellTableViewCell
let section = indexPath.section
switch section {
case 0: cell.textLabel?.text = address
case 1: cell.textLabel?.text = dateAndTime
case 2: cell.textLabel?.text = contact
case 3: cell.textLabel?.text = card
default: break
case 0:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = address
case 1:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = dateAndTime // cell.imageCell.isHidden = true
cell.imageCell?.image = UIImage(named: "uil_calendar-alt")
case 2:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
case 3:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell?.text = card
cell.imageCell?.image = UIImage(named: "Vector")
default:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
}
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
return cell
......
Em-call/VC/MainViewController.swift
View file @ cfe684e0
......@@ -8,22 +8,34 @@
import UIKit
import MapKit
class CustomPointAnnotation: MKPointAnnotation {
var imageName: String!
}
class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationManagerDelegate
class MainViewController: UIViewController, UITextFieldDelegate, MKMapViewDelegate //, CLLocationManagerDelegate
{
@IBOutlet weak var text_Location: UITextField!
var count:Int = 0
// var settingsLauncher:SettingsLauncher = SettingsLauncher()
var bottomSheetVC:UIViewController? = nil
var selRow:Int = 0
var showWorkerMap = 0
@IBOutlet weak var buttonWhatDo: UIButton!
@IBOutlet weak var imgMicrophon: UIImageView!
@IBOutlet weak var bottomView: UIView!
// @IBOutlet weak var swipeableView: SwipeableView!
// @IBOutlet weak var swipeableView: MKMapView!
@IBOutlet weak var buttonDoIt: UIButton!
var showAlert:ShowAlert = ShowAlert()
var arrayCoordMapWorker = [(51.51455283,-0.12197132),(51.5121277776,-0.120492655896),(51.515234854,-0.115117274),(51.5103413836,-0.1215190233),(51.51304096,-0.126825408),
(51.5089155267,-0.1272603095),
/*worker go*/(51.51379832395,-0.123224424264)]
var nameImageIconMap = ["electric_map2","plumber_map2","handyman_map2","worker_map2"]
var indexNameImageIconMap = 0
@IBOutlet weak var mapView: MKMapView!
//let locationManager = LocationMng(mainView:self)
let locationManager = LocationMng()
// var detailsController:MainChildViewController?
@IBOutlet weak var buttonEmerElectric: UIButton!
......@@ -61,14 +73,19 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
let pressPoint = (sender as AnyObject).location(in:mapView)
// let pressCoordinate = mapView.convert(pressPoint, to: mapView)
let pressCoordinate = mapView.convert(pressPoint, toCoordinateFrom: mapView)
let myposannot = MKPointAnnotation()
removeSpecificAnnotation(titleAnnot: "My place")
let myposannot = CustomPointAnnotation()
myposannot.coordinate = pressCoordinate
myposannot.title = "My place"
myposannot.subtitle = "I am here!"
myposannot.imageName = "eva_pin-fill_red3"
mapView.addAnnotation(myposannot)
//let countAnnot = mapView.annotations.count
let anno = findSpecificAnnotation(titleAnnot: "My place")
if anno != nil {
mapView.selectAnnotation(anno as! MKAnnotation, animated: true)
}
let getLat: CLLocationDegrees = pressCoordinate.latitude
let getLon: CLLocationDegrees = pressCoordinate.longitude
let locationTouch: CLLocation = CLLocation(latitude: getLat, longitude: getLon)
......@@ -78,15 +95,6 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
override func viewDidLoad() {
super.viewDidLoad()
// setupBackButton()
// self.navigationItem.titleView?.isHidden = false
/* self.title = "LOGO"
self.navigationController?.navigationBar.titleTextAttributes = [.foregroundColor : UIColor.white]
self.navigationController?.navigationBar.barTintColor = UIColor.black
self.navigationItem.title = "LOGO"
self.navigationController?.navigationBar.topItem?.title = "Logo"
self.navigationController?.navigationItem.title = "Logo"*/
//London coordinates
let initialLocation = CLLocation(latitude: 51.509865, longitude: -0.118092)
mapView.centerToLocation(initialLocation)
......@@ -97,15 +105,28 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
buttonEmerHandman.isHidden = true
text_Location.delegate = self
self.mapView.delegate = self
/*
let annotations = MKPointAnnotation()
annotations.title = "Set my location"
annotations.coordinate = CLLocationCoordinate2D(latitude: 51.509865, longitude: -0.118092)
mapView.addAnnotation(annotations)*/
// settingsLauncher.delegate = self
mapView.addAnnotation(annotations)*/ // settingsLauncher.delegate = self
navigationController?.navigationBar.titleTextAttributes = [.foregroundColor:UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1.0)]
// let leftBarButtonItem = UIBarButtonItem(image: UIImage(contentsOfFile: "akar-icons_arrow-left"), style: .plain, target: self, action:Selector("pressEmerElectric"))
// self.navigationItem.leftBarButtonItem = leftBarButtonItem
// let leftBarButtonItem = UIBarButtonItem(image: UIImage(contentsOfFile: "akar-icons_arrow-left"), style: .plain, target: self, action:Selector("pressEmerElectric")) // self.navigationItem.leftBarButtonItem = leftBarButtonItem
// self.locationManager.delegate = self
for coord in arrayCoordMapWorker {
let annotations = CustomPointAnnotation()
annotations.coordinate = CLLocationCoordinate2D(latitude:
coord.0, longitude: coord.1)
annotations.imageName = nameImageIconMap[indexNameImageIconMap]
indexNameImageIconMap = indexNameImageIconMap + 1
if indexNameImageIconMap > 2 {
indexNameImageIconMap = 0 }
annotations.title = "Worker Place"
mapView.addAnnotation(annotations)
}
}
override func viewDidAppear(_ animated:Bool) {
......@@ -123,6 +144,25 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
// self.view.willRemoveSubview(bottomSheetVC!.view)
bottomSheetVC!.removeFromParent()
}
if showWorkerMap == 1 //переход из CallProfiViewController
{
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
} else {
text_Location.isHidden = false
buttonWhatDo.isHidden = false
buttonDoIt.isHidden = false
imgMicrophon.isHidden = false
}
// mapView.selectAnnotation(mapView.annotations[0], animated: true)
}
override func viewWillAppear(_ animated: Bool) {
......@@ -137,11 +177,32 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
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 {
self.mapView.removeAnnotation(annotation)
}
}
}
func findSpecificAnnotation(titleAnnot:String)->AnyObject? {
// var annot:MKAnnotation? = nil
for annotation in self.mapView.annotations {
if let title = annotation.title, title == titleAnnot {
// self.mapView.removeAnnotation(annotation)
return annotation
}
}
return nil
}
func addBottomSheetView() {
// 1- Init bottomSheetVC
......@@ -162,21 +223,6 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
}
// bottomSheetVC.view.frame = CGRect(x: 0, y: 0, width: width, height: height)
}
/*
@IBAction func pressRowSelect(_ sender: Any) {
// guard let navVC = self.navigationController
// else { return }
// settingsLauncher.showSettings(navigVC: navVC,dispatcher:1)
let storyboard = UIStoryboard(name: "Main", bundle: nil)
let vc:UIViewController
if #available(iOS 13.0, *) {
vc = storyboard.instantiateViewController(identifier: "ListWork") as! ListWorkViewController
} else {
vc = storyboard.instantiateViewController(withIdentifier: "ListWork")
}
navigationController?.pushViewController(vc, animated: true)
}*/
func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
/* let item = UIBarButtonItem(title: "LOGO", style: .plain, target: nil, action: nil)
......@@ -187,19 +233,37 @@ class MainViewController: UIViewController, UITextFieldDelegate //, CLLocationM
text_Location.resignFirstResponder()
}
func mapView(mapViewAnnot: MKMapView!,ViewForAnnotation annotation: MKAnnotation!) ->MKAnnotationView{
//func mapView(mapViewAnnot: MKMapView!,ViewForAnnotation annotation: MKAnnotation!) ->MKAnnotationView{
func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) ->MKAnnotationView? {
if !(annotation is CustomPointAnnotation) {
return MKAnnotationView(annotation: annotation, reuseIdentifier: "pin")
}
let reuseId = "pin"
var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) as? MKPinAnnotationView
if(pinView == nil){
if pinView == nil {
pinView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
pinView!.canShowCallout = true
pinView!.animatesDrop = true
pinView!.pinTintColor = .red
pinView?.canShowCallout = true
}
else {
pinView?.annotation = annotation
pinView?.canShowCallout = true
// pinView.animatesDrop = true
// pinView.pinTintColor = UIColor.darkGrayColor
pinView?.isDraggable = true
pinView?.accessibilityLabel = "hello"
let btn = UIButton(type: .detailDisclosure)
pinView?.rightCalloutAccessoryView = btn
}
/*var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) as? MKPinAnnotationView
if(pinView == nil){ pinView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
pinView!.canShowCallout = true pinView!.animatesDrop = true pinView!.pinTintColor = .red
} else { pinView!.annotation = annotation }*/
let cpa = annotation as! CustomPointAnnotation
if cpa.imageName != "eva_pin-fill_red3" {
pinView!.image = UIImage(named:cpa.imageName)
} else {
pinView!.annotation = annotation
pinView!.image = UIImage(named: "eva_pin-fill_red3")
}
return pinView!
}
......
Em-call/VC/MapViewController.swift
View file @ cfe684e0
......@@ -12,7 +12,7 @@ protocol MapViewControllerDelegate:class {
func delegateClick(text:String)
}
class MapViewController: UIViewController {
class MapViewController: UIViewController, MKMapViewDelegate {
@IBOutlet weak var addressLocation: UITextField!
@IBAction func pressSavePosition(_ sender: Any) {
......@@ -26,21 +26,40 @@ class MapViewController: UIViewController {
@IBOutlet weak var mapView: MKMapView!
let locationManager = LocationMng()
@IBOutlet weak var textLocation: UITextField!
var arrayCoordMapWorker = [(51.51455283,-0.12197132),(51.5121277776,-0.120492655896),(51.515234854,-0.115117274),(51.5103413836,-0.1215190233),(51.51304096,-0.126825408),
(51.5089155267,-0.1272603095),
/*worker go*/(51.51379832395,-0.123224424264)]
var nameImageIconMap = ["electric_map2","plumber_map2","handyman_map2","worker_map2"]
var indexNameImageIconMap = 0
override func viewDidLoad() {
super.viewDidLoad()
navigationController?.navigationBar.titleTextAttributes = [.foregroundColor:UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1.0)]
let initialLocation = CLLocation(latitude: 51.509865, longitude: -0.118092)
self.mapView.delegate = self
mapView.centerToLocation(initialLocation)
let annotations = MKPointAnnotation()
annotations.title = "Set my location"
annotations.coordinate = CLLocationCoordinate2D(latitude:
51.509865, longitude: -0.118092)
mapView.addAnnotation(annotations)
navigationController?.navigationBar.titleTextAttributes = [.foregroundColor:UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1.0)]
for coord in arrayCoordMapWorker {
let annotations = CustomPointAnnotation()
annotations.coordinate = CLLocationCoordinate2D(latitude:
coord.0, longitude: coord.1)
annotations.imageName = nameImageIconMap[indexNameImageIconMap]
indexNameImageIconMap = indexNameImageIconMap + 1
if indexNameImageIconMap > 2 {
indexNameImageIconMap = 0 }
mapView.addAnnotation(annotations)
}
}
override func viewDidAppear(_ animated:Bool) {
super.viewDidAppear(animated)
locationManager.checkLocationEnable()
......@@ -67,22 +86,27 @@ class MapViewController: UIViewController {
}
func mapView(mapViewAnnot: MKMapView!,ViewForAnnotation annotation: MKAnnotation!) ->MKAnnotationView{
func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) ->MKAnnotationView? {
if !(annotation is CustomPointAnnotation) {
return MKAnnotationView(annotation: annotation, reuseIdentifier: "pin")
}
let reuseId = "pin"
var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId) as? MKPinAnnotationView
if(pinView == nil){
pinView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
pinView!.canShowCallout = true
pinView!.animatesDrop = true
pinView!.pinTintColor = .red
} else {
pinView!.annotation = annotation
var pinView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId)
if pinView == nil {
pinView = MKAnnotationView(annotation: annotation, reuseIdentifier: reuseId)
pinView?.canShowCallout = true
}
else {
pinView?.annotation = annotation
}
let cpa = annotation as! CustomPointAnnotation
pinView!.image = UIImage(named:cpa.imageName)
return pinView!
}
// Преобразуем координаты в Адрес
func coordinateToAdress(_ locations: CLLocation) {
CLGeocoder().reverseGeocodeLocation(locations /*.last!*/) { (placemarks, error) in
......
Em-call/VC/PlumViewController.swift
View file @ cfe684e0
......@@ -11,7 +11,7 @@ import UIKit
class PlumViewController: UIViewController, UITableViewDataSource,
UITableViewDelegate
{
// let trackList = Track.getTrackList()
let cellReuseIdentifier = "cell"
var address = "Unknow address"
var dateAndTime = "2022/02/23"
......
Em-call/VC/PlumbersViewController.swift
View file @ cfe684e0
......@@ -16,6 +16,7 @@ class PlumbersViewController: UIViewController,UITableViewDataSource, UITableVie
@IBOutlet weak var glidingView: GlidingCollection!
fileprivate var collectionView: UICollectionView!
@IBOutlet weak var addPhotoTopConstraint: NSLayoutConstraint!
var selRow:Int = 0
// let imagePickerController = UIImagePickerController()
......@@ -26,28 +27,61 @@ class PlumbersViewController: UIViewController,UITableViewDataSource, UITableVie
var card = "**** **** **** 1234"
fileprivate var images: [UIImage?] = []
@IBOutlet weak var tableview: UITableView!
@IBOutlet weak var textViewDesc: UITextView!
@IBOutlet weak var tableView: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
self.tableView.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
tableView.rowHeight = 65
tableView.delegate = self
tableView.dataSource = self
self.tableview.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
tableview.rowHeight = 65
// descTextView.delegate = self
tableview.delegate = self
tableview.dataSource = self
textViewDesc.delegate = self
settingsLauncher.delegate = self
//glide setup
setup()
glidingView.isHidden = true
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
collectionView.reloadData()
collectionView.collectionViewLayout.invalidateLayout()
navigationController?.navigationBar.titleTextAttributes = [.foregroundColor:UIColor(red: 0 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1.0)]
title = "Plumber"
let item1 = setBarButtom(str: "akar-icons_arrow-left")
self.navigationItem.setLeftBarButtonItems([item1], animated: true)
let item2 = setBarButtom(str: "gg_close")
self.navigationItem.setRightBarButtonItems([item2], animated: true)
}
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
}
@objc
func back() {
navigationController?.popViewController( animated: true)
}
@IBAction func pressAddPhoto(_ sender: Any) {
guard let navVC = self.navigationController
else { return }
settingsLauncher.showSettings(navigVC: navVC,dispatcher:0)
glidingView.isHidden = false
addPhotoTopConstraint.constant = 102
}
@IBAction func BOOK_NOW_Click(_ sender: Any) {
......@@ -84,15 +118,27 @@ class PlumbersViewController: UIViewController,UITableViewDataSource, UITableVie
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
//let track = trackList[indexPath.row]
// let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
var cell:CustCellTableViewCell
let section = indexPath.section
switch section {
case 0: cell.textLabel?.text = address
case 1: cell.textLabel?.text = dateAndTime
case 2: cell.textLabel?.text = contact
case 3: cell.textLabel?.text = card
default: break
case 0:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = address
case 1:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell.text = dateAndTime // cell.imageCell.isHidden = true
cell.imageCell?.image = UIImage(named: "uil_calendar-alt")
case 2:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
case 3:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell?.text = card
cell.imageCell?.image = UIImage(named: "Vector")
default:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
}
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
return cell
......@@ -128,7 +174,7 @@ extension PlumbersViewController:MapViewControllerDelegate {
func delegateClick(text:String) {
address = text
// NotificationCenter.default.post(name: NSNotification.Name(rawValue: "delegateClick"), object: nil)
tableView.reloadData()
tableview.reloadData()
}
}
extension PlumbersViewController:CalendarViewControllerDelegate {
......@@ -144,7 +190,7 @@ extension PlumbersViewController:CalendarViewControllerDelegate {
default:
break
}
tableView.reloadData()
tableview.reloadData()
}
}
//
......
Em-call/VC/ProfileViewController.swift
View file @ cfe684e0
......@@ -19,17 +19,20 @@ class ProfileViewController: UIViewController,UITableViewDataSource, UITableView
@IBOutlet weak var roundImage: UIImageView!
@IBOutlet weak var tableView: UITableView!
// @IBOutlet weak var tableview: UITableView!
@IBOutlet weak var tableview: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
imagePickerController.delegate = self
imagePickerController.allowsEditing = true
tableView.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
tableView.rowHeight = 45
tableview.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
tableview.estimatedRowHeight = 44
tableview.rowHeight = UITableView.automaticDimension
tableView.delegate = self
tableView.dataSource = self
tableview.delegate = self
tableview.dataSource = self
// Do any additional setup after loading the view.
}
......@@ -93,17 +96,30 @@ class ProfileViewController: UIViewController,UITableViewDataSource, UITableView
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
//let track = trackList[indexPath.row]
// let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
var cell:CustCellTableViewCell
let section = indexPath.section
switch section {
// case 0: cell.textLabel?.text = ""
// return cell
case 0: cell.textLabel?.text = name
case 1: cell.textLabel?.text = email
case 2: cell.textLabel?.text = contact
case 3: cell.textLabel?.text = card
default: break
case 0:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell.text = name
case 1:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2.text = email // cell.imageCell.isHidden = true
case 2:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
case 3:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell") as! CustCellTableViewCell
cell.custCell?.text = card
cell.imageCell?.image = UIImage(named: "Vector")
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
// default: break
default:
cell = tableView.dequeueReusableCell(withIdentifier: "cust_cell2") as! CustCellTableViewCell
cell.custCell2?.text = contact
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
}
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
return cell
......@@ -113,8 +129,7 @@ class ProfileViewController: UIViewController,UITableViewDataSource, UITableView
// let rets:String? = mainTable.tableView(tableView, titleForHeaderInSection: section)
// return rets!
switch section {
// case 0: return ("")
// return ("ico")
case 0: return ("Name")
case 1: return ("Your e-mail")
case 2: return ("Your contacts")
......@@ -128,33 +143,21 @@ class ProfileViewController: UIViewController,UITableViewDataSource, UITableView
var vc:UIViewController
vc = storyboard.instantiateViewController(withIdentifier: "DataProfile")
(vc as! DataProfileViewController).delegate = self
/// let nameXibName = ["Map","Calendar"]
// let section = indexPath.section
navigationController?.pushViewController(vc, animated: true)
/* switch section //if indexPath.row == 0
{
case 0:
navigationController?.pushViewController(vc, animated: true)
return
case 1:
navigationController?.pushViewController(vc, animated: true)
case 2:
navigationController?.pushViewController(vc, animated: true)
case 3:
navigationController?.pushViewController(vc, animated: true)
default: return
}*/
}
/*
// 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.
}
*/
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: 12)
}
}
/*extension ProfileViewController:MapViewControllerDelegate {
......@@ -179,7 +182,7 @@ extension ProfileViewController:DataProfileViewControllerDelegate {
default:
break
}
tableView.reloadData()
tableview.reloadData()
}
}
Em-call/VC/VKBookingViewController.swift
View file @ cfe684e0
......@@ -7,7 +7,7 @@
import UIKit
class VKBookingViewController: UIViewController,UITableViewDataSource, UITableViewDelegate {
class VKBookingViewController: UIViewController {
@IBOutlet weak var emergency: UILabel!
@IBOutlet weak var worker: UILabel!
......@@ -15,8 +15,20 @@ class VKBookingViewController: UIViewController,UITableViewDataSource, UITableVi
@IBOutlet weak var date_time: UILabel!
@IBOutlet weak var cost: UILabel!
@IBOutlet weak var costType: UILabel!
@IBOutlet weak var viewBut: UIView!
@IBOutlet weak var butCost: UILabel!
@IBOutlet weak var butPrice: UILabel!
@IBOutlet weak var viewTop: UIView!
@IBOutlet weak var buttonTop: UIButton!
@IBAction func pressButtonTop(_ sender: Any) {
guard let vc = storyboard?.instantiateViewController(withIdentifier: "Call_Prof")
else { return }
// (vc as! MainViewController).showWorkerMap = 1
navigationController?.pushViewController(vc, animated: true)
}
@IBOutlet weak var tableViewWork: UITableView!
@IBOutlet weak var segmentControl: UISegmentedControl!
let cellReuseIdentifier = "cell"
......@@ -24,13 +36,11 @@ class VKBookingViewController: UIViewController,UITableViewDataSource, UITableVi
super.viewDidLoad()
self.navigationItem.title = "BOOKING"
segmentControl.addTarget(self, action: #selector(segmentAction(_:)), for: .valueChanged)
self.tableViewWork.register(UITableViewCell.self, forCellReuseIdentifier: cellReuseIdentifier)
tableViewWork.rowHeight = 60
tableViewWork.delegate = self
tableViewWork.dataSource = self
tableViewWork.isHidden = true
// self.title = "Booking"
viewBut.isHidden = true
butCost.isHidden = true
butPrice.isHidden = true
viewTop.isHidden = false
hideKeyboardWhenTappedAround()
}
override func viewWillAppear(_ animated: Bool) {
......@@ -43,6 +53,7 @@ class VKBookingViewController: UIViewController,UITableViewDataSource, UITableVi
let item2 = setBarButtom(str: "gg_close")
self.navigationItem.setRightBarButtonItems([item2], animated: true)
}
func setBarButtom(str:String)->UIBarButtonItem {
......@@ -61,51 +72,29 @@ class VKBookingViewController: UIViewController,UITableViewDataSource, UITableVi
@objc func segmentAction(_ segmentedControl: UISegmentedControl) {
switch (segmentedControl.selectedSegmentIndex) {
case 0:
tableViewWork.isHidden = true
//tableViewWork.isHidden = true
workLocation.text = "22 Dorlan ave, Manchester"
date_time.text = "As soon as possible"
cost.text = "100"
cost.text = "$100"
costType.text = "Approximate price"
viewBut.isHidden = true
butCost.isHidden = true
butPrice.isHidden = true
break // Uno
case 1:
tableViewWork.isHidden = false
viewBut.isHidden = false
workLocation.text = "22 Dorlan ave"
date_time.text = "18 feb, 18:00"
cost.text = "200"
cost.text = "$200"
costType.text = "Total price"
butCost.isHidden = false
butPrice.isHidden = false
break // Dos
default:
break
}
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 2
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier, for: indexPath)
// let track = trackList[indexPath.row]
/* var content = cell.defaultContentConfiguration()
content.text = "Work"
content.secondaryText = "___________"
cell.contentConfiguration = content
*/
cell.textLabel?.text = "Work"
cell.detailTextLabel?.text = "___________"
cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
return cell
}
/*
// 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.
}
*/
}
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