Skip to content

Commit e6e0ab2

Browse files
authored
Merge pull request #2285 from woocommerce/issue/2054-remove-bottom-sheet-copy
Remove BottomSheet copy from WCiOS and use it from WordPressUI framework
2 parents b633b66 + 49ea266 commit e6e0ab2

File tree

10 files changed

+5
-801
lines changed

10 files changed

+5
-801
lines changed

WooCommerce/Classes/ViewRelated/BottomSheet/BottomSheetViewController+Constants.swift

Lines changed: 0 additions & 9 deletions
This file was deleted.

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorPresenter.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import UIKit
2+
import WordPressUI
23

34
/// Presents a bottom sheet list selector specified in its initializer.
45
///

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorViewController+DrawerPresentable.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import UIKit
2+
import WordPressUI
23

34
extension BottomSheetListSelectorViewController: DrawerPresentable {
45
var collapsedHeight: DrawerHeight {

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorViewController.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import UIKit
2+
import WordPressUI
23

34
/// Displays a list (implemented by table view) for the user to select a generic model from a bottom sheet.
45
///
@@ -128,8 +129,6 @@ private extension BottomSheetListSelectorViewController {
128129
}
129130

130131
func configurePreferredContentSize() {
131-
let size = contentSize
132-
let height = contentSize.height + BottomSheetViewController.Constants.additionalContentTopMargin
133-
preferredContentSize = CGSize(width: size.width, height: height)
132+
preferredContentSize = contentSize
134133
}
135134
}

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Photos
22
import UIKit
3+
import WordPressUI
34
import Yosemite
45

56
/// The entry UI for adding/editing a Product.

WooCommerce/Vendors/WPiOS-BottomSheet/BottomSheetAnimationController.swift

Lines changed: 0 additions & 50 deletions
This file was deleted.

WooCommerce/Vendors/WPiOS-BottomSheet/BottomSheetViewController.swift

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)