Delete deprecated HUD and Row

oversizedev · Nov 9, 2024 · d14b9e9 · d14b9e9
1 parent a334c18
commit d14b9e9
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 1,113 deletions.
diff --git a/Sources/OversizeUI/Controls/DateField/DateField.swift b/Sources/OversizeUI/Controls/DateField/DateField.swift
@@ -46,7 +46,7 @@ public struct DateField: View {
                 HStack {
                     Text(label)
                         .subheadline(.medium)
-                        .foregroundColor(.onSurfaceHighEmphasis)
+                        .foregroundColor(.onSurfacePrimary)
                     Spacer()
                 }
             }
@@ -58,7 +58,7 @@ public struct DateField: View {
                         Text(label)
                             .font(.subheadline)
                             .fontWeight(.semibold)
-                            .onSurfaceDisabledForegroundColor()
+                            .onSurfaceTertiaryForeground()
                     }
 
                     HStack {

diff --git a/Sources/OversizeUI/Controls/HUD/HUD.swift b/Sources/OversizeUI/Controls/HUD/HUD.swift
@@ -48,7 +48,7 @@ public struct HUD<Title, Icon>: View where Title: View, Icon: View {
                 #if os(macOS)
                     .foregroundColor(Color.onPrimary)
                 #else
-                    .foregroundColor(Color.onSurfaceHighEmphasis)
+                    .foregroundColor(Color.onSurfacePrimary)
 
                 #endif
 

diff --git a/Sources/OversizeUI/Controls/IconPicker/IconPicker.swift b/Sources/OversizeUI/Controls/IconPicker/IconPicker.swift
@@ -45,13 +45,13 @@ public struct IconPicker: View {
         } label: {
             HStack(spacing: .xxSmall) {
                 Text(label)
-                    .onSurfaceHighEmphasisForegroundColor()
+                    .onSurfacePrimaryForeground()
 
                 Spacer()
                 if let image = selection {
                     image
                 }
-                IconDeprecated(.chevronDown, color: .onSurfaceHighEmphasis)
+                IconDeprecated(.chevronDown, color: .onSurfacePrimary)
             }
         }
         .buttonStyle(.field)

diff --git a/Sources/OversizeUI/Controls/Notice/NoticeView.swift b/Sources/OversizeUI/Controls/Notice/NoticeView.swift
@@ -83,7 +83,7 @@ public struct NoticeView<A>: View where A: View {
                 Button {
                     closeAction?()
                 } label: {
-                    IconDeprecated(.xMini, color: .onSurfaceHighEmphasis)
+                    IconDeprecated(.xMini, color: .onSurfacePrimary)
                 }
                 .buttonStyle(subtitle != nil ? .tertiary(infinityWidth: false) : .quaternary(infinityWidth: false))
                 .controlBorderShape(.capsule)

diff --git a/Sources/OversizeUI/Controls/Row/Row.swift b/Sources/OversizeUI/Controls/Row/Row.swift
@@ -26,8 +26,8 @@ public struct Row<LeadingLabel, TrailingLabel>: View where LeadingLabel: View, T
     private let leadingLabel: LeadingLabel?
     private let trailingLabel: TrailingLabel?
 
-    private var leadingType: RowLeadingType?
-    private var trallingType: RowTrailingType?
+//    private var leadingType: RowLeadingType?
+//    private var trallingType: RowTrailingType?
 
     private let action: (() -> Void)?
 
@@ -66,16 +66,16 @@ public struct Row<LeadingLabel, TrailingLabel>: View where LeadingLabel: View, T
     @available(*, deprecated, message: "Use leading: {} and tralling: {}")
     public init(_ title: String,
                 subtitle: String? = nil,
-                leadingType: RowLeadingType? = nil,
-                trallingType: RowTrailingType? = nil,
+//                leadingType: RowLeadingType? = nil,
+//                trallingType: RowTrailingType? = nil,
                 paddingHorizontal _: Space = .medium,
                 paddingVertical _: Space = .small,
                 action: (() -> Void)? = nil)
     {
         self.title = title
         self.subtitle = subtitle
-        self.leadingType = leadingType
-        self.trallingType = trallingType
+//        self.leadingType = leadingType
+//        self.trallingType = trallingType
         self.action = action
         leadingLabel = nil
         trailingLabel = nil
@@ -246,20 +246,20 @@ public extension Row {
         control.textColor = color
         return control
     }
-
-    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
-    func rowLeading(_ leading: RowLeadingType?) -> Row {
-        var control = self
-        control.leadingType = leading
-        return control
-    }
-
-    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
-    func rowTrailing(_ trailing: RowTrailingType?) -> Row {
-        var control = self
-        control.trallingType = trailing
-        return control
-    }
+//
+//    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
+//    func rowLeading(_ leading: RowLeadingType?) -> Row {
+//        var control = self
+//        control.leadingType = leading
+//        return control
+//    }
+//
+//    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
+//    func rowTrailing(_ trailing: RowTrailingType?) -> Row {
+//        var control = self
+//        control.trallingType = trailing
+//        return control
+//    }
 }
 
 public extension View {

diff --git a/Sources/OversizeUI/Controls/Surface/Surface.swift b/Sources/OversizeUI/Controls/Surface/Surface.swift
@@ -283,7 +283,7 @@ struct Surface_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
             Surface {
-                RowDeprecated("Title") {}
+                Row("Title") {}
             }
             .surfaceStyle(.primary)
             .previewLayout(.fixed(width: 414, height: 300))

diff --git a/Sources/OversizeUI/Deprecated/BlurView.swift b/Sources/OversizeUI/Deprecated/BlurView.swift