From c6047b72b4ae65eeb9069e99eba8e7469db467ee Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 30 Oct 2017 12:43:39 -0400 Subject: [PATCH] Respond to CR. // FREEBIE --- Signal/src/util/DisplayableText.swift | 50 --------------------------- 1 file changed, 50 deletions(-) diff --git a/Signal/src/util/DisplayableText.swift b/Signal/src/util/DisplayableText.swift index 851a9c815..9cfbd11c9 100644 --- a/Signal/src/util/DisplayableText.swift +++ b/Signal/src/util/DisplayableText.swift @@ -228,56 +228,6 @@ extension String { && !$0.isZeroWidthJoiner }) } - - // The next tricks are mostly to demonstrate how tricky it can be to determine emoji's - // If anyone has suggestions how to improve this, please let me know - var emojiString: String { - - return emojiScalars.map { String($0) }.reduce("", +) - } - - var emojis: [String] { - - var scalars: [[UnicodeScalar]] = [] - var currentScalarSet: [UnicodeScalar] = [] - var previousScalar: UnicodeScalar? - - for scalar in emojiScalars { - - if let prev = previousScalar, !prev.isZeroWidthJoiner && !scalar.isZeroWidthJoiner { - - scalars.append(currentScalarSet) - currentScalarSet = [] - } - currentScalarSet.append(scalar) - - previousScalar = scalar - } - - scalars.append(currentScalarSet) - - return scalars.map { $0.map { String($0) } .reduce("", +) } - } - - fileprivate var emojiScalars: [UnicodeScalar] { - - var chars: [UnicodeScalar] = [] - var previous: UnicodeScalar? - for cur in unicodeScalars { - - if let previous = previous, previous.isZeroWidthJoiner && cur.isEmoji { - chars.append(previous) - chars.append(cur) - - } else if cur.isEmoji { - chars.append(cur) - } - - previous = cur - } - - return chars - } } @objc class DisplayableText: NSObject {