Some code cleanup and bug fixes.

Author: GetToSet

.idea/runConfigurations/BookCore.xml

@@ -7,7 +7,7 @@ whitelist_rules:
   - fatal_error_message
 #  - force_cast
   - force_try
-  - force_unwrapping
+#  - force_unwrapping
 #  - implicitly_unwrapped_optional
   - legacy_cggeometry_functions
   - legacy_constant
@@ -31,7 +31,7 @@ excluded:
 colon:
   apply_to_dictionaries: false
 
-indentation: 2
+indentation: 4
 
 custom_rules:
   no_objcMembers:

.idea/runConfigurations/LiveViewTestApp.xml

@@ -16,22 +16,22 @@ assessmentHelper.assessmentShowOnce({ true }, pass: nil)
 /*:
 # Art of ASCII — Introduction to Digital Image Processing
 
-## What is an ASCII Art?
+## ASCII Arts?
 
 **ASCII (American Standard Code for Information Interchange)** is a standard for electronic communication, which
-contains 128 characters.
+contains 128 characters including letters, numbers and some control characters.
 
 **ASCII arts** are artworks created with ASCII characters, which can be seen in many places where only textual data can
-be transmitted, for example, within a terminal.
+be transmitted, for example, within a computer terminal.
 
 * Experiment:
-    Head to the panel beside, and *tap the **run** button*, have fun experiencing the ASCII effects I've created.
+    *Tap the **run** button* on the side panel. Have fun experiencing ASCII effects I've created.
 
-## What We'll Learn by Generating ASCII Arts?
+## What Will We Learn by Generating ASCII Arts?
 
-Examining how to generate ASCII Arts is a great way to explore the world of image processing. You'll be introduced with
-**the RGB color model**, **histograms and equalization techniques** with piratical experiments, which can be a fun and
-delightful.
+Examining how to generate ASCII Arts is a great way to explore image processing. You'll be introduced with
+**the RGB color model, histograms and equalization techniques** with some piratical experiments, which are fun to play
+with.
 
 [Let's get started! 🏃‍♂️](@next)
 */

.swiftlint.yml

@@ -8,7 +8,6 @@ import UIKit
 import PlaygroundSupport
 
 import BookCore
-import BookAPI
 
 PlaygroundPage.current.needsIndefiniteExecution = true
 

ArtOfAscii.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@ import UIKit
 import PlaygroundSupport
 
 import BookCore
-import BookAPI
 
 PlaygroundPage.current.needsIndefiniteExecution = true
 

ArtOfAscii/Chapters/01-ArtOfAscii.playgroundchapter/Pages/01-Introduction.playgroundpage/main.swift

@@ -8,7 +8,6 @@ import UIKit
 import PlaygroundSupport
 
 import BookCore
-import BookAPI
 
 PlaygroundPage.current.needsIndefiniteExecution = true
 

ArtOfAscii/Chapters/01-ArtOfAscii.playgroundchapter/Pages/02-HowImagesComposed.playgroundpage/main.swift

@@ -26,7 +26,7 @@
 		<string>BookAPI</string>
 	</array>
 	<key>UserModuleMode</key>
-	<string>Full</string>
+	<string>Disabled</string>
 	<key>ImageReference</key>
 	<string>cover.png</string>
 	<key>SupportsDarkMode</key>

ArtOfAscii/Chapters/01-ArtOfAscii.playgroundchapter/Pages/03-GrayscaleHistogramEqualization.playgroundpage/main.swift

