Skip to content

Make privacy banner not dismissable via WordPress UI tooling #9830

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
merged 4 commits into from
Jun 1, 2023
Merged

Make privacy banner not dismissable via WordPress UI tooling #9830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
769ab26
Use WordPress-UI version 1.13 and above, resolves to 1.13.0
mokagio May 29, 2023
4248796
Configure `PrivacyBannerViewController` to not be dismissable
mokagio May 29, 2023
41c68ef
Remove no longer needed workaround to block privacy banner dismissal
mokagio May 29, 2023
88ed395
Set `allowsUserTransition` to `false` for privacy banner
mokagio May 31, 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 Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ target 'WooCommerce' do

wordpress_shared

pod 'WordPressUI', '~> 1.12.5'
pod 'WordPressUI', '~> 1.13-beta'
# pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''

aztec
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ PODS:
- WordPressShared (~> 2.0-beta)
- wpxmlrpc (~> 0.10)
- WordPressShared (2.1.0)
- WordPressUI (1.12.5)
- WordPressUI (1.13.0)
- Wormholy (1.6.6)
- WPMediaPicker (1.8.1)
- wpxmlrpc (0.10.0)
Expand Down Expand Up @@ -85,7 +85,7 @@ DEPENDENCIES:
- WordPress-Editor-iOS (~> 1.11.0)
- WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`)
- WordPressShared (~> 2.1)
- WordPressUI (~> 1.12.5)
- WordPressUI (~> 1.13-beta)
- Wormholy (~> 1.6.6)
- WPMediaPicker (~> 1.8.1)
- ZendeskSupportSDK (~> 6.0)
Expand Down Expand Up @@ -161,7 +161,7 @@ SPEC CHECKSUMS:
WordPressAuthenticator: 8a27a3c61ca0d740df66f260902aa2ca8528c61b
WordPressKit: b65a51863982d8166897bea8b753f1fc51732aad
WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
WordPressUI: 9951bdade87c8c64b50535aaed2a53a11d0c52ee
Wormholy: 09da0b876f9276031fd47383627cb75e194fc068
WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand All @@ -173,6 +173,6 @@ SPEC CHECKSUMS:
ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06
ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393

PODFILE CHECKSUM: 7ef16ee777d45b27a6ea41073fce0a707bda17a7
PODFILE CHECKSUM: 08c354d1c2b7fcbef3508c1931f343661f463f8e

COCOAPODS: 1.11.3
12 changes: 0 additions & 12 deletions WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,3 @@ extension PrivacyBannerPresenter {
static let retry = NSLocalizedString("Retry", comment: "Retry title on the notice action button")
}
}

extension BottomSheetViewController {
/// Temporary hack to prevent the `PrivacyBannerViewController` to be dismissed.
/// This should be changed once https://github.com/wordpress-mobile/WordPressUI-iOS/pull/126 is merged.
///
public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
if children.first is PrivacyBannerViewController {
return
}
super.dismiss(animated: flag, completion: completion)
}
}
5 changes: 5 additions & 0 deletions WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ extension PrivacyBannerViewController: DrawerPresentable {
var expandedHeight: DrawerHeight {
return .contentHeight(bannerIntrinsicHeight)
}

// We want the user to dimiss this only by completing the flow, not by tapping, dragging, or collapsing.
var allowsDragToDismiss: Bool { false }
var allowsTapToDismiss: Bool { false }
var allowsUserTransition: Bool { false }
}

/// Banner View for the privacy settings.
Expand Down