Merge branch 'charlesmchen/webrtc/video5' into feature/webrtc
This commit is contained in:
commit
a29e3674c4
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
BIN
Signal/Images.xcassets/video-mute-selected.imageset/video-mute-selected.png
vendored
Normal file
BIN
Signal/Images.xcassets/video-mute-selected.imageset/video-mute-selected.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
BIN
Signal/Images.xcassets/video-mute-unselected.imageset/video-mute-unselected.png
vendored
Normal file
BIN
Signal/Images.xcassets/video-mute-unselected.imageset/video-mute-unselected.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
BIN
Signal/Images.xcassets/video-video-selected.imageset/video-video-selected.png
vendored
Normal file
BIN
Signal/Images.xcassets/video-video-selected.imageset/video-video-selected.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
BIN
Signal/Images.xcassets/video-video-unselected.imageset/video-video-unselected.png
vendored
Normal file
BIN
Signal/Images.xcassets/video-video-unselected.imageset/video-video-unselected.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
|
@ -193,27 +193,19 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
|
||||||
hangUpButton = createButton(imageName:"hangup-active-wide",
|
hangUpButton = createButton(imageName:"hangup-active-wide",
|
||||||
action:#selector(didPressHangup))
|
action:#selector(didPressHangup))
|
||||||
audioModeMuteButton = createButton(imageName:"mute-unselected-wide",
|
audioModeMuteButton = createButton(imageName:"mute-unselected-wide",
|
||||||
action:#selector(didPressMute))
|
action:#selector(didPressMute))
|
||||||
videoModeMuteButton = createButton(imageName:"mute-unselected-wide",
|
videoModeMuteButton = createButton(imageName:"video-mute-unselected",
|
||||||
action:#selector(didPressMute))
|
action:#selector(didPressMute))
|
||||||
audioModeVideoButton = createButton(imageName:"video-inactive-wide",
|
audioModeVideoButton = createButton(imageName:"video-inactive-wide",
|
||||||
action:#selector(didPressVideo))
|
action:#selector(didPressVideo))
|
||||||
videoModeVideoButton = createButton(imageName:"video-inactive-wide",
|
videoModeVideoButton = createButton(imageName:"video-video-unselected",
|
||||||
action:#selector(didPressVideo))
|
action:#selector(didPressVideo))
|
||||||
|
|
||||||
let muteSelectedImage = UIImage(named:"mute-selected-wide")
|
setButtonSelectedImage(button: audioModeMuteButton, imageName: "mute-selected-wide")
|
||||||
assert(muteSelectedImage != nil)
|
setButtonSelectedImage(button: videoModeMuteButton, imageName: "video-mute-selected")
|
||||||
audioModeMuteButton.setImage(muteSelectedImage, for:.selected)
|
setButtonSelectedImage(button: audioModeVideoButton, imageName: "video-active-wide")
|
||||||
videoModeMuteButton.setImage(muteSelectedImage, for:.selected)
|
setButtonSelectedImage(button: videoModeVideoButton, imageName: "video-video-selected")
|
||||||
|
setButtonSelectedImage(button: speakerPhoneButton, imageName: "speaker-active-wide")
|
||||||
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)
|
|
||||||
|
|
||||||
ongoingCallView = createContainerForCallControls(controlGroups : [
|
ongoingCallView = createContainerForCallControls(controlGroups : [
|
||||||
[audioModeMuteButton, speakerPhoneButton, audioModeVideoButton ],
|
[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() {
|
func createIncomingCallControls() {
|
||||||
|
|
||||||
acceptIncomingButton = createButton(imageName:"call-active-wide",
|
acceptIncomingButton = createButton(imageName:"call-active-wide",
|
||||||
|
|
Loading…
Reference in New Issue