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

4.1: new CallView

Browse source
This commit is contained in:
Danmei Chen 2018-10-25 14:24:37 +02:00
parent 1e68cf1adc
commit 08d1331471
11 changed files with 427 additions and 327 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

196
Classes/Base.lproj/CallView.xib
View file

@ -26,6 +26,7 @@
<outlet property="fourButton" destination="653-Vb-YzA" id="x6R-Cq-7iJ"/>
<outlet property="hangupButton" destination="Xpw-A4-BZO" id="3hc-8p-CLb"/>
<outlet property="hashButton" destination="DqJ-35-h1Y" id="bVr-gn-5yW"/>
<outlet property="infoView" destination="Wj9-Fl-7Oq" id="WJ5-cc-uLF"/>
<outlet property="landscapeView" destination="mPH-MF-S0K" id="Qnt-pg-nbO"/>
<outlet property="microButton" destination="pRH-Ao-h65" id="F5a-sf-J7B"/>
<outlet property="nameLabel" destination="KPa-Rm-Qni" id="KiX-oL-MUd"/>
@ -43,7 +44,7 @@
<outlet property="pausedCallsTable" destination="162" id="ffv-xP-AXk"/>
<outlet property="portraitView" destination="lzH-M1-NdV" id="duc-gP-Nq1"/>
<outlet property="recordButton" destination="MAI-av-LMz" id="2Gn-na-dF2"/>
<outlet property="recordButtonOnView" destination="5tg-I7-Avu" id="PLj-su-DnF"/>
<outlet property="recordButtonOnView" destination="5tg-I7-Avu" id="MeV-e7-f7s"/>
<outlet property="routesBluetoothButton" destination="6uv-FV-mUL" id="c0F-7q-0m5"/>
<outlet property="routesButton" destination="nQp-5y-kTy" id="2u8-g5-6T1"/>
<outlet property="routesEarpieceButton" destination="jSA-bD-bCs" id="eeO-dk-84D"/>
@ -128,8 +129,8 @@
<rect key="frame" x="0.0" y="0.0" width="667" height="333"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" tag="7" contentMode="scaleAspectFit" image="avatar.png" id="fZy-K5-yQp" userLabel="avatarImage" customClass="UIRoundedImageView">
<rect key="frame" x="110" y="140" width="443" height="28"/>
<imageView userInteractionEnabled="NO" tag="7" contentMode="scaleAspectFit" misplaced="YES" image="avatar.png" id="fZy-K5-yQp" userLabel="avatarImage" customClass="UIRoundedImageView">
<rect key="frame" x="110" y="158" width="443" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<accessibility key="accessibilityConfiguration" label="Contact avatar">
<accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
@ -153,8 +154,8 @@
<accessibilityTraits key="traits" notEnabled="YES"/>
</accessibility>
</view>
<view tag="11" contentMode="scaleAspectFit" id="127" userLabel="preview">
<rect key="frame" x="473" y="182" width="194" height="67"/>
<view tag="11" contentMode="scaleAspectFit" misplaced="YES" id="127" userLabel="preview">
<rect key="frame" x="450" y="162" width="198" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
@ -162,9 +163,9 @@
<rect key="frame" x="313" y="169" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<button opaque="NO" tag="13" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="160" userLabel="videoCameraSwitch" customClass="UICamSwitch">
<rect key="frame" x="65" y="122" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<button opaque="NO" tag="13" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="160" userLabel="videoCameraSwitch" customClass="UICamSwitch">
<rect key="frame" x="23" y="140" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
<accessibility key="accessibilityConfiguration" label="Switch camera"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="camera_switch_default.png">
@ -180,22 +181,28 @@
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.79999999999999982" tag="14" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01:34" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" id="Oy8-QO-Jwb" userLabel="durationLabel">
<rect key="frame" x="0.0" y="40" width="667" height="26"/>
<view contentMode="scaleToFill" misplaced="YES" id="Wj9-Fl-7Oq" userLabel="infoView">
<rect key="frame" x="0.0" y="90" width="667" height="66"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.79999999999999982" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="KPa-Rm-Qni" userLabel="nameLabel">
<rect key="frame" x="0.0" y="0.0" width="667" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="33"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.79999999999999982" tag="14" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="01:34" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" id="Oy8-QO-Jwb" userLabel="durationLabel">
<rect key="frame" x="0.0" y="40" width="667" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.79999999999999982" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="KPa-Rm-Qni" userLabel="nameLabel">
<rect key="frame" x="0.0" y="0.0" width="667" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="33"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view>
<view hidden="YES" alpha="0.80000000000000004" tag="16" contentMode="scaleToFill" id="0MR-ml-8RY" userLabel="pausedByRemoteView">
<rect key="frame" x="0.0" y="66" width="667" height="267"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -214,9 +221,9 @@
</subviews>
<color key="backgroundColor" red="0.20521381497383118" green="0.20520767569541931" blue="0.20521116256713867" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7f5-7T-fV3" userLabel="callPauseButton" customClass="UIPauseButton">
<rect key="frame" x="550" y="80" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<button opaque="NO" tag="19" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7f5-7T-fV3" userLabel="callPauseButton" customClass="UIPauseButton">
<rect key="frame" x="592" y="420" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<accessibility key="accessibilityConfiguration" label="Pause"/>
<state key="normal" image="pause_big_default.png">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -226,9 +233,9 @@
<state key="highlighted" image="pause_big_over_selected.png"/>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageSizeForAccessibilityContentSizeCategory="YES" lineBreakMode="middleTruncation" id="5tg-I7-Avu" userLabel="recordButtonOnView">
<rect key="frame" x="6" y="90" width="125" height="74"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="rec_on_default.png"/>
<rect key="frame" x="23" y="420" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
<state key="normal" image="recording.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="UKO-LU-9u4"/>
</connections>
@ -474,23 +481,10 @@
<rect key="frame" x="0.0" y="0.0" width="167" height="264"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="MAI-av-LMz" userLabel="recordButton" customClass="UIIconButton">
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="06a-kv-hpZ" userLabel="optionConferenceButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="rec_on_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="options_start_conference_disabled.png"/>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="8fZ-A1-ula"/>
</connections>
</button>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="06a-kv-hpZ" userLabel="optionConferenceButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="66" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="options_start_conference_default.png">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
@ -501,7 +495,7 @@
</connections>
</button>
<button opaque="NO" tag="45" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="reb-7F-UDV" userLabel="optionsAddButton">
<rect key="frame" x="0.0" y="132" width="167" height="66"/>
<rect key="frame" x="0.0" y="66" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add call"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
@ -517,9 +511,9 @@
<action selector="onOptionsAddClick:" destination="-1" eventType="touchUpInside" id="diW-wF-VRO"/>
</connections>
</button>
<button opaque="NO" tag="46" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="S0k-bn-1bs" userLabel="optionsTransferButton">
<rect key="frame" x="0.0" y="198" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<button opaque="NO" tag="46" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="S0k-bn-1bs" userLabel="optionsTransferButton">
<rect key="frame" x="0.0" y="132" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Transfer call"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
@ -534,6 +528,19 @@
<action selector="onOptionsTransferClick:" destination="-1" eventType="touchUpInside" id="lJX-ud-MuS"/>
</connections>
</button>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="MAI-av-LMz" userLabel="recordButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="198" width="167" height="66"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="rec_on_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="options_start_conference_disabled.png"/>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="8fZ-A1-ula"/>
</connections>
</button>
</subviews>
</view>
<view tag="47" contentMode="scaleToFill" id="mga-O5-mUn" userLabel="bottomBar">
@ -779,8 +786,8 @@
<accessibilityTraits key="traits" notEnabled="YES"/>
</accessibility>
</view>
<view tag="11" contentMode="scaleAspectFit" id="FcF-4P-SjT" userLabel="preview">
<rect key="frame" x="521" y="204" width="146" height="108"/>
<view tag="11" contentMode="scaleAspectFit" misplaced="YES" id="FcF-4P-SjT" userLabel="preview">
<rect key="frame" x="503" y="189" width="146" height="108"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
@ -788,8 +795,8 @@
<rect key="frame" x="311" y="169" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<button opaque="NO" tag="13" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="7Mv-7u-XVs" userLabel="videoCameraSwitch" customClass="UICamSwitch">
<rect key="frame" x="65" y="122" width="52" height="52"/>
<button opaque="NO" tag="13" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="7Mv-7u-XVs" userLabel="videoCameraSwitch" customClass="UICamSwitch">
<rect key="frame" x="80" y="122" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Switch camera"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
@ -806,22 +813,28 @@
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000001192092896" tag="14" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01:34" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" id="4Jl-GT-mfD" userLabel="durationLabel">
<rect key="frame" x="0.0" y="40" width="667" height="26"/>
<view contentMode="scaleToFill" misplaced="YES" id="tpP-l6-j02" userLabel="infoView">
<rect key="frame" x="0.0" y="0.0" width="667" height="66"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000001192092896" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="2Zk-Vw-StV" userLabel="nameLabel">
<rect key="frame" x="0.0" y="0.0" width="667" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="33"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000001192092896" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="2Zk-Vw-StV" userLabel="nameLabel">
<rect key="frame" x="0.0" y="0.0" width="667" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="33"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000001192092896" tag="14" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="01:34" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" id="4Jl-GT-mfD" userLabel="durationLabel">
<rect key="frame" x="0.0" y="40" width="667" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view>
<view hidden="YES" alpha="0.80000001192092896" tag="16" contentMode="scaleToFill" id="va1-LU-Rb8" userLabel="pausedByRemoteView">
<rect key="frame" x="0.0" y="66" width="667" height="267"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -840,9 +853,9 @@
</subviews>
<color key="backgroundColor" red="0.20521381497383118" green="0.20520767569541931" blue="0.20521116256713867" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aOf-Ed-RL3" userLabel="callPauseButton" customClass="UIPauseButton">
<rect key="frame" x="550" y="80" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<button opaque="NO" tag="19" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aOf-Ed-RL3" userLabel="callPauseButton" customClass="UIPauseButton">
<rect key="frame" x="524" y="199" width="52" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<accessibility key="accessibilityConfiguration" label="Pause"/>
<state key="normal" image="pause_big_default.png">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -852,9 +865,9 @@
<state key="highlighted" image="pause_big_over_selected.png"/>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageSizeForAccessibilityContentSizeCategory="YES" lineBreakMode="middleTruncation" id="LTj-Ya-DnB" userLabel="recordButtonOnView">
<rect key="frame" x="8" y="74" width="120" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="rec_on_default.png"/>
<rect key="frame" x="80" y="199" width="50" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
<state key="normal" image="recording.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="Ff8-sw-dY3"/>
</connections>
@ -1100,23 +1113,10 @@
<rect key="frame" x="0.0" y="1" width="85" height="263"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="GQK-F8-oLr" userLabel="recordButton" customClass="UIIconButton">
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="WO0-b2-8Wc" userLabel="optionConferenceButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="0.0" width="85" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="button:GQK-F8-oLr:image">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="disabled" image="23CECC90-1197-4ACE-A0DC-747A6A127019"/>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="IFO-tT-oog"/>
</connections>
</button>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="WO0-b2-8Wc" userLabel="optionConferenceButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="66" width="85" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="options_start_conference_default.png">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
@ -1127,7 +1127,7 @@
</connections>
</button>
<button opaque="NO" tag="45" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="SQU-l1-LKp" userLabel="optionsAddButton">
<rect key="frame" x="0.0" y="132" width="85" height="70"/>
<rect key="frame" x="0.0" y="66" width="85" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Add call"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
@ -1144,8 +1144,8 @@
</connections>
</button>
<button opaque="NO" tag="46" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="JmM-FS-reF" userLabel="optionsTransferButton">
<rect key="frame" x="0.0" y="198" width="85" height="57"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<rect key="frame" x="0.0" y="132" width="85" height="57"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Transfer call"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
@ -1160,6 +1160,19 @@
<action selector="onOptionsTransferClick:" destination="-1" eventType="touchUpInside" id="iEu-GP-YvO"/>
</connections>
</button>
<button opaque="NO" tag="44" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="GQK-F8-oLr" userLabel="recordButton" customClass="UIIconButton">
<rect key="frame" x="0.0" y="198" width="85" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<accessibility key="accessibilityConfiguration" label="Start conference"/>
<state key="normal" image="button:GQK-F8-oLr:image">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="disabled" image="60CF2F77-2A6B-4515-BBD5-3EE2BF573FB1"/>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onRecordClick:" destination="-1" eventType="touchUpInside" id="IFO-tT-oog"/>
</connections>
</button>
</subviews>
</view>
<view tag="47" contentMode="scaleToFill" id="C62-Qc-40Y" userLabel="bottomBar">
@ -1336,7 +1349,7 @@
</view>
</objects>
<resources>
<image name="23CECC90-1197-4ACE-A0DC-747A6A127019" width="33" height="33">
<image name="60CF2F77-2A6B-4515-BBD5-3EE2BF573FB1" width="33" height="33">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGVVZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QEgcI
ExQZHh8jJCsuMTtDR0tPUlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdz
@ -1822,7 +1835,8 @@ qTKsMrkyvjLGMskyzjLWMtky6zLuMvMAAAAAAAACAQAAAAAAAABZAAAAAAAAAAAAAAAAAAAy9Q
<image name="pause_big_default.png" width="52" height="51"/>
<image name="pause_big_disabled.png" width="52" height="51"/>
<image name="pause_big_over_selected.png" width="52" height="51"/>
<image name="rec_on_default.png" width="40" height="36"/>
<image name="rec_on_default.png" width="18" height="28"/>
<image name="recording.png" width="50" height="50"/>
<image name="route_bluetooth_default.png" width="16" height="26"/>
<image name="route_bluetooth_disabled.png" width="16" height="26"/>
<image name="route_bluetooth_selected.png" width="16" height="26"/>

