Code Cleanup + Design Fix + Some Comments

amirsaam · amirsaam · commit 64dcda005231 · 2025-02-12T14:28:22.000+03:30
diff --git a/Sources/RadixUI/Helpers/ComponentViews/ResizableBundledImage.swift b/Sources/RadixUI/Helpers/ComponentViews/ResizableBundledImage.swift
diff --git a/Sources/RadixUI/RadixPrimitives/Toggle/RadixToggleStyle.swift b/Sources/RadixUI/RadixPrimitives/Toggle/RadixToggleStyle.swift
@@ -76,7 +76,7 @@ public struct RadixToggleStyle: ToggleStyle {
                                 .fill(newForegroundColor.text2)
                                 .frame(width: 21, height: 21)
                                 .offset(x: configuration.isOn ? 8 : -8)
-                                .radixShadow1()
+                                .radixShadow4()
                         }
                         .onTapGesture {
                             withAnimation(.easeIn(duration: 0.2)) {
diff --git a/Sources/RadixUI/RadixThemes/Button/RadixButtonLabelStyle.swift b/Sources/RadixUI/RadixThemes/Button/RadixButtonLabelStyle.swift
@@ -72,7 +72,7 @@ public struct RadixButtonLabelStyle: LabelStyle {
         .foregroundStyle(fgColor)
         .padding(.horizontal, 12)
         .padding(.vertical, 8)
-        .background(shape())
+        .background(shape)
         .opacity(opacityValue)
         .scaleEffect(isPressed ? 0.98 : 1)
         .animation(
@@ -98,7 +98,7 @@ public struct RadixButtonLabelStyle: LabelStyle {
     }
 
     @ViewBuilder
-    private func shape() -> some View {
+    private var shape: some View {
         switch radius {
             case .none:
                 Rectangle()
diff --git a/Sources/RadixUI/RadixThemes/Shadow/RadixShadow.swift b/Sources/RadixUI/RadixThemes/Shadow/RadixShadow.swift
@@ -29,6 +29,7 @@ fileprivate struct RadixShadowModifier: ViewModifier {
 
 extension View {
 
+    /// Inset shadow
     public func radixShadow1() -> some View {
         self.modifier(
             RadixShadowModifier(
@@ -47,6 +48,7 @@ extension View {
         )
     }
 
+    /// Shadow for "classic" variant of panels, like Card
     public func radixShadow2() -> some View {
         self.modifier(
             RadixShadowModifier(
@@ -68,6 +70,7 @@ extension View {
         )
     }
 
+    /// Shadow for "classic" variant of panels, like Card
     public func radixShadow3() -> some View {
         self.modifier(
             RadixShadowModifier(
@@ -87,6 +90,7 @@ extension View {
         )
     }
 
+    /// Shadow for smaller overlay panels, like Hover Card and Popover
     public func radixShadow4() -> some View {
         self.modifier(
             RadixShadowModifier(
@@ -104,6 +108,7 @@ extension View {
         )
     }
 
+    /// Shadow for smaller overlay panels, like Hover Card and Popover
     public func radixShadow5() -> some View {
         self.modifier(
             RadixShadowModifier(
@@ -121,6 +126,7 @@ extension View {
         )
     }
 
+    /// Shadow for larger overlay panels, like Dialog
     public func radixShadow6() -> some View {
         self.modifier(
             RadixShadowModifier(
diff --git a/Sources/RadixUI/RadixThemes/TextField/RadixTextFieldStyle.swift b/Sources/RadixUI/RadixThemes/TextField/RadixTextFieldStyle.swift
@@ -84,7 +84,7 @@ public struct RadixTextFieldStyle: TextFieldStyle {
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 8)
-        .background(shape())
+        .background(shape)
         .focused($isFocused)
         .onSubmit {
             if let action {
@@ -94,7 +94,7 @@ public struct RadixTextFieldStyle: TextFieldStyle {
     }
 
     @ViewBuilder
-    private func shape() -> some View {
+    private var shape: some View {
         switch radius {
             case .none:
                 Rectangle()

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public struct RadixToggleStyle: ToggleStyle {`
`76`	`76`	`.fill(newForegroundColor.text2)`
`77`	`77`	`.frame(width: 21, height: 21)`
`78`	`78`	`.offset(x: configuration.isOn ? 8 : -8)`
`79`		`- .radixShadow1()`
	`79`	`+ .radixShadow4()`
`80`	`80`	`}`
`81`	`81`	`.onTapGesture {`
`82`	`82`	`withAnimation(.easeIn(duration: 0.2)) {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ fileprivate struct RadixShadowModifier: ViewModifier {`
`29`	`29`
`30`	`30`	`extension View {`
`31`	`31`
	`32`	`+ /// Inset shadow`
`32`	`33`	`public func radixShadow1() -> some View {`
`33`	`34`	`self.modifier(`
`34`	`35`	`RadixShadowModifier(`
`@@ -47,6 +48,7 @@ extension View {`
`47`	`48`	`)`
`48`	`49`	`}`
`49`	`50`
	`51`	`+ /// Shadow for "classic" variant of panels, like Card`
`50`	`52`	`public func radixShadow2() -> some View {`
`51`	`53`	`self.modifier(`
`52`	`54`	`RadixShadowModifier(`
`@@ -68,6 +70,7 @@ extension View {`
`68`	`70`	`)`
`69`	`71`	`}`
`70`	`72`
	`73`	`+ /// Shadow for "classic" variant of panels, like Card`
`71`	`74`	`public func radixShadow3() -> some View {`
`72`	`75`	`self.modifier(`
`73`	`76`	`RadixShadowModifier(`
`@@ -87,6 +90,7 @@ extension View {`
`87`	`90`	`)`
`88`	`91`	`}`
`89`	`92`
	`93`	`+ /// Shadow for smaller overlay panels, like Hover Card and Popover`
`90`	`94`	`public func radixShadow4() -> some View {`
`91`	`95`	`self.modifier(`
`92`	`96`	`RadixShadowModifier(`
`@@ -104,6 +108,7 @@ extension View {`
`104`	`108`	`)`
`105`	`109`	`}`
`106`	`110`
	`111`	`+ /// Shadow for smaller overlay panels, like Hover Card and Popover`
`107`	`112`	`public func radixShadow5() -> some View {`
`108`	`113`	`self.modifier(`
`109`	`114`	`RadixShadowModifier(`
`@@ -121,6 +126,7 @@ extension View {`
`121`	`126`	`)`
`122`	`127`	`}`
`123`	`128`
	`129`	`+ /// Shadow for larger overlay panels, like Dialog`
`124`	`130`	`public func radixShadow6() -> some View {`
`125`	`131`	`self.modifier(`
`126`	`132`	`RadixShadowModifier(`