mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

continue headers

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-07-23 14:35:04 +02:00
parent 96718a80f9
commit 5be47874d5
161 changed files with 733 additions and 2418 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/AboutViewController.m
View file

@ -91,10 +91,8 @@ static UICompositeViewDescription *compositeDescription = nil;
if (compositeDescription == nil) {
compositeDescription = [[UICompositeViewDescription alloc] init:@"About"
content:@"AboutViewController"
stateBar:nil
stateBarEnabled:false
stateBar:@"UIStateBar"
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

136
Classes/Base.lproj/ContactsViewController.xib
View file

@ -22,105 +22,98 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" id="3" userLabel="toolBar">
<rect key="frame" x="0.0" y="0.0" width="360" height="88"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<rect key="frame" x="0.0" y="0.0" width="360" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="toolsbar_background.png" id="92" userLabel="background">
<rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="87" userLabel="backButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Back"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" image="back.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="89"/>
</connections>
</button>
<view contentMode="scaleToFill" id="93" userLabel="switchView">
<rect key="frame" x="146" y="0.0" width="214" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<rect key="frame" x="0.0" y="0.0" width="144" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="4" userLabel="allButton">
<rect key="frame" x="0.0" y="0.0" width="107" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="4" userLabel="allButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="All contacts filter"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="0.0" minY="16" maxX="0.0" maxY="0.0"/>
<state key="normal" title="All" backgroundImage="contacts_all_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="contacts_all.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected" backgroundImage="contacts_all_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="contacts_all_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onAllClick:" destination="-1" eventType="touchUpInside" id="29"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="5" userLabel="linphoneButton">
<rect key="frame" x="107" y="0.0" width="107" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="5" userLabel="linphoneButton" customClass="UIIconButton">
<rect key="frame" x="72" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Linphone contacts filter"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="5" minY="14" maxX="10" maxY="0.0"/>
<state key="normal" title="Linphone" backgroundImage="contacts_linphone_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="contacts_linphone.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected" backgroundImage="contacts_linphone_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="contacts_linphone_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onLinphoneClick:" destination="-1" eventType="touchUpInside" id="47"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="6" userLabel="addButton">
<rect key="frame" x="0.0" y="0.0" width="107" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vXX-dG-OTJ" userLabel="listEditButton" customClass="UIIconButton">
<rect key="frame" x="216" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add contact"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Add contact" backgroundImage="contacts_add_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="edit_list.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="contacts_add_over.png">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
<state key="highlighted" backgroundImage="color_E.png"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="addButton" customClass="UIIconButton">
<rect key="frame" x="288" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add contact"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" image="add_contact.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onAddContactClick:" destination="-1" eventType="touchUpInside" id="86"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="87" userLabel="backButton">
<rect key="frame" x="0.0" y="0.0" width="107" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Back"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aJI-VJ-xN6" userLabel="deleteButton" customClass="UIIconButton">
<rect key="frame" x="288" y="0.0" width="72" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add contact"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Back" backgroundImage="contacts_back_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="delete.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="contacts_back_over.png">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
</state>
<connections>
<action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="89"/>
</connections>
<state key="highlighted" backgroundImage="color_E.png"/>
</button>
<searchBar contentMode="redraw" showsCancelButton="YES" id="5jE-oF-d45" userLabel="searchBar">
<rect key="frame" x="0.0" y="44" width="360" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="-1" id="4jL-Rv-dW7"/>
</connections>
</searchBar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<searchBar contentMode="redraw" showsCancelButton="YES" id="5jE-oF-d45" userLabel="searchBar">
<rect key="frame" x="0.0" y="40" width="360" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="-1" id="4jL-Rv-dW7"/>
</connections>
</searchBar>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<nil key="simulatedStatusBarMetrics"/>
@ -128,15 +121,14 @@
</view>
</objects>
<resources>
<image name="contacts_add_default.png" width="214" height="88"/>
<image name="contacts_add_over.png" width="214" height="88"/>
<image name="contacts_all_default.png" width="213" height="88"/>
<image name="contacts_all_selected.png" width="213" height="88"/>
<image name="contacts_back_default.png" width="214" height="88"/>
<image name="contacts_back_over.png" width="214" height="88"/>
<image name="contacts_linphone_default.png" width="213" height="88"/>
<image name="contacts_linphone_selected.png" width="213" height="88"/>
<image name="toolsbar_background.png" width="5" height="88"/>
<image name="add_contact.png" width="101" height="86"/>
<image name="back.png" width="71" height="64"/>
<image name="color_E.png" width="1" height="1"/>
<image name="color_F.png" width="1" height="1"/>
<image name="contacts_all.png" width="109" height="86"/>
<image name="contacts_linphone.png" width="110" height="86"/>
<image name="delete.png" width="64" height="82"/>
<image name="edit_list.png" width="88" height="85"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>

2
Classes/Base.lproj/DialerViewController.xib
View file

@ -37,7 +37,7 @@
<rect key="frame" x="0.0" y="0.0" width="360" height="63"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number..." minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
<textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
<rect key="frame" x="0.0" y="0.0" width="300" height="63"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>

8
Classes/Base.lproj/DialerViewController~ipad.xib
View file

@ -73,7 +73,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</imageView>
<textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number..." adjustsFontSizeToFit="NO" minimumFontSize="15" id="6" userLabel="addressField" customClass="UIAddressTextField">
<textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" adjustsFontSizeToFit="NO" minimumFontSize="15" id="6" userLabel="addressField" customClass="UIAddressTextField">
<rect key="frame" x="0.0" y="0.0" width="700" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@ -368,7 +368,7 @@
<image name="background_alt.png" width="640" height="561"/>
<image name="backspace_default.png" width="81" height="43"/>
<image name="backspace_disabled.png" width="81" height="43"/>
<image name="backspace_over.png" width="81" height="43"/>
<image name="backspace_over.png" width="106" height="56"/>
<image name="call_default.png" width="371" height="170"/>
<image name="call_disabled.png" width="371" height="170"/>
<image name="call_over.png" width="371" height="170"/>
@ -398,8 +398,8 @@
<image name="numpad_two_over.png" width="220" height="113"/>
<image name="numpad_zero_default.png" width="220" height="113"/>
<image name="numpad_zero_over.png" width="220" height="113"/>
<image name="switch_camera_default.png" width="151" height="51"/>
<image name="switch_camera_over.png" width="151" height="51"/>
<image name="switch_camera_default.png" width="151" height="149"/>
<image name="switch_camera_over.png" width="151" height="149"/>
<image name="transfer_call_default.png" width="371" height="170"/>
<image name="transfer_call_disabled.png" width="371" height="170"/>
<image name="transfer_call_over.png" width="371" height="170"/>

93
Classes/Base.lproj/HistoryViewController.xib
View file

@ -22,72 +22,48 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" id="3" userLabel="toolsBar">
<rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="360" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="toolsbar_background.png" id="34" userLabel="background">
<rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="35" userLabel="deleteButton">
<rect key="frame" x="0.0" y="0.0" width="80" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="35" userLabel="deleteButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="90" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Delete all"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Delete all" backgroundImage="history_delete_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="delete.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="history_delete_over.png">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="selected" backgroundImage="color_E.png"/>
<connections>
<action selector="onDeleteClick:" destination="-1" eventType="touchUpInside" id="37"/>
</connections>
</button>
<view contentMode="scaleToFill" id="38" userLabel="switchView">
<rect key="frame" x="100" y="0.0" width="160" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<rect key="frame" x="90" y="0.0" width="180" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="4" userLabel="allButton">
<rect key="frame" x="0.0" y="0.0" width="80" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="4" userLabel="allButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="90" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="All contacts filter"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="0.0" minY="16" maxX="0.0" maxY="0.0"/>
<state key="normal" title="All" backgroundImage="history_all_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="history_all.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected" backgroundImage="history_all_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="history_all_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="selected" backgroundImage="color_E.png"/>
<connections>
<action selector="onAllClick:" destination="-1" eventType="touchUpInside" id="29"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="5" userLabel="missedButton">
<rect key="frame" x="80" y="0.0" width="80" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="5" userLabel="missedButton" customClass="UIIconButton">
<rect key="frame" x="90" y="0.0" width="90" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Missed contacts filter"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="titleEdgeInsets" minX="0.0" minY="16" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Missed" backgroundImage="history_missed_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="history_missed.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected" backgroundImage="history_missed_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="highlighted" backgroundImage="history_missed_selected.png">
<color key="titleColor" red="0.97647064920000004" green="0.97647064920000004" blue="0.97647064920000004" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="selected" backgroundImage="color_E.png"/>
<connections>
<action selector="onMissedClick:" destination="-1" eventType="touchUpInside" id="30"/>
</connections>
@ -95,26 +71,21 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="6" userLabel="editButton" customClass="UIToggleButton">
<rect key="frame" x="280" y="0.0" width="80" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="editButton" customClass="UIToggleButton">
<rect key="frame" x="270" y="0.0" width="90" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Edit"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Edit" backgroundImage="history_edit_default.png">
<color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" image="edit_list.png" backgroundImage="color_F.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="selected" title="Ok" backgroundImage="history_ok_default.png"/>
<state key="highlighted" backgroundImage="history_edit_over.png">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
</state>
<state key="selected" backgroundImage="color_E.png"/>
<connections>
<action selector="onEditClick:" destination="-1" eventType="touchUpInside" id="32"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="17" userLabel="tableView">
<rect key="frame" x="0.0" y="44" width="360" height="493"/>
@ -142,16 +113,12 @@
</tableViewController>
</objects>
<resources>
<image name="history_all_default.png" width="160" height="88"/>
<image name="history_all_selected.png" width="160" height="88"/>
<image name="history_delete_default.png" width="160" height="88"/>
<image name="history_delete_over.png" width="160" height="88"/>
<image name="history_edit_default.png" width="160" height="88"/>
<image name="history_edit_over.png" width="160" height="88"/>
<image name="history_missed_default.png" width="160" height="88"/>
<image name="history_missed_selected.png" width="160" height="88"/>
<image name="history_ok_default.png" width="160" height="88"/>
<image name="toolsbar_background.png" width="5" height="88"/>
<image name="color_E.png" width="1" height="1"/>
<image name="color_F.png" width="1" height="1"/>
<image name="delete.png" width="64" height="82"/>
<image name="edit_list.png" width="88" height="85"/>
<image name="history_all.png" width="105" height="96"/>
<image name="history_missed.png" width="97" height="96"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>

12
Classes/Base.lproj/SettingsViewController.xib
View file

@ -55,12 +55,12 @@
<string key="IBUITitle"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics" id="624080061"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics" id="295213552">
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics" id="338571273"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics" id="111068182">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics" id="570318709">
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics" id="264134814">
<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
<string key="IBUIDisplayName">iPhone 4-inch</string>
@ -81,13 +81,13 @@
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUINavigationController" id="983459891">
<reference key="IBUISimulatedStatusBarMetrics" ref="624080061"/>
<reference key="IBUISimulatedStatusBarMetrics" ref="338571273"/>
<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
<bool key="IBUITranslucent">NO</bool>
<bool key="IBUIPrompted">NO</bool>
</object>
<reference key="IBUISimulatedOrientationMetrics" ref="295213552"/>
<reference key="IBUISimulatedDestinationMetrics" ref="570318709"/>
<reference key="IBUISimulatedOrientationMetrics" ref="111068182"/>
<reference key="IBUISimulatedDestinationMetrics" ref="264134814"/>
<bool key="IBUIDefinesPresentationContext">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>

2
Classes/ChatRoomViewController.m
View file

@ -80,9 +80,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"ChatRoom"
content:@"ChatRoomViewController"
stateBar:nil
stateBarEnabled:false
tabBar:/*@"UIMainBar"*/ nil
tabBarEnabled:false /*to keep room for chat*/
fullscreen:false
landscapeMode:true
portraitMode:true];

2
Classes/ChatViewController.m
View file

@ -83,9 +83,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"Chat"
content:@"ChatViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/ContactDetailsLabelViewController.m
View file

@ -49,9 +49,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetailsLabel"
content:@"ContactDetailsLabelViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/ContactDetailsViewController.m
View file

@ -228,9 +228,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetails"
content:@"ContactDetailsViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/ContactsViewController.m
View file

@ -108,9 +108,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"Contacts"
content:@"ContactsViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

20
Classes/DialerViewController.m
View file

@ -83,9 +83,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"Dialer"
content:@"DialerViewController"
stateBar:@"UIStateBar"
stateBarEnabled:true
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];
@ -143,28 +141,12 @@ static UICompositeViewDescription *compositeDescription = nil;
[videoCameraSwitch setHidden:TRUE];
}
}
[addressField setText:@""];
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_6_0 // attributed string only available since iOS6
if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) {
// fix placeholder bar color in iOS7
UIColor *color = [UIColor grayColor];
NSAttributedString *placeHolderString =
[[NSAttributedString alloc] initWithString:NSLocalizedString(@"Enter an address", @"Enter an address")
attributes:@{NSForegroundColorAttributeName : color}];
addressField.attributedPlaceholder = placeHolderString;
}
#endif
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
// Remove observer
[[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneCallUpdate object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneCoreUpdate object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
- (void)viewDidLoad {

2
Classes/FirstLoginViewController.m
View file

@ -51,9 +51,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"FirstLogin"
content:@"FirstLoginViewController"
stateBar:nil
stateBarEnabled:false
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:false
portraitMode:true];

2
Classes/HistoryDetailsViewController.m
View file

@ -67,9 +67,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"HistoryDetails"
content:@"HistoryDetailsViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/HistoryViewController.m
View file

@ -46,9 +46,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"History"
content:@"HistoryViewController"
stateBar:nil
stateBarEnabled:false
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/ImagePickerViewController.m
View file

@ -51,9 +51,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"ImagePicker"
content:@"ImagePickerViewController"
stateBar:nil
stateBarEnabled:false
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/ImageViewController.m
View file

@ -127,9 +127,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"ImageView"
content:@"ImageViewController"
stateBar:nil
stateBarEnabled:false
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/InCallViewController.m
View file

@ -78,9 +78,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"InCall"
content:@"InCallViewController"
stateBar:@"UIStateBar"
stateBarEnabled:true
tabBar:@"UICallBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:true
portraitMode:true];

2
Classes/IncomingCallViewController.m
View file

@ -66,9 +66,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"IncomingCall"
content:@"IncomingCallViewController"
stateBar:nil
stateBarEnabled:false
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

4
Classes/LinphoneUI/Base.lproj/UIContactCell.xib
View file

@ -75,7 +75,7 @@
<int key="weightCategory">0</int>
<double key="pointSize">25</double>
</object>
<object class="NSFont" key="IBUIFont" id="529562122">
<object class="NSFont" key="IBUIFont" id="808316515">
<string key="NSName">HelveticaNeue</string>
<double key="NSSize">25</double>
<int key="NSfFlags">16</int>
@ -107,7 +107,7 @@
<int key="weightCategory">30</int>
<double key="pointSize">25</double>
</object>
<reference key="IBUIFont" ref="529562122"/>
<reference key="IBUIFont" ref="808316515"/>
<bool key="useAutomaticPreferredMaxLayoutWidth">YES</bool>
</object>
</array>

6
Classes/LinphoneUI/Base.lproj/UIStateBar.xib
View file

@ -88,10 +88,10 @@
</view>
</objects>
<resources>
<image name="call_quality_indicator_2.png" width="54" height="30"/>
<image name="led_disconnected.png" width="18" height="17"/>
<image name="call_quality_indicator_2.png" width="56" height="58"/>
<image name="led_disconnected.png" width="35" height="35"/>
<image name="menu.png" width="56" height="55"/>
<image name="security_ok.png" width="19" height="24"/>
<image name="security_ok.png" width="39" height="49"/>
<image name="voicemail.png" width="76" height="36"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">

4
Classes/LinphoneUI/UICompositeViewController.h
View file

@ -29,9 +29,7 @@
@property (strong) NSString *name;
@property (strong) NSString *content;
@property (strong) NSString *stateBar;
@property (assign) BOOL stateBarEnabled;
@property (strong) NSString *tabBar;
@property (assign) BOOL tabBarEnabled;
@property (assign) BOOL fullscreen;
@property (assign) BOOL landscapeMode;
@property (assign) BOOL portraitMode;
@ -40,9 +38,7 @@
- (id)copy;
- (BOOL)equal:(UICompositeViewDescription*) description;
- (id)init:(NSString *)name content:(NSString *)content stateBar:(NSString*)stateBar
stateBarEnabled:(BOOL) stateBarEnabled
tabBar:(NSString*)tabBar
tabBarEnabled:(BOOL) tabBarEnabled
fullscreen:(BOOL) fullscreen
landscapeMode:(BOOL) landscapeMode
portraitMode:(BOOL) portraitMode;

73
Classes/LinphoneUI/UICompositeViewController.m
View file

@ -26,9 +26,7 @@
@synthesize name;
@synthesize content;
@synthesize stateBar;
@synthesize stateBarEnabled;
@synthesize tabBar;
@synthesize tabBarEnabled;
@synthesize fullscreen;
@synthesize landscapeMode;
@synthesize portraitMode;
@ -37,9 +35,7 @@
UICompositeViewDescription *copy = [UICompositeViewDescription alloc];
copy.content = self.content;
copy.stateBar = self.stateBar;
copy.stateBarEnabled = self.stateBarEnabled;
copy.tabBar = self.tabBar;
copy.tabBarEnabled = self.tabBarEnabled;
copy.fullscreen = self.fullscreen;
copy.landscapeMode = self.landscapeMode;
copy.portraitMode = self.portraitMode;
@ -54,18 +50,14 @@
- (id)init:(NSString *)aname
content:(NSString *)acontent
stateBar:(NSString *)astateBar
stateBarEnabled:(BOOL)astateBarEnabled
tabBar:(NSString *)atabBar
tabBarEnabled:(BOOL)atabBarEnabled
fullscreen:(BOOL)afullscreen
landscapeMode:(BOOL)alandscapeMode
portraitMode:(BOOL)aportraitMode {
self.name = aname;
self.content = acontent;
self.stateBar = astateBar;
self.stateBarEnabled = astateBarEnabled;
self.tabBar = atabBar;
self.tabBarEnabled = atabBarEnabled;
self.stateBar = astateBar ?: @"UIStateBar";
self.tabBar = atabBar ?: @"UIMainBar";
self.fullscreen = afullscreen;
self.landscapeMode = alandscapeMode;
self.portraitMode = aportraitMode;
@ -408,13 +400,11 @@
[contentView.layer removeAnimationForKey:@"transition"];
[contentView.layer addAnimation:viewTransition forKey:@"transition"];
if (oldViewDescription.stateBar != currentViewDescription.stateBar ||
oldViewDescription.stateBarEnabled != currentViewDescription.stateBarEnabled ||
[stateBarView.layer animationForKey:@"transition"] != nil) {
[stateBarView.layer removeAnimationForKey:@"transition"];
[stateBarView.layer addAnimation:viewTransition forKey:@"transition"];
}
if (oldViewDescription.tabBar != currentViewDescription.tabBar ||
oldViewDescription.tabBarEnabled != currentViewDescription.tabBarEnabled ||
[tabBarView.layer animationForKey:@"transition"] != nil) {
[tabBarView.layer removeAnimationForKey:@"transition"];
[tabBarView.layer addAnimation:viewTransition forKey:@"transition"];
@ -476,21 +466,8 @@
return;
}
if (tabBar != nil) {
if (currentViewDescription.tabBarEnabled != [tabBar boolValue]) {
currentViewDescription.tabBarEnabled = [tabBar boolValue];
} else {
tabBar = nil; // No change = No Update
}
}
if (stateBar != nil) {
if (currentViewDescription.stateBarEnabled != [stateBar boolValue]) {
currentViewDescription.stateBarEnabled = [stateBar boolValue];
} else {
stateBar = nil; // No change = No Update
}
}
tabBar = nil; // No change = No Update
stateBar = nil; // No change = No Update
if (fullscreen != nil) {
if (currentViewDescription.fullscreen != [fullscreen boolValue]) {
@ -521,37 +498,27 @@
if (currentViewDescription.fullscreen)
origin = 0;
if (self.stateBarViewController != nil && currentViewDescription.stateBarEnabled) {
contentFrame.origin.y = origin + stateBarFrame.size.height;
stateBarFrame.origin.y = origin;
} else {
contentFrame.origin.y = origin;
stateBarFrame.origin.y = origin - stateBarFrame.size.height;
}
contentFrame.origin.y = origin + stateBarFrame.size.height;
stateBarFrame.origin.y = origin;
// Resize TabBar
CGRect tabFrame = tabBarView.frame;
if (self.tabBarViewController != nil && currentViewDescription.tabBarEnabled) {
tabFrame.origin.y = viewFrame.size.height;
tabFrame.origin.x = viewFrame.size.width;
tabFrame.size.height = self.tabBarViewController.view.frame.size.height;
// tabFrame.size.width = self.tabBarViewController.view.frame.size.width;
tabFrame.origin.y -= tabFrame.size.height;
tabFrame.origin.x -= tabFrame.size.width;
contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y;
tabFrame.origin.y = viewFrame.size.height;
tabFrame.origin.x = viewFrame.size.width;
tabFrame.size.height = self.tabBarViewController.view.frame.size.height;
// tabFrame.size.width = self.tabBarViewController.view.frame.size.width;
tabFrame.origin.y -= tabFrame.size.height;
tabFrame.origin.x -= tabFrame.size.width;
contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y;
// for some views, we need the content to overlap, in which case
// we insert in the tab XIB a mask with tag -1 and with y = the amount of
// points that the content should overlap.
for (UIView *view in self.tabBarViewController.view.subviews) {
if (view.tag == -1) {
contentFrame.size.height += view.frame.origin.y;
break;
}
// for some views, we need the content to overlap, in which case
// we insert in the tab XIB a mask with tag -1 and with y = the amount of
// points that the content should overlap.
for (UIView *view in self.tabBarViewController.view.subviews) {
if (view.tag == -1) {
contentFrame.size.height += view.frame.origin.y;
break;
}
} else {
contentFrame.size.height = viewFrame.size.height - contentFrame.origin.y;
tabFrame.origin.y = viewFrame.size.height;
}
if (currentViewDescription.fullscreen) {

6
Classes/LinphoneUI/UIStateBar.m
View file

@ -223,7 +223,7 @@
- (void)updateUI:(BOOL)inCall {
_outcallView.hidden = (inCall);
_incallView.hidden = !_incallView.hidden;
_incallView.hidden = !_outcallView.hidden;
}
- (void)callSecurityUpdate {
@ -231,12 +231,12 @@
BOOL security = true;
const MSList *list = linphone_core_get_calls([LinphoneManager getLc]);
[self updateUI:(list != NULL)];
if (list == NULL) {
if (securitySheet) {
[securitySheet dismissWithClickedButtonIndex:securitySheet.destructiveButtonIndex animated:TRUE];
}
} else {
[self updateUI:YES];
while (list != NULL) {
LinphoneCall *call = (LinphoneCall *)list->data;
LinphoneMediaEncryption enc =
@ -258,8 +258,8 @@
- (void)callQualityUpdate {
UIImage *image = nil;
LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
[self updateUI:(call != NULL)];
if (call != NULL) {
[self updateUI:YES];
// FIXME double check call state before computing, may cause core dump
float quality = linphone_call_get_average_quality(call);
if (quality < 1) {

4
Classes/LinphoneUI/UIToggleButton.h
View file

@ -19,13 +19,15 @@
#import <UIKit/UIKit.h>
#import "UIIconButton.h"
@protocol UIToggleButtonDelegate
- (void)onOn;
- (void)onOff;
- (bool)onUpdate;
@end
@interface UIToggleButton : UIButton <UIToggleButtonDelegate> {
@interface UIToggleButton : UIIconButton <UIToggleButtonDelegate> {
}
- (bool)update;

4
Classes/SettingsViewController.m
View file

@ -404,10 +404,8 @@ static UICompositeViewDescription *compositeDescription = nil;
if (compositeDescription == nil) {
compositeDescription = [[UICompositeViewDescription alloc] init:@"Settings"
content:@"SettingsViewController"
stateBar:nil
stateBarEnabled:false
stateBar:@"UIStateBar"
tabBar:@"UIMainBar"
tabBarEnabled:true
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

2
Classes/WizardViewController.m
View file

@ -94,9 +94,7 @@ static UICompositeViewDescription *compositeDescription = nil;
compositeDescription = [[UICompositeViewDescription alloc] init:@"Wizard"
content:@"WizardViewController"
stateBar:nil
stateBarEnabled:false
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];

BIN
ResourcesV3/images/add_call.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
ResourcesV3/images/add_contact.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
ResourcesV3/images/add_field_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 975 B

BIN
ResourcesV3/images/add_field_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
ResourcesV3/images/avatar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
ResourcesV3/images/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
ResourcesV3/images/back_call_footer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
ResourcesV3/images/back_call_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
ResourcesV3/images/back_dialer_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
ResourcesV3/images/backspace.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
ResourcesV3/images/backspace_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
ResourcesV3/images/call_quality_indicator_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 960 B

BIN
ResourcesV3/images/call_quality_indicator_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 946 B

BIN
ResourcesV3/images/call_quality_indicator_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 936 B

BIN
ResourcesV3/images/call_quality_indicator_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 917 B

BIN
ResourcesV3/images/call_quality_indicator_4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 888 B

BIN
ResourcesV3/images/call_statuts_incoming.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
ResourcesV3/images/call_statuts_missed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
ResourcesV3/images/call_statuts_outgoing.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
ResourcesV3/images/camera_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
ResourcesV3/images/camera_on_all_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
ResourcesV3/images/chat_list_indicator.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
ResourcesV3/images/chat_message_delivered.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 902 B

BIN
ResourcesV3/images/chat_message_inprogress.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 753 B

BIN
ResourcesV3/images/chat_message_not_delivered.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 805 B

BIN
ResourcesV3/images/chat_new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
ResourcesV3/images/chat_photo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
ResourcesV3/images/chat_photo_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
ResourcesV3/images/chat_send.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ResourcesV3/images/chat_send_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
ResourcesV3/images/clean_field_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
ResourcesV3/images/clean_field_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
ResourcesV3/images/color_F.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 153 B

BIN
ResourcesV3/images/contacts_all.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
ResourcesV3/images/contacts_all_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
ResourcesV3/images/contacts_linphone.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
ResourcesV3/images/contacts_linphone_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
ResourcesV3/images/delete.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
ResourcesV3/images/delete_field_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
ResourcesV3/images/delete_field_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
ResourcesV3/images/deselect_all.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 999 B

BIN
ResourcesV3/images/dialer_alt_back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ResourcesV3/images/edit_detail.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
ResourcesV3/images/edit_list.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ResourcesV3/images/exit_conference_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
ResourcesV3/images/exit_conference_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
ResourcesV3/images/footer_chat.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
ResourcesV3/images/footer_contacts.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
ResourcesV3/images/footer_dialer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
ResourcesV3/images/footer_history.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
ResourcesV3/images/hangup_decline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
ResourcesV3/images/history_all.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
ResourcesV3/images/history_all_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
ResourcesV3/images/history_chat_indicator.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 943 B

BIN
ResourcesV3/images/history_missed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
ResourcesV3/images/history_missed_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
ResourcesV3/images/incoming_call_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
ResourcesV3/images/led_connected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ResourcesV3/images/led_disconnected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ResourcesV3/images/led_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,021 B

BIN
ResourcesV3/images/led_inprogress.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ResourcesV3/images/linphone_user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
ResourcesV3/images/list_detail_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 668 B

BIN
ResourcesV3/images/list_detail_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
ResourcesV3/images/menu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 682 B

BIN
ResourcesV3/images/micro_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
ResourcesV3/images/micro_off_missed_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
ResourcesV3/images/numpad_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ResourcesV3/images/numpad_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
ResourcesV3/images/numpad_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
ResourcesV3/images/numpad_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ResourcesV3/images/numpad_4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 864 B

BIN
ResourcesV3/images/numpad_5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

Some files were not shown because too many files have changed in this diff Show more