diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 93deb1815..e7ceca8a3 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -71,6 +71,9 @@
5E31290C20D7A37E00CF3AAE /* latestChatroomsWidget.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 5E31290020D7A37E00CF3AAE /* latestChatroomsWidget.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
5E31291320D7AAA100CF3AAE /* avatar.png in Resources */ = {isa = PBXBuildFile; fileRef = 633FEBE61D3CD5570014B822 /* avatar.png */; };
5E31291A20D7AAAD00CF3AAE /* chat_group_avatar.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C2A81941F87B8000012A66B /* chat_group_avatar.png */; };
+ 5E32944520E4C29000BBA896 /* chat_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523AC1E8266CC0037A187 /* chat_delivered.png */; };
+ 5E32944C20E4C29300BBA896 /* chat_error.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523AD1E8266CC0037A187 /* chat_error.png */; };
+ 5E32944D20E4C29700BBA896 /* chat_read.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523AE1E8266CC0037A187 /* chat_read.png */; };
5E3391EC20E387E000F66299 /* color_A.png in Resources */ = {isa = PBXBuildFile; fileRef = 633FEC701D3CD5570014B822 /* color_A.png */; };
5E3391F320E387E700F66299 /* color_D.png in Resources */ = {isa = PBXBuildFile; fileRef = 633FEC721D3CD5570014B822 /* color_D.png */; };
5E58962420DCE5700030868C /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C73477B1D9BA3A00022EE8C /* UserNotifications.framework */; };
@@ -4211,6 +4214,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 5E32944C20E4C29300BBA896 /* chat_error.png in Resources */,
+ 5E32944D20E4C29700BBA896 /* chat_read.png in Resources */,
+ 5E32944520E4C29000BBA896 /* chat_delivered.png in Resources */,
5E3391F320E387E700F66299 /* color_D.png in Resources */,
5E58962D20DCE5700030868C /* MainInterface.storyboard in Resources */,
5E3391EC20E387E000F66299 /* color_A.png in Resources */,
diff --git a/richNotifications/Base.lproj/MainInterface.storyboard b/richNotifications/Base.lproj/MainInterface.storyboard
index de6f3da83..3ad8ffb45 100644
--- a/richNotifications/Base.lproj/MainInterface.storyboard
+++ b/richNotifications/Base.lproj/MainInterface.storyboard
@@ -26,10 +26,10 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
@@ -82,13 +96,13 @@
-
+
-
+
@@ -97,6 +111,7 @@
+
diff --git a/richNotifications/NotificationTableViewCell.h b/richNotifications/NotificationTableViewCell.h
index 534c10f0c..58fb529cb 100644
--- a/richNotifications/NotificationTableViewCell.h
+++ b/richNotifications/NotificationTableViewCell.h
@@ -14,6 +14,7 @@
@property (weak, nonatomic) IBOutlet UILabel *imdm;
@property (weak, nonatomic) IBOutlet UIImageView *background;
@property (weak, nonatomic) IBOutlet UIImageView *bottomBarColor;
+@property (weak, nonatomic) IBOutlet UIImageView *imdmImage;
@property BOOL isOutgoing;
@property float width;
@property float height;
diff --git a/richNotifications/NotificationViewController.m b/richNotifications/NotificationViewController.m
index 9ba2fa616..19d4e0075 100644
--- a/richNotifications/NotificationViewController.m
+++ b/richNotifications/NotificationViewController.m
@@ -37,6 +37,9 @@
animated:YES];
NSLog(@"Content length : %f", self.tableView.contentSize.height);
NSLog(@"Number of rows : %d", (unsigned int)[self tableView:self.tableView numberOfRowsInSection:0]);
+ [self.view.superview bringSubviewToFront:self.tableView];
+ self.tableView.bounds = CGRectMake(self.tableView.bounds.origin.x, self.tableView.bounds.origin.y, self.tableView.contentSize.width, self.tableView.contentSize.height);
+ NSLog(@"View length : %f", self.tableView.bounds.size.height);
}
#pragma mark - UITableViewDataSource Functions
@@ -69,14 +72,18 @@
cell.height = ((NSNumber *)[msgs[indexPath.row] objectForKey:@"height"]).floatValue;
cell.nameDate.textColor = [UIColor colorWithPatternImage:cell.background.image];
cell.msgText.textColor = [UIColor darkGrayColor];
- if (!isOutgoing)
+ if (!isOutgoing) {
cell.imdm.hidden = YES;
+ cell.imdmImage.hidden = YES;
+ }
if ([imdm isEqualToString:@"LinphoneChatMessageStateDelivered"]) {
cell.imdm.text = NSLocalizedString(@"Delivered", nil);
cell.imdm.textColor = [UIColor grayColor];
+ cell.imdmImage.image = [UIImage imageNamed:@"chat_delivered.png"];
} else if ([imdm isEqualToString:@"LinphoneChatMessageStateDisplayed"]) {
cell.imdm.text = NSLocalizedString(@"Read", nil);
cell.imdm.textColor = [UIColor colorWithRed:(24 / 255.0) green:(167 / 255.0) blue:(175 / 255.0) alpha:1.0];
+ cell.imdmImage.image = [UIImage imageNamed:@"chat_read.png"];
} else
cell.imdm.text = imdm;
printf("Taille label : %f\n", cell.nameDate.font.pointSize);