Skip to content

Rename EmptyView to LegacyEmptyView to avoid SwiftUI.EmptyView ambiguity #1451

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

Merged
AliPishvaei merged 1 commit into from
Jul 1, 2026
Merged

Rename EmptyView to LegacyEmptyView to avoid SwiftUI.EmptyView ambiguity #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Demo/Sources/Fullscreen/EmptyView/EmptyViewDemoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import FinniversKit
import DemoKit

class EmptyViewDemoView: UIView {
var emptyView: EmptyView?
var emptyView: LegacyEmptyView?

override init(frame: CGRect) {
super.init(frame: frame)
Expand All @@ -18,7 +18,7 @@ class EmptyViewDemoView: UIView {
private func setupEmptyView(header: String, message: String, image: UIImage? = nil, actionButtonTitle: String = "") {
self.emptyView?.removeFromSuperview()
self.emptyView = nil
self.emptyView = EmptyView()
self.emptyView = LegacyEmptyView()
self.addSubview(self.emptyView!) // swiftlint:disable:this force_unwrapping
self.emptyView?.fillInSuperview()

Expand Down
8 changes: 4 additions & 4 deletions FinniversKit/FinniversKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
44AFCE49215839F7005984DB /* LoadingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44AFCE47215839F6005984DB /* LoadingIndicatorView.swift */; };
44C4E8DE1FFBA714000B014D /* Config.swift in Headers */ = {isa = PBXBuildFile; fileRef = 4447F6C61FDB2B110033DBC1 /* Config.swift */; settings = {ATTRIBUTES = (Public, ); }; };
44C6CE44209CABFE00929269 /* ImageAsset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44C6CE43209CABFE00929269 /* ImageAsset.swift */; };
44D9125F2077AC8A00486848 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44D912512077AC8A00486848 /* EmptyView.swift */; };
44D9125F2077AC8A00486848 /* LegacyEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44D912512077AC8A00486848 /* LegacyEmptyView.swift */; };
44F8831220551D59003E3171 /* NSAttributedStringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44F8831120551D59003E3171 /* NSAttributedStringExtensions.swift */; };
45B2E06A207CF5C100C68B92 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B2E069207CF5C100C68B92 /* StringExtensions.swift */; };
45D7C56B204949E2000E788F /* SwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D7C56A204949E2000E788F /* SwitchView.swift */; };
Expand Down Expand Up @@ -575,7 +575,7 @@
44A557B322E72187001667AE /* CheckboxTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxTableViewCell.swift; sourceTree = "<group>"; };
44AFCE47215839F6005984DB /* LoadingIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingIndicatorView.swift; sourceTree = "<group>"; };
44C6CE43209CABFE00929269 /* ImageAsset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAsset.swift; sourceTree = "<group>"; };
44D912512077AC8A00486848 /* EmptyView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = "<group>"; };
44D912512077AC8A00486848 /* LegacyEmptyView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacyEmptyView.swift; sourceTree = "<group>"; };
44F8831120551D59003E3171 /* NSAttributedStringExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSAttributedStringExtensions.swift; sourceTree = "<group>"; };
45B2E069207CF5C100C68B92 /* StringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = "<group>"; };
45D7C56A204949E2000E788F /* SwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1698,7 +1698,7 @@
44D912502077AC8A00486848 /* EmptyView */ = {
isa = PBXGroup;
children = (
44D912512077AC8A00486848 /* EmptyView.swift */,
44D912512077AC8A00486848 /* LegacyEmptyView.swift */,
);
path = EmptyView;
sourceTree = "<group>";
Expand Down Expand Up @@ -3153,7 +3153,7 @@
441FE433209A24E500B04EF1 /* AdRecommendationsGridViewLayout.swift in Sources */,
08F0D3F422259AD100968256 /* HappinessRatingView.swift in Sources */,
179D06A82906A39D00A65E3A /* HTMLStringParserHTMLTranslator.swift in Sources */,
44D9125F2077AC8A00486848 /* EmptyView.swift in Sources */,
44D9125F2077AC8A00486848 /* LegacyEmptyView.swift in Sources */,
44A557B622E72187001667AE /* CheckboxTableViewCell.swift in Sources */,
CF376C18231D452100ED2B24 /* Array+Step.swift in Sources */,
B6F5ECB32CB56CCA00E24EC3 /* PushNotificationNudgingView.swift in Sources */,
Expand Down
12 changes: 6 additions & 6 deletions FinniversKit/Sources/Fullscreen/EmptyView/GenericErrorSwiftUIView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public struct GenericErrorSwiftUIView: UIViewRepresentable {
self.viewModel = viewModel
}

public func makeUIView(context: Context) -> FinniversKit.EmptyView {
let genericView = FinniversKit.EmptyView(shapeType: .default)
public func makeUIView(context: Context) -> LegacyEmptyView {
let genericView = LegacyEmptyView(shapeType: .default)
genericView.header = viewModel.title
genericView.message = viewModel.description ?? ""
genericView.actionButtonTitle = viewModel.buttonTitle ?? ""
Expand All @@ -50,25 +50,25 @@ public struct GenericErrorSwiftUIView: UIViewRepresentable {
return genericView
}

public func updateUIView(_ uiView: FinniversKit.EmptyView, context: Context) {
public func updateUIView(_ uiView: LegacyEmptyView, context: Context) {
}

public func makeCoordinator() -> Coordinator {
Coordinator(parent: self)
}

public class Coordinator: NSObject, EmptyViewDelegate {
public class Coordinator: NSObject, LegacyEmptyViewDelegate {
let parent: GenericErrorSwiftUIView

init(parent: GenericErrorSwiftUIView) {
self.parent = parent
}

public func emptyView(_ emptyView: FinniversKit.EmptyView, didSelectActionButton button: FinniversKit.Button) {
public func emptyView(_ emptyView: LegacyEmptyView, didSelectActionButton button: FinniversKit.Button) {
parent.viewModel.action?()
}

public func emptyView(_ emptyView: FinniversKit.EmptyView, didMoveObjectView view: UIView) {
public func emptyView(_ emptyView: LegacyEmptyView, didMoveObjectView view: UIView) {
}
}
}
Expand Down
23 changes: 16 additions & 7 deletions ...rces/Fullscreen/EmptyView/EmptyView.swift → ...ullscreen/EmptyView/LegacyEmptyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import CoreMotion
import UIKit
import Warp

public protocol EmptyViewDelegate: AnyObject {
func emptyView(_ emptyView: EmptyView, didSelectActionButton button: Button)
func emptyView(_ emptyView: EmptyView, didMoveObjectView view: UIView)
public protocol LegacyEmptyViewDelegate: AnyObject {
func emptyView(_ emptyView: LegacyEmptyView, didSelectActionButton button: Button)
func emptyView(_ emptyView: LegacyEmptyView, didMoveObjectView view: UIView)
}

public enum EmptyViewShapeType { // Deprecated
public enum LegacyEmptyViewShapeType { // Deprecated
case `default`
case christmas
case none
}

@available(*, deprecated, message: "This view is deprecated. Use `StateViews.EmptyStateView` instead")
public class EmptyView: UIView {
public class LegacyEmptyView: UIView {

// MARK: - Other private attributes

Expand Down Expand Up @@ -56,7 +56,7 @@ public class EmptyView: UIView {

// MARK: - External properties / Dependency injection

public weak var delegate: EmptyViewDelegate?
public weak var delegate: LegacyEmptyViewDelegate?

public var header: String = "" {
didSet {
Expand Down Expand Up @@ -102,7 +102,7 @@ public class EmptyView: UIView {
// MARK: - Deprecated

@available(*, deprecated, message: "shapeType parameter is not supported anymore and should be removed")
public init(shapeType: EmptyViewShapeType = .default) {
public init(shapeType: LegacyEmptyViewShapeType = .default) {
super.init(frame: .zero)
translatesAutoresizingMaskIntoConstraints = false
setup()
Expand Down Expand Up @@ -143,3 +143,12 @@ public class EmptyView: UIView {
delegate?.emptyView(self, didSelectActionButton: actionButton)
}
}

@available(*, deprecated, renamed: "LegacyEmptyView")
public typealias EmptyView = LegacyEmptyView

@available(*, deprecated, renamed: "LegacyEmptyViewDelegate")
public typealias EmptyViewDelegate = LegacyEmptyViewDelegate

@available(*, deprecated, renamed: "LegacyEmptyViewShapeType")
public typealias EmptyViewShapeType = LegacyEmptyViewShapeType
Loading