Skip to content

Commit 4c2a8ce

Browse files
telzhovtelzhov
committedJun 19, 2018
bugfix #42038
1 parent 418a2df commit 4c2a8ce

File tree

5 files changed

+75
-48
lines changed

5 files changed

+75
-48
lines changed
 

‎client/iOS/clapperboard/PROVERClapperboard.xcodeproj/project.pbxproj

+30-34
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2D62A08A32A6AE996B5932AA /* Pods_PROVERClapperboard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC2262B3C52F795DA2A04F2 /* Pods_PROVERClapperboard.framework */; };
10+
1A9C2C4D20D92A3C004EA3C6 /* NavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9C2C4C20D92A3C004EA3C6 /* NavigationBar.swift */; };
11+
75A5572DFAD39D800F548D7D /* Pods_PROVERClapperboard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FA5DA41DD745A7480D066C8 /* Pods_PROVERClapperboard.framework */; };
1112
9A0E848E2056BB8100624995 /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0E848D2056BB8100624995 /* AsyncOperation.swift */; };
1213
9A0E84902056BD9E00624995 /* GetInfoOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0E848F2056BD9E00624995 /* GetInfoOperation.swift */; };
1314
9A0E84922056C1C500624995 /* SubmitOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0E84912056C1C500624995 /* SubmitOperation.swift */; };
@@ -50,7 +51,8 @@
5051
/* End PBXContainerItemProxy section */
5152

5253
/* Begin PBXFileReference section */
53-
7E544281C44D61F26F00ED3F /* Pods-PROVERClapperboard.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PROVERClapperboard.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PROVERClapperboard/Pods-PROVERClapperboard.debug.xcconfig"; sourceTree = "<group>"; };
54+
1A9C2C4C20D92A3C004EA3C6 /* NavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBar.swift; sourceTree = "<group>"; };
55+
3FA5DA41DD745A7480D066C8 /* Pods_PROVERClapperboard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PROVERClapperboard.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5456
9A0E848D2056BB8100624995 /* AsyncOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncOperation.swift; sourceTree = "<group>"; };
5557
9A0E848F2056BD9E00624995 /* GetInfoOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetInfoOperation.swift; sourceTree = "<group>"; };
5658
9A0E84912056C1C500624995 /* SubmitOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubmitOperation.swift; sourceTree = "<group>"; };
@@ -71,7 +73,7 @@
7173
9AD6D6082057A6B700D9E1FE /* QRCodeDataOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeDataOperation.swift; sourceTree = "<group>"; };
7274
9AD6D63020580F1400D9E1FE /* WalletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletViewController.swift; sourceTree = "<group>"; };
7375
9AFA5DDB205A7FBB009818EA /* ExportWalletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportWalletViewController.swift; sourceTree = "<group>"; };
74-
A0D18F7D9F3FA28B86C15F7A /* Pods-PROVERClapperboard.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PROVERClapperboard.release.xcconfig"; path = "Pods/Target Support Files/Pods-PROVERClapperboard/Pods-PROVERClapperboard.release.xcconfig"; sourceTree = "<group>"; };
76+
B826588F6083079C9B68BE64 /* Pods-PROVERClapperboard.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PROVERClapperboard.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PROVERClapperboard/Pods-PROVERClapperboard.debug.xcconfig"; sourceTree = "<group>"; };
7577
BA2747B12046CA5900364A1D /* PROVERClapperboard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PROVERClapperboard.app; sourceTree = BUILT_PRODUCTS_DIR; };
7678
BA2747B42046CA5900364A1D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7779
BA2747B62046CA5900364A1D /* InputTextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputTextViewController.swift; sourceTree = "<group>"; };
@@ -85,15 +87,15 @@
8587
BACE32EB2047F33C007B8FF9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8688
BACE32F32047F5DD007B8FF9 /* EthereumService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthereumService.swift; sourceTree = "<group>"; };
8789
BACE32F820481414007B8FF9 /* ProverAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProverAPI.swift; sourceTree = "<group>"; };
88-
BCC2262B3C52F795DA2A04F2 /* Pods_PROVERClapperboard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PROVERClapperboard.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90+
C83ABDBB2208FCB95D1D0D72 /* Pods-PROVERClapperboard.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PROVERClapperboard.release.xcconfig"; path = "Pods/Target Support Files/Pods-PROVERClapperboard/Pods-PROVERClapperboard.release.xcconfig"; sourceTree = "<group>"; };
8991
/* End PBXFileReference section */
9092

