Feat UIKit Toast

.swiftformat

@@ -30,4 +30,4 @@
 --wraparguments before-first
 --wrapcollections before-first
 
---exclude Sources/Charcoal/Generated
+--exclude Sources/CharcoalShared/Generated

CharcoalUIKitSample/Sources/CharcoalUIKitSample/ContentViewController.swift

@@ -50,6 +50,7 @@ public final class ContentViewController: UIViewController {
         case typographies = "Typographies"
         case icons = "Icons"
         case tooltips = "Tooltips"
+        case toasts = "Toasts"
         case spinners = "Spinners"
 
         var viewController: UIViewController {
@@ -68,6 +69,8 @@ public final class ContentViewController: UIViewController {
                 return TextFieldsViewController()
             case .tooltips:
                 return TooltipsViewController()
+            case .toasts:
+                return ToastsViewController()
             case .spinners:
                 return SpinnersViewController()
             }

CharcoalUIKitSample/Sources/CharcoalUIKitSample/Media.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CharcoalUIKitSample/Sources/CharcoalUIKitSample/Media.xcassets/SnackbarDemo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "charcoal-logo.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CharcoalUIKitSample/Sources/CharcoalUIKitSample/Views/Buttons/Buttons.swift

@@ -19,6 +19,8 @@ final class ButtonsViewController: UIViewController {
         return view
     }()
 
+    let cellReuseIdentifier = "cell"
+
     private var buttons: [ButtonExample] = [
         // Primary
         ButtonExample(title: "Primary Button M", buttonStyle: CharcoalPrimaryMButton.self, isEnabled: true),

CharcoalUIKitSample/Sources/CharcoalUIKitSample/Views/Toasts/Toasts.swift

@@ -0,0 +1,177 @@
+import Charcoal
+import UIKit
+
+enum SnackbarTitles: String, CaseIterable {
+    case normal = "Normal"
+    case withAction = "with Action"
+    case withActionAndThumbnail = "with Action and Thumbnail"
+
+    var text: String {
+        return "ブックマークしました"
+    }
+
+    func configCell(cell: UITableViewCell) {
+        cell.textLabel!.text = "SnackBar"
+        cell.detailTextLabel?.text = rawValue
+    }
+}
+
+enum ToastsTitles: String, CaseIterable {
+    case top = "Top"
+    case bottom = "Bottom"
+    case multiline = "Multiline"
+
+    var text: String {
+        switch self {
+        case .top:
+            return "Hello World"
+        case .bottom:
+            return "Hello World This is a tooltip with mutiple line"
+        case .multiline:
+            return "こんにちは This is a tooltip and here is testing it's multiple line feature"
+        }
+    }
+
+    func configCell(cell: UITableViewCell) {
+        cell.textLabel!.text = rawValue
+    }
+}
+
+public final class ToastsViewController: UIViewController {
+    private lazy var tableView: UITableView = {
+        let view = UITableView(frame: .zero, style: .insetGrouped)
+        view.translatesAutoresizingMaskIntoConstraints = false
+        return view
+    }()
+
+    let cellReuseIdentifier = "cell"
+
+    private enum Sections: Int, CaseIterable {
+        case toasts
+        case snackbars
+
+        var title: String {
+            switch self {
+            case .toasts:
+                return "Toasts"
+            case .snackbars:
+                return "Snackbars"
+            }
+        }
+
+        var items: [any CaseIterable] {
+            switch self {
+            case .toasts:
+                return ToastsTitles.allCases
+            case .snackbars:
+                return SnackbarTitles.allCases
+            }
+        }
+    }
+
+    override public func viewDidLoad() {
+        super.viewDidLoad()
+        setupNavigationBar()
+        setupUI()
+    }
+
+    private func setupNavigationBar() {
+        navigationItem.title = "Charcoal"
+    }
+
+    private func setupUI() {
+        view.addSubview(tableView)
+
+        NSLayoutConstraint.activate([
+            tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            tableView.topAnchor.constraint(equalTo: view.topAnchor),
+            tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+
+        tableView.dataSource = self
+        tableView.delegate = self
+    }
+}
+
+extension ToastsViewController: UITableViewDelegate, UITableViewDataSource {
+    public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let section = Sections.allCases[indexPath.section]
+
+        let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseIdentifier) as UITableViewCell? ?? UITableViewCell(style: .subtitle, reuseIdentifier: cellReuseIdentifier)
+
+        switch section {
+        case .toasts:
+            let titleCase = ToastsTitles.allCases[indexPath.row]
+            titleCase.configCell(cell: cell)
+            return cell
+        case .snackbars:
+            let titleCase = SnackbarTitles.allCases[indexPath.row]
+            titleCase.configCell(cell: cell)
+            return cell
+        }
+    }
+
+    public func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return Sections.allCases[section].items.count
+    }
+
+    public func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+
+        let section = Sections.allCases[indexPath.section]
+
+        switch section {
+        case .toasts:
+            let titleCase = ToastsTitles.allCases[indexPath.row]
+
+            var toastID: CharcoalIdentifiableOverlayView.IDValue
+            switch titleCase {
+            case .top:
+                toastID = CharcoalToast.show(text: titleCase.text, screenEdge: .top)
+            case .bottom:
+                toastID = CharcoalToast.show(text: titleCase.text, appearance: .error, screenEdge: .bottom)
+            case .multiline:
+                toastID = CharcoalToast.show(text: titleCase.text, screenEdge: .bottom)
+            }
+
+            DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+                CharcoalToast.dismiss(id: toastID)
+            }
+        case .snackbars:
+            let titleCase = SnackbarTitles.allCases[indexPath.row]
+
+            var toastID: CharcoalIdentifiableOverlayView.IDValue
+            switch titleCase {
+            case .normal:
+                toastID = CharcoalSnackBar.show(text: titleCase.text, screenEdge: .top)
+            case .withAction:
+                toastID = CharcoalSnackBar.show(text: titleCase.text, screenEdge: .bottom, action: CharcoalAction(title: "編集", actionCallback: {
+                    print("Tapped 編集")
+                }))
+            case .withActionAndThumbnail:
+                toastID = CharcoalSnackBar.show(text: titleCase.text, thumbnailImage: UIImage(named: "SnackbarDemo", in: Bundle.module, with: nil), screenEdge: .bottom, action: CharcoalAction(title: "編集", actionCallback: {
+                    print("Tapped 編集")
+                }))
+            }
+
+            DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+                CharcoalSnackBar.dismiss(id: toastID)
+            }
+        }
+    }
+
+    public func numberOfSections(in tableView: UITableView) -> Int {
+        return Sections.allCases.count
+    }
+
+    public func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        return Sections.allCases[section].title
+    }
+}
+
+@available(iOS 17.0, *)
+#Preview {
+    let viewController = ToastsViewController()
+    return viewController
+}

