From 1e68cf1adce8dd4e313e5354879ffb15119447f1 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Wed, 24 Oct 2018 16:00:09 +0200 Subject: [PATCH] 4.1: some new views --- Classes/Base.lproj/HistoryDetailsView.xib | 17 +++++++------ Classes/HistoryDetailsView.h | 1 + Classes/HistoryDetailsView.m | 3 +++ .../Base.lproj/UIContactDetailsCell.xib | 21 +++++++++++----- Classes/LinphoneUI/UIContactDetailsCell.h | 1 + Classes/LinphoneUI/UIContactDetailsCell.m | 8 +++++- Classes/SideMenuTableView.h | 1 + Classes/SideMenuTableView.m | 23 ++++++++++++------ Resources/images/invite_linphone.png | Bin 0 -> 3486 bytes Resources/images/invite_linphone@2x.png | Bin 0 -> 3486 bytes Resources/images/menu_about.png | Bin 0 -> 1143 bytes Resources/images/menu_about@2x.png | Bin 0 -> 2275 bytes Resources/images/menu_assistant.png | Bin 0 -> 1492 bytes Resources/images/menu_assistant@2x.png | Bin 0 -> 3257 bytes Resources/images/menu_link_account.png | Bin 0 -> 1655 bytes Resources/images/menu_link_account@2x.png | Bin 0 -> 3205 bytes Resources/images/menu_options.png | Bin 0 -> 857 bytes Resources/images/menu_options@2x.png | Bin 0 -> 1564 bytes Resources/images/menu_recordings.png | Bin 0 -> 918 bytes Resources/images/menu_recordings@2x.png | Bin 0 -> 1768 bytes linphone.xcodeproj/project.pbxproj | 8 ++++++ 21 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 Resources/images/invite_linphone.png create mode 100644 Resources/images/invite_linphone@2x.png create mode 100644 Resources/images/menu_about.png create mode 100644 Resources/images/menu_about@2x.png create mode 100644 Resources/images/menu_assistant.png create mode 100644 Resources/images/menu_assistant@2x.png create mode 100644 Resources/images/menu_link_account.png create mode 100644 Resources/images/menu_link_account@2x.png create mode 100644 Resources/images/menu_options.png create mode 100644 Resources/images/menu_options@2x.png create mode 100644 Resources/images/menu_recordings.png create mode 100644 Resources/images/menu_recordings@2x.png diff --git a/Classes/Base.lproj/HistoryDetailsView.xib b/Classes/Base.lproj/HistoryDetailsView.xib index 103180110..9c8838b00 100644 --- a/Classes/Base.lproj/HistoryDetailsView.xib +++ b/Classes/Base.lproj/HistoryDetailsView.xib @@ -1,11 +1,11 @@ - + - + @@ -19,6 +19,7 @@ + @@ -88,9 +89,9 @@ - diff --git a/Classes/HistoryDetailsView.h b/Classes/HistoryDetailsView.h index dcae22794..1e88ed6ca 100644 --- a/Classes/HistoryDetailsView.h +++ b/Classes/HistoryDetailsView.h @@ -39,6 +39,7 @@ @property(strong, nonatomic) IBOutlet HistoryDetailsTableView *tableView; @property(weak, nonatomic) IBOutlet UILabel *emptyLabel; @property (weak, nonatomic) IBOutlet UIView *waitView; +@property (weak, nonatomic) IBOutlet UIRoundedImageView *linphoneImage; - (IBAction)onBackClick:(id)event; - (IBAction)onAddContactClick:(id)event; diff --git a/Classes/HistoryDetailsView.m b/Classes/HistoryDetailsView.m index 708a10185..cf99cf01c 100644 --- a/Classes/HistoryDetailsView.m +++ b/Classes/HistoryDetailsView.m @@ -146,6 +146,9 @@ static UICompositeViewDescription *compositeDescription = nil; _addContactButton.hidden = ([FastAddressBook getContactWithAddress:addr] != nil); [ContactDisplay setDisplayNameLabel:_contactLabel forAddress:addr withAddressLabel:_addressLabel]; [_avatarImage setImage:[FastAddressBook imageForAddress:addr] bordered:NO withRoundedRadius:YES]; + Contact *contact = [FastAddressBook getContactWithAddress:addr]; + _linphoneImage.hidden = + ! ((contact.friend && linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(contact.friend)) == LinphonePresenceBasicStatusOpen) || [FastAddressBook contactHasValidSipDomain:contact]); char *addrURI = linphone_address_as_string_uri_only(addr); ms_free(addrURI); diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib index 956ebac28..6ec283499 100644 --- a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib +++ b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib @@ -19,6 +19,7 @@ + @@ -85,8 +86,8 @@ -