From 30a168c2e16bc98083a4b213f29e88f8567c0dd3 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 26 Oct 2015 11:11:12 +0100 Subject: [PATCH] Incoming: add video icon acceptance --- Classes/Base.lproj/CallIncomingView.xib | 72 +++++++++++++++--- Classes/Base.lproj/CallView.xib | 18 ++--- Classes/Base.lproj/ChatConversationView.xib | 6 +- Classes/Base.lproj/DialerView.xib | 11 ++- Classes/Base.lproj/HistoryDetailsView.xib | 4 + Classes/CallIncomingView.h | 5 +- Classes/CallIncomingView.m | 10 ++- Classes/LinphoneManager.h | 2 +- Classes/LinphoneManager.m | 7 +- Classes/LinphoneUI/UICallButton.m | 6 +- Classes/LinphoneUI/UIContactDetailsCell.xib | 14 ++-- Classes/PhoneMainView.m | 6 +- Resources/images/back_disabled.png | Bin 569 -> 569 bytes Resources/images/backspace_disabled.png | Bin 707 -> 707 bytes Resources/images/call_add_disabled.png | Bin 1211 -> 1211 bytes Resources/images/call_alt_back_disabled.png | Bin 1498 -> 1498 bytes Resources/images/call_alt_start_disabled.png | Bin 1095 -> 1095 bytes .../images/call_audio_start_disabled.png | Bin 1104 -> 1104 bytes Resources/images/call_back_disabled.png | Bin 1185 -> 1185 bytes Resources/images/call_hangup_disabled.png | Bin 840 -> 840 bytes Resources/images/call_transfer_disabled.png | Bin 1248 -> 1248 bytes .../images/call_video_start_disabled.png | Bin 1009 -> 1009 bytes Resources/images/camera_disabled.png | Bin 541 -> 541 bytes Resources/images/cancel_edit_disabled.png | Bin 851 -> 851 bytes Resources/images/chat_add_disabled.png | Bin 1044 -> 1044 bytes Resources/images/chat_attachment_disabled.png | Bin 992 -> 992 bytes Resources/images/chat_send_disabled.png | Bin 1132 -> 1132 bytes Resources/images/color_A.png | Bin 277 -> 277 bytes Resources/images/color_B.png | Bin 260 -> 260 bytes Resources/images/color_C.png | Bin 260 -> 260 bytes Resources/images/color_D.png | Bin 262 -> 262 bytes Resources/images/color_E.png | Bin 262 -> 262 bytes Resources/images/color_F.png | Bin 262 -> 262 bytes Resources/images/color_G.png | Bin 262 -> 262 bytes Resources/images/color_H.png | Bin 260 -> 260 bytes Resources/images/color_I.png | Bin 277 -> 277 bytes Resources/images/color_J.png | Bin 277 -> 277 bytes Resources/images/color_K.png | Bin 277 -> 277 bytes Resources/images/color_L.png | Bin 277 -> 277 bytes Resources/images/color_M.png | Bin 277 -> 277 bytes .../images/conference_start_disabled.png | Bin 1193 -> 1193 bytes Resources/images/contact_add_disabled.png | Bin 1040 -> 1040 bytes Resources/images/contacts_all_disabled.png | Bin 944 -> 944 bytes Resources/images/contacts_sip_disabled.png | Bin 1191 -> 1191 bytes Resources/images/delete_disabled.png | Bin 633 -> 633 bytes Resources/images/deselect_all_disabled.png | Bin 502 -> 502 bytes Resources/images/dialer_alt_back_disabled.png | Bin 532 -> 532 bytes Resources/images/dialer_back_disabled.png | Bin 1181 -> 1181 bytes Resources/images/edit_disabled.png | Bin 820 -> 820 bytes Resources/images/edit_list_disabled.png | Bin 838 -> 838 bytes Resources/images/footer_chat_disabled.png | Bin 737 -> 737 bytes Resources/images/footer_contacts_disabled.png | Bin 728 -> 728 bytes Resources/images/footer_dialer_disabled.png | Bin 946 -> 946 bytes Resources/images/footer_history_disabled.png | Bin 717 -> 717 bytes Resources/images/history_all_disabled.png | Bin 1269 -> 1269 bytes Resources/images/history_missed_disabled.png | Bin 1156 -> 1156 bytes Resources/images/micro_disabled.png | Bin 1025 -> 1025 bytes .../images/options_add_call_disabled.png | Bin 1126 -> 1126 bytes Resources/images/options_disabled.png | Bin 939 -> 939 bytes .../options_start_conference_disabled.png | Bin 1201 -> 1201 bytes .../images/options_transfer_call_disabled.png | Bin 1130 -> 1130 bytes Resources/images/route_bluetooth_disabled.png | Bin 697 -> 697 bytes Resources/images/route_earpiece_disabled.png | Bin 801 -> 801 bytes Resources/images/route_speaker_disabled.png | Bin 684 -> 684 bytes Resources/images/routes_disabled.png | Bin 951 -> 951 bytes Resources/images/select_all_disabled.png | Bin 619 -> 619 bytes Resources/images/speaker_disabled.png | Bin 684 -> 684 bytes Resources/images/valid_disabled.png | Bin 625 -> 625 bytes 68 files changed, 118 insertions(+), 43 deletions(-) diff --git a/Classes/Base.lproj/CallIncomingView.xib b/Classes/Base.lproj/CallIncomingView.xib index 7545138a7..9adc96b5e 100644 --- a/Classes/Base.lproj/CallIncomingView.xib +++ b/Classes/Base.lproj/CallIncomingView.xib @@ -1,5 +1,5 @@ - + @@ -11,6 +11,8 @@ + + @@ -33,7 +35,7 @@ - + @@ -41,14 +43,14 @@