Merge pull request #5 from samridhgupta/fix/recording-name-sort

code-matt · web-flow · commit 9309544dda05 · 2019-05-11T10:59:41.000-04:00
Fix/recording name sort
diff --git a/ios/RNReactNativeReplaykit.m b/ios/RNReactNativeReplaykit.m
@@ -22,14 +22,13 @@ - (dispatch_queue_t)methodQueue
 
 RCT_EXPORT_METHOD(startRecording:(RCTResponseSenderBlock)callback)
 {
-    static NSString *letters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    NSMutableString *randomString = [NSMutableString stringWithCapacity: 15];
-    for (int i=0; i<15; i++) {
-        [randomString appendFormat: @"%C", [letters characterAtIndex: arc4random() % [letters length]]];
-    }
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSNumber *timeStampObj = [NSNumber numberWithInteger: [[NSNumber numberWithDouble: timeStamp] integerValue] ];
+    NSMutableString *fileName = [[NSMutableString alloc] initWithString:@"Recording-"];
+    [fileName appendString: [timeStampObj stringValue]];
 
     [self.screenRecordCoordinator
-     startRecordingWithFileName:randomString
+     startRecordingWithFileName:fileName
      recordingHandler:^(NSError *error) {
          if(error)
          {
diff --git a/ios/RNReactNativeReplaykit.xcodeproj/project.pbxproj b/ios/RNReactNativeReplaykit.xcodeproj/project.pbxproj
@@ -109,7 +109,7 @@
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0940;
+						LastSwiftMigration = 1010;
 					};
 				};
 			};
@@ -255,7 +255,8 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "RNReactNativeReplaykit-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_PRECOMPILE_BRIDGING_HEADER = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -278,7 +279,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNReactNativeReplaykit-Bridging-Header.h";
 				SWIFT_PRECOMPILE_BRIDGING_HEADER = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/ios/ScreenRecord/FileUtil.swift b/ios/ScreenRecord/FileUtil.swift
@@ -76,8 +76,8 @@ import Foundation
         let urls = directoryContents.map({
             (url: URL) -> String in
             return url.relativePath
-        })
-        return urls
+        }).sorted(by: >);
+        return urls;
     }
 }
 
