diff --git a/LNPopupUIExample/LNPopupUIExample/DemoScenes/PopupDemoView.swift b/LNPopupUIExample/LNPopupUIExample/DemoScenes/PopupDemoView.swift index 54978ce..f8a2e61 100644 --- a/LNPopupUIExample/LNPopupUIExample/DemoScenes/PopupDemoView.swift +++ b/LNPopupUIExample/LNPopupUIExample/DemoScenes/PopupDemoView.swift @@ -175,7 +175,7 @@ extension View { } } - func popupDemo(demoContent: DemoContent, isBarPresented: Binding, isPopupOpen: Binding? = nil, includeContextMenu: Bool = false, includeCustomTextLabels: Bool = false) -> some View { + func popupDemo(demoContent: DemoContent, isBarPresented: Binding, isPopupOpen: Binding? = nil, includeContextMenu: Bool = true, includeCustomTextLabels: Bool = false) -> some View { return self.popup(isBarPresented: isBarPresented, isPopupOpen: isPopupOpen, onOpen: { print("Opened") }, onClose: { print("Closed") }) { SafeAreaDemoView(colorSeed: "Popup", offset: true, isPopupOpen: isPopupOpen) .if(includeCustomTextLabels) { view in diff --git a/LNPopupUIExample/LNPopupUIExample/DemoScenes/ViewDemoView.swift b/LNPopupUIExample/LNPopupUIExample/DemoScenes/ViewDemoView.swift index 485fb63..9f2702a 100644 --- a/LNPopupUIExample/LNPopupUIExample/DemoScenes/ViewDemoView.swift +++ b/LNPopupUIExample/LNPopupUIExample/DemoScenes/ViewDemoView.swift @@ -12,18 +12,16 @@ import LNPopupUI struct ViewDemoView : View { @State private var isBarPresented: Bool = true let onDismiss: () -> Void - let contextMenu: Bool let demoContent: DemoContent - init(demoContent: DemoContent, contextMenu: Bool = false, onDismiss: @escaping () -> Void) { - self.contextMenu = contextMenu + init(demoContent: DemoContent, onDismiss: @escaping () -> Void) { self.onDismiss = onDismiss self.demoContent = demoContent } var body: some View { InnerView(onDismiss: onDismiss) - .popupDemo(demoContent:demoContent, isBarPresented: $isBarPresented, includeContextMenu: contextMenu) + .popupDemo(demoContent:demoContent, isBarPresented: $isBarPresented, includeContextMenu: true) } } diff --git a/LNPopupUIExample/LNPopupUIExample/MusicScene/MusicView.swift b/LNPopupUIExample/LNPopupUIExample/MusicScene/MusicView.swift index 275fda8..f4c5a86 100644 --- a/LNPopupUIExample/LNPopupUIExample/MusicScene/MusicView.swift +++ b/LNPopupUIExample/LNPopupUIExample/MusicScene/MusicView.swift @@ -135,10 +135,7 @@ struct MusicView: View { PlayerView(song: currentSong) } } - // .popupInteractionStyle(.drag) - .popupBarStyle(.prominent) .popupBarProgressViewStyle(.top) - .popupBarMarqueeScrollEnabled(true) } } diff --git a/LNPopupUIExample/LNPopupUIExample/SceneSelection.swift b/LNPopupUIExample/LNPopupUIExample/SceneSelection.swift index 35f4ebf..4890fb9 100644 --- a/LNPopupUIExample/LNPopupUIExample/SceneSelection.swift +++ b/LNPopupUIExample/LNPopupUIExample/SceneSelection.swift @@ -81,15 +81,6 @@ struct SceneSelection: View { viewPresented.toggle() } }) - Button("View + Context Menu Interaction") { - viewPresented.toggle() - } - .foregroundColor(Color(.label)) - .fullScreenCover(isPresented: $viewPresented, content: { - ViewDemoView(demoContent: DemoContent(), contextMenu: true) { - viewPresented.toggle() - } - }) } Section(header: Text("Demo App")) { Button("Apple Music") { diff --git a/Package.swift b/Package.swift index a47ebba..8c526a3 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ], dependencies: [ // .package(path: "../LNPopupController") - .package(url: "https://github.com/LeoNatan/LNPopupController.git", from: Version(stringLiteral: "2.15.2")) + .package(url: "https://github.com/LeoNatan/LNPopupController.git", from: Version(stringLiteral: "2.15.7")) ], targets: [ .target( diff --git a/Supplements/floating_bar_style.gif b/Supplements/floating_bar_style.gif index 7f2ff4e..6b5fc3b 100644 Binary files a/Supplements/floating_bar_style.gif and b/Supplements/floating_bar_style.gif differ diff --git a/Supplements/floating_custom.png b/Supplements/floating_custom.png index f255084..361ee50 100644 Binary files a/Supplements/floating_custom.png and b/Supplements/floating_custom.png differ diff --git a/Supplements/floating_no_scroll.gif b/Supplements/floating_no_scroll.gif index c1de2ea..bc520d6 100644 Binary files a/Supplements/floating_no_scroll.gif and b/Supplements/floating_no_scroll.gif differ diff --git a/Supplements/open_floating_popup.gif b/Supplements/open_floating_popup.gif index c5e6e34..3dcf0e0 100644 Binary files a/Supplements/open_floating_popup.gif and b/Supplements/open_floating_popup.gif differ