From ff13d6f0164138d00c9f3c7390127df3210b61c6 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 22 Oct 2015 13:23:23 +0200 Subject: [PATCH] UI: fix all icons states --- Classes/Base.lproj/AssistantView.xib | 13 +- Classes/Base.lproj/CallIncomingView.xib | 17 +- Classes/Base.lproj/CallOutgoingView.xib | 21 +- Classes/Base.lproj/CallView.xib | 86 +- .../Base.lproj/ChatConversationCreateView.xib | 6 +- Classes/Base.lproj/ChatConversationView.xib | 55 +- Classes/Base.lproj/ChatsListView.xib | 35 +- Classes/Base.lproj/ContactDetailsView.xib | 28 +- Classes/Base.lproj/ContactsListView.xib | 54 +- Classes/Base.lproj/DialerView.xib | 34 +- Classes/Base.lproj/HistoryDetailsView.xib | 23 +- Classes/Base.lproj/HistoryListView.xib | 53 +- Classes/Base.lproj/ImageView.xib | 8 +- Classes/CallView.h | 6 +- Classes/CallView.m | 8 +- Classes/ContactDetailsTableView.m | 8 +- Classes/ContactsListTableView.m | 2 +- Classes/ContactsListView.h | 1 + Classes/ContactsListView.m | 24 +- Classes/DialerView.h | 2 +- Classes/DialerView.m | 5 +- Classes/HistoryListTableView.m | 2 +- Classes/HistoryListView.h | 1 + Classes/HistoryListView.m | 14 +- Classes/LinphoneUI/Base.lproj/TabBarView.xib | 26 +- Classes/LinphoneUI/UIChatBubbleTextCell.m | 3 +- Classes/LinphoneUI/UIConfirmationDialog.m | 5 +- Classes/LinphoneUI/UIContactDetailsCell.xib | 6 +- Classes/SideMenuTableView.m | 2 +- Classes/Utils/FastAddressBook.m | 2 +- Classes/Utils/Utils.m | 2 +- .../images/{back.png => back_default.png} | Bin Resources/images/back_disabled.png | Bin 0 -> 569 bytes Resources/images/backspace_disabled.png | Bin 0 -> 707 bytes .../{call_add.png => call_add_default.png} | Bin Resources/images/call_add_disabled.png | Bin 0 -> 1211 bytes ...alt_back.png => call_alt_back_default.png} | Bin Resources/images/call_alt_back_disabled.png | Bin 0 -> 1498 bytes ...t_start.png => call_alt_start_default.png} | Bin Resources/images/call_alt_start_disabled.png | Bin 0 -> 1095 bytes ...start.png => call_audio_start_default.png} | Bin .../images/call_audio_start_disabled.png | Bin 0 -> 1104 bytes .../{call_back.png => call_back_default.png} | Bin Resources/images/call_back_disabled.png | Bin 0 -> 1185 bytes ...all_hangup.png => call_hangup_default.png} | Bin Resources/images/call_hangup_disabled.png | Bin 0 -> 840 bytes Resources/images/call_incoming.png | Bin 0 -> 336 bytes Resources/images/call_missed.png | Bin 0 -> 266 bytes Resources/images/call_outgoing.png | Bin 0 -> 271 bytes ...transfer.png => call_transfer_default.png} | Bin Resources/images/call_transfer_disabled.png | Bin 0 -> 1248 bytes ...start.png => call_video_start_default.png} | Bin .../images/call_video_start_disabled.png | Bin 0 -> 1009 bytes Resources/images/camera_disabled.png | Bin 0 -> 541 bytes ...ancel_edit.png => cancel_edit_default.png} | Bin Resources/images/cancel_edit_disabled.png | Bin 0 -> 851 bytes .../{chat_add.png => chat_add_default.png} | Bin Resources/images/chat_add_disabled.png | Bin 0 -> 1044 bytes Resources/images/chat_attachment_disabled.png | Bin 0 -> 992 bytes Resources/images/chat_picture_default.png | Bin 717 -> 0 bytes Resources/images/chat_picture_over.png | Bin 1834 -> 0 bytes Resources/images/chat_send_disabled.png | Bin 0 -> 1132 bytes Resources/images/color_A.png | Bin 150 -> 277 bytes Resources/images/color_B.png | Bin 150 -> 260 bytes Resources/images/color_C.png | Bin 169 -> 260 bytes Resources/images/color_D.png | Bin 150 -> 262 bytes Resources/images/color_E.png | Bin 150 -> 262 bytes Resources/images/color_F.png | Bin 153 -> 262 bytes Resources/images/color_G.png | Bin 150 -> 262 bytes Resources/images/color_H.png | Bin 150 -> 260 bytes Resources/images/color_I.png | Bin 150 -> 277 bytes Resources/images/color_J.png | Bin 150 -> 277 bytes Resources/images/color_K.png | Bin 150 -> 277 bytes Resources/images/color_L.png | Bin 150 -> 277 bytes Resources/images/color_M.png | Bin 0 -> 277 bytes ...start.png => conference_start_default.png} | Bin .../images/conference_start_disabled.png | Bin 0 -> 1193 bytes ...ontact_add.png => contact_add_default.png} | Bin Resources/images/contact_add_disabled.png | Bin 0 -> 1040 bytes Resources/images/contacts_all_disabled.png | Bin 0 -> 944 bytes Resources/images/contacts_sip_disabled.png | Bin 0 -> 1191 bytes .../images/{delete.png => delete_default.png} | Bin Resources/images/delete_disabled.png | Bin 0 -> 633 bytes ...elect_all.png => deselect_all_default.png} | Bin Resources/images/deselect_all_disabled.png | Bin 0 -> 502 bytes ...t_back.png => dialer_alt_back_default.png} | Bin Resources/images/dialer_alt_back_disabled.png | Bin 0 -> 532 bytes ...ialer_back.png => dialer_back_default.png} | Bin Resources/images/dialer_back_disabled.png | Bin 0 -> 1181 bytes .../images/{edit.png => edit_default.png} | Bin Resources/images/edit_disabled.png | Bin 0 -> 820 bytes .../{edit_list.png => edit_list_default.png} | Bin Resources/images/edit_list_disabled.png | Bin 0 -> 838 bytes ...ooter_chat.png => footer_chat_default.png} | Bin Resources/images/footer_chat_disabled.png | Bin 0 -> 737 bytes ...ntacts.png => footer_contacts_default.png} | Bin Resources/images/footer_contacts_disabled.png | Bin 0 -> 728 bytes ...r_dialer.png => footer_dialer_default.png} | Bin Resources/images/footer_dialer_disabled.png | Bin 0 -> 946 bytes ...history.png => footer_history_default.png} | Bin Resources/images/footer_history_disabled.png | Bin 0 -> 717 bytes Resources/images/history_all_disabled.png | Bin 0 -> 1269 bytes Resources/images/history_missed_disabled.png | Bin 0 -> 1156 bytes Resources/images/micro_disabled.png | Bin 0 -> 1025 bytes Resources/images/numpad_sharp.png | Bin 792 -> 0 bytes ..._call.png => options_add_call_default.png} | Bin .../images/options_add_call_disabled.png | Bin 0 -> 1126 bytes Resources/images/options_disabled.png | Bin 0 -> 939 bytes ...g => options_start_conference_default.png} | Bin .../options_start_conference_disabled.png | Bin 0 -> 1201 bytes ....png => options_transfer_call_default.png} | Bin .../images/options_transfer_call_disabled.png | Bin 0 -> 1130 bytes Resources/images/quit_default.png | Bin 1089 -> 0 bytes Resources/images/quit_over.png | Bin 1426 -> 0 bytes .../images/resizable_assistant_button.png | Bin 431 -> 0 bytes Resources/images/resizable_cancel_button.png | Bin 479 -> 0 bytes .../images/resizable_chat_bubble_incoming.png | Bin 291 -> 0 bytes .../images/resizable_chat_bubble_outgoing.png | Bin 306 -> 0 bytes .../resizable_confirm_delete_button.png | Bin 523 -> 0 bytes Resources/images/resizable_textfield.png | Bin 350 -> 0 bytes ...etooth.png => route_bluetooth_default.png} | Bin Resources/images/route_bluetooth_disabled.png | Bin 0 -> 697 bytes ...arpiece.png => route_earpiece_default.png} | Bin Resources/images/route_earpiece_disabled.png | Bin 0 -> 801 bytes ..._speaker.png => route_speaker_default.png} | Bin Resources/images/route_speaker_disabled.png | Bin 0 -> 684 bytes Resources/images/routes_disabled.png | Bin 0 -> 951 bytes ...{select_all.png => select_all_default.png} | Bin Resources/images/select_all_disabled.png | Bin 0 -> 619 bytes Resources/images/speaker_disabled.png | Bin 0 -> 684 bytes .../images/{valid.png => valid_default.png} | Bin Resources/images/valid_disabled.png | Bin 0 -> 625 bytes linphone.xcodeproj/project.pbxproj | 1588 +++++++++-------- 133 files changed, 1228 insertions(+), 912 deletions(-) rename Resources/images/{back.png => back_default.png} (100%) create mode 100644 Resources/images/back_disabled.png create mode 100644 Resources/images/backspace_disabled.png rename Resources/images/{call_add.png => call_add_default.png} (100%) create mode 100644 Resources/images/call_add_disabled.png rename Resources/images/{call_alt_back.png => call_alt_back_default.png} (100%) create mode 100644 Resources/images/call_alt_back_disabled.png rename Resources/images/{call_alt_start.png => call_alt_start_default.png} (100%) create mode 100644 Resources/images/call_alt_start_disabled.png rename Resources/images/{call_audio_start.png => call_audio_start_default.png} (100%) create mode 100644 Resources/images/call_audio_start_disabled.png rename Resources/images/{call_back.png => call_back_default.png} (100%) create mode 100644 Resources/images/call_back_disabled.png rename Resources/images/{call_hangup.png => call_hangup_default.png} (100%) create mode 100644 Resources/images/call_hangup_disabled.png create mode 100644 Resources/images/call_incoming.png create mode 100644 Resources/images/call_missed.png create mode 100644 Resources/images/call_outgoing.png rename Resources/images/{call_transfer.png => call_transfer_default.png} (100%) create mode 100644 Resources/images/call_transfer_disabled.png rename Resources/images/{call_video_start.png => call_video_start_default.png} (100%) create mode 100644 Resources/images/call_video_start_disabled.png create mode 100644 Resources/images/camera_disabled.png rename Resources/images/{cancel_edit.png => cancel_edit_default.png} (100%) create mode 100644 Resources/images/cancel_edit_disabled.png rename Resources/images/{chat_add.png => chat_add_default.png} (100%) create mode 100644 Resources/images/chat_add_disabled.png create mode 100644 Resources/images/chat_attachment_disabled.png delete mode 100644 Resources/images/chat_picture_default.png delete mode 100644 Resources/images/chat_picture_over.png create mode 100644 Resources/images/chat_send_disabled.png create mode 100644 Resources/images/color_M.png rename Resources/images/{conference_start.png => conference_start_default.png} (100%) create mode 100644 Resources/images/conference_start_disabled.png rename Resources/images/{contact_add.png => contact_add_default.png} (100%) create mode 100644 Resources/images/contact_add_disabled.png create mode 100644 Resources/images/contacts_all_disabled.png create mode 100644 Resources/images/contacts_sip_disabled.png rename Resources/images/{delete.png => delete_default.png} (100%) create mode 100644 Resources/images/delete_disabled.png rename Resources/images/{deselect_all.png => deselect_all_default.png} (100%) create mode 100644 Resources/images/deselect_all_disabled.png rename Resources/images/{dialer_alt_back.png => dialer_alt_back_default.png} (100%) create mode 100644 Resources/images/dialer_alt_back_disabled.png rename Resources/images/{dialer_back.png => dialer_back_default.png} (100%) create mode 100644 Resources/images/dialer_back_disabled.png rename Resources/images/{edit.png => edit_default.png} (100%) create mode 100644 Resources/images/edit_disabled.png rename Resources/images/{edit_list.png => edit_list_default.png} (100%) create mode 100644 Resources/images/edit_list_disabled.png rename Resources/images/{footer_chat.png => footer_chat_default.png} (100%) create mode 100644 Resources/images/footer_chat_disabled.png rename Resources/images/{footer_contacts.png => footer_contacts_default.png} (100%) create mode 100644 Resources/images/footer_contacts_disabled.png rename Resources/images/{footer_dialer.png => footer_dialer_default.png} (100%) create mode 100644 Resources/images/footer_dialer_disabled.png rename Resources/images/{footer_history.png => footer_history_default.png} (100%) create mode 100644 Resources/images/footer_history_disabled.png create mode 100644 Resources/images/history_all_disabled.png create mode 100644 Resources/images/history_missed_disabled.png create mode 100644 Resources/images/micro_disabled.png delete mode 100644 Resources/images/numpad_sharp.png rename Resources/images/{options_add_call.png => options_add_call_default.png} (100%) create mode 100644 Resources/images/options_add_call_disabled.png create mode 100644 Resources/images/options_disabled.png rename Resources/images/{options_start_conference.png => options_start_conference_default.png} (100%) create mode 100644 Resources/images/options_start_conference_disabled.png rename Resources/images/{options_transfer_call.png => options_transfer_call_default.png} (100%) create mode 100644 Resources/images/options_transfer_call_disabled.png delete mode 100644 Resources/images/quit_default.png delete mode 100644 Resources/images/quit_over.png delete mode 100644 Resources/images/resizable_assistant_button.png delete mode 100644 Resources/images/resizable_cancel_button.png delete mode 100644 Resources/images/resizable_chat_bubble_incoming.png delete mode 100644 Resources/images/resizable_chat_bubble_outgoing.png delete mode 100644 Resources/images/resizable_confirm_delete_button.png delete mode 100644 Resources/images/resizable_textfield.png rename Resources/images/{route_bluetooth.png => route_bluetooth_default.png} (100%) create mode 100644 Resources/images/route_bluetooth_disabled.png rename Resources/images/{route_earpiece.png => route_earpiece_default.png} (100%) create mode 100644 Resources/images/route_earpiece_disabled.png rename Resources/images/{route_speaker.png => route_speaker_default.png} (100%) create mode 100644 Resources/images/route_speaker_disabled.png create mode 100644 Resources/images/routes_disabled.png rename Resources/images/{select_all.png => select_all_default.png} (100%) create mode 100644 Resources/images/select_all_disabled.png create mode 100644 Resources/images/speaker_disabled.png rename Resources/images/{valid.png => valid_default.png} (100%) create mode 100644 Resources/images/valid_disabled.png diff --git a/Classes/Base.lproj/AssistantView.xib b/Classes/Base.lproj/AssistantView.xib index 38fbe3ade..28fa2c850 100644 --- a/Classes/Base.lproj/AssistantView.xib +++ b/Classes/Base.lproj/AssistantView.xib @@ -1,6 +1,7 @@ + @@ -35,9 +36,10 @@ - + + @@ -55,9 +57,10 @@ - + + @@ -92,10 +95,12 @@ - + + - + + diff --git a/Classes/Base.lproj/CallIncomingView.xib b/Classes/Base.lproj/CallIncomingView.xib index 1e1514e96..7545138a7 100644 --- a/Classes/Base.lproj/CallIncomingView.xib +++ b/Classes/Base.lproj/CallIncomingView.xib @@ -1,6 +1,7 @@ - + + @@ -62,9 +63,10 @@ - + + @@ -75,9 +77,10 @@ - + + @@ -96,9 +99,11 @@ - - - + + + + + diff --git a/Classes/Base.lproj/CallOutgoingView.xib b/Classes/Base.lproj/CallOutgoingView.xib index 48f3961ec..2ae19e160 100644 --- a/Classes/Base.lproj/CallOutgoingView.xib +++ b/Classes/Base.lproj/CallOutgoingView.xib @@ -1,8 +1,8 @@ - + - + @@ -36,7 +36,7 @@ - + @@ -70,6 +70,7 @@ + @@ -360,13 +359,14 @@ - + - + + @@ -374,24 +374,25 @@ - @@ -519,6 +524,7 @@ + @@ -527,9 +533,10 @@ - + + @@ -543,6 +550,7 @@ + @@ -559,9 +567,10 @@ - + + @@ -571,7 +580,7 @@ - + @@ -580,7 +589,7 @@ - + @@ -600,8 +609,9 @@ - + + @@ -610,10 +620,13 @@ - - - + + + + + + @@ -625,16 +638,31 @@ - + - + + + - + + + + + + + + + + + + + + diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib index 5b786244f..30a2e2553 100644 --- a/Classes/Base.lproj/ChatConversationCreateView.xib +++ b/Classes/Base.lproj/ChatConversationCreateView.xib @@ -34,9 +34,10 @@ - + + @@ -79,7 +80,8 @@ - + + diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib index 7132776dc..3b58bb0a7 100644 --- a/Classes/Base.lproj/ChatConversationView.xib +++ b/Classes/Base.lproj/ChatConversationView.xib @@ -1,6 +1,7 @@ + @@ -43,9 +44,10 @@ - + + @@ -64,11 +66,10 @@ + + + + - + + + + - + @@ -130,10 +134,14 @@ - - - - + + + + + + + + diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m index 096c19294..2ab9a6fd0 100644 --- a/Classes/LinphoneUI/UIChatBubbleTextCell.m +++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m @@ -112,7 +112,8 @@ ABRecordRef contact = [FastAddressBook getContactWithAddress:linphone_chat_message_get_peer_address(_message)]; _avatarImage.image = [FastAddressBook imageForContact:contact thumbnail:YES]; } - _backgroundColorImage.image = _bottomBarColor.image = [UIImage imageNamed:(outgoing ? @"color_A" : @"color_D")]; + _backgroundColorImage.image = _bottomBarColor.image = + [UIImage imageNamed:(outgoing ? @"color_A.png" : @"color_D.png")]; if (!outgoing) { _statusImage.accessibilityValue = @"incoming"; diff --git a/Classes/LinphoneUI/UIConfirmationDialog.m b/Classes/LinphoneUI/UIConfirmationDialog.m index b6251eb47..71c15395e 100644 --- a/Classes/LinphoneUI/UIConfirmationDialog.m +++ b/Classes/LinphoneUI/UIConfirmationDialog.m @@ -25,8 +25,9 @@ [dialog.titleLabel setText:message]; dialog.confirmationButton.layer.borderColor = - [[UIColor colorWithPatternImage:[UIImage imageNamed:@"color_A"]] CGColor]; - dialog.cancelButton.layer.borderColor = [[UIColor colorWithPatternImage:[UIImage imageNamed:@"color_F"]] CGColor]; + [[UIColor colorWithPatternImage:[UIImage imageNamed:@"color_A.png"]] CGColor]; + dialog.cancelButton.layer.borderColor = + [[UIColor colorWithPatternImage:[UIImage imageNamed:@"color_F.png"]] CGColor]; } - (IBAction)onCancelClick:(id)sender { diff --git a/Classes/LinphoneUI/UIContactDetailsCell.xib b/Classes/LinphoneUI/UIContactDetailsCell.xib index 4b84e867d..5dcda06d0 100644 --- a/Classes/LinphoneUI/UIContactDetailsCell.xib +++ b/Classes/LinphoneUI/UIContactDetailsCell.xib @@ -30,7 +30,7 @@