Merge branch 'charlesmchen/webrtc/video5' into feature/webrtc

Signal/Images.xcassets/video-mute-selected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "video-mute-selected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/Images.xcassets/video-mute-unselected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "video-mute-unselected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/Images.xcassets/video-video-selected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "video-video-selected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/Images.xcassets/video-video-unselected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "video-video-unselected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/view controllers/CallViewController.swift

@@ -193,27 +193,19 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
         hangUpButton = createButton(imageName:"hangup-active-wide",
                                     action:#selector(didPressHangup))
         audioModeMuteButton = createButton(imageName:"mute-unselected-wide",
-                                       action:#selector(didPressMute))
-        videoModeMuteButton = createButton(imageName:"mute-unselected-wide",
-                                       action:#selector(didPressMute))
+                                           action:#selector(didPressMute))
+        videoModeMuteButton = createButton(imageName:"video-mute-unselected",
+                                           action:#selector(didPressMute))
         audioModeVideoButton = createButton(imageName:"video-inactive-wide",
-                                        action:#selector(didPressVideo))
-        videoModeVideoButton = createButton(imageName:"video-inactive-wide",
-                                        action:#selector(didPressVideo))
+                                            action:#selector(didPressVideo))
+        videoModeVideoButton = createButton(imageName:"video-video-unselected",
+                                            action:#selector(didPressVideo))
 
-        let muteSelectedImage = UIImage(named:"mute-selected-wide")
-        assert(muteSelectedImage != nil)
-        audioModeMuteButton.setImage(muteSelectedImage, for:.selected)
-        videoModeMuteButton.setImage(muteSelectedImage, for:.selected)
-
-        let videoSelectedImage = UIImage(named:"video-active-wide")
-        assert(videoSelectedImage != nil)
-        audioModeVideoButton.setImage(videoSelectedImage, for:.selected)
-        videoModeVideoButton.setImage(videoSelectedImage, for:.selected)
-
-        let speakerPhoneSelectedImage = UIImage(named:"speaker-active-wide")
-        assert(speakerPhoneSelectedImage != nil)
-        speakerPhoneButton.setImage(speakerPhoneSelectedImage, for:.selected)
+        setButtonSelectedImage(button: audioModeMuteButton, imageName: "mute-selected-wide")
+        setButtonSelectedImage(button: videoModeMuteButton, imageName: "video-mute-selected")
+        setButtonSelectedImage(button: audioModeVideoButton, imageName: "video-active-wide")
+        setButtonSelectedImage(button: videoModeVideoButton, imageName: "video-video-selected")
+        setButtonSelectedImage(button: speakerPhoneButton, imageName: "speaker-active-wide")
 
         ongoingCallView = createContainerForCallControls(controlGroups : [
             [audioModeMuteButton, speakerPhoneButton, audioModeVideoButton ],
@@ -221,6 +213,12 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
             ])
     }
 
+    func setButtonSelectedImage(button: UIButton, imageName: String) {
+        let image = UIImage(named:imageName)
+        assert(image != nil)
+        button.setImage(image, for:.selected)
+    }
+
     func createIncomingCallControls() {
 
         acceptIncomingButton = createButton(imageName:"call-active-wide",