Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean @warn_unqualified_access #265

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Clean @warn_unqualified_access #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9613620
clean warn_unqualified_access
kevinneko Sep 10, 2024
7cdc8a2
Merge branch 'main' into fix-warn_unqualified_access
kevinneko Sep 10, 2024
bfdc4df
Revert "clean warn_unqualified_access"
kevinneko Sep 10, 2024
29d23d6
Reformat
kevinneko Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Sources/CharcoalSwiftUI/Colors/Backgrounds.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ struct CharcoalBackground2: ViewModifier {
}

public extension View {
@warn_unqualified_access
func charcoalBackground1() -> some View {
modifier(CharcoalBackground1())
}
}

public extension View {
@warn_unqualified_access
func charcoalBackground2() -> some View {
modifier(CharcoalBackground2())
}
Expand Down
8 changes: 0 additions & 8 deletions Sources/CharcoalSwiftUI/Colors/OnSurfaces.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,56 +64,48 @@ struct CharcoalOnSurfaceIcon6: ViewModifier {
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceBorder() -> some View {
modifier(CharcoalOnSurfaceBorder())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceLink1() -> some View {
modifier(CharcoalOnSurfaceLink1())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceLink2() -> some View {
modifier(CharcoalOnSurfaceLink2())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceText1() -> some View {
modifier(CharcoalOnSurfaceText1())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceText2() -> some View {
modifier(CharcoalOnSurfaceText2())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceText3() -> some View {
modifier(CharcoalOnSurfaceText3())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceText4() -> some View {
modifier(CharcoalOnSurfaceText4())
}
}

public extension View {
@warn_unqualified_access
func charcoalOnSurfaceText5() -> some View {
modifier(CharcoalOnSurfaceText5())
}
Expand Down
9 changes: 0 additions & 9 deletions Sources/CharcoalSwiftUI/Colors/Surfaces.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,63 +73,54 @@ struct CharcoalSurface9: ViewModifier {
}

public extension View {
@warn_unqualified_access
func charcoalSurface1() -> some View {
modifier(CharcoalSurface1())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface2() -> some View {
modifier(CharcoalSurface2())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface3() -> some View {
modifier(CharcoalSurface3())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface4() -> some View {
modifier(CharcoalSurface4())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface5() -> some View {
modifier(CharcoalSurface5())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface6() -> some View {
modifier(CharcoalSurface6())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface7() -> some View {
modifier(CharcoalSurface7())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface8() -> some View {
modifier(CharcoalSurface8())
}
}

public extension View {
@warn_unqualified_access
func charcoalSurface9() -> some View {
modifier(CharcoalSurface9())
}
Expand Down
17 changes: 12 additions & 5 deletions Sources/CharcoalSwiftUI/Components/Buttons/CharcoalDefaultButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ struct CharcoalDefaultButtonStyleView: View {

@ScaledMetric var cornerRadius: CGFloat

init(label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool, size: CharcoalButtonSize, isFixed: Bool) {
init(
label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool,
size: CharcoalButtonSize, isFixed: Bool
) {
self.label = label
self.isPressed = isPressed
self.isEnabled = isEnabled
Expand All @@ -31,7 +34,9 @@ struct CharcoalDefaultButtonStyleView: View {
.opacity(isEnabled ? 1.0 : 0.32)
.overlay(
Rectangle()
.backport.foregroundStyle(isPressed ? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
.backport.foregroundStyle(
isPressed
? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
)
.cornerRadius(cornerRadius)
}
Expand Down Expand Up @@ -79,14 +84,16 @@ struct CharcoalDefaultButtonStyleModifier: ViewModifier {
if #available(iOS 15, *) {
content.buttonStyle(CharcoalDefaultButtonStyleIos15(size: size, isFixed: isFixed))
} else {
content.buttonStyle(CharcoalDefaultButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed))
content.buttonStyle(
CharcoalDefaultButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed))
}
}
}

public extension View {
@warn_unqualified_access
func charcoalDefaultButton(size: CharcoalButtonSize = .medium, isFixed: Bool = true) -> some View {
func charcoalDefaultButton(size: CharcoalButtonSize = .medium, isFixed: Bool = true)
-> some View
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

いくつか改行周りが変更されてますが、これってフォーマットを掛けたらなったって感じですかね...?
この行あたりが特に違和感があります

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

そうです、SwiftFormat を使った後にこれらのフォーマットの変更が起きました。おそらく SwiftFormat のアップデートで新しい動作が追加されたのかもしれません。調べてみます

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ああ、原因が分かりました。先に VSCode でコードを編集したときに、VSCode 自体のフォーマット機能が影響していたんですね

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

なるほどです！

{
return modifier(CharcoalDefaultButtonStyleModifier(size: size, isFixed: isFixed))
}
}
Expand Down
22 changes: 16 additions & 6 deletions Sources/CharcoalSwiftUI/Components/Buttons/CharcoalDefaultOverlay.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ struct CharcoalDefaultOverlayButtonStyleView: View {

@ScaledMetric var cornerRadius: CGFloat

init(label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool, size: CharcoalButtonSize, isFixed: Bool) {
init(
label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool,
size: CharcoalButtonSize, isFixed: Bool
) {
self.label = label
self.isPressed = isPressed
self.isEnabled = isEnabled
Expand All @@ -31,7 +34,9 @@ struct CharcoalDefaultOverlayButtonStyleView: View {
.opacity(isEnabled ? 1.0 : 0.32)
.overlay(
Rectangle()
.backport.foregroundStyle(isPressed ? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
.backport.foregroundStyle(
isPressed
? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
)
.cornerRadius(cornerRadius)
}
Expand Down Expand Up @@ -78,16 +83,21 @@ struct CharcoalDefaultOverlayButtonStyleModifier: ViewModifier {

func body(content: Content) -> some View {
if #available(iOS 15, *) {
content.buttonStyle(CharcoalDefaultOverlayButtonStyleIos15(size: size, isFixed: isFixed))
content.buttonStyle(
CharcoalDefaultOverlayButtonStyleIos15(size: size, isFixed: isFixed))
} else {
content.buttonStyle(CharcoalDefaultOverlayButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed))
content.buttonStyle(
CharcoalDefaultOverlayButtonStyle(
isEnabled: isEnabled, size: size, isFixed: isFixed
))
}
}
}

public extension View {
@warn_unqualified_access
func charcoalDefaultOverlayButton(size: CharcoalButtonSize = .medium, isFixed: Bool = true) -> some View {
func charcoalDefaultOverlayButton(
size: CharcoalButtonSize = .medium, isFixed: Bool = true
) -> some View {
return modifier(CharcoalDefaultOverlayButtonStyleModifier(size: size, isFixed: isFixed))
}
}
Expand Down
1 change: 0 additions & 1 deletion Sources/CharcoalSwiftUI/Components/Buttons/CharcoalLinkButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ struct CharcoalLinkButtonStyleModifier: ViewModifier {
}

public extension View {
@warn_unqualified_access
func charcoalLinkButton() -> some View {
return modifier(CharcoalLinkButtonStyleModifier())
}
Expand Down
39 changes: 24 additions & 15 deletions Sources/CharcoalSwiftUI/Components/Buttons/CharcoalNavigationButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ struct CharcoalNavigationButtonStyleView: View {

@ScaledMetric var cornerRadius: CGFloat

init(label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool, size: CharcoalButtonSize, isFixed: Bool) {
init(
label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool,
size: CharcoalButtonSize, isFixed: Bool
) {
self.label = label
self.isPressed = isPressed
self.isEnabled = isEnabled
Expand All @@ -28,17 +31,21 @@ struct CharcoalNavigationButtonStyleView: View {
.frame(height: size == .medium ? 40 : 32)
)
}
return AnyView(label
.font(.system(size: fontSize, weight: .bold))
.charcoalOnSurfaceText5()
.padding(size.padding)
.frame(maxWidth: isFixed ? nil : .infinity)
.charcoalSurface6()
.overlay(
Rectangle()
.backport.foregroundStyle(isPressed ? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
)
.cornerRadius(cornerRadius)
return AnyView(
label
.font(.system(size: fontSize, weight: .bold))
.charcoalOnSurfaceText5()
.padding(size.padding)
.frame(maxWidth: isFixed ? nil : .infinity)
.charcoalSurface6()
.overlay(
Rectangle()
.backport.foregroundStyle(
isPressed
? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color)
: .clear)
)
.cornerRadius(cornerRadius)
)
}
}
Expand Down Expand Up @@ -85,14 +92,16 @@ struct CharcoalNavigationButtonStyleModifier: ViewModifier {
if #available(iOS 15, *) {
content.buttonStyle(CharcoalNavigationButtonStyleIos15(size: size, isFixed: isFixed))
} else {
content.buttonStyle(CharcoalNavigationButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed))
content.buttonStyle(
CharcoalNavigationButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed))
}
}
}

public extension View {
@warn_unqualified_access
func charcoalNavigationButton(size: CharcoalButtonSize = .medium, isFixed: Bool = true) -> some View {
func charcoalNavigationButton(size: CharcoalButtonSize = .medium, isFixed: Bool = true)
-> some View
{
return modifier(CharcoalNavigationButtonStyleModifier(size: size, isFixed: isFixed))
}
}
Expand Down
25 changes: 19 additions & 6 deletions Sources/CharcoalSwiftUI/Components/Buttons/CharcoalPrimaryButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ struct CharcoalPrimaryButtonStyleView: View {

@ScaledMetric var cornerRadius: CGFloat

init(label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool, size: CharcoalButtonSize, isFixed: Bool, primaryColor: Color) {
init(
label: ButtonStyleConfiguration.Label, isPressed: Bool, isEnabled: Bool,
size: CharcoalButtonSize, isFixed: Bool, primaryColor: Color
) {
self.label = label
self.isPressed = isPressed
self.isEnabled = isEnabled
Expand All @@ -33,7 +36,9 @@ struct CharcoalPrimaryButtonStyleView: View {
.opacity(isEnabled ? 1.0 : 0.32)
.overlay(
Rectangle()
.backport.foregroundStyle(isPressed ? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
.backport.foregroundStyle(
isPressed
? Color(CharcoalAsset.ColorPaletteGenerated.surface10.color) : .clear)
)
.cornerRadius(cornerRadius)
}
Expand Down Expand Up @@ -85,22 +90,30 @@ struct CharcoalPrimaryButtonStyleModifier: ViewModifier {
func body(content: Content) -> some View {
if #available(iOS 15, *) {
// swiftlint:disable line_length
content.buttonStyle(CharcoalPrimaryButtonStyleIos15(size: size, isFixed: isFixed, primaryColor: primaryColor))
content.buttonStyle(
CharcoalPrimaryButtonStyleIos15(
size: size, isFixed: isFixed, primaryColor: primaryColor
))
} else {
// swiftlint:disable line_length
content.buttonStyle(CharcoalPrimaryButtonStyle(isEnabled: isEnabled, size: size, isFixed: isFixed, primaryColor: primaryColor))
content.buttonStyle(
CharcoalPrimaryButtonStyle(
isEnabled: isEnabled, size: size, isFixed: isFixed, primaryColor: primaryColor
))
}
}
}

public extension View {
@warn_unqualified_access
func charcoalPrimaryButton(
size: CharcoalButtonSize = .medium,
isFixed: Bool = true,
primaryColor: Color = Color(CharcoalAsset.ColorPaletteGenerated.brand.color)
) -> some View {
return modifier(CharcoalPrimaryButtonStyleModifier(size: size, isFixed: isFixed, primaryColor: primaryColor))
return modifier(
CharcoalPrimaryButtonStyleModifier(
size: size, isFixed: isFixed, primaryColor: primaryColor
))
}
}

Expand Down
Loading
Loading