Merge pull request #19 from hitendra-gofynd/master

Add custom item spacing support for checkbox and radio buttons

Author: hitendra-gofynd

Example-Nitrozen-SwiftUI/Example-Nitrozen-SwiftUI/Example-Code/Example_Nitrozen_SwiftUIApp.swift

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import Nitrozen_SwiftUI
-import FloatingTextField_SwiftUI
 
 @main
 struct Example_Nitrozen_SwiftUIApp: App {

Example-Nitrozen-SwiftUI/Example-Nitrozen-SwiftUI/Example-Code/RadioButton.swift

@@ -32,10 +32,10 @@ struct RadioButton: View {
 			}
 
 			Section(selection2.first ?? "") {
-				Text("Vetical RadioButton With Title")
+				Text("Vetical RadioButton With Title\n- custom spacing")
 				NitrozenRadio(
 					options: self.options2, selection: $selection2,
-					layout: .verticle)
+					layout: .verticle, itemSpacing: 2)
 				.frame(maxWidth: .infinity, alignment: .leading)
 			}
 

Sources/Nitrozen-SwiftUI/Elements/Checkbox/NitrozenCheckbox.swift

@@ -17,33 +17,35 @@ public struct NitrozenCheckbox<Element>: View where Element: NitrozenElementStri
 	var options: Array<Element>
 	@Binding var selection: Set<Element>
 	var layout: Layout
+	var itemSpacing: CGFloat
 	var appearance: NitrozenAppearance.Checkbox
 
 	public init(options: Array<Element>, selection: Binding<Set<Element>>,
-		 layout: Layout, appearance: NitrozenAppearance.Checkbox? = nil) {
+		 layout: Layout, itemSpacing: CGFloat = 8, appearance: NitrozenAppearance.Checkbox? = nil) {
 		self.options = options
 		self._selection = selection
 		self.layout = layout
+		self.itemSpacing = itemSpacing
 		self.appearance = appearance.or(NitrozenAppearance.shared.checkbox)
 	}
 
 	public var body: some View {
 		switch self.layout {
 		case .horizontal:
-			HStack {
+			HStack(alignment: .top, spacing: self.itemSpacing) {
 				ForEach(self.options, id: \.hashValue) { item in
 					itemView(item: item, width: .infinity)
 				}
 			}
 		case .verticle:
-			VStack {
+			VStack(alignment: .leading, spacing: self.itemSpacing) {
 				ForEach(self.options, id: \.hashValue) { item in
 					itemView(item: item, width: .infinity)
 				}
 			}
 		case .collection:
 			CollectionStack(self.options) { item in
-				itemView(item: item, width: .dynamic(itemSpacing: 8))
+				itemView(item: item, width: .dynamic(itemSpacing: self.itemSpacing))
 			}
 		}
 	}

Sources/Nitrozen-SwiftUI/Elements/RadioButton/NitrozenRadio.swift

@@ -19,24 +19,26 @@ public struct NitrozenRadio<Element>: View where Element: NitrozenElementRadioSt
     var options: Array<Element>
     @Binding var selection: Set<Element>
     var layout: Layout
+	var itemSpacing: CGFloat
     var appearance: NitrozenAppearance.RadioButton
 
     public init(options: Array<Element>, selection: Binding<Set<Element>>,
-                layout: Layout, appearance: NitrozenAppearance.RadioButton? = nil) {
+                layout: Layout, itemSpacing: CGFloat = 8, appearance: NitrozenAppearance.RadioButton? = nil) {
         self.options = options
         self._selection = selection
         self.layout = layout
+		self.itemSpacing = itemSpacing
         self.appearance = appearance.or(NitrozenAppearance.shared.radioButton)
     }
 
     public var body: some View {
         switch self.layout {
         case .horizontal:
-            HStack {
+            HStack(spacing: self.itemSpacing) {
                 listView()
             }
         case .verticle:
-            VStack {
+            VStack(spacing: self.itemSpacing) {
                 listView()
             }
         }
@@ -45,11 +47,10 @@ public struct NitrozenRadio<Element>: View where Element: NitrozenElementRadioSt
     @ViewBuilder
     func listView() -> some View {
         ForEach(self.options, id: \.hashValue) { item in
-            
             NitrozenRadioButtonItem(
                 isSelected: selection.contains(item),
                 title: item.selectionTitleText,
-                subTitle: item.selectionSubTitleText.or(""),
+                subTitle: item.selectionSubTitleText,
                 appearance:self.appearance
             )
             .onTapGesture {
@@ -87,7 +88,7 @@ public struct NitrozenRadioButtonItem: View {
 
     public var body: some View {
 
-        VStack(alignment: .leading, spacing: 8) {
+        VStack(alignment: .leading, spacing: 0) {
             HStack(alignment: .center) {
                 radioButton()
                 titleLabel()

Sources/Nitrozen-SwiftUI/Elements/TextField/Textfield+Appearance.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import FloatingTextField_SwiftUI
 
 public extension NitrozenAppearance {
 	//TODO: define protocol textApperancable for titleColor and font