witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Minor changes

Browse source
This commit is contained in:
Benoit Martins 2022-12-20 09:27:02 +01:00 • committed by QuentinArguillere
parent 4e96033d04
commit c1ef2f558a
6 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Classes/Base.lproj/ChatsListView.xib
View file

@ -14,7 +14,6 @@
<outlet property="addGroupChatButton" destination="glf-ni-nqe" id="0hy-5m-7C7"/>
<outlet property="backToCallButton" destination="Fac-hy-za4" id="8I3-TM-oJ7"/>
<outlet property="cancelForwardButton" destination="Kxx-SO-CB0" id="LFJ-NQ-YrU"/>
<outlet property="chatRoomSwiftButton" destination="EQ8-W6-ITN" id="apP-Tp-Veb"/>
<outlet property="forwardTitle" destination="waa-HU-xFW" id="Qqs-p4-k9A"/>
<outlet property="tableController" destination="4" id="18"/>
<outlet property="toggleSelectionButton" destination="uqG-2T-VOa" id="cAk-tz-5Z0"/>
@ -65,21 +64,6 @@
<action selector="onAddGroupChatClick:" destination="-1" eventType="touchUpInside" id="tem-mm-w62"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EQ8-W6-ITN" userLabel="chatRoomSwiftButton" customClass="UIInterfaceStyleButton">
<rect key="frame" x="165" y="0.0" width="83" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<accessibility key="accessibilityConfiguration" label="New discussion"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" image="menu_resend_default.png">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="disabled" image="chat_add_group.png"/>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onChatRoomSwiftClick:" destination="-1" eventType="touchUpInside" id="RyK-9X-ZrB"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KhE-c3-2Zj" userLabel="cancelButton" customClass="UIInterfaceStyleButton">
<rect key="frame" x="0.0" y="0.0" width="82" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
@ -241,7 +225,6 @@
<image name="delete_default.png" width="34.400001525878906" height="44.799999237060547"/>
<image name="delete_disabled.png" width="34.400001525878906" height="44.799999237060547"/>
<image name="deselect_all.png" width="43.200000762939453" height="43.200000762939453"/>
<image name="menu_resend_default.png" width="32" height="32"/>
<image name="select_all_default.png" width="43.200000762939453" height="43.200000762939453"/>
<image name="select_all_disabled.png" width="43.200000762939453" height="43.200000762939453"/>
<systemColor name="secondarySystemBackgroundColor">

1
Classes/ChatsListView.h
View file

@ -41,7 +41,6 @@
- (IBAction)onAddGroupChatClick:(id)event;
- (IBAction)onAddClick:(id)event;
- (IBAction)onChatRoomSwiftClick:(id)event;
- (IBAction)onEditionChangeClick:(id)sender;
- (IBAction)onDeleteClick:(id)sender;

4
Classes/ChatsListView.m
View file

@ -160,10 +160,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneChatCreateViewChange object:VIEW(ChatConversationCreateView) userInfo:nil];
}
- (IBAction)onChatRoomSwiftClick:(id)event {
[PhoneMainView.instance changeCurrentView:ChatConversationViewSwift.compositeViewDescription];
}
- (IBAction)onAddClick:(id)event {
[self newChatCreate:FALSE];
if (IPAD)

18
Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
View file

@ -67,22 +67,31 @@ import DropDown
switch menu.dataSource[index] {
case VoipTexts.dropdown_menu_chat_conversation_add_to_contact:
cell.myImageView.image = UIImage(named: images[0])
//cell.addGestureRecognizer(UITapGestureRecognizer(target: parent.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_go_to_contact:
cell.myImageView.image = UIImage(named: images[1])
cell.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.conference_schedule_start:
cell.myImageView.image = UIImage(named: images[2])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_conversation_device:
cell.myImageView.image = UIImage(named: images[3])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_ephemeral_messages:
cell.myImageView.image = UIImage(named: images[4])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_mute_notifications:
cell.myImageView.image = UIImage(named: images[5])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_unmute_notifications:
cell.myImageView.image = UIImage(named: images[6])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
case VoipTexts.dropdown_menu_chat_conversation_delete_messages:
cell.myImageView.image = UIImage(named: images[7])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
default:
cell.myImageView.image = UIImage(named: images[8])
cell.addGestureRecognizer(UITapGestureRecognizer(target: ChatConversationViewSwift.self, action: #selector(dropDownGoToDevicesList)))
}
}
}
@ -97,9 +106,6 @@ import DropDown
action1: {
self.onCallClick(cChatRoom: self.chatRoom?.getCobject)
},
action1Bis: {
self.onCallClick(cChatRoom: self.chatRoom?.getCobject)
},
action2: {
self.tapChooseMenuItem(self.action2Button)
},
@ -228,7 +234,7 @@ import DropDown
}
func alertActionGoToDevicesList() {
@objc func alertActionGoToDevicesList() {
let notAskAgain = ConfigManager.instance().lpConfigBoolForKey(key: "confirmation_dialog_before_sas_call_not_ask_again");
if(!notAskAgain){
@ -275,4 +281,8 @@ import DropDown
@objc func dismissOnTapOutsideOrCancel(){
self.dismiss(animated: true, completion: nil)
}
@objc func dropDownGoToDevicesList() {
print("Aaaaaa")
}
}

3
Classes/Swift/Util/BackActionsNavigationView.swift
View file

@ -49,7 +49,6 @@ import linphonesw
func viewDidLoad(backAction : @escaping () -> Void,
action1 : @escaping () -> Void,
action1Bis : @escaping () -> Void,
action2 : @escaping () -> Void,
action3 : @escaping () -> Void,
title:String) {
@ -74,7 +73,7 @@ import linphonesw
action1BisButton.toLeftOf(action2Button, withRightMargin: 20).matchParentHeight().done()
action1Button.onClickAction = action1
action1BisButton.onClickAction = action1Bis
action1BisButton.onClickAction = action1
action1BisButton.isHidden = true

4
Podfile
View file

@ -5,7 +5,11 @@ source "https://github.com/CocoaPods/Specs.git"
def all_pods
if ENV['PODFILE_PATH'].nil?
<<<<<<< HEAD
pod 'linphone-sdk', '~>5.2.45'
=======
pod 'linphone-sdk', '~>5.2.1'
>>>>>>> 29e060dc1 (Minor changes)
else
pod 'linphone-sdk', :path => ENV['PODFILE_PATH'] # local sdk
end