diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png index faa1cbd04..44225b355 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png index cf8d33c36..6f9c4f168 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png index 229c0f15c..19839d529 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/call_audio_mute_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png index 013c41d5c..34bcaaf01 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png index 215a080fc..7b63fde7b 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png index 95624f6a6..88f122d63 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/call_audio_mute_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png index 44864f900..a704776e3 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png index 13fefb36c..a6744b918 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png index 39e3c5052..2b70dd92f 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_chat_icon.imageset/call_chat_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png deleted file mode 100644 index 159cf2ea3..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png deleted file mode 100644 index ca996ebbf..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@2x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png deleted file mode 100644 index 383d5dbcd..000000000 Binary files a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/call_hangup_icon@3x.png and /dev/null differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json similarity index 71% rename from Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json rename to Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json index 8079f23b0..738bd32c7 100644 --- a/Riot/Assets/Images.xcassets/Call/call_hangup_icon.imageset/Contents.json +++ b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "call_hangup_icon.png", + "filename" : "call_hangup_big.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "call_hangup_icon@2x.png", + "filename" : "call_hangup_big@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "call_hangup_icon@3x.png", + "filename" : "call_hangup_big@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png new file mode 100644 index 000000000..1ce2c0d62 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png new file mode 100644 index 000000000..0f64361ce Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png new file mode 100644 index 000000000..b33700210 Binary files /dev/null and b/Riot/Assets/Images.xcassets/Call/call_hangup_large.imageset/call_hangup_big@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png index fbafbd024..5d8901204 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png index 90aa4ee1b..0f460c384 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png index 61ffad725..b09c2b88a 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_off_icon.imageset/call_speaker_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png index db46e4226..9f63fa17f 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png index e77a0fe96..1dd05a3a6 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png index 17aa6b00c..16dcbc728 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_speaker_on_icon.imageset/call_speaker_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png index 86fb6880f..15dc99bf2 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png index b78646748..0c37cf99e 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png index 9a5e5b622..8041bd8d8 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/call_video_mute_off_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png index e4027cf3f..fe9838b71 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png index f52ebfd34..071185caf 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png index ccdebb760..2f90f11b6 100644 Binary files a/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png and b/Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/call_video_mute_on_icon@3x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png index c5edbd95c..ae556b303 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png index b09dc61f8..e30a30e1e 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@2x.png differ diff --git a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png index 445b5c633..51d5c1d5f 100644 Binary files a/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png and b/Riot/Assets/Images.xcassets/Call/camera_switch.imageset/camera_switch@3x.png differ diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index a08cb796b..93996749d 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -22,7 +22,7 @@ internal enum Asset { internal static let callAudioMuteOffIcon = ImageAsset(name: "call_audio_mute_off_icon") internal static let callAudioMuteOnIcon = ImageAsset(name: "call_audio_mute_on_icon") internal static let callChatIcon = ImageAsset(name: "call_chat_icon") - internal static let callHangupIcon = ImageAsset(name: "call_hangup_icon") + internal static let callHangupLarge = ImageAsset(name: "call_hangup_large") internal static let callSpeakerOffIcon = ImageAsset(name: "call_speaker_off_icon") internal static let callSpeakerOnIcon = ImageAsset(name: "call_speaker_on_icon") internal static let callVideoMuteOffIcon = ImageAsset(name: "call_video_mute_off_icon") diff --git a/Riot/Modules/Call/CallViewController.h b/Riot/Modules/Call/CallViewController.h index 23fe8b82e..97033feb6 100644 --- a/Riot/Modules/Call/CallViewController.h +++ b/Riot/Modules/Call/CallViewController.h @@ -24,6 +24,8 @@ @property (weak, nonatomic) IBOutlet UIView *gradientMaskContainerView; @property (weak, nonatomic) IBOutlet UIButton *chatButton; +@property (weak, nonatomic) IBOutlet UIView *callControlsBackgroundView; + @property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *callerImageViewWidthConstraint; // At the end of call, this flag indicates if the prompt to use the fallback should be displayed diff --git a/Riot/Modules/Call/CallViewController.m b/Riot/Modules/Call/CallViewController.m index 5b0296dfa..efb4009ba 100644 --- a/Riot/Modules/Call/CallViewController.m +++ b/Riot/Modules/Call/CallViewController.m @@ -107,13 +107,13 @@ // Chat - UIImage *chatButtonImage = [[UIImage imageNamed:@"call_chat_icon"] vc_tintedImageUsingColor:selectedColor]; + UIImage *chatButtonImage = [[UIImage imageNamed:@"call_chat_icon"] vc_tintedImageUsingColor:unselectedColor]; [self.chatButton setImage:chatButtonImage forState:UIControlStateNormal]; [self.chatButton setImage:chatButtonImage forState:UIControlStateHighlighted]; // Hang up - UIImage *hangUpButtonImage = [[UIImage imageNamed:@"call_hangup_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.noticeColor]; + UIImage *hangUpButtonImage = [[UIImage imageNamed:@"call_hangup_large"] vc_tintedImageUsingColor:ThemeService.shared.theme.noticeColor]; [self.endCallButton setTitle:nil forState:UIControlStateNormal]; [self.endCallButton setTitle:nil forState:UIControlStateHighlighted]; @@ -177,6 +177,8 @@ // it seems only being supported on Mac OS. // so viewDidLayoutSubviews will refresh the layout bounds. [self.gradientMaskContainerView.layer addSublayer:gradientMaskLayer]; + + self.callControlsBackgroundView.backgroundColor = ThemeService.shared.theme.baseColor; } - (BOOL)prefersStatusBarHidden diff --git a/Riot/Modules/Call/CallViewController.xib b/Riot/Modules/Call/CallViewController.xib index 27b4d1812..50da8494a 100644 --- a/Riot/Modules/Call/CallViewController.xib +++ b/Riot/Modules/Call/CallViewController.xib @@ -1,6 +1,6 @@ - + @@ -15,6 +15,7 @@ + @@ -39,7 +40,7 @@ - + - + @@ -62,17 +63,17 @@ - + - + + + + + - + - + @@ -206,17 +210,17 @@ - +