diff --git a/Classes/Base.lproj/HistoryDetailsView.xib b/Classes/Base.lproj/HistoryDetailsView.xib
index 56308f6d0..15aa024e7 100644
--- a/Classes/Base.lproj/HistoryDetailsView.xib
+++ b/Classes/Base.lproj/HistoryDetailsView.xib
@@ -65,16 +65,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -145,6 +135,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -201,7 +201,7 @@
-
+
@@ -216,7 +216,7 @@
-
+
@@ -233,15 +233,6 @@
-
-
-
-
-
-
-
-
-
@@ -290,7 +290,7 @@
-
+
diff --git a/Classes/Base.lproj/SideMenuView.xib b/Classes/Base.lproj/SideMenuView.xib
index 0aedb4bb6..17cf621c3 100644
--- a/Classes/Base.lproj/SideMenuView.xib
+++ b/Classes/Base.lproj/SideMenuView.xib
@@ -9,6 +9,7 @@
+
@@ -29,6 +30,12 @@
+
+
+
+
+
+
@@ -83,6 +90,7 @@
+
diff --git a/Classes/LinphoneUI/Base.lproj/TabBarView.xib b/Classes/LinphoneUI/Base.lproj/TabBarView.xib
index d9ab148f9..c7a620ad7 100644
--- a/Classes/LinphoneUI/Base.lproj/TabBarView.xib
+++ b/Classes/LinphoneUI/Base.lproj/TabBarView.xib
@@ -152,18 +152,6 @@
-
-
+
-
+
-
+
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
index 815fa05d2..f3a90494c 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib
@@ -47,7 +47,7 @@
-
-
-
-
-
-
-
-
@@ -74,11 +66,19 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/Classes/LinphoneUI/StatusBarView.m b/Classes/LinphoneUI/StatusBarView.m
index bfa5dc80c..58b9b0bc8 100644
--- a/Classes/LinphoneUI/StatusBarView.m
+++ b/Classes/LinphoneUI/StatusBarView.m
@@ -181,15 +181,16 @@
message = NSLocalizedString(@"Fetching remote configuration", nil);
} else if (config == NULL) {
state = LinphoneRegistrationNone;
- if (linphone_core_is_network_reachable([LinphoneManager getLc])) {
- if (linphone_core_get_proxy_config_list(lc) != NULL) {
+ if (linphone_core_get_proxy_config_list(lc) != NULL) {
+ if (linphone_core_is_network_reachable([LinphoneManager getLc])) {
message = NSLocalizedString(@"No default account", nil);
} else {
- message = NSLocalizedString(@"No account configured", nil);
+ message = NSLocalizedString(@"Network down", nil);
}
} else {
- message = NSLocalizedString(@"Network down", nil);
+ message = NSLocalizedString(@"No account configured", nil);
}
+
} else {
state = linphone_proxy_config_get_state(config);
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index a15c1dcad..c50521f44 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -238,26 +238,26 @@ static void message_status(LinphoneChatMessage *msg, LinphoneChatMessageState st
static const CGFloat CELL_MIN_HEIGHT = 60.0f;
static const CGFloat CELL_MIN_WIDTH = 150.0f;
static const CGFloat CELL_MESSAGE_X_MARGIN = 78 + 10.0f;
-static const CGFloat CELL_MESSAGE_Y_MARGIN = 32;
+static const CGFloat CELL_MESSAGE_Y_MARGIN = 44;
static const CGFloat CELL_IMAGE_HEIGHT = 100.0f;
static const CGFloat CELL_IMAGE_WIDTH = 100.0f;
+ (CGSize)ViewHeightForMessage:(LinphoneChatMessage *)chat withWidth:(int)width {
NSString *messageText = [UIChatBubbleTextCell TextMessageForChat:chat];
- UITableView *tableView = VIEW(ChatConversationView).tableController.tableView;
static UIFont *messageFont = nil;
if (!messageFont) {
UIChatBubbleTextCell *cell =
[[UIChatBubbleTextCell alloc] initWithIdentifier:NSStringFromClass(UIChatBubbleTextCell.class)];
messageFont = cell.messageText.font;
}
- if (tableView.isEditing)
+ // UITableView *tableView = VIEW(ChatConversationView).tableController.tableView;
+ // if (tableView.isEditing)
width -= 40; /*checkbox */
CGSize size;
const char *url = linphone_chat_message_get_external_body_url(chat);
if (url == nil && linphone_chat_message_get_file_transfer_information(chat) == NULL) {
size = [self computeBoundingBox:messageText
- size:CGSizeMake(width - CELL_MESSAGE_X_MARGIN, CGFLOAT_MAX)
+ size:CGSizeMake(width - CELL_MESSAGE_X_MARGIN - 4, CGFLOAT_MAX)
font:messageFont];
} else {
NSString *localImage = [LinphoneManager getMessageAppDataForKey:@"localimage" inMessage:chat];
diff --git a/Classes/LinphoneUI/UICompositeView.m b/Classes/LinphoneUI/UICompositeView.m
index 15c2a3d80..06d75bd60 100644
--- a/Classes/LinphoneUI/UICompositeView.m
+++ b/Classes/LinphoneUI/UICompositeView.m
@@ -628,6 +628,11 @@
[UICompositeView addSubView:self.sideMenuViewController view:self.sideMenuView];
}
}
+ if (currentViewDescription.sideMenuEnabled) {
+ [_sideMenuViewController viewDidAppear:YES];
+ } else {
+ [_sideMenuViewController viewDidDisappear:YES];
+ }
// Dealloc old view description
}
diff --git a/Classes/SideMenuView.h b/Classes/SideMenuView.h
index 98a17b818..ef81e5208 100644
--- a/Classes/SideMenuView.h
+++ b/Classes/SideMenuView.h
@@ -17,6 +17,7 @@
@property(weak, nonatomic) IBOutlet UILabel *nameLabel;
@property(weak, nonatomic) IBOutlet UIButton *addressButton;
@property(strong, nonatomic) IBOutlet SideMenuTableView *sideMenuTableViewController;
+@property(weak, nonatomic) IBOutlet UIView *grayBackground;
- (IBAction)onLateralSwipe:(id)sender;
- (IBAction)onHeaderClick:(id)sender;
- (IBAction)onAvatarClick:(id)sender;
diff --git a/Classes/SideMenuView.m b/Classes/SideMenuView.m
index bee769e69..dd67d67d7 100644
--- a/Classes/SideMenuView.m
+++ b/Classes/SideMenuView.m
@@ -43,6 +43,16 @@
[_sideMenuTableViewController.tableView reloadData];
}
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+ _grayBackground.hidden = NO;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ _grayBackground.hidden = YES;
+ // should be better than that with alpha animation..
+}
- (IBAction)onLateralSwipe:(id)sender {
[PhoneMainView.instance.mainViewController hideSideMenu:YES];
}
diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m
index 31cca7e79..9502b3682 100644
--- a/Classes/Utils/Utils.m
+++ b/Classes/Utils/Utils.m
@@ -151,9 +151,9 @@ void linphone_iphone_log_handler(int lev, const char *fmt, va_list args) {
}
break;
case LinphoneDateHistoryDetails:
- formatstr = NSLocalizedString(@"MM/dd '-' HH'h'mm", @"Date formatting in History Details (also see "
- @"http://cybersam.com/ios-dev/"
- @"quick-guide-to-ios-dateformatting)");
+ formatstr = NSLocalizedString(@"EEE dd MMM 'at' HH'h'mm", @"Date formatting in History Details (also see "
+ @"http://cybersam.com/ios-dev/"
+ @"quick-guide-to-ios-dateformatting)");
break;
case LinphoneDateChatList:
if (sameDay) {
@@ -430,7 +430,7 @@ void linphone_iphone_log_handler(int lev, const char *fmt, va_list args) {
@implementation ContactDisplay
-+ (void)setDisplayNameLabel:(UILabel *)label forContact:(const LinphoneFriend *)contact {
++ (void)setDisplayNameLabel:(UILabel *)label forContact:(ABRecordRef)contact {
label.text = [FastAddressBook displayNameForContact:contact];
#if 0
NSString *lLastName = CFBridgingRelease(ABRecordCopyValue(contact, kABPersonLastNameProperty));