Skip to content

Commit 3e68964

Browse files
committed
ProverSwipe: Implement selection of video quality
1 parent 0fbcb89 commit 3e68964

28 files changed

+449
-210
lines changed

client/iOS/swype/ProverSwipe.xcodeproj/project.pbxproj

+12-4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
1AACAB2E20D1AC890018AAFA /* ServerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AACAB2D20D1AC880018AAFA /* ServerModel.swift */; };
6161
1AACAB3020D1AD420018AAFA /* ServerExceptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AACAB2F20D1AD410018AAFA /* ServerExceptions.swift */; };
6262
1AACAB3620D1ADB70018AAFA /* NEMWallet.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1AACAB3320D1ADB60018AAFA /* NEMWallet.xcdatamodeld */; };
63+
1AC002CA20F163AE007942E6 /* VideoQualityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AC002C920F163AE007942E6 /* VideoQualityViewController.swift */; };
6364
1AC9D53220EF8867006758CA /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AC9D53120EF8867006758CA /* Settings.swift */; };
6465
1AF1FFA620C32F2D00176F53 /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AF1FFA520C32F2C00176F53 /* Wallet.swift */; };
6566
3C238EC22613F7B47957AE74 /* Pods_ProverSwipe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 553F0162152AFFAD533356AC /* Pods_ProverSwipe.framework */; };
@@ -203,7 +204,6 @@
203204
9AEF62E620736B41006C59DD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9AEF62E520736B41006C59DD /* Images.xcassets */; };
204205
9AEF62E920736B41006C59DD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9AEF62E720736B41006C59DD /* LaunchScreen.storyboard */; };
205206
9AF02BA620B59B9A00C5BC3A /* VideoProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF02BA520B59B9A00C5BC3A /* VideoProcessor.swift */; };
206-
9AF364A320BBF21400A6A968 /* SwypeDetectionProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF364A220BBF21400A6A968 /* SwypeDetectionProtocols.swift */; };
207207
9AFB3C9A2080AD69003F72AA /* APIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AFB3C992080AD69003F72AA /* APIError.swift */; };
208208
9AFB3CA02080BC97003F72AA /* GetSwypeOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AFB3C9F2080BC97003F72AA /* GetSwypeOperation.swift */; };
209209
9AFB3CA22080C29C003F72AA /* SwypeResponce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AFB3CA12080C29C003F72AA /* SwypeResponce.swift */; };
@@ -290,6 +290,7 @@
290290
1AACAB2D20D1AC880018AAFA /* ServerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerModel.swift; sourceTree = "<group>"; };
291291
1AACAB2F20D1AD410018AAFA /* ServerExceptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerExceptions.swift; sourceTree = "<group>"; };
292292
1AACAB3420D1ADB60018AAFA /* NEMWallet.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = NEMWallet.xcdatamodel; sourceTree = "<group>"; };
293+
1AC002C920F163AE007942E6 /* VideoQualityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoQualityViewController.swift; sourceTree = "<group>"; };
293294
1AC9D53120EF8867006758CA /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
294295
1AF1FFA520C32F2C00176F53 /* Wallet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
295296
1D8C41A3F68CF1161BBCAAA4 /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -450,7 +451,6 @@
450451
9AEF62E820736B41006C59DD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
451452
9AEF62EA20736B41006C59DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
452453
9AF02BA520B59B9A00C5BC3A /* VideoProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoProcessor.swift; sourceTree = "<group>"; };
453-
9AF364A220BBF21400A6A968 /* SwypeDetectionProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwypeDetectionProtocols.swift; sourceTree = "<group>"; };
454454
9AFB3C992080AD69003F72AA /* APIError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIError.swift; sourceTree = "<group>"; };
455455
9AFB3C9F2080BC97003F72AA /* GetSwypeOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetSwypeOperation.swift; sourceTree = "<group>"; };
456456
9AFB3CA12080C29C003F72AA /* SwypeResponce.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwypeResponce.swift; sourceTree = "<group>"; };
@@ -683,6 +683,14 @@
683683
path = Additions;
684684
sourceTree = "<group>";
685685
};
686+
1AC002C820F16337007942E6 /* Video Quality */ = {
687+
isa = PBXGroup;
688+
children = (
689+
1AC002C920F163AE007942E6 /* VideoQualityViewController.swift */,
690+
);
691+
path = "Video Quality";
692+
sourceTree = "<group>";
693+
};
686694
1AC9D53020EF8825006758CA /* Settings */ = {
687695
isa = PBXGroup;
688696
children = (
@@ -811,7 +819,6 @@
811819
9A2EA9DE2074EB9300910CFB /* CPP */,
812820
9A2EA9DA2074EB7E00910CFB /* Wrapper */,
813821
9A2EA9FA2074EC1D00910CFB /* SwypeDetector.swift */,
814-
9AF364A220BBF21400A6A968 /* SwypeDetectionProtocols.swift */,
815822
9AF02BA520B59B9A00C5BC3A /* VideoProcessor.swift */,
816823
9A89F3CB207CA06D00E31F57 /* VideoRecorder.swift */,
817824
);
@@ -872,6 +879,7 @@
872879
9A9DB77D20737C1200E29A07 /* Export Wallet */,
873880
9A9DB77A20737BE400E29A07 /* Import Wallet */,
874881
9A2EAA242074F5C800910CFB /* Swype */,
882+
1AC002C820F16337007942E6 /* Video Quality */,
875883
9A9DB77720737BA000E29A07 /* Wallet */,
876884
9AEF62E220736B40006C59DD /* Main.storyboard */,
877885
9A2EA9D52074DFCA00910CFB /* UpdateBalanceBehaviour.swift */,
@@ -1382,7 +1390,6 @@
13821390
1A97070620D5A13F003E8EF4 /* BlockModel.swift in Sources */,
13831391
1A8A318620D15A1F00BB7E97 /* sc.c in Sources */,
13841392
9A9DB78720737EF600E29A07 /* DependencyStore.swift in Sources */,
1385-
9AF364A320BBF21400A6A968 /* SwypeDetectionProtocols.swift in Sources */,
13861393
1A97070320D5A13F003E8EF4 /* MultisigCosignatoryModificationModel.swift in Sources */,
13871394
1AF1FFA620C32F2D00176F53 /* Wallet.swift in Sources */,
13881395
1A58439A20C96B6D00C8FA14 /* Keychain.swift in Sources */,
@@ -1455,6 +1462,7 @@
14551462
1AACAB3020D1AD420018AAFA /* ServerExceptions.swift in Sources */,
14561463
9AE7B4F420B0023400DF0E93 /* UIView+extension.swift in Sources */,
14571464
1A97070420D5A13F003E8EF4 /* TransactionMetaDataModel.swift in Sources */,
1465+
1AC002CA20F163AE007942E6 /* VideoQualityViewController.swift in Sources */,
14581466
9A2EA9D62074DFCA00910CFB /* UpdateBalanceBehaviour.swift in Sources */,
14591467
9A2EAA142074ECE400910CFB /* Vector.cpp in Sources */,
14601468
9A2EAA0F2074ECE400910CFB /* VectorExplained.cpp in Sources */,
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

client/iOS/swype/ProverSwipe/Assets/Images/Images.xcassets/AppIcon.appiconset/Contents.json

+36-18
Original file line numberDiff line numberDiff line change
@@ -3,92 +3,110 @@
33
{
44
"idiom" : "iphone",
55
"size" : "20x20",
6-
"scale" : "2x"
6+
"scale" : "2x",
7+
"filename" : "40.png"
78
},
89
{
910
"idiom" : "iphone",
1011
"size" : "20x20",
11-
"scale" : "3x"
12+
"scale" : "3x",
13+
"filename" : "60.png"
1214
},
1315
{
1416
"idiom" : "iphone",
1517
"size" : "29x29",
16-
"scale" : "2x"
18+
"scale" : "2x",
19+
"filename" : "58.png"
1720
},
1821
{
1922
"idiom" : "iphone",
2023
"size" : "29x29",
21-
"scale" : "3x"
24+
"scale" : "3x",
25+
"filename" : "87.png"
2226
},
2327
{
2428
"idiom" : "iphone",
2529
"size" : "40x40",
26-
"scale" : "2x"
30+
"scale" : "2x",
31+
"filename" : "80-1.png"
2732
},
2833
{
2934
"idiom" : "iphone",
3035
"size" : "40x40",
31-
"scale" : "3x"
36+
"scale" : "3x",
37+
"filename" : "120.png"
3238
},
3339
{
3440
"idiom" : "iphone",
3541
"size" : "60x60",
36-
"scale" : "2x"
42+
"scale" : "2x",
43+
"filename" : "120-1.png"
3744
},
3845
{
3946
"idiom" : "iphone",
4047
"size" : "60x60",
41-
"scale" : "3x"
48+
"scale" : "3x",
49+
"filename" : "180.png"
4250
},
4351
{
4452
"idiom" : "ipad",
4553
"size" : "20x20",
46-
"scale" : "1x"
54+
"scale" : "1x",
55+
"filename" : "20.png"
4756
},
4857
{
4958
"idiom" : "ipad",
5059
"size" : "20x20",
51-
"scale" : "2x"
60+
"scale" : "2x",
61+
"filename" : "40-1.png"
5262
},
5363
{
5464
"idiom" : "ipad",
5565
"size" : "29x29",
56-
"scale" : "1x"
66+
"scale" : "1x",
67+
"filename" : "29.png"
5768
},
5869
{
5970
"idiom" : "ipad",
6071
"size" : "29x29",
61-
"scale" : "2x"
72+
"scale" : "2x",
73+
"filename" : "58-1.png"
6274
},
6375
{
6476
"idiom" : "ipad",
6577
"size" : "40x40",
66-
"scale" : "1x"
78+
"scale" : "1x",
79+
"filename" : "40-2.png"
6780
},
6881
{
6982
"idiom" : "ipad",
7083
"size" : "40x40",
71-
"scale" : "2x"
84+
"scale" : "2x",
85+
"filename" : "80.png"
7286
},
7387
{
7488
"idiom" : "ipad",
7589
"size" : "76x76",
76-
"scale" : "1x"
90+
"scale" : "1x",
91+
"filename" : "76.png"
7792
},
7893
{
7994
"idiom" : "ipad",
8095
"size" : "76x76",
81-
"scale" : "2x"
96+
"scale" : "2x",
97+
"filename" : "152.png"
8298
},
8399
{
84100
"idiom" : "ipad",
85101
"size" : "83.5x83.5",
86-
"scale" : "2x"
102+
"scale" : "2x",
103+
"filename" : "167.png"
87104
},
88105
{
89106
"idiom" : "ios-marketing",
90107
"size" : "1024x1024",
91-
"scale" : "1x"
108+
"scale" : "1x",
109+
"filename" : "512@2x.png"
92110
}
93111
],
94112
"info" : {

client/iOS/swype/ProverSwipe/Detection/SwypeDetectionProtocols.swift

-10
This file was deleted.

client/iOS/swype/ProverSwipe/Detection/VideoProcessor.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ protocol VideoProcessorDelegate: class {
1111

1212
class VideoProcessor {
1313

14-
public var isRecordingAlive: Bool { return videoRecorder.isRecordingAlive }
15-
14+
public var isRecording: Bool { return videoRecorder.isRecording }
15+
1616
private var videoRecorder: VideoRecorder!
1717
private var swypeDetector: SwypeDetector!
1818

@@ -54,21 +54,21 @@ extension VideoProcessor {
5454
// MARK: - Public methods (Detector)
5555
extension VideoProcessor {
5656

57-
func startCapture() {
58-
videoRecorder.startCapture()
57+
func startSession() {
58+
videoRecorder.startSession()
5959
}
6060

61-
func stopCapture() {
62-
videoRecorder.stopCapture()
61+
func stopSession() {
62+
videoRecorder.stopSession()
6363
}
6464

6565
func startRecord() {
6666
videoRecorder.startRecord()
6767
}
6868

69-
func stopRecord(allowSubmit: Bool) {
69+
func stopRecord(submit: Bool) {
7070
videoRecorder.stopRecord { [unowned self] recordedVideoURL in
71-
if !allowSubmit {
71+
if !submit {
7272
self.delegate.recordingStopped()
7373
}
7474
else {

0 commit comments

Comments
 (0)