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

Jump to bottom

option to hide dismiss button and timer for BillboardBannerView #26

Merged
merged 2 commits into from
Oct 29, 2023
Merged

option to hide dismiss button and timer for BillboardBannerView #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40c64e2
option to hide dismiss button and timer for BillboardBannerView
dhaydl Oct 22, 2023
b5e73ac
make advertisement of BillboardViewModel public
dhaydl Oct 22, 2023
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: 1 addition & 1 deletion Sources/Billboard/BillboardViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public final class BillboardViewModel : ObservableObject {

let configuration: BillboardConfiguration

@Published var advertisement : BillboardAd? = nil
@Published public var advertisement : BillboardAd? = nil

public init(configuration: BillboardConfiguration = BillboardConfiguration()) {
self.configuration = configuration
Expand Down
51 changes: 27 additions & 24 deletions Sources/Billboard/Views/BillboardBannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ public struct BillboardBannerView : View {
let advert : BillboardAd
let config : BillboardConfiguration
let includeShadow : Bool
let hideDismissButtonAndTimer : Bool

@State private var canDismiss = false
@State private var appIcon : UIImage? = nil
@State private var showAdvertisement = true

public init(advert: BillboardAd, config: BillboardConfiguration = BillboardConfiguration(), includeShadow: Bool = true) {
public init(advert: BillboardAd, config: BillboardConfiguration = BillboardConfiguration(), includeShadow: Bool = true, hideDismissButtonAndTimer: Bool = false) {
self.advert = advert
self.config = config
self.includeShadow = includeShadow
self.hideDismissButtonAndTimer = hideDismissButtonAndTimer
}

public var body: some View {
Expand Down Expand Up @@ -59,32 +61,33 @@ public struct BillboardBannerView : View {
.buttonStyle(.plain)
Spacer()

if canDismiss {
Button {
if config.allowHaptics {
haptics(.light)
}

withAnimation(.spring()) {
showAdvertisement = false
if !hideDismissButtonAndTimer {
if canDismiss {
Button {
if config.allowHaptics {
haptics(.light)
}

withAnimation(.spring()) {
showAdvertisement = false
}

} label: {
Label("Dismiss advertisement", systemImage: "xmark.circle.fill")
.labelStyle(.iconOnly)
.font(.compatibleSystem(.title2, design: .rounded, weight: .bold))
.symbolRenderingMode(.hierarchical)
.imageScale(.large)
.controlSize(.large)
}

} label: {
Label("Dismiss advertisement", systemImage: "xmark.circle.fill")
.labelStyle(.iconOnly)
.font(.compatibleSystem(.title2, design: .rounded, weight: .bold))
.symbolRenderingMode(.hierarchical)
.imageScale(.large)
.controlSize(.large)
.tint(advert.tint)
} else {
BillboardCountdownView(advert:advert,
totalDuration: config.duration,
canDismiss: $canDismiss)
.padding(.trailing, 2)
}
.tint(advert.tint)
} else {
BillboardCountdownView(advert:advert,
totalDuration: config.duration,
canDismiss: $canDismiss)
.padding(.trailing, 2)
}

}
.padding(10)
.background(backgroundView)
Expand Down