Using AsyncButton from button kit to improve following and related buttons (#1888)

IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -9,6 +9,15 @@
         "version" : "2.1.0"
       }
     },
+    {
+      "identity" : "buttonkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Dean151/ButtonKit",
+      "state" : {
+        "revision" : "377f5bab4ed047704316d531e0826d4de5ebf6a4",
+        "version" : "0.1.1"
+      }
+    },
     {
       "identity" : "emojitext",
       "kind" : "remoteSourceControl",

Packages/Account/Package.swift

@@ -21,6 +21,7 @@ let package = Package(
     .package(name: "Models", path: "../Models"),
     .package(name: "StatusKit", path: "../StatusKit"),
     .package(name: "Env", path: "../Env"),
+    .package(url: "https://github.com/Dean151/ButtonKit", from: "0.1.1"),
   ],
   targets: [
     .target(
@@ -30,6 +31,7 @@ let package = Package(
         .product(name: "Models", package: "Models"),
         .product(name: "StatusKit", package: "StatusKit"),
         .product(name: "Env", package: "Env"),
+        .product(name: "ButtonKit", package: "ButtonKit")
       ],
       swiftSettings: [
         .enableExperimentalFeature("StrictConcurrency"),

Packages/Account/Sources/Account/Follow/FollowButton.swift

@@ -1,3 +1,4 @@
+import ButtonKit
 import Combine
 import Foundation
 import Models
@@ -13,7 +14,6 @@ import SwiftUI
   public let shouldDisplayNotify: Bool
   public let relationshipUpdated: (Relationship) -> Void
   public private(set) var relationship: Relationship
-  public private(set) var isUpdating: Bool = false
 
   public init(accountId: String,
               relationship: Relationship,
@@ -26,31 +26,29 @@ import SwiftUI
     self.relationshipUpdated = relationshipUpdated
   }
 
-  func follow() async {
+  func follow() async throws {
     guard let client else { return }
-    isUpdating = true
     do {
       relationship = try await client.post(endpoint: Accounts.follow(id: accountId, notify: false, reblogs: true))
       relationshipUpdated(relationship)
     } catch {
       print("Error while following: \(error.localizedDescription)")
+      throw error
     }
-    isUpdating = false
   }
 
-  func unfollow() async {
+  func unfollow() async throws {
     guard let client else { return }
-    isUpdating = true
     do {
       relationship = try await client.post(endpoint: Accounts.unfollow(id: accountId))
       relationshipUpdated(relationship)
     } catch {
       print("Error while unfollowing: \(error.localizedDescription)")
+      throw error
     }
-    isUpdating = false
   }
 
-  func toggleNotify() async {
+  func toggleNotify() async throws {
     guard let client else { return }
     do {
       relationship = try await client.post(endpoint: Accounts.follow(id: accountId,
@@ -59,10 +57,11 @@ import SwiftUI
       relationshipUpdated(relationship)
     } catch {
       print("Error while following: \(error.localizedDescription)")
+      throw error
     }
   }
 
-  func toggleReboosts() async {
+  func toggleReboosts() async throws {
     guard let client else { return }
     do {
       relationship = try await client.post(endpoint: Accounts.follow(id: accountId,
@@ -71,6 +70,7 @@ import SwiftUI
       relationshipUpdated(relationship)
     } catch {
       print("Error while switching reboosts: \(error.localizedDescription)")
+      throw error
     }
   }
 }
@@ -85,13 +85,11 @@ public struct FollowButton: View {
 
   public var body: some View {
     VStack(alignment: .trailing) {
-      Button {
+      AsyncButton {
-        Task {
+        if viewModel.relationship.following {
-          if viewModel.relationship.following {
+          try await viewModel.unfollow()
-            await viewModel.unfollow()
+        } else {
-          } else {
+          try await viewModel.follow()
-            await viewModel.follow()
-          }
         }
       } label: {
         if viewModel.relationship.requested == true {
@@ -106,29 +104,26 @@ public struct FollowButton: View {
          viewModel.shouldDisplayNotify
       {
         HStack {
-          Button {
+          AsyncButton {
-            Task {
+            try await viewModel.toggleNotify()
-              await viewModel.toggleNotify()
-            }
           } label: {
             Image(systemName: viewModel.relationship.notifying ? "bell.fill" : "bell")
           }
           .accessibilityLabel("accessibility.tabs.profile.user-notifications.label")
           .accessibilityValue(viewModel.relationship.notifying ? "accessibility.general.toggle.on" : "accessibility.general.toggle.off")
-          Button {
+          AsyncButton {
-            Task {
+            try await viewModel.toggleReboosts()
-              await viewModel.toggleReboosts()
-            }
           } label: {
             Image(viewModel.relationship.showingReblogs ? "Rocket.Fill" : "Rocket")
           }
           .accessibilityLabel("accessibility.tabs.profile.user-reblogs.label")
           .accessibilityValue(viewModel.relationship.showingReblogs ? "accessibility.general.toggle.on" : "accessibility.general.toggle.off")
         }
+        .asyncButtonStyle(.none)
+        .disabledWhenLoading()
       }
     }
     .buttonStyle(.bordered)
-    .disabled(viewModel.isUpdating)
     .onAppear {
       viewModel.client = client
     }