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

sidemenu: fix crash on iPad

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-05-02 10:25:20 +02:00
parent 16da2145a3
commit 0afb9d6f23
4 changed files with 42 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Classes/Base.lproj/SideMenuView~ipad.xib
View file

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SideMenuView">
<connections>
<outlet property="addressButton" destination="MFj-XQ-w5V" id="EPi-6H-59a"/>
<outlet property="avatarImage" destination="BNQ-7N-NGT" id="LXr-Yr-zSK"/>
<outlet property="grayBackground" destination="ccB-VK-LF9" id="Rbz-Ix-k62"/>
<outlet property="nameLabel" destination="XbU-2B-u1b" id="rKF-4e-1HA"/>
@ -54,15 +53,17 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="tailTruncation" id="MFj-XQ-w5V" userLabel="adressButton" customClass="UIRightImageButton">
<rect key="frame" x="76" y="54" width="111" height="22"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" textAlignment="natural" lineBreakMode="middleTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="ypg-P8-Els" userLabel="addressLabel">
<rect key="frame" x="74" y="54" width="95" height="22"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<inset key="titleEdgeInsets" minX="3" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="john.doe@sip.linphone.org" image="led_connected.png">
<color key="titleColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="led_connected.png" id="tNM-uE-Eum" userLabel="presenceImage">
<rect key="frame" x="169" y="54" width="16" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
</imageView>
<imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar.png" id="BNQ-7N-NGT" userLabel="avatarImage" customClass="UIRoundedImageView">
<rect key="frame" x="8" y="20" width="60" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>

13
Classes/LinphoneUI/UIRightImageButton.h
View file

@ -1,13 +0,0 @@
//
// UIRightImageButton.h
// linphone
//
// Created by Gautier Pelloux-Prayer on 28/10/15.
//
//
#import <UIKit/UIKit.h>
@interface UIRightImageButton : UIButton
@end

35
Classes/LinphoneUI/UIRightImageButton.m
View file

@ -1,35 +0,0 @@
//
// UIRightImageButton.m
// linphone
//
// Created by Gautier Pelloux-Prayer on 28/10/15.
//
//
#import "UIRightImageButton.h"
@implementation UIRightImageButton
- (instancetype)invertImage {
self.transform = CGAffineTransformMakeScale(-1.0, 1.0);
self.titleLabel.transform = CGAffineTransformMakeScale(-1.0, 1.0);
self.imageView.transform = CGAffineTransformMakeScale(-1.0, 1.0);
self.contentHorizontalAlignment = (self.contentHorizontalAlignment == UIControlContentHorizontalAlignmentLeft)
? UIControlContentHorizontalAlignmentRight
: UIControlContentHorizontalAlignmentLeft;
return self;
}
- (instancetype)init {
return [[super init] invertImage];
}
- (id)initWithCoder:(NSCoder *)aDecoder {
return [[super initWithCoder:aDecoder] invertImage];
}
- (instancetype)initWithFrame:(CGRect)frame {
return [[super initWithFrame:frame] invertImage];
}
@end

36
linphone.xcodeproj/project.pbxproj
View file

@ -516,7 +516,6 @@
6316A3DA1C5F64350073BFA4 /* voicemail@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6316A2291C5F64350073BFA4 /* voicemail@2x.png */; };
6316A3DB1C5F64350073BFA4 /* waiting_time.png in Resources */ = {isa = PBXBuildFile; fileRef = 6316A22A1C5F64350073BFA4 /* waiting_time.png */; };
6316A3DC1C5F64350073BFA4 /* waiting_time@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6316A22B1C5F64350073BFA4 /* waiting_time@2x.png */; };
6316FA6D1BE12A3E0050E441 /* UIRightImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6316FA6C1BE12A3E0050E441 /* UIRightImageButton.m */; };
63177FBF1C86E68C00ADE58D /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; };
6334DDFA1BBAC97C00631900 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
6334DDFB1BBAC99400631900 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
@ -820,6 +819,20 @@
remoteGlobalIDString = EABD46791857A0C700A5F081;
remoteInfo = KIF;
};
633FC7C71CD7466400774B8B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1;
remoteInfo = KIFFrameworkConsumer;
};
633FC7C91CD7466400774B8B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1;
remoteInfo = KIFFrameworkConsumerTests;
};
D3554ED015CA79AA00478841 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D3554EC515CA79A900478841 /* XMLRPC.xcodeproj */;
@ -1415,8 +1428,6 @@
6316A2291C5F64350073BFA4 /* voicemail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "voicemail@2x.png"; sourceTree = "<group>"; };
6316A22A1C5F64350073BFA4 /* waiting_time.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = waiting_time.png; sourceTree = "<group>"; };
6316A22B1C5F64350073BFA4 /* waiting_time@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "waiting_time@2x.png"; sourceTree = "<group>"; };
6316FA6B1BE12A3E0050E441 /* UIRightImageButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRightImageButton.h; sourceTree = "<group>"; };
6316FA6C1BE12A3E0050E441 /* UIRightImageButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIRightImageButton.m; sourceTree = "<group>"; };
6336715E1BCBAAD200BFCBDE /* ChatConversationCreateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatConversationCreateView.h; sourceTree = "<group>"; };
6336715F1BCBAAD200BFCBDE /* ChatConversationCreateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatConversationCreateView.m; sourceTree = "<group>"; };
633756371B67BAF400E21BAD /* SideMenuTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SideMenuTableView.h; sourceTree = "<group>"; };
@ -2110,8 +2121,6 @@
2214EBF212F86360002A5394 /* UIMutedMicroButton.m */,
D36FB2D31589EF7C0036F6F2 /* UIPauseButton.h */,
D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */,
6316FA6B1BE12A3E0050E441 /* UIRightImageButton.h */,
6316FA6C1BE12A3E0050E441 /* UIRightImageButton.m */,
6313482E1B6F7B6600C6BDCB /* UIRoundBorderedButton.h */,
6313482F1B6F7B6600C6BDCB /* UIRoundBorderedButton.m */,
63FB30331A680E73008CA393 /* UIRoundedImageView.h */,
@ -2277,6 +2286,8 @@
63058A011B4E816A00EFAE36 /* Test Host.app */,
63058A031B4E816A00EFAE36 /* KIF Tests - XCTest.xctest */,
63058A071B4E816A00EFAE36 /* KIF.framework */,
633FC7C81CD7466400774B8B /* KIFFrameworkConsumer.app */,
633FC7CA1CD7466400774B8B /* KIFFrameworkConsumerTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -3173,6 +3184,20 @@
remoteRef = 63058A061B4E816A00EFAE36 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
633FC7C81CD7466400774B8B /* KIFFrameworkConsumer.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = KIFFrameworkConsumer.app;
remoteRef = 633FC7C71CD7466400774B8B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
633FC7CA1CD7466400774B8B /* KIFFrameworkConsumerTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = KIFFrameworkConsumerTests.xctest;
remoteRef = 633FC7C91CD7466400774B8B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D3554ED115CA79AA00478841 /* libXMLRPC.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -3808,7 +3833,6 @@
D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */,
63B81A0E1B57DA33009604A6 /* TPKeyboardAvoidingScrollView.m in Sources */,
633888451BFB2C49001D5E7B /* HPGrowingTextView.m in Sources */,
6316FA6D1BE12A3E0050E441 /* UIRightImageButton.m in Sources */,
63F1DF441BCE618E00EDED90 /* UIAddressTextField.m in Sources */,
D3EA540D1598528B0037DC6B /* ChatsListTableView.m in Sources */,
D3EA5411159853750037DC6B /* UIChatCell.m in Sources */,