From ba57dc1653198566cad10a4cc43126e330c8a617 Mon Sep 17 00:00:00 2001 From: giomfo Date: Wed, 16 Dec 2015 17:08:53 +0100 Subject: [PATCH] Messages screen: Update recents display. Apply Ribot design on recents cell --- Vector/Utils/VectorDesignValues.h | 12 ++- .../RoomList/InviteRecentTableViewCell.m | 3 - .../RoomList/InviteRecentTableViewCell.xib | 76 +++++++------------ Vector/Views/RoomList/RecentTableViewCell.m | 18 +++-- Vector/Views/RoomList/RecentTableViewCell.xib | 56 +++++++------- 5 files changed, 75 insertions(+), 90 deletions(-) diff --git a/Vector/Utils/VectorDesignValues.h b/Vector/Utils/VectorDesignValues.h index c61b22c59..c19cd8d7c 100644 --- a/Vector/Utils/VectorDesignValues.h +++ b/Vector/Utils/VectorDesignValues.h @@ -14,14 +14,20 @@ limitations under the License. */ -// the green text color +#pragma mark - Vector Colors + #define VECTOR_GREEN_COLOR [UIColor colorWithRed:(98.0/256.0) green:(206.0/256.0) blue:(156.0/256.0) alpha:1.0] +#define VECTOR_LIGHT_GRAY_COLOR [UIColor colorWithRed:(242.0 / 256.0) green:(242.0 / 256.0) blue:(242.0 / 256.0) alpha:1.0] + +#define VECTOR_SILVER_COLOR [UIColor colorWithRed:(199.0 / 256.0) green:(199.0 / 256.0) blue:(204.0 / 256.0) alpha:1.0] + + +#pragma mark - Vector Text Colors + #define VECTOR_TEXT_BLACK_COLOR [UIColor colorWithRed:(60.0 / 256.0) green:(60.0 / 256.0) blue:(60.0 / 256.0) alpha:1.0] #define VECTOR_TEXT_GRAY_COLOR [UIColor colorWithRed:(157.0 / 256.0) green:(157.0 / 256.0) blue:(157.0 / 256.0) alpha:1.0] -#define VECTOR_LIGHT_GRAY_COLOR [UIColor colorWithRed:(242.0 / 256.0) green:(242.0 / 256.0) blue:(242.0 / 256.0) alpha:1.0] - // to update the navigation bar buttons color // [[AppDelegate theDelegate] recentsNavigationController].navigationBar.tintColor = [UIColor greenColor]; diff --git a/Vector/Views/RoomList/InviteRecentTableViewCell.m b/Vector/Views/RoomList/InviteRecentTableViewCell.m index 4c0d1a04c..717f0d8c7 100644 --- a/Vector/Views/RoomList/InviteRecentTableViewCell.m +++ b/Vector/Views/RoomList/InviteRecentTableViewCell.m @@ -68,9 +68,6 @@ - (void)render:(MXKCellData *)cellData { [super render:cellData]; - - // the date is not displayed in the invitation cells. - self.lastEventDate.hidden = YES; } + (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth diff --git a/Vector/Views/RoomList/InviteRecentTableViewCell.xib b/Vector/Views/RoomList/InviteRecentTableViewCell.xib index 602951b26..b34ae499f 100644 --- a/Vector/Views/RoomList/InviteRecentTableViewCell.xib +++ b/Vector/Views/RoomList/InviteRecentTableViewCell.xib @@ -1,8 +1,8 @@ - + - + @@ -15,53 +15,40 @@ - - + - - + + -