cleanup

Classes/Base.lproj/ContactsListView.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ContactsListView">
@@ -58,7 +59,7 @@
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <inset key="titleEdgeInsets" minX="-38" minY="15" maxX="0.0" maxY="0.0"/>
                                             <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" title="ALL" image="contacts_all_default.png">
+                                            <state key="normal" image="contacts_all_default.png">
                                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
@@ -77,7 +78,7 @@
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <inset key="titleEdgeInsets" minX="-35" minY="15" maxX="0.0" maxY="0.0"/>
                                             <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" title="SIP" image="contacts_sip_default.png">
+                                            <state key="normal" image="contacts_sip_default.png">
                                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
@@ -161,20 +162,15 @@
         </tableViewController>
     </objects>
     <resources>
-        <image name="back.png" width="25" height="22"/>
+        <image name="back.png" width="48" height="44"/>
         <image name="color_E.png" width="1" height="1"/>
         <image name="color_F.png" width="1" height="1"/>
-        <image name="contact_add.png" width="35" height="30"/>
-        <image name="contacts_all_default.png" width="38" height="30"/>
-        <image name="contacts_all_selected.png" width="38" height="30"/>
-        <image name="contacts_sip_default.png" width="38" height="30"/>
-        <image name="contacts_sip_selected.png" width="38" height="30"/>
-        <image name="delete.png" width="22" height="28"/>
-        <image name="edit_list.png" width="31" height="29"/>
+        <image name="contact_add.png" width="69" height="59"/>
+        <image name="contacts_all_default.png" width="65" height="55"/>
+        <image name="contacts_all_selected.png" width="65" height="55"/>
+        <image name="contacts_sip_default.png" width="77" height="60"/>
+        <image name="contacts_sip_selected.png" width="77" height="60"/>
+        <image name="delete.png" width="43" height="56"/>
+        <image name="edit_list.png" width="60" height="57"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>

Classes/ContactsListView.m

@@ -165,17 +165,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 }
 
-- (void)centerTextOnIcon:(UIButton *)button {
-	UIEdgeInsets inset = button.titleEdgeInsets;
-	inset.left = -(button.imageView.frame.size.width);
-	button.titleEdgeInsets = inset;
-}
-
 - (void)viewDidLoad {
 	[super viewDidLoad];
 	[self changeView:History_All];
-	[self centerTextOnIcon:allButton];
-	[self centerTextOnIcon:linphoneButton];
 }
 
 #pragma mark -

Classes/LinphoneUI/Base.lproj/UICompositeView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <development version="6000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UICompositeView">
@@ -31,12 +31,12 @@
                         <outletCollection property="gestureRecognizers" destination="40" appends="YES" id="41"/>
                     </connections>
                 </view>
-                <view autoresizesSubviews="NO" tag="2" contentMode="scaleToFill" id="14" userLabel="statusBar" customClass="UITransparentView">
+                <view autoresizesSubviews="NO" tag="2" contentMode="scaleToFill" id="14" userLabel="statusBar">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
-                <view autoresizesSubviews="NO" tag="3" contentMode="scaleToFill" id="16" userLabel="tabBar" customClass="UITransparentView">
+                <view autoresizesSubviews="NO" tag="3" contentMode="scaleToFill" id="16" userLabel="tabBar">
                     <rect key="frame" x="0.0" y="604" width="375" height="66"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -60,12 +60,12 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
-                <view autoresizesSubviews="NO" tag="2" contentMode="scaleToFill" id="22" userLabel="statusBar" customClass="UITransparentView">
+                <view autoresizesSubviews="NO" tag="2" contentMode="scaleToFill" id="22" userLabel="statusBar">
                     <rect key="frame" x="0.0" y="0.0" width="667" height="26"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
-                <view autoresizesSubviews="NO" tag="3" contentMode="scaleToFill" id="21" userLabel="tabBar" customClass="UITransparentView">
+                <view autoresizesSubviews="NO" tag="3" contentMode="scaleToFill" id="21" userLabel="tabBar">
                     <rect key="frame" x="0.0" y="325" width="667" height="50"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -84,9 +84,4 @@
             </connections>
         </swipeGestureRecognizer>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>

Classes/LinphoneUI/UICallPausedCell.h

@@ -6,12 +6,12 @@
 //
 //
 
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 
 #import "UIRoundedImageView.h"
 #import "LinphoneManager.h"
 
