From 2f4f1a49a869ebd19c08718ade319ffdf59e6da1 Mon Sep 17 00:00:00 2001
From: Matthew Ramsden <6657488+reez@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:01:36 -0500
Subject: [PATCH] chore: refactor previews and utilities

---
 Sources/BitcoinUI/AddressFormattedView.swift | 22 ++----
 Sources/BitcoinUI/ButtonStyles.swift         | 11 ++-
 Sources/BitcoinUI/Colors.swift               | 12 ++-
 Sources/BitcoinUI/Images.swift               | 11 ++-
 Sources/BitcoinUI/SeedPhraseView.swift       | 83 +++-----------------
 Sources/BitcoinUI/TextStyles.swift           | 11 ++-
 Sources/BitcoinUI/Utilities.swift            | 18 +++++
 7 files changed, 57 insertions(+), 111 deletions(-)

diff --git a/Sources/BitcoinUI/AddressFormattedView.swift b/Sources/BitcoinUI/AddressFormattedView.swift
index cc1d035..fad6262 100644
--- a/Sources/BitcoinUI/AddressFormattedView.swift
+++ b/Sources/BitcoinUI/AddressFormattedView.swift
@@ -36,7 +36,7 @@ public struct AddressFormattedView: View {
             ),
             spacing: spacing
         ) {
-            let chunks = chunkedAddress()
+            let chunks = address.chunked(into: 4)
             ForEach(chunks.indices, id: \.self) { index in
                 Text(chunks[index])
                     .font(.system(size: 20, weight: .medium, design: .monospaced))
@@ -46,27 +46,17 @@ public struct AddressFormattedView: View {
     }
 }
 
-extension AddressFormattedView {
-    private func chunkedAddress() -> [String] {
-        let chunkSize = 4
-        return stride(from: 0, to: address.count, by: chunkSize).map {
-            let start = address.index(address.startIndex, offsetBy: $0)
-            let end =
-                address.index(start, offsetBy: chunkSize, limitedBy: address.endIndex)
-                ?? address.endIndex
-            return String(address[start..<end])
-        }
-    }
-}
-
 struct AddressFormattedView_Previews: PreviewProvider {
     static var previews: some View {
         AddressFormattedView(
-            address: "tb1pw6y0vtmsn46epvz0j8ddc46ketmp28t82p22hcrrkch3a0jhu40qe267dl"
+            address:
+                "tb1pw6y0vtmsn46epvz0j8ddc46ketmp28t82p22hcrrkch3a0jhu40qe267dl"
         )
     }
 }
 
 #Preview {
-    AddressFormattedView(address: "tb1pw6y0vtmsn46epvz0j8ddc46ketmp28t82p22hcrrkch3a0jhu40qe267dl")
+    AddressFormattedView(
+        address: "tb1pw6y0vtmsn46epvz0j8ddc46ketmp28t82p22hcrrkch3a0jhu40qe267dl"
+    )
 }
diff --git a/Sources/BitcoinUI/ButtonStyles.swift b/Sources/BitcoinUI/ButtonStyles.swift
index dca2742..6def3f0 100644
--- a/Sources/BitcoinUI/ButtonStyles.swift
+++ b/Sources/BitcoinUI/ButtonStyles.swift
@@ -282,11 +282,10 @@ struct ButtonStylesView: View {
 
 struct ButtonStylesView_Previews: PreviewProvider {
     static var previews: some View {
-        Group {
-            ButtonStylesView()
-                .environment(\.colorScheme, .light)
-            ButtonStylesView()
-                .environment(\.colorScheme, .dark)
-        }
+        ButtonStylesView()
     }
 }
+
+#Preview {
+    ButtonStylesView()
+}
diff --git a/Sources/BitcoinUI/Colors.swift b/Sources/BitcoinUI/Colors.swift
index 88ed699..a43d0cb 100644
--- a/Sources/BitcoinUI/Colors.swift
+++ b/Sources/BitcoinUI/Colors.swift
@@ -451,12 +451,10 @@ struct ColorsView: View {
 
 struct ColorsView_Previews: PreviewProvider {
     static var previews: some View {
-        Group {
-            ColorsView()
-                .environment(\.colorScheme, .light)
-            ColorsView()
-                .environment(\.colorScheme, .dark)
-
-        }
+        ColorsView()
     }
 }
+
+#Preview {
+    ColorsView()
+}
diff --git a/Sources/BitcoinUI/Images.swift b/Sources/BitcoinUI/Images.swift
index 196ccf1..509d9d1 100644
--- a/Sources/BitcoinUI/Images.swift
+++ b/Sources/BitcoinUI/Images.swift
@@ -118,11 +118,10 @@ struct IconsView: View {
 
 struct IconsView_Previews: PreviewProvider {
     static var previews: some View {
-        Group {
-            IconsView()
-                .environment(\.colorScheme, .light)
-            IconsView()
-                .environment(\.colorScheme, .dark)
-        }
+        IconsView()
     }
 }
+
+#Preview {
+    IconsView()
+}
diff --git a/Sources/BitcoinUI/SeedPhraseView.swift b/Sources/BitcoinUI/SeedPhraseView.swift
index 6c764cf..fc06be2 100644
--- a/Sources/BitcoinUI/SeedPhraseView.swift
+++ b/Sources/BitcoinUI/SeedPhraseView.swift
@@ -128,11 +128,19 @@ struct WordCapsule: View {
     }
 }
 