528
Classes/Base.lproj/CallView~ipad.xib
View file

File diff suppressed because it is too large Load diff

1
Classes/CallView.h
View file

@ -99,6 +99,7 @@
@property(weak, nonatomic) IBOutlet UIView *conferenceView;
@property(strong, nonatomic) IBOutlet CallPausedTableView *conferenceCallsTable;
@property (weak, nonatomic) IBOutlet UIView *waitView;
@property (weak, nonatomic) IBOutlet UIView *infoView;
- (IBAction)onRoutesClick:(id)sender;
- (IBAction)onRoutesBluetoothClick:(id)sender;

21
Classes/CallView.m
View file

@ -49,6 +49,10 @@ const NSInteger SECURE_BUTTON_TAG = 5;
videoZoomHandler = [[VideoZoomHandler alloc] init];
videoHidden = TRUE;
callRecording = FALSE;
_recordButtonOnView.hidden = TRUE;
CGRect frame = _callPauseButton.frame;
frame.origin.y = _recordButtonOnView.frame.origin.y;
_callPauseButton.frame = frame;
}
return self;
}
@ -235,10 +239,26 @@ static UICompositeViewDescription *compositeDescription = nil;
[self updateUnreadMessage:NO];
[self previewTouchLift];
[self hideStatusBar:!videoHidden && (_nameLabel.alpha <= 0.f)];
[_recordButtonOnView setHidden:!callRecording];
[self updateInfoView];
}
#pragma mark - UI modification
- (void)updateInfoView {
CGRect infoFrame = _infoView.frame;
CGRect frame = _callPauseButton.frame;
if (videoHidden) {
infoFrame.origin.y = (_avatarImage.frame.origin.y-66)/2;
frame.origin.y = _recordButtonOnView.frame.origin.y;
} else {
infoFrame.origin.y = 0;
frame.origin.y = _videoCameraSwitch.frame.origin.y+_videoGroup.frame.origin.y;
}
_infoView.frame = infoFrame;
_callPauseButton.frame = frame;
}
- (void)hideSpinnerIndicator:(LinphoneCall *)call {
_videoWaitingForFirstImage.hidden = TRUE;
}
@ -527,6 +547,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
[self displayAudioCall:animated];
}
}
[self updateInfoView];
if (state != LinphoneCallPausedByRemote) {
_pausedByRemoteView.hidden = YES;

BIN
Resources/images/rec_off_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 597 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
Resources/images/rec_off_default@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Resources/images/rec_on_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/images/rec_on_default@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Resources/images/recording.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/images/recording@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

8
linphone.xcodeproj/project.pbxproj
View file

@ -116,6 +116,8 @@
615A283C2180789C0060F920 /* security_toogle_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A283B2180789C0060F920 /* security_toogle_button@2x.png */; };
615A283E2180A2560060F920 /* invite_linphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A283D2180A2550060F920 /* invite_linphone.png */; };
615A28402180A2620060F920 /* invite_linphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A283F2180A2620060F920 /* invite_linphone@2x.png */; };
615A28422180C0870060F920 /* recording.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A28412180C0820060F920 /* recording.png */; };
615A28442180C0900060F920 /* recording@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A28432180C08F0060F920 /* recording@2x.png */; };
61AE364F20C00B370089D9D3 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61AE364E20C00B370089D9D3 /* ShareViewController.m */; };
61AE365220C00B370089D9D3 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61AE365020C00B370089D9D3 /* MainInterface.storyboard */; };
61AE365620C00B370089D9D3 /* linphoneExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 61AE364B20C00B370089D9D3 /* linphoneExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@ -1179,6 +1181,8 @@
615A283B2180789C0060F920 /* security_toogle_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_button@2x.png"; sourceTree = "<group>"; };
615A283D2180A2550060F920 /* invite_linphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = invite_linphone.png; sourceTree = "<group>"; };
615A283F2180A2620060F920 /* invite_linphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "invite_linphone@2x.png"; sourceTree = "<group>"; };
615A28412180C0820060F920 /* recording.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = recording.png; sourceTree = "<group>"; };
615A28432180C08F0060F920 /* recording@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "recording@2x.png"; sourceTree = "<group>"; };
61AE364B20C00B370089D9D3 /* linphoneExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = linphoneExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
61AE364D20C00B370089D9D3 /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
61AE364E20C00B370089D9D3 /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
@ -3210,6 +3214,8 @@
CF7602EB210898C100749F76 /* rec_off_default@2x.png */,
CF7602F4210898C800749F76 /* rec_on_default.png */,
CF7602F2210898C400749F76 /* rec_on_default@2x.png */,
615A28412180C0820060F920 /* recording.png */,
615A28432180C08F0060F920 /* recording@2x.png */,
633FED681D3CD5590014B822 /* route_bluetooth_default.png */,
633FED691D3CD5590014B822 /* route_bluetooth_default@2x.png */,
633FED6A1D3CD5590014B822 /* route_bluetooth_disabled.png */,
@ -4080,6 +4086,7 @@
633FEE031D3CD5590014B822 /* cancel_edit_default@2x.png in Resources */,
633FEDE01D3CD5590014B822 /* call_start_body_over~ipad.png in Resources */,
8CBD7BA920B6B82A00E5DCC0 /* UIChatConversationImdnTableViewCell.xib in Resources */,
615A28442180C0900060F920 /* recording@2x.png in Resources */,
615A2813217F24D40060F920 /* security_1_indicator.png in Resources */,
24BFAAA7209B0630004F47A7 /* callkit_logo.png in Resources */,
615A2811217F1FDE0060F920 /* chat_add_group@2x.png in Resources */,
@ -4204,6 +4211,7 @@
633FEE391D3CD5590014B822 /* contact_add_default@2x.png in Resources */,
633FEE741D3CD5590014B822 /* history_all_disabled.png in Resources */,
633FEE081D3CD5590014B822 /* chat_add_disabled.png in Resources */,
615A28422180C0870060F920 /* recording.png in Resources */,
633FEF1D1D3CD55A0014B822 /* presence_offline@2x.png in Resources */,
24A3459E1D95797700881A5C /* UIShopTableCell.xib in Resources */,
633FEE231D3CD5590014B822 /* chat_start_body_over@2x.png in Resources */,