Examples/SwiftUISample/SwiftUISample.xcodeproj/project.pbxproj

@@ -81,7 +81,7 @@
 				24651B2727043658005AD842 /* Sources */,
 				24651B2827043658005AD842 /* Frameworks */,
 				24651B2927043658005AD842 /* Resources */,
-				242CCCD62771748B00897251 /* SwiftLint */,
+				9F0036972C0A0399003BE2C2 /* SwiftLint */,
 			);
 			buildRules = (
 			);
@@ -141,7 +141,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		242CCCD62771748B00897251 /* SwiftLint */ = {
+		9F0036972C0A0399003BE2C2 /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

Sources/CharcoalShared/Enums/CharcoalPopupViewEdge.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+public enum CharcoalPopupViewEdge {
+    case top
+    case bottom
+
+    public var direction: CGFloat {
+        switch self {
+        case .top:
+            return 1
+        case .bottom:
+            return -1
+        }
+    }
+}

Sources/CharcoalShared/Enums/CharcoalToastAppearance.swift

@@ -0,0 +1,13 @@
+public enum CharcoalToastAppearance {
+    case success
+    case error
+
+    public var background: ColorAsset.Color {
+        switch self {
+        case .success:
+            return CharcoalAsset.ColorPaletteGenerated.success.color
+        case .error:
+            return CharcoalAsset.ColorPaletteGenerated.assertive.color
+        }
+    }
+}

Sources/CharcoalShared/Extensions/UIColor+Extension.swift

@@ -0,0 +1,11 @@
+import UIKit
+
+public extension UIColor {
+    func imageWithColor(width: Int, height: Int) -> UIImage {
+        let size = CGSize(width: width, height: height)
+        return UIGraphicsImageRenderer(size: size).image { rendererContext in
+            self.setFill()
+            rendererContext.fill(CGRect(origin: .zero, size: size))
+        }
+    }
+}

Sources/CharcoalSwiftUI/Components/Overlay/CharcoalPopupProtocol.swift

@@ -2,10 +2,7 @@ import SwiftUI
 
 typealias CharcoalPopupProtocol = Equatable & Identifiable & View
 
-public enum CharcoalPopupViewEdge {
-    case top
-    case bottom
-
+extension CharcoalPopupViewEdge {
     var alignment: Alignment {
         switch self {
         case .top:

Sources/CharcoalSwiftUI/Components/Toast/CharcoalSnackBar.swift

@@ -203,15 +203,6 @@ public extension View {
     }
 }
 
-private extension UIColor {
-    func imageWithColor(width: Int, height: Int) -> UIImage {
-        let size = CGSize(width: width, height: height)
-        return UIGraphicsImageRenderer(size: size).image { rendererContext in
-            self.setFill()
-            rendererContext.fill(CGRect(origin: .zero, size: size))
-        }
-    }
-}
 
 private struct SnackBarsPreviewView: View {
     @State var isPresenting = true

Sources/CharcoalSwiftUI/Components/Toast/CharcoalToast.swift

@@ -79,7 +79,7 @@ struct CharcoalToast<ActionContent: View>: CharcoalPopupProtocol, CharcoalToastB
                 .padding(EdgeInsets(top: 8, leading: 24, bottom: 8, trailing: 24))
             }
             .background(
-                appearance.background
+                Color(appearance.background)
             )
             .charcoalAnimatableToast(
                 isPresenting: $isPresenting,
@@ -110,20 +110,6 @@ struct PopupViewSizeKey: PreferenceKey {
     static var defaultValue: CGSize = .zero
 }
 
-public enum CharcoalToastAppearance {
-    case success
-    case error
-
-    var background: Color {
-        switch self {
-        case .success:
-            return Color(CharcoalAsset.ColorPaletteGenerated.success.color)
-        case .error:
-            return Color(CharcoalAsset.ColorPaletteGenerated.assertive.color)
-        }
-    }
-}
-
 public struct CharcoalToastAnimationConfiguration {
     public let enablePositionAnimation: Bool
     public let animation: Animation

Sources/CharcoalSwiftUI/Components/Toast/CharcoalToastDraggableModifier.swift

@@ -27,7 +27,7 @@ struct CharcoalToastDraggableModifier: ViewModifier, CharcoalToastDraggable {
                                 height: gesture.translation.height
                             )
                         } else {
-                            // the less the faster resistance
+                            // Rubber band effect
                             let limit: CGFloat = 60
                             let yOff = gesture.translation.height
                             let dist = sqrt(yOff * yOff)

Sources/CharcoalUIKit/Components/Overlay/ChacoalOverlayManager.swift

@@ -130,8 +130,8 @@ extension ChacoalOverlayManager {
 // MARK: - CharcoalIdentifiableOverlayDelegate
 
 extension ChacoalOverlayManager: CharcoalIdentifiableOverlayDelegate {
-    func overlayViewDidDismiss(_ overlayView: CharcoalIdentifiableOverlayView) {
-        overlayContainerViews = overlayContainerViews.filter { $0.id != overlayView.id }
+    func overlayViewDidDismiss(_ overlayID: CharcoalIdentifiableOverlayView.ID) {
+        overlayContainerViews = overlayContainerViews.filter { $0.id != overlayID }
         if overlayContainerViews.isEmpty {
             removeBackground()
         }