@@ -17,10 +17,7 @@ public class AssessmentHelper {
     }
 
     public func assessmentShowOnce(_ assessmentFunc: AssessmentFunc, pass passMessage: String?) {
-        guard !assessmentStatusShown else {
-            return
-        }
-        if assessmentFunc() == true {
+        if !assessmentStatusShown && assessmentFunc() == true {
             assessmentStatusShown = true
             PlaygroundPage.current.assessmentStatus = .pass(message: passMessage)
         }

ArtOfAscii/Chapters/01-ArtOfAscii.playgroundchapter/Pages/04-Asciification.playgroundpage/main.swift

@@ -6,25 +6,25 @@
 import Foundation
 import CoreText
 
-public struct FontResourceName {
+public struct FontFile {
     let name: String
     let extensionName: String
 }
 
-public protocol Font {
+public protocol FontResource {
 
-    static var resourceNames: [FontResourceName] { get }
+    static var resourceFiles: [FontFile] { get }
     static var characterAspectRatio: Double { get }
 
     static func register()
 
 }
 
-public extension Font {
+public extension FontResource {
 
     static func register() {
-        for resourceName in resourceNames {
-            if let fontURL = Bundle.main.url(forResource: resourceName.name, withExtension: resourceName.extensionName) {
+        for fontFile in resourceFiles {
+            if let fontURL = Bundle.main.url(forResource: fontFile.name, withExtension: fontFile.extensionName) {
                 CTFontManagerRegisterFontsForURL(fontURL as CFURL, CTFontManagerScope.process, nil)
             }
         }
@@ -34,53 +34,43 @@ public extension Font {
 
 public class FontResourceProvider {
 
-    public enum FiraCode: String, Font {
+    public enum FiraCode: String, FontResource {
 
         case light = "FiraCode-Light"
         case retina = "FiraCode-Light_Retina"
         case bold = "FiraCode-Light_Bold"
         case medium = "FiraCode-Light_Medium"
         case regular = "FiraCode-Light_Regular"
 
-        public static var resourceNames: [FontResourceName] {
-            return [FontResourceName(name: "FiraCode-VF", extensionName: "ttf")]
-        }
+        public static var resourceFiles = [
+            FontFile(name: "FiraCode-VF", extensionName: "ttf")
+        ]
 
-        public static var characterAspectRatio: Double {
-            return 0.6
-        }
+        public static var characterAspectRatio = 0.6
 
     }
 
-    public enum CourierPrime: String, Font {
+    public enum CourierPrime: String, FontResource {
 
         case regular = "CourierPrime"
         case bold = "CourierPrime-Bold"
 
-        public static var resourceNames: [FontResourceName] {
-            return [
-                FontResourceName(name: "Courier Prime", extensionName: "ttf"),
-                FontResourceName(name: "Courier Prime Bold", extensionName: "ttf")
-            ]
-        }
+        public static var resourceFiles = [
+            FontFile(name: "Courier Prime", extensionName: "ttf"),
+            FontFile(name: "Courier Prime Bold", extensionName: "ttf")
+        ]
 
-        public static var characterAspectRatio: Double {
-            return 0.6
-        }
+        public static var characterAspectRatio = 0.6
 
     }
 
-    public enum Unscii16: String, Font {
-
-        public static var resourceNames: [FontResourceName] {
-            return [FontResourceName(name: "unscii-16", extensionName: "ttf")]
-        }
+    public enum Unscii16: String, FontResource {
 
         case regular = "unscii-16"
 
-        public static var characterAspectRatio: Double {
-            return 0.5
-        }
+        public static var resourceFiles = [FontFile(name: "unscii-16", extensionName: "ttf")]
+
+        public static var characterAspectRatio = 0.5
 
     }
 

ArtOfAscii/Manifest.plist

@@ -0,0 +1,18 @@
+//
+// Copyright © 2020 Bunny Wong
+// Created on 2020/2/11.
+//
+
+import UIKit
+
+extension UIColor {
+
+    struct States {
+
+        static let highlight = UIColor(red: 0.13, green: 0.53, blue: 1.00, alpha: 1.0)
+        static let success = UIColor(red: 0.20, green: 0.82, blue: 0.35, alpha: 1.0)
+        static var error = UIColor(red: 0.92, green: 0.29, blue: 0.35, alpha: 1.0)
+
+    }
+
+}

ArtOfAscii/Modules/BookAPI.playgroundmodule/Sources/AssessmentHelper.swift

@@ -36,7 +36,7 @@ public class HowImagesComposedViewController: BaseViewController {
     }
 
     private func requestImageFiltering() {
-        guard let sourceImage = self.sourceImage else {
+        guard let sourceImage = sourceImage else {
             return
         }
         let payload = EventMessage.rgbFilterRequest(
@@ -49,7 +49,7 @@ public class HowImagesComposedViewController: BaseViewController {
     }
 
     private func updateMagnificationCenter(centerInImageView: CGPoint) {
-        if let centerInImage = self.showcaseImageView.pointInImageFor(point: centerInImageView) {
+        if let centerInImage = showcaseImageView.pointInImageFor(point: centerInImageView) {
             magnifierContainerView.magnificationCenter = centerInImage
         }
     }
@@ -104,7 +104,7 @@ public class HowImagesComposedViewController: BaseViewController {
 extension HowImagesComposedViewController: MagnifierContainerViewDelegate {
 
     func magnifierCenterPositionChanged(point: CGPoint, containerView: MagnifierContainerView) {
-        let centerInImageView = self.showcaseImageView.convert(point, from: containerView)
+        let centerInImageView = showcaseImageView.convert(point, from: containerView)
         updateMagnificationCenter(centerInImageView: centerInImageView)
     }
 

ArtOfAscii/Modules/BookAPI.playgroundmodule/Sources/BookAPI.swift

@@ -71,7 +71,7 @@ class MagnifierContainerView: UIView {
 
 }
 
-protocol MagnifierContainerViewDelegate: AnyObject {
+@objc protocol MagnifierContainerViewDelegate: AnyObject {
 
     func magnifierCenterPositionChanged(point: CGPoint, containerView: MagnifierContainerView)
 

ArtOfAscii/Modules/BookCore.playgroundmodule/Sources/Core/FontResourceProvider.swift

@@ -9,7 +9,7 @@ class HistogramToolBarButtonView: ToolBarButtonView {
 
     var isRgbMode: Bool = false {
         didSet {
-            updateAppearance()
+            updateAppearanceForState()
         }
     }
 
@@ -35,8 +35,8 @@ class HistogramToolBarButtonView: ToolBarButtonView {
         self.delegate?.toolBarButtonTapped(buttonView: self)
     }
 
-    override func updateAppearance() {
-        super.updateAppearance()
+    override func updateAppearanceForState() {
+        super.updateAppearanceForState()
         if isRgbMode {
             self.button.setImage(UIImage(named: "toolbar/button-histogram-rgb"), for: .normal)
         } else {