Merge pull request #137 from fassko/develop

Add HTMLString pod
fassko · Feb 24, 2019 · e2e55f2 · e2e55f2
2 parents 706bde7 + ff0cbe7
commit e2e55f2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 383 deletions.
diff --git a/Dodies.lv.xcodeproj/project.pbxproj b/Dodies.lv.xcodeproj/project.pbxproj
@@ -493,6 +493,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Dodies.lv/Pods-Dodies.lv-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
+				"${BUILT_PRODUCTS_DIR}/HTMLString/HTMLString.framework",
 				"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
 				"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
 				"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
@@ -505,6 +506,7 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HTMLString.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",

diff --git a/Dodies.lv/DetailsViewController.swift b/Dodies.lv/DetailsViewController.swift
@@ -9,12 +9,11 @@
 import Foundation
 import UIKit
 
-//import Fabric
-//import Crashlytics
 import Kingfisher
 import Localize_Swift
 import Lightbox
 import SafariServices
+import HTMLString
 
 class DetailsViewController: UIViewController, Storyboarded {
 
@@ -39,7 +38,7 @@ class DetailsViewController: UIViewController, Storyboarded {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    title = point.name
+    title = point.name.removingHTMLEntities
 
     checkedTitle.text = "Checked".localized()
     lengthTitle.text = "Length".localized()
@@ -50,7 +49,7 @@ class DetailsViewController: UIViewController, Storyboarded {
     navigationItem.titleView = titleLabel
 
     desc.isScrollEnabled = false
-    desc.text = dodiesPointDetails.description.decodingHTMLEntities()
+    desc.text = dodiesPointDetails.description.removingHTMLEntities
 
     desc.sizeToFit()
     desc.layoutIfNeeded()