felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 13:46:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Room details: use italic font for state events

Browse Source
This commit is contained in:
giomfo
2014-12-02 16:48:26 +01:00
parent b1d98a83d0
commit 390edac9d5
4 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/Model/RoomMessage.m
+2 -30
View File
@@ -29,7 +29,6 @@ static NSAttributedString *messageSeparator = nil;
}
+ (NSAttributedString *)messageSeparator;
+ (NSDictionary *)stringAttributesForComponentStatus:(RoomMessageComponentStatus)status;
@end
@@ -245,7 +244,7 @@ static NSAttributedString *messageSeparator = nil;
if (!currentAttributedTextMsg && messageComponents.count) {
// Create attributed string
for (RoomMessageComponent* msgComponent in messageComponents) {
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:msgComponent.textMessage attributes:[RoomMessage stringAttributesForComponentStatus:msgComponent.status]];
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:msgComponent.textMessage attributes:[msgComponent stringAttributes]];
if (!currentAttributedTextMsg) {
currentAttributedTextMsg = [[NSMutableAttributedString alloc] initWithAttributedString:attributedString];
} else {
@@ -272,7 +271,7 @@ static NSAttributedString *messageSeparator = nil;
if (_messageType != RoomMessageTypeText) {
if (messageComponents.count) {
RoomMessageComponent *msgComponent = [messageComponents firstObject];
return (msgComponent.status == RoomMessageComponentStatusInProgress);
return (msgComponent.style == RoomMessageComponentStyleInProgress);
}
}
return NO;
@@ -290,31 +289,4 @@ static NSAttributedString *messageSeparator = nil;
return messageSeparator;
}
+ (NSDictionary*)stringAttributesForComponentStatus:(RoomMessageComponentStatus)status {
UIColor *textColor;
switch (status) {
case RoomMessageComponentStatusNormal:
textColor = [UIColor blackColor];
break;
case RoomMessageComponentStatusHighlighted:
textColor = [UIColor blueColor];
break;
case RoomMessageComponentStatusInProgress:
textColor = [UIColor lightGrayColor];
break;
case RoomMessageComponentStatusFailed:
case RoomMessageComponentStatusUnsupported:
textColor = [UIColor redColor];
break;
default:
textColor = [UIColor blackColor];
break;
}
return @{
NSForegroundColorAttributeName : textColor,
NSFontAttributeName: [UIFont systemFontOfSize:14]
};
}
@end