From 4fc355303b25385b40e08ac7b7fcd78f8c8d1b55 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 26 Nov 2014 17:29:55 +0100
Subject: [PATCH] Fix padding, part 2

---
 Classes/LinphoneUI/Base.lproj/UICallBar.xib | 20 +++++++++++---------
 Classes/LinphoneUI/UICallBar.h              |  4 ++++
 Classes/LinphoneUI/UICallBar.m              | 15 ++++++++++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.xib b/Classes/LinphoneUI/Base.lproj/UICallBar.xib
index b5c699672..f76753d37 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallBar.xib
@@ -14,6 +14,7 @@
                 <outlet property="fourButton" destination="69" id="77"/>
                 <outlet property="hangupButton" destination="7" id="29"/>
                 <outlet property="landscapeView" destination="100" id="137"/>
+                <outlet property="leftPadding" destination="ft8-yH-2Ta" id="zp9-XP-bDv"/>
                 <outlet property="microButton" destination="11" id="14"/>
                 <outlet property="nineButton" destination="66" id="78"/>
                 <outlet property="oneButton" destination="73" id="79"/>
@@ -24,6 +25,7 @@
                 <outlet property="padView" destination="31" id="45"/>
                 <outlet property="pauseButton" destination="8" id="15"/>
                 <outlet property="portraitView" destination="4" id="138"/>
+                <outlet property="rightPadding" destination="145" id="cgI-HK-3gA"/>
                 <outlet property="routesBluetoothButton" destination="174" id="203"/>
                 <outlet property="routesButton" destination="164" id="202"/>
                 <outlet property="routesReceiverButton" destination="169" id="204"/>
@@ -306,14 +308,14 @@
                     <rect key="frame" x="0.0" y="325" width="320" height="135"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" tag="101" contentMode="scaleToFill" image="incall_padding_right.png" id="145" userLabel="rightPadding">
-                            <rect key="frame" x="320" y="-11" width="47" height="146"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="incall_padding_left.png" id="ft8-yH-2Ta" userLabel="leftPadding">
+                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" tag="60" contentMode="scaleToFill" image="incall_padding_left.png" id="ft8-yH-2Ta" userLabel="leftPadding">
                             <rect key="frame" x="-47" y="-11" width="47" height="146"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         </imageView>
+                        <imageView userInteractionEnabled="NO" tag="61" contentMode="scaleToFill" image="incall_padding_right.png" id="145" userLabel="rightPadding">
+                            <rect key="frame" x="320" y="-11" width="47" height="146"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        </imageView>
                         <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="12" userLabel="videoButton" customClass="UIVideoButton">
                             <rect key="frame" x="0.0" y="0.0" width="80" height="67"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -727,12 +729,12 @@
                     <rect key="frame" x="0.0" y="238" width="480" height="82"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" tag="100" contentMode="scaleToFill" image="incall_padding_left_landscape.png" id="143" userLabel="leftPadding">
-                            <rect key="frame" x="-251" y="-23" width="128" height="105"/>
+                        <imageView userInteractionEnabled="NO" tag="60" contentMode="scaleToFill" image="incall_padding_left_landscape.png" id="143" userLabel="leftPadding">
+                            <rect key="frame" x="-128" y="-24" width="128" height="106"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         </imageView>
-                        <imageView userInteractionEnabled="NO" tag="101" contentMode="scaleToFill" image="incall_padding_right_landscape.png" id="144" userLabel="rightPadding">
-                            <rect key="frame" x="480" y="-23" width="128" height="105"/>
+                        <imageView userInteractionEnabled="NO" tag="61" contentMode="scaleToFill" image="incall_padding_right_landscape.png" id="144" userLabel="rightPadding">
+                            <rect key="frame" x="480" y="-24" width="128" height="106"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         </imageView>
                         <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="113" userLabel="videoButton" customClass="UIVideoButton">
diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h
index 791ea4d52..832a5906c 100644
--- a/Classes/LinphoneUI/UICallBar.h
+++ b/Classes/LinphoneUI/UICallBar.h
@@ -48,6 +48,10 @@
 @property (nonatomic, retain) IBOutlet UIButton*        optionsTransferButton;
 @property (nonatomic, retain) IBOutlet UIToggleButton*  dialerButton;
 
+@property (nonatomic, retain) IBOutlet UIImageView*         leftPadding;
+@property (nonatomic, retain) IBOutlet UIImageView*         rightPadding;
+
+
 @property (nonatomic, retain) IBOutlet UIDigitButton* oneButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* twoButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* threeButton;
diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m
index ec2d16c0c..69ec007cd 100644
--- a/Classes/LinphoneUI/UICallBar.m
+++ b/Classes/LinphoneUI/UICallBar.m
@@ -151,7 +151,16 @@
         [LinphoneUtils buttonFixStates:videoButton];
         [LinphoneUtils buttonFixStates:videoButtonLandscape];
     }
-    
+
+    {
+        UIImageView* leftPaddingLandscape = (UIImageView*)[landscapeView viewWithTag:self.leftPadding.tag];
+        leftPaddingLandscape.image =[UIImage imageNamed:@"incall_padding_left_landscape.png"];
+    }
+    {
+        UIImageView* rightPaddingLandscape = (UIImageView*)[landscapeView viewWithTag:self.rightPadding.tag];
+        rightPaddingLandscape.image = [UIImage imageNamed:@"incall_padding_right_landscape.png"];
+    }
+
     {
         UIButton *speakerButtonLandscape = (UIButton*) [landscapeView viewWithTag:[speakerButton tag]];
         // Set selected+disabled background: IB lack !
@@ -565,6 +574,8 @@
     if([view isKindOfClass:[UIButton class]]) {
         UIButton *button = (UIButton *)view;    
         [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button];
+    } else if (view.tag ==self.leftPadding.tag || view.tag == self.rightPadding.tag){
+        [attributes setObject:[(UIImageView*)view image] forKey:@"image"];
     }
     [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"];
 
@@ -577,6 +588,8 @@
     if([view isKindOfClass:[UIButton class]]) {
         UIButton *button = (UIButton *)view;
         [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button];
+    } else if (view.tag ==self.leftPadding.tag || view.tag == self.rightPadding.tag){
+        [(UIImageView*)view setImage:[attributes objectForKey:@"image"]];
     }
     view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue];
 }