Add export button type

Author: danielsaidi

RELEASE_NOTES.md

@@ -4,6 +4,14 @@ SwiftUIKit makes its best effort to honor semver, but breaking changes can occur
 
 
 
+## 5.1.4
+
+### ✨ Features
+
+* `ButtonType` has a several new types.
+
+
+
 ## 5.1.3
 
 ### ✨ Features

Sources/SwiftUIKit/Buttons/StandardButtonType.swift Sources/SwiftUIKit/Buttons/ButtonType.swift

@@ -1,5 +1,5 @@
 //
-//  Button+Standard.swift
+//  ButtonType.swift
 //  SwiftUIKit
 //
 //  Created by Daniel Saidi on 2024-04-30.
@@ -10,18 +10,28 @@ import SwiftUI
 
 public extension Button {
 
-    /// Create a new ``StandardType``-based button.
+    /// Create a new ``ButtonType``-based button.
+    ///
+    /// You have to tint the icon separately for destructive
+    /// buttons like ``ButtonType/delete``. This can be done
+    /// automatically, by using `.labelStyle(.titleAndIcon)`.
     init(
         _ type: ButtonType,
         _ title: LocalizedStringKey? = nil,
         _ icon: Image? = nil,
         bundle: Bundle? = nil,
         action: @escaping () -> Void
     ) where Label == SwiftUI.Label<Text, Image?> {
-        self.init(role: type.role, action: action) {
+        self.init(
+            role: type.role,
+            action: action
+        ) {
+            let bundle: Bundle? = title == nil ? .module : bundle
+            let displayTitle = title ?? type.title
+            let icon = icon ?? type.image
             Label(
-                title: { Text(title ?? type.title, bundle: title == nil ? .module : bundle) },
-                icon: { icon ?? type.image }
+                title: { Text(displayTitle, bundle: bundle) },
+                icon: { icon }
             )
         }
     }
@@ -31,16 +41,28 @@ public extension Button {
 /// This enum defines standard button types and provides
 /// standard localized texts and icons.
 public enum ButtonType: String, CaseIterable, Identifiable {
-    case add, addFavorite, addToFavorites,
+    case add, addToFavorites,
          cancel, call, copy,
          delete, deselect, done,
-         edit, email,
+         edit, email, export,
+         like,
          ok,
          paste,
-         removeFavorite, removeFromFavorites,
+         removeFromFavorites, removeLike,
          search, select, share
 }
 
+public extension ButtonType {
+    
+    static func toggleFavorite(isFavorite: Bool) -> ButtonType {
+        isFavorite ? .removeFromFavorites : .addToFavorites
+    }
+    
+    static func toggleLike(isLiked: Bool) -> ButtonType {
+        isLiked ? .removeLike : .like
+    }
+}
+
 public extension ButtonType {
 
     var id: String { rawValue }
@@ -53,8 +75,7 @@ public extension ButtonType {
     var imageName: String? {
         switch self {
         case .add: "plus"
-        case .addFavorite: "star.circle"
-        case .addToFavorites: "star.circle"
+        case .addToFavorites: "star"
         case .cancel: "xmark"
         case .call: "phone"
         case .copy: "doc.on.doc"
@@ -63,10 +84,12 @@ public extension ButtonType {
         case .done: "checkmark"
         case .edit: "pencil"
         case .email: "envelope"
+        case .export: "square.and.arrow.up"
+        case .like: "heart"
         case .ok: "checkmark"
         case .paste: "clipboard"
-        case .removeFavorite: "star.circle.fill"
-        case .removeFromFavorites: "star.circle.fill"
+        case .removeFromFavorites: "star.fill"
+        case .removeLike: "heart.fill"
         case .search: "magnifyingglass"
         case .select: "checkmark.circle"
         case .share: "square.and.arrow.up"
@@ -97,20 +120,21 @@ public extension ButtonType {
     var title: LocalizedStringKey {
         switch self {
         case .add: "Button.Add"
-        case .addFavorite: "Button.AddFavorite"
         case .addToFavorites: "Button.AddToFavorites"
         case .call: "Button.Call"
         case .cancel: "Button.Cancel"
         case .copy: "Button.Copy"
         case .deselect: "Button.Deselect"
         case .edit: "Button.Edit"
         case .email: "Button.Email"
+        case .export: "Button.Export"
         case .delete: "Button.Delete"
         case .done: "Button.Done"
+        case .like: "Button.Like"
         case .ok: "Button.OK"
         case .paste: "Button.Paste"
-        case .removeFavorite: "Button.RemoveFavorite"
         case .removeFromFavorites: "Button.RemoveFromFavorites"
+        case .removeLike: "Button.RemoveLike"
         case .search: "Button.Search"
         case .select: "Button.Select"
         case .share: "Button.Share"
@@ -140,20 +164,26 @@ public extension View {
     }
 }
 
-/*
+
 #Preview {
 
     @ViewBuilder
     func buttons() -> some View {
         Section {
-            ForEach(Button.StandardType.allCases) { type in
+            ForEach(ButtonType.allCases) { type in
                 Button(type) { print("Tapped \(type.title)") }
             }
         }
+        Section {
+            Button(.toggleFavorite(isFavorite: false)) {}
+            Button(.toggleFavorite(isFavorite: true)) {}
+            Button(.toggleLike(isLiked: false)) {}
+            Button(.toggleLike(isLiked: true)) {}
+        }
     }
 
     return List {
-        buttons()
+        buttons().labelStyle(.titleAndIcon)
         buttons().labelStyle(.titleOnly)
         buttons().labelStyle(.iconOnly)
     }
@@ -163,4 +193,3 @@ public extension View {
         }
     }
 }
-*/

Sources/SwiftUIKit/Resources/Localizable.xcstrings

@@ -26,16 +26,6 @@
         }
       }
     },
-    "Button.AddFavorite" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Add Favorite"
-          }
-        }
-      }
-    },
     "Button.AddToFavorites" : {
       "localizations" : {
         "en" : {
@@ -126,6 +116,26 @@
         }
       }
     },
+    "Button.Export" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Export"
+          }
+        }
+      }
+    },
+    "Button.Like" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Like"
+          }
+        }
+      }
+    },
     "Button.OK" : {
       "localizations" : {
         "en" : {
@@ -146,22 +156,22 @@
         }
       }
     },
-    "Button.RemoveFavorite" : {
+    "Button.RemoveFromFavorites" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Remove Favorite"
+            "value" : "Remove From Favorites"
           }
         }
       }
     },
-    "Button.RemoveFromFavorites" : {
+    "Button.RemoveLike" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Remove From Favorites"
+            "value" : "Remove Like"
           }
         }
       }