summaryrefslogtreecommitdiff
path: root/Juick
diff options
context:
space:
mode:
Diffstat (limited to 'Juick')
-rw-r--r--Juick/Model/Entity.h19
-rw-r--r--Juick/Model/Entity.m13
-rw-r--r--Juick/Model/Message.h2
-rw-r--r--Juick/Model/Message.m1
-rw-r--r--Juick/Supporting Files/Juick-Info.plist2
-rw-r--r--Juick/Views/MessageCell.m43
6 files changed, 78 insertions, 2 deletions
diff --git a/Juick/Model/Entity.h b/Juick/Model/Entity.h
new file mode 100644
index 0000000..13142f1
--- /dev/null
+++ b/Juick/Model/Entity.h
@@ -0,0 +1,19 @@
+//
+// Entity.h
+// Juick
+//
+// Created by Vitaly Takmazov on 12/11/2018.
+// Copyright © 2018 com.juick. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Entity : NSObject
+
+@property NSString *type;
+@property NSString *text;
+@property NSString *link;
+@property NSNumber *start;
+@property NSNumber *end;
+
+@end
diff --git a/Juick/Model/Entity.m b/Juick/Model/Entity.m
new file mode 100644
index 0000000..ac53a1f
--- /dev/null
+++ b/Juick/Model/Entity.m
@@ -0,0 +1,13 @@
+//
+// Entity.m
+// Juick
+//
+// Created by Vitaly Takmazov on 12/11/2018.
+// Copyright © 2018 com.juick. All rights reserved.
+//
+
+#import "Entity.h"
+
+@implementation Entity
+
+@end
diff --git a/Juick/Model/Message.h b/Juick/Model/Message.h
index 5eab279..45b14fa 100644
--- a/Juick/Model/Message.h
+++ b/Juick/Model/Message.h
@@ -9,6 +9,7 @@
#import <Foundation/Foundation.h>
#import "User.h"
#import "Attachment.h"
+#import "Entity.h"
@interface Message : NSObject
@@ -17,6 +18,7 @@
@property User *user;
@property NSString *text;
@property NSArray<NSString *> *tags;
+@property NSArray<Entity *> *entities;
@property NSString *timestamp;
@property NSString *attach;
@property NSString *repliesBy;
diff --git a/Juick/Model/Message.m b/Juick/Model/Message.m
index d4d6a88..2a4090a 100644
--- a/Juick/Model/Message.m
+++ b/Juick/Model/Message.m
@@ -15,6 +15,7 @@
return @{@"text" : @"body",
@"mid" : @"mid",
@"rid" : @"rid",
+ @"entities": @"entities",
@"attach" : @"photo.small",
@"repliesCount": @"replies",
@"repliesBy": @"repliesby"};
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index 2e2031f..75e1360 100644
--- a/Juick/Supporting Files/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>80</string>
+ <string>81</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 851e097..99fb296 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -9,6 +9,7 @@
#import "MessageCell.h"
#import "ColorScheme.h"
#import "APIClient.h"
+#import "Entity.h"
@implementation MessageCell
@@ -70,7 +71,47 @@
} else {
self.summary.text = nil;
}
- self.text.text = [msg.text stringByDecodingHTMLEntities];
+ self.text.attributedText = nil;
+ if (msg.text) {
+ NSMutableAttributedString *txt = [[NSMutableAttributedString alloc] initWithString:[msg.text stringByDecodingHTMLEntities] attributes:@{NSFontAttributeName:[UIFont preferredFontForTextStyle:UIFontTextStyleBody]}];
+ [txt beginEditing];
+ for (NSDictionary *entity in msg.entities) {
+ NSUInteger start = [[entity objectForKey:@"start"] unsignedIntegerValue];
+ NSUInteger end = [[entity objectForKey:@"end"] unsignedIntegerValue];
+ NSRange currentRange = NSMakeRange(start, end - start);
+ [txt addAttribute:@"displayText" value:[entity objectForKey:@"text"] range:currentRange];
+ if ([[entity objectForKey:@"type"] isEqualToString:@"a"]) {
+ [txt addAttribute:NSLinkAttributeName value:[entity objectForKey:@"url"] range:currentRange];
+ }
+ if ([[entity objectForKey:@"type"] isEqualToString:@"q"]) {
+ [txt addAttribute:NSForegroundColorAttributeName value:[UIColor darkGrayColor] range:currentRange];
+ }
+ if ([[entity objectForKey:@"type"] isEqualToString:@"u"]) {
+ [txt addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:currentRange];
+ }
+ UIFontDescriptor* fontDescriptor = [UIFontDescriptor
+ preferredFontDescriptorWithTextStyle:UIFontTextStyleBody];
+ if ([[entity objectForKey:@"type"] isEqualToString:@"b"]) {
+ UIFontDescriptor* boldFontDescriptor = [fontDescriptor
+ fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitBold];
+ UIFont* boldFont = [UIFont fontWithDescriptor:boldFontDescriptor size: 0.0];
+ [txt addAttribute:NSFontAttributeName value:boldFont range:currentRange];
+ }
+ if ([[entity objectForKey:@"type"] isEqualToString:@"i"]) {
+ UIFontDescriptor* italicFontDescriptor = [fontDescriptor
+ fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitItalic];
+ UIFont* italicFont = [UIFont fontWithDescriptor:italicFontDescriptor size: 0.0];
+ [txt addAttribute:NSFontAttributeName value:italicFont range:currentRange];
+ }
+ }
+ [txt enumerateAttribute:@"displayText" inRange:NSMakeRange(0, [txt length]) options:0 usingBlock:^(id _Nullable value, NSRange range, BOOL * _Nonnull stop) {
+ if (value) {
+ [txt replaceCharactersInRange:range withString:value];
+ }
+ }];
+ [txt endEditing];
+ self.text.attributedText = txt;
+ }
[self.tags removeAllTags];
if ([msg.tags count] > 0) {
[msg.tags enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {