From 3034d8000d86352865f84d175d8a1e6138fd6964 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 29 Oct 2015 11:20:39 +0100 Subject: [PATCH] UI: fix numerous glitchs and launchscreen --- Classes/AssistantView.m | 21 +- Classes/Base.lproj/AboutView.xib | 46 +- Classes/Base.lproj/AssistantSubviews.xib | 250 +- Classes/Base.lproj/AssistantView.xib | 28 +- Classes/Base.lproj/CallIncomingView.xib | 45 +- Classes/Base.lproj/CallOutgoingView.xib | 52 +- Classes/Base.lproj/CallView.xib | 356 +- .../Base.lproj/ChatConversationCreateView.xib | 29 +- Classes/Base.lproj/ChatConversationView.xib | 87 +- Classes/Base.lproj/ChatsListView.xib | 59 +- Classes/Base.lproj/ContactDetailsView.xib | 133 +- Classes/Base.lproj/ContactsListView.xib | 67 +- Classes/Base.lproj/DialerView.xib | 112 +- Classes/Base.lproj/HistoryDetailsView.xib | 125 +- Classes/Base.lproj/HistoryListView.xib | 50 +- Classes/Base.lproj/ImageView.xib | 22 +- Classes/Base.lproj/SettingsView.xib | 23 +- Classes/CallConferenceTableView.m | 1 - Classes/CallPausedTableView.m | 1 - Classes/ChatsListTableView.m | 1 - Classes/ContactDetailsTableView.m | 21 +- Classes/ContactDetailsView.h | 1 + Classes/ContactDetailsView.m | 15 +- Classes/ContactsListTableView.m | 6 +- Classes/HistoryDetailsTableView.m | 7 +- Classes/HistoryListTableView.m | 6 +- Classes/LaunchScreen.xib | 29 +- Classes/LinphoneManager.h | 2 + Classes/LinphoneManager.m | 18 +- .../LinphoneUI/Base.lproj/StatusBarView.xib | 17 +- Classes/LinphoneUI/Base.lproj/TabBarView.xib | 35 +- .../Base.lproj/UIConferenceHeader.strings | Bin 636 -> 0 bytes .../Base.lproj/UIConferenceHeader.xib | 63 - .../LinphoneUI/Base.lproj/UIContactCell.xib | 6 +- .../LinphoneUI/Base.lproj/UIHistoryCell.xib | 4 +- Classes/LinphoneUI/StatusBarView.m | 12 +- Classes/LinphoneUI/UICallButton.m | 2 - Classes/LinphoneUI/UICallPausedCell.m | 4 +- Classes/LinphoneUI/UICallPausedCell.xib | 3 +- Classes/LinphoneUI/UIChatBubblePhotoCell.xib | 6 +- Classes/LinphoneUI/UIChatBubbleTextCell.m | 2 +- Classes/LinphoneUI/UIChatCreateCell.xib | 5 +- Classes/LinphoneUI/UICompositeView.m | 5 + Classes/LinphoneUI/UIConferenceHeader.h | 33 - Classes/LinphoneUI/UIConferenceHeader.m | 43 - Classes/LinphoneUI/UIConfirmationDialog.xib | 17 +- Classes/LinphoneUI/UIContactDetailsCell.h | 7 +- Classes/LinphoneUI/UIContactDetailsCell.m | 21 +- Classes/LinphoneUI/UIContactDetailsCell.xib | 25 +- Classes/LinphoneUI/UIRoundedImageView.m | 2 +- .../ar.lproj/UIConferenceHeader.strings | Bin 630 -> 0 bytes .../de.lproj/UIConferenceHeader.strings | Bin 632 -> 0 bytes .../fr.lproj/UIConferenceHeader.strings | Bin 636 -> 0 bytes .../ja.lproj/UIConferenceHeader.strings | Bin 602 -> 0 bytes .../nl.lproj/UIConferenceHeader.strings | Bin 644 -> 0 bytes .../ru.lproj/UIConferenceHeader.strings | Bin 640 -> 0 bytes .../zh_TW.lproj/UIConferenceHeader.strings | Bin 636 -> 0 bytes Classes/PhoneMainView.m | 17 +- Classes/SettingsView.m | 1 - Classes/SideMenuTableView.m | 9 +- Classes/SideMenuView.m | 13 +- Classes/SideMenuView.xib | 14 +- Classes/Utils/FastAddressBook.m | 4 +- .../UACellBackgroundView.h | 29 - .../UACellBackgroundView.m | 277 -- Classes/Utils/Utils.h | 4 +- Classes/Utils/Utils.m | 42 +- .../AppIcon.appiconset/Contents.json | 88 - .../TestAppIcon.appiconset/Contents.json | 93 + .../Contents.json | 0 .../LaunchImage.launchimage/Contents.json | 103 - .../linphone_splashscreen-568h@2x.png | Bin 72308 -> 0 bytes .../linphone_splashscreen-568hios6@2x.png | Bin 72308 -> 0 bytes .../linphone_splashscreen-Landscape.png | Bin 74855 -> 0 bytes .../linphone_splashscreen-Landscape@2x.png | Bin 152382 -> 0 bytes .../linphone_splashscreen-Portrait.png | Bin 75465 -> 0 bytes .../linphone_splashscreen-Portrait@2x.png | Bin 158598 -> 0 bytes .../linphone_splashscreen.png | Bin 30133 -> 0 bytes .../linphone_splashscreen@2x.png | Bin 84781 -> 0 bytes .../linphone_splashscreenios6@2x.png | Bin 84781 -> 0 bytes Resources/images/back_disabled.png | Bin 569 -> 569 bytes Resources/images/back_disabled@2x.png | Bin 949 -> 949 bytes Resources/images/backspace_disabled.png | Bin 707 -> 707 bytes Resources/images/backspace_disabled@2x.png | Bin 1302 -> 1302 bytes Resources/images/call_add_disabled.png | Bin 1211 -> 1211 bytes Resources/images/call_add_disabled@2x.png | Bin 2482 -> 2482 bytes Resources/images/call_alt_back_disabled.png | Bin 1498 -> 1498 bytes .../images/call_alt_back_disabled@2x.png | Bin 3110 -> 3110 bytes Resources/images/call_alt_start_disabled.png | Bin 1095 -> 1095 bytes .../images/call_alt_start_disabled@2x.png | Bin 2154 -> 2154 bytes .../images/call_audio_start_disabled.png | Bin 1104 -> 1104 bytes .../images/call_audio_start_disabled@2x.png | Bin 2233 -> 2233 bytes Resources/images/call_back_disabled.png | Bin 1185 -> 1185 bytes Resources/images/call_back_disabled@2x.png | Bin 2302 -> 2302 bytes Resources/images/call_hangup_disabled.png | Bin 840 -> 840 bytes Resources/images/call_hangup_disabled@2x.png | Bin 1470 -> 1470 bytes Resources/images/call_transfer_disabled.png | Bin 1248 -> 1248 bytes .../images/call_transfer_disabled@2x.png | Bin 2546 -> 2546 bytes .../images/call_video_start_disabled.png | Bin 1009 -> 1009 bytes .../images/call_video_start_disabled@2x.png | Bin 2037 -> 2037 bytes Resources/images/camera_disabled.png | Bin 541 -> 541 bytes Resources/images/camera_disabled@2x.png | Bin 832 -> 832 bytes Resources/images/cancel_edit_disabled.png | Bin 851 -> 851 bytes Resources/images/cancel_edit_disabled@2x.png | Bin 1602 -> 1602 bytes Resources/images/chat_add_disabled.png | Bin 1044 -> 1044 bytes Resources/images/chat_add_disabled@2x.png | Bin 2093 -> 2093 bytes Resources/images/chat_attachment_disabled.png | Bin 992 -> 992 bytes .../images/chat_attachment_disabled@2x.png | Bin 1920 -> 1920 bytes Resources/images/chat_send_disabled.png | Bin 1132 -> 1132 bytes Resources/images/chat_send_disabled@2x.png | Bin 2138 -> 2138 bytes Resources/images/chat_start_body_disabled.png | Bin 1810 -> 1701 bytes .../images/chat_start_body_disabled@2x.png | Bin 3586 -> 3397 bytes Resources/images/clean_field_default.png | Bin 800 -> 0 bytes Resources/images/clean_field_default@2x.png | Bin 1532 -> 0 bytes Resources/images/clean_field_over.png | Bin 518 -> 0 bytes Resources/images/clean_field_over@2x.png | Bin 1002 -> 0 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 -> 0 bytes Resources/images/color_K.png | Bin 277 -> 0 bytes Resources/images/color_L.png | Bin 277 -> 277 bytes Resources/images/color_M.png | Bin 277 -> 277 bytes Resources/images/conference_start_default.png | Bin 1610 -> 0 bytes .../images/conference_start_default@2x.png | Bin 3623 -> 0 bytes .../images/conference_start_disabled.png | Bin 1193 -> 0 bytes .../images/conference_start_disabled@2x.png | Bin 2559 -> 0 bytes Resources/images/contact_add_disabled.png | Bin 1040 -> 1040 bytes Resources/images/contact_add_disabled@2x.png | Bin 2039 -> 2039 bytes Resources/images/contacts_all_disabled.png | Bin 944 -> 944 bytes Resources/images/contacts_all_disabled@2x.png | Bin 1913 -> 1913 bytes Resources/images/contacts_sip_disabled.png | Bin 1191 -> 1191 bytes Resources/images/contacts_sip_disabled@2x.png | Bin 2500 -> 2500 bytes Resources/images/delete_disabled.png | Bin 633 -> 633 bytes Resources/images/delete_disabled@2x.png | Bin 1088 -> 1088 bytes ...elect_all_default.png => deselect_all.png} | Bin ...all_default@2x.png => deselect_all@2x.png} | Bin Resources/images/deselect_all_disabled.png | Bin 502 -> 0 bytes Resources/images/deselect_all_disabled@2x.png | Bin 694 -> 0 bytes ...t_back_default.png => dialer_alt_back.png} | Bin ..._default@2x.png => dialer_alt_back@2x.png} | Bin Resources/images/dialer_alt_back_disabled.png | Bin 532 -> 0 bytes .../images/dialer_alt_back_disabled@2x.png | Bin 870 -> 0 bytes Resources/images/dialer_back_disabled.png | Bin 1181 -> 1181 bytes Resources/images/dialer_back_disabled@2x.png | Bin 2581 -> 2581 bytes Resources/images/edit_disabled.png | Bin 820 -> 820 bytes Resources/images/edit_disabled@2x.png | Bin 1505 -> 1505 bytes Resources/images/edit_list_disabled.png | Bin 838 -> 838 bytes Resources/images/edit_list_disabled@2x.png | Bin 1579 -> 1579 bytes Resources/images/footer_chat_disabled.png | Bin 737 -> 737 bytes Resources/images/footer_chat_disabled@2x.png | Bin 1351 -> 1351 bytes Resources/images/footer_contacts_disabled.png | Bin 728 -> 728 bytes .../images/footer_contacts_disabled@2x.png | Bin 1327 -> 1327 bytes Resources/images/footer_dialer_disabled.png | Bin 946 -> 946 bytes .../images/footer_dialer_disabled@2x.png | Bin 2083 -> 2083 bytes Resources/images/footer_history_disabled.png | Bin 717 -> 717 bytes .../images/footer_history_disabled@2x.png | Bin 1335 -> 1335 bytes Resources/images/history_all_disabled.png | Bin 1269 -> 1269 bytes Resources/images/history_all_disabled@2x.png | Bin 2694 -> 2694 bytes Resources/images/history_missed_disabled.png | Bin 1156 -> 1156 bytes .../images/history_missed_disabled@2x.png | Bin 2201 -> 2201 bytes Resources/images/incoming_call.png | Bin 971 -> 0 bytes Resources/images/incoming_call@2x.png | Bin 1891 -> 0 bytes Resources/images/incoming_call_unlock.png | Bin 2007 -> 0 bytes Resources/images/incoming_call_unlock@2x.png | Bin 4150 -> 0 bytes Resources/images/micro_disabled.png | Bin 1025 -> 1025 bytes Resources/images/micro_disabled@2x.png | Bin 1943 -> 1943 bytes .../{numpad_0.png => numpad_0_default.png} | Bin ...umpad_0@2x.png => numpad_0_default@2x.png} | Bin .../{numpad_1.png => numpad_1_default.png} | Bin ...umpad_1@2x.png => numpad_1_default@2x.png} | Bin .../{numpad_2.png => numpad_2_default.png} | Bin ...umpad_2@2x.png => numpad_2_default@2x.png} | Bin .../{numpad_3.png => numpad_3_default.png} | Bin ...umpad_3@2x.png => numpad_3_default@2x.png} | Bin .../{numpad_4.png => numpad_4_default.png} | Bin ...umpad_4@2x.png => numpad_4_default@2x.png} | Bin .../{numpad_5.png => numpad_5_default.png} | Bin ...umpad_5@2x.png => numpad_5_default@2x.png} | Bin .../{numpad_6.png => numpad_6_default.png} | Bin ...umpad_6@2x.png => numpad_6_default@2x.png} | Bin .../{numpad_7.png => numpad_7_default.png} | Bin ...umpad_7@2x.png => numpad_7_default@2x.png} | Bin .../{numpad_8.png => numpad_8_default.png} | Bin ...umpad_8@2x.png => numpad_8_default@2x.png} | Bin .../{numpad_9.png => numpad_9_default.png} | Bin ...umpad_9@2x.png => numpad_9_default@2x.png} | Bin ...umpad_hash.png => numpad_hash_default.png} | Bin ...hash@2x.png => numpad_hash_default@2x.png} | Bin Resources/images/numpad_over_background.png | Bin 0 -> 290 bytes ...umpad_star.png => numpad_star_default.png} | Bin ...star@2x.png => numpad_star_default@2x.png} | Bin .../images/options_add_call_disabled.png | Bin 1126 -> 1126 bytes .../images/options_add_call_disabled@2x.png | Bin 2264 -> 2264 bytes Resources/images/options_disabled.png | Bin 939 -> 939 bytes Resources/images/options_disabled@2x.png | Bin 1880 -> 1880 bytes .../options_start_conference_disabled.png | Bin 1201 -> 1201 bytes .../options_start_conference_disabled@2x.png | Bin 2514 -> 2514 bytes .../images/options_transfer_call_disabled.png | Bin 1130 -> 1130 bytes .../options_transfer_call_disabled@2x.png | Bin 2322 -> 2322 bytes Resources/images/route_bluetooth_disabled.png | Bin 697 -> 697 bytes .../images/route_bluetooth_disabled@2x.png | Bin 1286 -> 1286 bytes Resources/images/route_earpiece_disabled.png | Bin 801 -> 801 bytes .../images/route_earpiece_disabled@2x.png | Bin 1526 -> 1526 bytes Resources/images/route_speaker_disabled.png | Bin 684 -> 684 bytes .../images/route_speaker_disabled@2x.png | Bin 1161 -> 1161 bytes Resources/images/routes_disabled.png | Bin 951 -> 951 bytes Resources/images/routes_disabled@2x.png | Bin 1766 -> 1766 bytes Resources/images/select_all_disabled.png | Bin 619 -> 619 bytes Resources/images/select_all_disabled@2x.png | Bin 983 -> 983 bytes Resources/images/speaker_disabled.png | Bin 684 -> 684 bytes Resources/images/speaker_disabled@2x.png | Bin 1161 -> 1161 bytes Resources/images/status_available.png | Bin 840 -> 0 bytes Resources/images/status_available@2x.png | Bin 1699 -> 0 bytes Resources/images/status_available_desktop.png | Bin 621 -> 0 bytes .../images/status_available_desktop@2x.png | Bin 1081 -> 0 bytes Resources/images/status_available_phone.png | Bin 585 -> 0 bytes .../images/status_available_phone@2x.png | Bin 1072 -> 0 bytes Resources/images/status_away.png | Bin 761 -> 0 bytes Resources/images/status_away@2x.png | Bin 1514 -> 0 bytes Resources/images/status_away_desktop.png | Bin 598 -> 0 bytes Resources/images/status_away_desktop@2x.png | Bin 1010 -> 0 bytes Resources/images/status_away_phone.png | Bin 553 -> 0 bytes Resources/images/status_away_phone@2x.png | Bin 988 -> 0 bytes Resources/images/status_busy.png | Bin 699 -> 0 bytes Resources/images/status_busy@2x.png | Bin 1381 -> 0 bytes Resources/images/status_busy_desktop.png | Bin 443 -> 0 bytes Resources/images/status_busy_desktop@2x.png | Bin 711 -> 0 bytes Resources/images/status_busy_phone.png | Bin 413 -> 0 bytes Resources/images/status_busy_phone@2x.png | Bin 710 -> 0 bytes Resources/images/status_disconnected.png | Bin 727 -> 0 bytes Resources/images/status_disconnected@2x.png | Bin 1422 -> 0 bytes .../images/status_disconnected_desktop.png | Bin 595 -> 0 bytes .../images/status_disconnected_desktop@2x.png | Bin 1027 -> 0 bytes .../images/status_disconnected_phone.png | Bin 557 -> 0 bytes .../images/status_disconnected_phone@2x.png | Bin 1000 -> 0 bytes Resources/images/topbar_call_notification.png | Bin 376 -> 0 bytes .../images/topbar_call_notification@2x.png | Bin 677 -> 0 bytes Resources/images/topbar_chat_notification.png | Bin 355 -> 0 bytes .../images/topbar_chat_notification@2x.png | Bin 680 -> 0 bytes .../images/topbar_videocall_notification.png | Bin 222 -> 0 bytes .../topbar_videocall_notification@2x.png | Bin 378 -> 0 bytes Resources/images/valid_disabled.png | Bin 625 -> 625 bytes Resources/images/valid_disabled@2x.png | Bin 1085 -> 1085 bytes linphone.xcodeproj/project.pbxproj | 3146 ++++++++--------- 251 files changed, 2763 insertions(+), 3002 deletions(-) delete mode 100644 Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/Base.lproj/UIConferenceHeader.xib delete mode 100644 Classes/LinphoneUI/UIConferenceHeader.h delete mode 100644 Classes/LinphoneUI/UIConferenceHeader.m delete mode 100644 Classes/LinphoneUI/ar.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/de.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/fr.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/ja.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/nl.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/ru.lproj/UIConferenceHeader.strings delete mode 100644 Classes/LinphoneUI/zh_TW.lproj/UIConferenceHeader.strings delete mode 100644 Classes/Utils/UACellBackgroundView/UACellBackgroundView.h delete mode 100644 Classes/Utils/UACellBackgroundView/UACellBackgroundView.m delete mode 100644 LiblinphoneTester/TesterImages.xcassets/AppIcon.appiconset/Contents.json create mode 100644 LiblinphoneTester/TesterImages.xcassets/TestAppIcon.appiconset/Contents.json rename LiblinphoneTester/TesterImages.xcassets/{LaunchImage.launchimage => TestLaunchImage.launchimage}/Contents.json (100%) delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/Contents.json delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png delete mode 100644 Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png delete mode 100644 Resources/images/clean_field_default.png delete mode 100644 Resources/images/clean_field_default@2x.png delete mode 100644 Resources/images/clean_field_over.png delete mode 100644 Resources/images/clean_field_over@2x.png delete mode 100644 Resources/images/color_J.png delete mode 100644 Resources/images/color_K.png delete mode 100644 Resources/images/conference_start_default.png delete mode 100644 Resources/images/conference_start_default@2x.png delete mode 100644 Resources/images/conference_start_disabled.png delete mode 100644 Resources/images/conference_start_disabled@2x.png rename Resources/images/{deselect_all_default.png => deselect_all.png} (100%) rename Resources/images/{deselect_all_default@2x.png => deselect_all@2x.png} (100%) delete mode 100644 Resources/images/deselect_all_disabled.png delete mode 100644 Resources/images/deselect_all_disabled@2x.png rename Resources/images/{dialer_alt_back_default.png => dialer_alt_back.png} (100%) rename Resources/images/{dialer_alt_back_default@2x.png => dialer_alt_back@2x.png} (100%) delete mode 100644 Resources/images/dialer_alt_back_disabled.png delete mode 100644 Resources/images/dialer_alt_back_disabled@2x.png delete mode 100644 Resources/images/incoming_call.png delete mode 100644 Resources/images/incoming_call@2x.png delete mode 100644 Resources/images/incoming_call_unlock.png delete mode 100644 Resources/images/incoming_call_unlock@2x.png rename Resources/images/{numpad_0.png => numpad_0_default.png} (100%) rename Resources/images/{numpad_0@2x.png => numpad_0_default@2x.png} (100%) rename Resources/images/{numpad_1.png => numpad_1_default.png} (100%) rename Resources/images/{numpad_1@2x.png => numpad_1_default@2x.png} (100%) rename Resources/images/{numpad_2.png => numpad_2_default.png} (100%) rename Resources/images/{numpad_2@2x.png => numpad_2_default@2x.png} (100%) rename Resources/images/{numpad_3.png => numpad_3_default.png} (100%) rename Resources/images/{numpad_3@2x.png => numpad_3_default@2x.png} (100%) rename Resources/images/{numpad_4.png => numpad_4_default.png} (100%) rename Resources/images/{numpad_4@2x.png => numpad_4_default@2x.png} (100%) rename Resources/images/{numpad_5.png => numpad_5_default.png} (100%) rename Resources/images/{numpad_5@2x.png => numpad_5_default@2x.png} (100%) rename Resources/images/{numpad_6.png => numpad_6_default.png} (100%) rename Resources/images/{numpad_6@2x.png => numpad_6_default@2x.png} (100%) rename Resources/images/{numpad_7.png => numpad_7_default.png} (100%) rename Resources/images/{numpad_7@2x.png => numpad_7_default@2x.png} (100%) rename Resources/images/{numpad_8.png => numpad_8_default.png} (100%) rename Resources/images/{numpad_8@2x.png => numpad_8_default@2x.png} (100%) rename Resources/images/{numpad_9.png => numpad_9_default.png} (100%) rename Resources/images/{numpad_9@2x.png => numpad_9_default@2x.png} (100%) rename Resources/images/{numpad_hash.png => numpad_hash_default.png} (100%) rename Resources/images/{numpad_hash@2x.png => numpad_hash_default@2x.png} (100%) create mode 100644 Resources/images/numpad_over_background.png rename Resources/images/{numpad_star.png => numpad_star_default.png} (100%) rename Resources/images/{numpad_star@2x.png => numpad_star_default@2x.png} (100%) delete mode 100644 Resources/images/status_available.png delete mode 100644 Resources/images/status_available@2x.png delete mode 100644 Resources/images/status_available_desktop.png delete mode 100644 Resources/images/status_available_desktop@2x.png delete mode 100644 Resources/images/status_available_phone.png delete mode 100644 Resources/images/status_available_phone@2x.png delete mode 100644 Resources/images/status_away.png delete mode 100644 Resources/images/status_away@2x.png delete mode 100644 Resources/images/status_away_desktop.png delete mode 100644 Resources/images/status_away_desktop@2x.png delete mode 100644 Resources/images/status_away_phone.png delete mode 100644 Resources/images/status_away_phone@2x.png delete mode 100644 Resources/images/status_busy.png delete mode 100644 Resources/images/status_busy@2x.png delete mode 100644 Resources/images/status_busy_desktop.png delete mode 100644 Resources/images/status_busy_desktop@2x.png delete mode 100644 Resources/images/status_busy_phone.png delete mode 100644 Resources/images/status_busy_phone@2x.png delete mode 100644 Resources/images/status_disconnected.png delete mode 100644 Resources/images/status_disconnected@2x.png delete mode 100644 Resources/images/status_disconnected_desktop.png delete mode 100644 Resources/images/status_disconnected_desktop@2x.png delete mode 100644 Resources/images/status_disconnected_phone.png delete mode 100644 Resources/images/status_disconnected_phone@2x.png delete mode 100644 Resources/images/topbar_call_notification.png delete mode 100644 Resources/images/topbar_call_notification@2x.png delete mode 100644 Resources/images/topbar_chat_notification.png delete mode 100644 Resources/images/topbar_chat_notification@2x.png delete mode 100644 Resources/images/topbar_videocall_notification.png delete mode 100644 Resources/images/topbar_videocall_notification@2x.png diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index fe9b64913..25ce0695a 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -35,9 +35,10 @@ typedef enum _ViewElement { ViewElement_Password2 = 102, ViewElement_Email = 103, ViewElement_Domain = 104, - ViewElement_Transport = 105, - ViewElement_Username_Label = 106, - ViewElement_URL = 107, + ViewElement_URL = 105, + ViewElement_TextFieldCount = 6, + ViewElement_Transport = 110, + ViewElement_Username_Label = 120, ViewElement_NextButton = 130, } ViewElement; @@ -360,10 +361,14 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)shouldEnableNextButton { - [self findButton:ViewElement_NextButton].enabled = - (![self findTextField:ViewElement_Username].isInvalid && ![self findTextField:ViewElement_Password].isInvalid && - ![self findTextField:ViewElement_Password2].isInvalid && ![self findTextField:ViewElement_Domain].isInvalid && - ![self findTextField:ViewElement_Email].isInvalid); + BOOL invalidInputs = NO; + for (int i = 0; i < ViewElement_TextFieldCount; i++) { + UIAssistantTextField *field = [self findTextField:100 + i]; + if (field) { + invalidInputs |= (field.isInvalid || field.lastText.length == 0); + } + } + [self findButton:ViewElement_NextButton].enabled = !invalidInputs; } - (UIView *)findView:(ViewElement)tag inView:view ofType:(Class)type { @@ -589,11 +594,11 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun replacementString:(NSString *)string { UIAssistantTextField *atf = (UIAssistantTextField *)textField; [atf textField:atf shouldChangeCharactersInRange:range replacementString:string]; - [self shouldEnableNextButton]; if (atf.tag == ViewElement_Username && currentView == _createAccountView) { textField.text = [textField.text stringByReplacingCharactersInRange:range withString:string.lowercaseString]; return NO; } + [self shouldEnableNextButton]; return YES; } diff --git a/Classes/Base.lproj/AboutView.xib b/Classes/Base.lproj/AboutView.xib index 8045b7875..fdbe70145 100644 --- a/Classes/Base.lproj/AboutView.xib +++ b/Classes/Base.lproj/AboutView.xib @@ -1,5 +1,5 @@ - + @@ -28,16 +28,18 @@ - + - - + + + + - + - + + - + + + + + @@ -134,6 +149,7 @@ + diff --git a/Classes/Base.lproj/AssistantSubviews.xib b/Classes/Base.lproj/AssistantSubviews.xib index 73bda6530..c3c6fa332 100644 --- a/Classes/Base.lproj/AssistantSubviews.xib +++ b/Classes/Base.lproj/AssistantSubviews.xib @@ -1,5 +1,5 @@ - + @@ -28,52 +28,48 @@ - - - - + @@ -131,24 +128,27 @@ -