From 7fd9ca22c596c5923ea5c6874800678021012b94 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 26 Oct 2015 17:08:50 +0100
Subject: [PATCH] History: fix sections order and other UI bugs

---
 Classes/Base.lproj/HistoryListView.xib |  2 +-
 Classes/ChatConversationView.m         |  3 ++-
 Classes/ContactDetailsView.m           |  4 +++-
 Classes/HistoryDetailsView.m           |  3 ++-
 Classes/HistoryListTableView.m         |  4 ++--
 Classes/LaunchScreen.xib               | 15 ++++++++++-----
 Classes/LinphoneAppDelegate.m          |  6 ++++--
 Resources/linphonerc                   |  1 -
 Resources/linphonerc-factory           |  2 --
 Resources/linphonerc~ipad              |  1 -
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Classes/Base.lproj/HistoryListView.xib b/Classes/Base.lproj/HistoryListView.xib
index c7bcaee90..47ea9ca4e 100644
--- a/Classes/Base.lproj/HistoryListView.xib
+++ b/Classes/Base.lproj/HistoryListView.xib
@@ -146,7 +146,7 @@
                         </tableView>
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No history." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xtr-Fp-60Z" userLabel="emptyTableLabel">
                             <rect key="frame" x="0.0" y="40" width="375" height="519"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 5bc64c185..ffb8383ce 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -426,7 +426,8 @@ static void message_status(LinphoneChatMessage *msg, LinphoneChatMessageState st
 
 - (IBAction)onBackClick:(id)event {
 	[_tableController setChatRoom:NULL];
-	[PhoneMainView.instance popCurrentView];
+	ChatsListView *view = VIEW(ChatsListView);
+	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
 - (IBAction)onEditClick:(id)event {
diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index 721284c48..7ffe86daf 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -243,7 +243,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if ([ContactSelection getSelectionMode] == ContactSelectionModeEdit) {
 		[ContactSelection setSelectionMode:ContactSelectionModeNone];
 	}
-	[PhoneMainView.instance popCurrentView];
+
+	ContactsListView *view = VIEW(ContactsListView);
+	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
 - (IBAction)onEditClick:(id)event {
diff --git a/Classes/HistoryDetailsView.m b/Classes/HistoryDetailsView.m
index a358b3c8b..4ea646623 100644
--- a/Classes/HistoryDetailsView.m
+++ b/Classes/HistoryDetailsView.m
@@ -149,7 +149,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - Action Functions
 
 - (IBAction)onBackClick:(id)event {
-	[PhoneMainView.instance popCurrentView];
+	HistoryListView *view = VIEW(HistoryListView);
+	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
 - (IBAction)onContactClick:(id)event {
diff --git a/Classes/HistoryListTableView.m b/Classes/HistoryListTableView.m
index f2e7e20fc..3d4c54aa5 100644
--- a/Classes/HistoryListTableView.m
+++ b/Classes/HistoryListTableView.m
@@ -130,8 +130,8 @@
 
 - (void)computeSections {
 	NSArray *unsortedDays = [self.sections allKeys];
-	self.sortedDays = [unsortedDays sortedArrayUsingComparator:^NSComparisonResult(NSDate *d1, NSDate *d2) {
-	  return ![d1 compare:d2]; // reverse order
+	_sortedDays = [unsortedDays sortedArrayUsingComparator:^NSComparisonResult(NSDate *d1, NSDate *d2) {
+	  return [d2 compare:d1]; // reverse order
 	}];
 }
 
diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib
index 3bf65782e..b93c2e2b8 100644
--- a/Classes/LaunchScreen.xib
+++ b/Classes/LaunchScreen.xib
@@ -1,15 +1,15 @@
 <?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" launchScreen="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" launchScreen="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_C.png" id="xtr-QP-6We" userLabel="backgroundColor">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
@@ -36,12 +36,17 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <nil key="simulatedStatusBarMetrics"/>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="238.5" y="1005.5"/>
         </view>
     </objects>
     <resources>
-        <image name="color_C.png" width="1" height="1"/>
+        <image name="color_C.png" width="2" height="2"/>
         <image name="splashscreen.png" width="181" height="165"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index b69b6ea86..f3972ed4a 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -344,11 +344,13 @@
 		[PhoneMainView.instance changeCurrentView:ChatsListView.compositeViewDescription];
 		LinphoneChatRoom *room = [self findChatRoomForContact:remoteContact];
 		ChatConversationView *view = VIEW(ChatConversationView);
-		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription push:TRUE], [view setChatRoom:room];
+		[view setChatRoom:room];
+		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription push:TRUE];
 	} else if ([notification.userInfo objectForKey:@"callLog"] != nil) {
 		NSString *callLog = (NSString *)[notification.userInfo objectForKey:@"callLog"];
 		HistoryDetailsView *view = VIEW(HistoryDetailsView);
-		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription push:TRUE], [view setCallLogId:callLog];
+		[view setCallLogId:callLog];
+		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription push:TRUE];
 	}
 }
 
diff --git a/Resources/linphonerc b/Resources/linphonerc
index c93ee98a4..ac6fa272c 100644
--- a/Resources/linphonerc
+++ b/Resources/linphonerc
@@ -71,5 +71,4 @@ stun=stun.linphone.org
 
 
 [misc]
-history_max_size=30
 max_calls=3
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index 4ddba5a5f..b667b21d0 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -9,8 +9,6 @@ dtmf_player_amp=0.007
 eq_location=mic
 eq_gains=50:2:50 100:2:50
 
-
-
 [video]
 display_filter_auto_rotate=0
 
diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad
index ae8baa55c..514844416 100644
--- a/Resources/linphonerc~ipad
+++ b/Resources/linphonerc~ipad
@@ -71,5 +71,4 @@ stun=stun.linphone.org
 
 
 [misc]
-history_max_size=30
 max_calls=3