-@interface UICallPausedCell : UITransparentTVCell
+@interface UICallPausedCell : UICheckBoxTVCell
 
 @property(weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
 @property(weak, nonatomic) IBOutlet UILabel *nameLabel;

Classes/LinphoneUI/UIChatBubblePhotoCell.h

@@ -20,12 +20,12 @@
 #import <UIKit/UIKit.h>
 
 #import "UILoadingImageView.h"
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 #import "UITextViewNoDefine.h"
 #import "FileTransferDelegate.h"
 #import "ChatConversationTableView.h"
 
-@interface UIChatBubblePhotoCell : UITransparentTVCell
+@interface UIChatBubblePhotoCell : UICheckBoxTVCell
 
 //@property(nonatomic, strong) IBOutlet UIView *innerView;
 //@property(nonatomic, strong) IBOutlet UIView *bubbleView;

Classes/LinphoneUI/UIChatBubbleTextCell.h

@@ -19,12 +19,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 #import "UITextViewNoDefine.h"
 #import "ChatConversationTableView.h"
 #import "UIRoundedImageView.h"
 
-@interface UIChatBubbleTextCell : UITransparentTVCell
+@interface UIChatBubbleTextCell : UICheckBoxTVCell
 
 @property(nonatomic, weak) IBOutlet UIImageView *backgroundColor;
 @property(nonatomic, weak) IBOutlet UIRoundedImageView *avatarImage;

Classes/LinphoneUI/UIChatCell.h

@@ -19,14 +19,14 @@
 
 #import <UIKit/UIKit.h>
 
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 #import "UIRoundedImageView.h"
 #import "UIIconButton.h"
 
 #include "linphone/linphonecore.h"
 
-@interface UIChatCell : UITransparentTVCell {
-    LinphoneChatRoom* chatRoom;
+@interface UIChatCell : UICheckBoxTVCell {
+	LinphoneChatRoom *chatRoom;
 }
 
 @property(nonatomic, strong) IBOutlet UIRoundedImageView *avatarImage;

Classes/LinphoneUI/UICheckBoxTVCell.h

@@ -19,6 +19,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface UITransparentTVCell : UITableViewCell
+@interface UICheckBoxTVCell : UITableViewCell
+@property(weak, nonatomic) IBOutlet UIImageView *checkboxImage;
 
 @end

Classes/LinphoneUI/UICheckBoxTVCell.m

@@ -17,15 +17,17 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 
-@implementation UITransparentTVCell
+@implementation UICheckBoxTVCell
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
 	self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
 	if (self) {
-		// Set transparent background
-		[self setBackgroundColor:[UIColor clearColor]];
+		NSArray *arrayOfViews =
+			[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil];
+
+		[self.contentView addSubview:[arrayOfViews objectAtIndex:0]];
 	}
 	return self;
 }

Classes/LinphoneUI/UICheckBoxTVCell.xib

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UICheckBoxTVCell">
+            <connections>
+                <outlet property="checkboxImage" destination="3x9-iI-sTW" id="Z4c-Me-pzr"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="340" height="44"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="checkbox_checked.png" id="3x9-iI-sTW" userLabel="checkboxImage">
+                    <rect key="frame" x="298" y="5" width="34" height="34"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                </imageView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="285" y="292"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="checkbox_checked.png" width="34" height="34"/>
+    </resources>
+</document>

Classes/LinphoneUI/UIContactCell.h

@@ -19,9 +19,9 @@
 
 #import <UIKit/UIKit.h>
 #import <AddressBook/AddressBook.h>
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 
-@interface UIContactCell : UITransparentTVCell {
+@interface UIContactCell : UICheckBoxTVCell {
 }
 
 @property(nonatomic, strong) IBOutlet UILabel *nameLabel;

Classes/LinphoneUI/UIEditableTableViewCell.h

@@ -18,9 +18,9 @@
  */  
 
 #import <UIKit/UIKit.h>
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 
-@interface UIEditableTableViewCell : UITransparentTVCell {
+@interface UIEditableTableViewCell : UICheckBoxTVCell {
 }
 
 @property (nonatomic, strong) IBOutlet UIView *verticalSep;

Classes/LinphoneUI/UIHistoryCell.h

@@ -19,12 +19,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import "UITransparentTVCell.h"
+#import "UICheckBoxTVCell.h"
 #import "UIRoundedImageView.h"
 
 #include "linphone/linphonecore.h"
 
-@interface UIHistoryCell : UITransparentTVCell {
+@interface UIHistoryCell : UICheckBoxTVCell {
 }
 
 @property (nonatomic, assign) LinphoneCallLog *callLog;

Classes/LinphoneUI/UITransparentView.h

@@ -1,24 +0,0 @@
-/* UITransparentView.h
- *
- * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or   
- *  (at your option) any later version.                                 
- *                                                                      
- *  This program is distributed in the hope that it will be useful,     
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
- *  GNU General Public License for more details.                
- *                                                                      
- *  You should have received a copy of the GNU General Public License   
- *  along with this program; if not, write to the Free Software         
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */       
-
-#import <UIKit/UIKit.h>
-
-@interface UITransparentView : UIView
-
-@end

Classes/LinphoneUI/UITransparentView.m

@@ -1,44 +0,0 @@
-/* UITransparentView.m
- *
- * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "UITransparentView.h"
-
-@implementation UITransparentView
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
-	BOOL pointInside = NO;
-
-	for (UIView *child in [self subviews]) {
-		if (![child isHidden]) {
-			if (CGRectContainsPoint(child.frame, point)) {
-				CGPoint newPoint = point;
-				newPoint.x -= child.frame.origin.x;
-				newPoint.y -= child.frame.origin.y;
-				if ([child pointInside:newPoint withEvent:event]) {
-					pointInside = YES;
-					break;
-				}
-			}
-		}
-	}
-
-	return pointInside;
-}
-
-@end