diff --git a/ios/ScreenRecord/ScreenRecordCoordinator.swift b/ios/ScreenRecord/ScreenRecordCoordinator.swift
@@ -27,7 +27,7 @@ import AVKit
 
     func startRecording(withFileName fileName: String, recordingHandler: @escaping (Error?) -> Void,onCompletion: @escaping (Error?)->Void)
     {
-        self.viewOverlay.show()
+//        self.viewOverlay.show()
         screenRecorder.startRecording(withFileName: fileName) { (error) in
             recordingHandler(error)
             self.recordCompleted = onCompletion
@@ -37,7 +37,7 @@ import AVKit
     func stopRecording()
     {
         screenRecorder.stopRecording { (error) in
-            self.viewOverlay.hide()
+//            self.viewOverlay.hide()
             self.recordCompleted?(error)
         }
     }
diff --git a/ios/ScreenRecord/ScreenRecorder.swift b/ios/ScreenRecord/ScreenRecorder.swift
@@ -24,14 +24,14 @@ import AVKit
         {
             let fileURL = URL(fileURLWithPath: ReplayFileUtil.filePath(fileName))
             assetWriter = try! AVAssetWriter(outputURL: fileURL, fileType:
-                AVFileTypeMPEG4)
+                AVFileType.mp4)
             let videoOutputSettings: Dictionary<String, Any> = [
                 AVVideoCodecKey : AVVideoCodecType.h264,
                 AVVideoWidthKey : UIScreen.main.bounds.size.width,
                 AVVideoHeightKey : UIScreen.main.bounds.size.height
             ];
             
-            videoInput  = AVAssetWriterInput (mediaType: AVMediaTypeVideo as String, outputSettings: videoOutputSettings)
+            videoInput  = AVAssetWriterInput (mediaType: AVMediaType.video, outputSettings: videoOutputSettings)
             videoInput.expectsMediaDataInRealTime = true
             assetWriter.add(videoInput)
 //            RPScreenRecorder.shared().
@@ -42,13 +42,13 @@ import AVKit
                 
                 if CMSampleBufferDataIsReady(sample)
                 {
-                    if self.assetWriter.status == AVAssetWriterStatus.unknown
+                    if self.assetWriter.status == AVAssetWriter.Status.unknown
                     {
                         self.assetWriter.startWriting()
                         self.assetWriter.startSession(atSourceTime: CMSampleBufferGetPresentationTimeStamp(sample))
                     }
                     
-                    if self.assetWriter.status == AVAssetWriterStatus.failed {
+                    if self.assetWriter.status == AVAssetWriter.Status.failed {
                         print("Error occured, status = \(self.assetWriter.status.rawValue), \(self.assetWriter.error!.localizedDescription) \(String(describing: self.assetWriter.error))")
                         return
                     }
diff --git a/ios/ScreenRecord/WindowUtil.swift b/ios/ScreenRecord/WindowUtil.swift
@@ -17,7 +17,7 @@ protocol Overlayable
 class WindowUtil: Overlayable
 {
     var overlayWindow = UIWindow(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))
-    var stopButton = UIButton(type: UIButtonType.custom)
+    var stopButton = UIButton(type: UIButton.ButtonType.custom)
     var stopButtonColor = UIColor(red:0.30, green:0.67, blue:0.99, alpha:1.00)
     var onStopClick:(() -> ())?
     
@@ -29,7 +29,7 @@ class WindowUtil: Overlayable
     func initViews()
     {
         overlayWindow = UIWindow(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))
-        stopButton = UIButton(type: UIButtonType.custom)
+        stopButton = UIButton(type: UIButton.ButtonType.custom)
     }
     
     func hide()
@@ -55,13 +55,13 @@ class WindowUtil: Overlayable
         stopButton.setTitle("Stop Recording", for: .normal)
         stopButton.titleLabel?.font = UIFont.systemFont(ofSize: UIFont.smallSystemFontSize)
         
-        stopButton.addTarget(self, action: #selector(stopRecording), for: UIControlEvents.touchDown)
+        stopButton.addTarget(self, action: #selector(stopRecording), for: UIControl.Event.touchDown)
         
         
         
         stopButton.frame = overlayWindow.frame
         overlayWindow.addSubview(stopButton)
-        overlayWindow.windowLevel = CGFloat.greatestFiniteMagnitude
+        overlayWindow.windowLevel = UIWindow.Level(rawValue: CGFloat.greatestFiniteMagnitude)
         
     }
     

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ import Foundation`
`76`	`76`	`let urls = directoryContents.map({`
`77`	`77`	`(url: URL) -> String in`
`78`	`78`	`return url.relativePath`
`79`		`- })`
`80`		`- return urls`
	`79`	`+ }).sorted(by: >);`
	`80`	`+ return urls;`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import AVKit`
`27`	`27`
`28`	`28`	`func startRecording(withFileName fileName: String, recordingHandler: @escaping (Error?) -> Void,onCompletion: @escaping (Error?)->Void)`
`29`	`29`	`{`
`30`		`- self.viewOverlay.show()`
	`30`	`+// self.viewOverlay.show()`
`31`	`31`	`screenRecorder.startRecording(withFileName: fileName) { (error) in`
`32`	`32`	`recordingHandler(error)`
`33`	`33`	`self.recordCompleted = onCompletion`
`@@ -37,7 +37,7 @@ import AVKit`
`37`	`37`	`func stopRecording()`
`38`	`38`	`{`
`39`	`39`	`screenRecorder.stopRecording { (error) in`
`40`		`- self.viewOverlay.hide()`
	`40`	`+// self.viewOverlay.hide()`
`41`	`41`	`self.recordCompleted?(error)`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ import AVKit`
`24`	`24`	`{`
`25`	`25`	`let fileURL = URL(fileURLWithPath: ReplayFileUtil.filePath(fileName))`
`26`	`26`	`assetWriter = try! AVAssetWriter(outputURL: fileURL, fileType:`
`27`		`- AVFileTypeMPEG4)`
	`27`	`+ AVFileType.mp4)`
`28`	`28`	`let videoOutputSettings: Dictionary<String, Any> = [`
`29`	`29`	`AVVideoCodecKey : AVVideoCodecType.h264,`
`30`	`30`	`AVVideoWidthKey : UIScreen.main.bounds.size.width,`
`31`	`31`	`AVVideoHeightKey : UIScreen.main.bounds.size.height`
`32`	`32`	`];`
`33`	`33`
`34`		`- videoInput = AVAssetWriterInput (mediaType: AVMediaTypeVideo as String, outputSettings: videoOutputSettings)`
	`34`	`+ videoInput = AVAssetWriterInput (mediaType: AVMediaType.video, outputSettings: videoOutputSettings)`
`35`	`35`	`videoInput.expectsMediaDataInRealTime = true`
`36`	`36`	`assetWriter.add(videoInput)`
`37`	`37`	`// RPScreenRecorder.shared().`
`@@ -42,13 +42,13 @@ import AVKit`
`42`	`42`
`43`	`43`	`if CMSampleBufferDataIsReady(sample)`
`44`	`44`	`{`
`45`		`- if self.assetWriter.status == AVAssetWriterStatus.unknown`
	`45`	`+ if self.assetWriter.status == AVAssetWriter.Status.unknown`
`46`	`46`	`{`
`47`	`47`	`self.assetWriter.startWriting()`
`48`	`48`	`self.assetWriter.startSession(atSourceTime: CMSampleBufferGetPresentationTimeStamp(sample))`
`49`	`49`	`}`
`50`	`50`
`51`		`- if self.assetWriter.status == AVAssetWriterStatus.failed {`
	`51`	`+ if self.assetWriter.status == AVAssetWriter.Status.failed {`
`52`	`52`	`print("Error occured, status = \(self.assetWriter.status.rawValue), \(self.assetWriter.error!.localizedDescription) \(String(describing: self.assetWriter.error))")`
`53`	`53`	`return`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protocol Overlayable`
`17`	`17`	`class WindowUtil: Overlayable`
`18`	`18`	`{`
`19`	`19`	`var overlayWindow = UIWindow(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))`
`20`		`- var stopButton = UIButton(type: UIButtonType.custom)`
	`20`	`+ var stopButton = UIButton(type: UIButton.ButtonType.custom)`
`21`	`21`	`var stopButtonColor = UIColor(red:0.30, green:0.67, blue:0.99, alpha:1.00)`
`22`	`22`	`var onStopClick:(() -> ())?`
`23`	`23`
`@@ -29,7 +29,7 @@ class WindowUtil: Overlayable`
`29`	`29`	`func initViews()`
`30`	`30`	`{`
`31`	`31`	`overlayWindow = UIWindow(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))`
`32`		`- stopButton = UIButton(type: UIButtonType.custom)`
	`32`	`+ stopButton = UIButton(type: UIButton.ButtonType.custom)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func hide()`
`@@ -55,13 +55,13 @@ class WindowUtil: Overlayable`
`55`	`55`	`stopButton.setTitle("Stop Recording", for: .normal)`
`56`	`56`	`stopButton.titleLabel?.font = UIFont.systemFont(ofSize: UIFont.smallSystemFontSize)`
`57`	`57`
`58`		`- stopButton.addTarget(self, action: #selector(stopRecording), for: UIControlEvents.touchDown)`
	`58`	`+ stopButton.addTarget(self, action: #selector(stopRecording), for: UIControl.Event.touchDown)`
`59`	`59`
`60`	`60`
`61`	`61`
`62`	`62`	`stopButton.frame = overlayWindow.frame`
`63`	`63`	`overlayWindow.addSubview(stopButton)`
`64`		`- overlayWindow.windowLevel = CGFloat.greatestFiniteMagnitude`
	`64`	`+ overlayWindow.windowLevel = UIWindow.Level(rawValue: CGFloat.greatestFiniteMagnitude)`
`65`	`65`
`66`	`66`	`}`
`67`	`67`