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

Support for having non-square previews + make selectCameraCell open to allow for opening custom camera without needing a custom cell #335

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Support for having non-square previews + make selectCameraCell open to allow for opening custom camera without needing a custom cell #335

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ceb28f
Made the one func public
NickNeedsAName Sep 22, 2021
3bc126b
Move things around so I can override. Make open so I can override
NickNeedsAName Sep 22, 2021
2c7cad6
Merge branch 'tilltue:master' into master
NickNeedsAName Apr 15, 2022
b189f76
Add support for having cells not just be squares
NickNeedsAName Apr 15, 2022
f58d0ef
Rename from thumbnail -> Cell as it's more accurate and informative
NickNeedsAName Apr 15, 2022
40837f9
content inset
NickNeedsAName Apr 15, 2022
57aae90
COLORS
NickNeedsAName Apr 15, 2022
df96500
COLORS
NickNeedsAName Apr 15, 2022
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
44 changes: 30 additions & 14 deletions TLPhotoPicker/Classes/TLPhotosPickerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,12 @@ public struct TLPhotosPickerConfigure {
public var numberOfColumn = 3
public var minimumLineSpacing: CGFloat = 5
public var minimumInteritemSpacing: CGFloat = 5
public var contentInset: UIEdgeInsets = .zero
public var singleSelectedMode = false
public var maxSelectedAssets: Int? = nil
public var cellHeightWidthAspectRatio: CGFloat = 1
public var backgroundColor: UIColor? = nil
public var collectionViewBackgroundColor: UIColor? = nil
public var fetchOption: PHFetchOptions? = nil
public var fetchCollectionOption: [FetchCollectionType: PHFetchOptions] = [:]
public var selectedColor = UIColor(red: 88/255, green: 144/255, blue: 255/255, alpha: 1.0)
Expand Down Expand Up @@ -256,6 +260,14 @@ open class TLPhotosPickerViewController: UIViewController {
self.view.backgroundColor = .white
self.collectionView.backgroundColor = .white
}
if let bgColor = self.configure.backgroundColor {
print("\n\n\n\n\n!!!!!!!!!!!!!!!!SETTING BG COLOR!!!!!!!!!!!!!!!!!!!!\n\n\n\n\n")
self.view.backgroundColor = bgColor
self.navigationBar.backgroundColor = bgColor
}
if let collectionBGColor = self.configure.collectionViewBackgroundColor {
self.view.backgroundColor = collectionBGColor
}
}
}

Expand Down Expand Up @@ -359,6 +371,19 @@ open class TLPhotosPickerViewController: UIViewController {
}
}

open func selectCameraCell(_ cell: TLPhotoCollectionViewCell) {
if Platform.isSimulator {
print("not supported by the simulator.")
} else {
if configure.cameraCellNibSet?.nibName != nil {
cell.selectedCell()
} else {
showCameraIfAuthorized()
}
logDelegate?.selectedCameraCell(picker: self)
}
}

open func maxCheck() -> Bool {
deselectWhenUsingSingleSelectedMode()
if let max = self.configure.maxSelectedAssets, max <= self.selectedAssets.count {
Expand Down Expand Up @@ -393,8 +418,10 @@ extension TLPhotosPickerViewController {
return
}
let count = CGFloat(self.configure.numberOfColumn)
let width = floor((self.view.frame.size.width - (self.configure.minimumInteritemSpacing * (count-1))) / count)
self.thumbnailSize = CGSize(width: width, height: width)
let workingWidth = self.view.frame.size.width - (self.collectionView.contentInset.left + self.collectionView.contentInset.right)
let width = floor((workingWidth - (self.configure.minimumInteritemSpacing * (count-1))) / count)
let height = self.configure.cellHeightWidthAspectRatio * width
self.thumbnailSize = CGSize(width: width, height: height)
layout.itemSize = self.thumbnailSize
layout.minimumInteritemSpacing = self.configure.minimumInteritemSpacing
layout.minimumLineSpacing = self.configure.minimumLineSpacing
Expand Down Expand Up @@ -438,6 +465,7 @@ extension TLPhotosPickerViewController {
} else {
self.allowedLivePhotos = false
}
self.collectionView.contentInset = self.configure.contentInset
self.customDataSouces?.registerSupplementView(collectionView: self.collectionView)
self.navigationBar.delegate = self
updateUserInterfaceStyle()
Expand Down Expand Up @@ -1263,18 +1291,6 @@ extension TLPhotosPickerViewController: UIViewControllerPreviewingDelegate {
}

extension TLPhotosPickerViewController {
func selectCameraCell(_ cell: TLPhotoCollectionViewCell) {
if Platform.isSimulator {
print("not supported by the simulator.")
} else {
if configure.cameraCellNibSet?.nibName != nil {
cell.selectedCell()
} else {
showCameraIfAuthorized()
}
logDelegate?.selectedCameraCell(picker: self)
}
}

func toggleSelection(for cell: TLPhotoCollectionViewCell, at indexPath: IndexPath) {
guard let collection = focusedCollection, var asset = collection.getTLAsset(at: indexPath), let phAsset = asset.phAsset else { return }
Expand Down