9193
/* Begin PBXFrameworksBuildPhase section */
9294
BA2747AE2046CA5900364A1D /* Frameworks */ = {
9395
isa = PBXFrameworksBuildPhase;
9496
buildActionMask = 2147483647;
9597
files = (
96-
2D62A08A32A6AE996B5932AA /* Pods_PROVERClapperboard.framework in Frameworks */,
98+
75A5572DFAD39D800F548D7D /* Pods_PROVERClapperboard.framework in Frameworks */,
9799
);
98100
runOnlyForDeploymentPostprocessing = 0;
99101
};
@@ -107,23 +109,31 @@
107109
/* End PBXFrameworksBuildPhase section */
108110

109111
/* Begin PBXGroup section */
110-
0654FA56A3DE13446939756B /* Frameworks */ = {
112+
0A483C798FDB9069E5468634 /* Frameworks */ = {
111113
isa = PBXGroup;
112114
children = (
113-
BCC2262B3C52F795DA2A04F2 /* Pods_PROVERClapperboard.framework */,
115+
3FA5DA41DD745A7480D066C8 /* Pods_PROVERClapperboard.framework */,
114116
);
115117
name = Frameworks;
116118
sourceTree = "<group>";
117119
};
118-
3FB3B82E8DE7C3DA0B06BB06 /* Pods */ = {
120+
0B836EA6EDFEA98D503FB731 /* Pods */ = {
119121
isa = PBXGroup;
120122
children = (
121-
7E544281C44D61F26F00ED3F /* Pods-PROVERClapperboard.debug.xcconfig */,
122-
A0D18F7D9F3FA28B86C15F7A /* Pods-PROVERClapperboard.release.xcconfig */,
123+
B826588F6083079C9B68BE64 /* Pods-PROVERClapperboard.debug.xcconfig */,
124+
C83ABDBB2208FCB95D1D0D72 /* Pods-PROVERClapperboard.release.xcconfig */,
123125
);
124126
name = Pods;
125127
sourceTree = "<group>";
126128
};
129+
1A9C2C4B20D92A17004EA3C6 /* NavigationBar */ = {
130+
isa = PBXGroup;
131+
children = (
132+
1A9C2C4C20D92A3C004EA3C6 /* NavigationBar.swift */,
133+
);
134+
path = NavigationBar;
135+
sourceTree = "<group>";
136+
};
127137
9A0E848C2056BB7200624995 /* Operation */ = {
128138
isa = PBXGroup;
129139
children = (
@@ -173,6 +183,7 @@
173183
9AD6D62E20580EB400D9E1FE /* Screeens */ = {
174184
isa = PBXGroup;
175185
children = (
186+
1A9C2C4B20D92A17004EA3C6 /* NavigationBar */,
176187
9AFA5DDA205A7F9C009818EA /* ExportWallet */,
177188
9AD2BB7020595BAC00CD4E03 /* ImportWallet */,
178189
9ACA53F3205022D5007FBAD9 /* QRCode */,
@@ -204,8 +215,8 @@
204215
BA2747B32046CA5900364A1D /* PROVERClapperboard */,
205216
BACE32E82047F33C007B8FF9 /* PROVERClapperboardTests */,
206217
BA2747B22046CA5900364A1D /* Products */,
207-
3FB3B82E8DE7C3DA0B06BB06 /* Pods */,
208-
0654FA56A3DE13446939756B /* Frameworks */,
218+
0B836EA6EDFEA98D503FB731 /* Pods */,
219+
0A483C798FDB9069E5468634 /* Frameworks */,
209220
);
210221
sourceTree = "<group>";
211222
};
@@ -284,13 +295,12 @@
284295
isa = PBXNativeTarget;
285296
buildConfigurationList = BA2747C32046CA5900364A1D /* Build configuration list for PBXNativeTarget "PROVERClapperboard" */;
286297
buildPhases = (
287-
155301334D30D3DC135EC01A /* [CP] Check Pods Manifest.lock */,
298+
05FA55EF4EB3698C2EDD67A8 /* [CP] Check Pods Manifest.lock */,
288299
BA2747AD2046CA5900364A1D /* Sources */,
289300
BA2747AE2046CA5900364A1D /* Frameworks */,
290301
BA2747AF2046CA5900364A1D /* Resources */,
291302
BA2747C62046CA6700364A1D /* ShellScript */,
292-
8990BAF9D10AC368093795E3 /* [CP] Embed Pods Frameworks */,
293-
DD7B5D18D476455DDFC31903 /* [CP] Copy Pods Resources */,
303+
9D402BE01F75EBC00F7741E3 /* [CP] Embed Pods Frameworks */,
294304
);
295305
buildRules = (
296306
);
@@ -388,7 +398,7 @@
388398
/* End PBXResourcesBuildPhase section */
389399

390400
/* Begin PBXShellScriptBuildPhase section */
391-
155301334D30D3DC135EC01A /* [CP] Check Pods Manifest.lock */ = {
401+
05FA55EF4EB3698C2EDD67A8 /* [CP] Check Pods Manifest.lock */ = {
392402
isa = PBXShellScriptBuildPhase;
393403
buildActionMask = 2147483647;
394404
files = (
@@ -406,7 +416,7 @@
406416
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
407417
showEnvVarsInLog = 0;
408418
};
409-
8990BAF9D10AC368093795E3 /* [CP] Embed Pods Frameworks */ = {
419+
9D402BE01F75EBC00F7741E3 /* [CP] Embed Pods Frameworks */ = {
410420
isa = PBXShellScriptBuildPhase;
411421
buildActionMask = 2147483647;
412422
files = (
@@ -449,21 +459,6 @@
449459
shellPath = /bin/sh;
450460
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
451461
};
452-
DD7B5D18D476455DDFC31903 /* [CP] Copy Pods Resources */ = {
453-
isa = PBXShellScriptBuildPhase;
454-
buildActionMask = 2147483647;
455-
files = (
456-
);
457-
inputPaths = (
458-
);
459-
name = "[CP] Copy Pods Resources";
460-
outputPaths = (
461-
);
462-
runOnlyForDeploymentPostprocessing = 0;
463-
shellPath = /bin/sh;
464-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PROVERClapperboard/Pods-PROVERClapperboard-resources.sh\"\n";
465-
showEnvVarsInLog = 0;
466-
};
467462
/* End PBXShellScriptBuildPhase section */
468463

469464
/* Begin PBXSourcesBuildPhase section */
@@ -494,6 +489,7 @@
494489
BA2747B52046CA5900364A1D /* AppDelegate.swift in Sources */,
495490
9AC6AD1420568376007C6BBF /* SubmitRequestError.swift in Sources */,
496491
9A0E848E2056BB8100624995 /* AsyncOperation.swift in Sources */,
492+
1A9C2C4D20D92A3C004EA3C6 /* NavigationBar.swift in Sources */,
497493
9A44D52320566F400027A2D0 /* InfoReslut.swift in Sources */,
498494
9A0E84942056C6A100624995 /* CheckOperation.swift in Sources */,
499495
9A0E84922056C1C500624995 /* SubmitOperation.swift in Sources */,
@@ -646,7 +642,7 @@
646642
};
647643
BA2747C42046CA5900364A1D /* Debug */ = {
648644
isa = XCBuildConfiguration;
649-
baseConfigurationReference = 7E544281C44D61F26F00ED3F /* Pods-PROVERClapperboard.debug.xcconfig */;
645+
baseConfigurationReference = B826588F6083079C9B68BE64 /* Pods-PROVERClapperboard.debug.xcconfig */;
650646
buildSettings = {
651647
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
652648
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -667,7 +663,7 @@
667663
};
668664
BA2747C52046CA5900364A1D /* Release */ = {
669665
isa = XCBuildConfiguration;
670-
baseConfigurationReference = A0D18F7D9F3FA28B86C15F7A /* Pods-PROVERClapperboard.release.xcconfig */;
666+
baseConfigurationReference = C83ABDBB2208FCB95D1D0D72 /* Pods-PROVERClapperboard.release.xcconfig */;
671667
buildSettings = {
672668
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
673669
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

‎client/iOS/clapperboard/PROVERClapperboard/Base.lproj/Main.storyboard

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@
679679
<objects>
680680
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="4ZJ-jn-pTM" sceneMemberID="viewController">
681681
<toolbarItems/>
682-
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" backIndicatorImage="back" largeTitles="YES" backIndicatorTransitionMaskImage="back" id="TuK-t2-AgY">
682+
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" backIndicatorImage="back" largeTitles="YES" backIndicatorTransitionMaskImage="back" id="TuK-t2-AgY" customClass="NavigationBar" customModule="PROVERClapperboard" customModuleProvider="target">
683683
<rect key="frame" x="0.0" y="20" width="375" height="96"/>
684684
<autoresizingMask key="autoresizingMask"/>
685685
</navigationBar>

‎client/iOS/clapperboard/PROVERClapperboard/Screeens/NavigationBar/NavigationBar.swift

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import UIKit
2+
3+
class NavigationBar: UINavigationBar {
4+
5+
override func layoutSubviews() {
6+
super.layoutSubviews()
7+
8+
guard barTintColor == nil else { return }
9+
10+
let size = CGSize(width: bounds.width,
11+
height: bounds.height + UIApplication.shared.statusBarFrame.height)
12+
let image = #imageLiteral(resourceName: "background").resizedImage(newSize: size)
13+
barTintColor = UIColor(patternImage: image)
14+
tintColor = .white
15+
}
16+
17+
override func sizeThatFits(_ size: CGSize) -> CGSize {
18+
return CGSize(width: UIScreen.main.bounds.width, height: 96)
19+
}
20+
}

‎client/iOS/clapperboard/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment the next line to define a global platform for your project
2-
platform :ios, '11.0'
2+
platform :ios, '10.0'
33
inhibit_all_warnings!
44

55
target 'PROVERClapperboard' do

‎client/iOS/clapperboard/Podfile.lock

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PODS:
2-
- Alamofire (4.6.0)
2+
- Alamofire (4.7.2)
33
- BigInt (3.0.1):
44
- SipHash (~> 1.2)
55
- FileBrowser (1.0.0)
6-
- Geth (1.8.1)
7-
- KeychainSwift (10.0.0)
8-
- Moya (11.0.1):
9-
- Moya/Core (= 11.0.1)
10-
- Moya/Core (11.0.1):
6+
- Geth (1.8.8)
7+
- KeychainSwift (11.0.0)
8+
- Moya (11.0.2):
9+
- Moya/Core (= 11.0.2)
10+
- Moya/Core (11.0.2):
1111
- Alamofire (~> 4.1)
1212
- Result (~> 3.0)
1313
- Result (3.2.4)
@@ -20,16 +20,27 @@ DEPENDENCIES:
2020
- KeychainSwift
2121
- Moya
2222

23+
SPEC REPOS:
24+
https://github.com/cocoapods/specs.git:
25+
- Alamofire
26+
- BigInt
27+
- FileBrowser
28+
- Geth
29+
- KeychainSwift
30+
- Moya
31+
- Result
32+
- SipHash
33+
2334
SPEC CHECKSUMS:
24-
Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
35+
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
2536
BigInt: 8e8a52161c745cd3ab78e3dc346a9fbee51e6cf6
2637
FileBrowser: 2ca91ff61c9ea09665eb3b8f9e64a7a77e66a0bf
27-
Geth: b39574e8d037c7752f73f3e5320855581e1cf75a
28-
KeychainSwift: f9f7910449a0c0fd2cabc889121530dd2c477c33
29-
Moya: 3d594ada51a21cc02b18739ab578a1984f900c8a
38+
Geth: 483ea44b5f930b72320218290b939ba8e2389aaf
39+
KeychainSwift: bea6bd9f98af7b8d7ca4aa79fe105c00fab532db
40+
Moya: a725035953bc1c0eb1be505ab903984501d82440
3041
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
3142
SipHash: c6e9e43e9c531b5bc6602545130c26194a6d31ce
3243

33-
PODFILE CHECKSUM: 8548ac6cc5ebb8aa6e0171882f1325c6119d59ca
44+
PODFILE CHECKSUM: f4bc9dc03802ffb606c953a583775924f344a53e
3445

35-
COCOAPODS: 1.4.0
46+
COCOAPODS: 1.5.3

0 commit comments

Comments
 (0)