-extension Array {
-    func chunked(into size: Int) -> [[Element]] {
-        stride(from: 0, to: count, by: size).map {
-            Array(self[$0..<Swift.min($0 + size, count)])
-        }
+struct SeedPhraseView_Previews: PreviewProvider {
+    static var previews: some View {
+        SeedPhraseView(
+            words: [
+                "paddle", "train", "boil", "catch", "trim", "plastic",
+                "wolf", "hazard", "govern", "oval", "drama", "gun",
+                "swim", "accuse", "degree", "teach", "game", "penalty",
+                "social", "hard", "crush", "media", "radar", "click",
+            ],
+            preferredWordsPerRow: 2,
+            usePaging: true,
+            wordsPerPage: 4
+        )
     }
 }
 
@@ -149,68 +157,3 @@ extension Array {
         wordsPerPage: 4
     )
 }
-
-#Preview {
-    SeedPhraseView(
-        words: [
-            "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew", "kiwi",
-            "lemon", "mango", "nectarine",
-        ],
-        preferredWordsPerRow: 3
-    )
-}
-
-#Preview {
-    SeedPhraseView(
-        words: [
-            "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew", "kiwi",
-            "lemon", "mango", "nectarine",
-        ],
-        preferredWordsPerRow: 3
-    )
-}
-
-#Preview {
-    SeedPhraseView(
-        words: [
-            "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew", "kiwi",
-            "lemon", "mango", "nectarine",
-        ],
-        preferredWordsPerRow: 3,
-        usePaging: true
-    )
-}
-
-#Preview {
-    SeedPhraseView(
-        words: [
-            "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew", "kiwi",
-            "lemon", "mango", "nectarine",
-        ],
-        preferredWordsPerRow: 2
-    )
-}
-
-#Preview {
-    SeedPhraseView(
-        words: [
-            "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew", "kiwi",
-            "lemon", "mango", "nectarine",
-        ],
-        preferredWordsPerRow: 4
-    )
-}
-
-struct SeedPhraseView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group {
-            SeedPhraseView(
-                words: [
-                    "apple", "banana", "cherry", "date", "elderberry", "fig", "grape", "honeydew",
-                    "kiwi", "lemon", "mango", "nectarine",
-                ],
-                preferredWordsPerRow: 3
-            )
-        }
-    }
-}
diff --git a/Sources/BitcoinUI/TextStyles.swift b/Sources/BitcoinUI/TextStyles.swift
index 7710822..68b3f21 100644
--- a/Sources/BitcoinUI/TextStyles.swift
+++ b/Sources/BitcoinUI/TextStyles.swift
@@ -171,11 +171,10 @@ struct TextStylesView: View {
 
 struct TextStylesView_Previews: PreviewProvider {
     static var previews: some View {
-        Group {
-            TextStylesView()
-                .environment(\.colorScheme, .light)
-            TextStylesView()
-                .environment(\.colorScheme, .dark)
-        }
+        TextStylesView()
     }
 }
+
+#Preview {
+    TextStylesView()
+}
diff --git a/Sources/BitcoinUI/Utilities.swift b/Sources/BitcoinUI/Utilities.swift
index 23984e2..1fc31af 100644
--- a/Sources/BitcoinUI/Utilities.swift
+++ b/Sources/BitcoinUI/Utilities.swift
@@ -8,6 +8,14 @@
 import Foundation
 import SwiftUI
 
+extension Array {
+    func chunked(into size: Int) -> [[Element]] {
+        stride(from: 0, to: count, by: size).map {
+            Array(self[$0..<Swift.min($0 + size, count)])
+        }
+    }
+}
+
 extension CGFloat {
 
     // Choose horizontal spacing per Figma
@@ -22,6 +30,16 @@ extension CGFloat {
 
 }
 
+extension String {
+    func chunked(into size: Int) -> [String] {
+        return stride(from: 0, to: self.count, by: size).map {
+            let start = self.index(self.startIndex, offsetBy: $0)
+            let end = self.index(start, offsetBy: size, limitedBy: self.endIndex) ?? self.endIndex
+            return String(self[start..<end])
+        }
+    }
+}
+
 extension View {
     func applyFidgetEffect(viewState: Binding<CGSize>) -> some View {
         self