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

Added behavior for a long press on image cells. And added podspec back in. #110

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

Added behavior for a long press on image cells. And added podspec back in. #110

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
5cfa894
Added behavior for a long press on image cells.
crspybits Feb 24, 2019
c3c893e
Added podspec back in.
crspybits Feb 24, 2019
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
16 changes: 16 additions & 0 deletions NohanaImagePicker.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Pod::Spec.new do |s|
s.name = 'NohanaImagePicker'
s.version = '0.9.3'
s.summary = 'A multiple image picker for iOS app.'
s.homepage = 'https://github.com/nohana/NohanaImagePicker'
s.license = { :type => 'Apache License v2', :file => 'LICENSE' }
s.author = { 'nohana' => '[email protected]' }
s.source = { :git => 'https://github.com/nohana/NohanaImagePicker.git', :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.source_files = 'NohanaImagePicker/*.swift'
s.resource_bundles = {
'NohanaImagePicker' => ['NohanaImagePicker/*.{xcassets,storyboard,lproj}']
}
s.frameworks = 'UIKit', 'Photos'
s.swift_version = '4.2'
end
35 changes: 34 additions & 1 deletion NohanaImagePicker/AssetCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,34 @@ class AssetCell: UICollectionViewCell {
@IBOutlet weak var imageView: UIImageView!
@IBOutlet weak var pickButton: UIButton!
@IBOutlet weak var overlayView: UIView!

weak var nohanaImagePickerController: NohanaImagePickerController?
var asset: Asset?
private var longPressRecognizer:UILongPressGestureRecognizer!
private var longPress: (()->())?

override func awakeFromNib() {
longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(longPressAction(gesture:)))
longPressRecognizer.delaysTouchesBegan = true
contentView.addGestureRecognizer(longPressRecognizer)
super.awakeFromNib()
}

@objc private func longPressAction(gesture: UILongPressGestureRecognizer!) {
if gesture.state == .began {
longPress?()
}
}

func setLongPressAction(forCellAt indexPath: IndexPath, collectionView: UICollectionView, viewController: UIViewController, segueIdentifier: String) {
if let cellMainAction = nohanaImagePickerController?.cellMainAction,
cellMainAction == .longPressShowLargeImage {

longPress = {
collectionView.selectItem(at: indexPath, animated: false, scrollPosition: UICollectionView.ScrollPosition(rawValue: 0))
viewController.performSegue(withIdentifier: segueIdentifier, sender: viewController)
}
}
}

override func willMove(toSuperview newSuperview: UIView?) {
super.willMove(toSuperview: newSuperview)
Expand All @@ -36,6 +61,10 @@ class AssetCell: UICollectionViewCell {
}

@IBAction func didPushPickButton(_ sender: UIButton) {
pushPickButton()
}

func pushPickButton() {
guard let asset = asset else {
return
}
Expand All @@ -54,6 +83,10 @@ class AssetCell: UICollectionViewCell {
func update(asset: Asset, nohanaImagePickerController: NohanaImagePickerController) {
self.asset = asset
self.nohanaImagePickerController = nohanaImagePickerController

self.longPressRecognizer.isEnabled =
nohanaImagePickerController.cellMainAction == .longPressShowLargeImage

self.pickButton.isSelected = nohanaImagePickerController.pickedAssetList.isPicked(asset)
self.overlayView.isHidden = !pickButton.isSelected
self.pickButton.isHidden = !(nohanaImagePickerController.canPickAsset(asset) )
Expand Down
21 changes: 21 additions & 0 deletions NohanaImagePicker/AssetListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ class AssetListViewController: UICollectionViewController, UICollectionViewDeleg
}
})
}

cell.setLongPressAction(forCellAt: indexPath, collectionView: collectionView, viewController: self, segueIdentifier: "AssetDetailListViewController1")

return (nohanaImagePickerController.delegate?.nohanaImagePicker?(nohanaImagePickerController, assetListViewController: self, cell: cell, indexPath: indexPath, photoKitAsset: asset.originalAsset)) ?? cell
}

Expand All @@ -141,6 +144,24 @@ class AssetListViewController: UICollectionViewController, UICollectionViewDeleg
}

// MARK: - Storyboard

override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if let cellMainAction = nohanaImagePickerController?.cellMainAction {
switch cellMainAction {
case .tapShowLargeImage:
return true
case .longPressShowLargeImage:
// This actually represent a tap action: Using it for changing picked state.
if let indexPaths = collectionView.indexPathsForSelectedItems, indexPaths.count > 0,
let cell = collectionView.cellForItem(at: indexPaths[0]) as? AssetCell {
cell.pushPickButton()
}
return false
}
}

return true
}

override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
guard let selectedIndexPath = collectionView?.indexPathsForSelectedItems?.first else {
Expand Down
3 changes: 3 additions & 0 deletions NohanaImagePicker/MomentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ class MomentViewController: AssetListViewController, ActivityIndicatable {
}
})
}

cell.setLongPressAction(forCellAt: indexPath, collectionView: collectionView, viewController: self, segueIdentifier: "AssetDetailListViewController2")

return (nohanaImagePickerController.delegate?.nohanaImagePicker?(nohanaImagePickerController, assetListViewController: self, cell: cell, indexPath: indexPath, photoKitAsset: asset.originalAsset)) ?? cell
}

Expand Down
39 changes: 19 additions & 20 deletions NohanaImagePicker/NohanaImagePicker.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -23,18 +22,18 @@
<rect key="frame" x="0.0" y="28" width="320" height="82"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HiQ-6b-xqZ" id="Nuf-ja-Ajg">
<rect key="frame" x="0.0" y="0.0" width="287" height="82"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="82"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Igm-UH-WUI">
<rect key="frame" x="12" y="6" width="70" height="70"/>
<rect key="frame" x="20" y="6" width="70" height="70"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="Vc2-EG-fnZ"/>
<constraint firstAttribute="height" constant="70" id="xiw-gz-cfn"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Album Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YSz-MM-h6f">
<rect key="frame" x="100" y="31.5" width="187" height="19.5"/>
<rect key="frame" x="108" y="31.5" width="178" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -59,11 +58,11 @@
<rect key="frame" x="0.0" y="110" width="320" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="URZ-ke-kYw" id="ZzC-oj-tew">
<rect key="frame" x="0.0" y="0.0" width="287" height="52"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Moment Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzC-P1-sBf">
<rect key="frame" x="16" y="18" width="271" height="16"/>
<rect key="frame" x="24" y="18" width="262" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="tPC-2Q-2pd"/>
</constraints>
Expand Down Expand Up @@ -127,14 +126,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WKb-lP-sq5">
<rect key="frame" x="-8" y="-8" width="94" height="94"/>
<rect key="frame" x="0.0" y="20" width="78" height="58"/>
</imageView>
<view hidden="YES" alpha="0.29999999999999999" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MT5-kg-1gq">
<rect key="frame" x="-8" y="-8" width="94" height="94"/>
<rect key="frame" x="0.0" y="20" width="78" height="58"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oDB-be-mWY">
<rect key="frame" x="42" y="-8" width="44" height="44"/>
<rect key="frame" x="34" y="20" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="7Yd-sj-A9c"/>
<constraint firstAttribute="height" constant="44" id="Biw-rC-p8x"/>
Expand Down Expand Up @@ -162,7 +161,7 @@
<outlet property="imageView" destination="WKb-lP-sq5" id="ejZ-cu-f5Y"/>
<outlet property="overlayView" destination="MT5-kg-1gq" id="yGO-Ix-xoL"/>
<outlet property="pickButton" destination="oDB-be-mWY" id="hf7-6i-k62"/>
<segue destination="r7t-t8-AuE" kind="show" id="vma-iJ-kti"/>
<segue destination="r7t-t8-AuE" kind="show" identifier="AssetDetailListViewController1" id="vma-iJ-kti"/>
</connections>
</collectionViewCell>
</cells>
Expand Down Expand Up @@ -211,7 +210,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="hM8-Xr-3HX">
<rect key="frame" x="-8" y="-8" width="336" height="336"/>
<rect key="frame" x="0.0" y="20" width="320" height="300"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jr7-IN-pxL">
<rect key="frame" x="0.0" y="0.0" width="320" height="320"/>
Expand Down Expand Up @@ -336,14 +335,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TB3-Xf-nik">
<rect key="frame" x="-8" y="-8" width="94" height="94"/>
<rect key="frame" x="0.0" y="20" width="78" height="58"/>
</imageView>
<view hidden="YES" alpha="0.30000001192092896" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SnZ-bd-Zia">
<rect key="frame" x="-8" y="-8" width="94" height="94"/>
<rect key="frame" x="0.0" y="20" width="78" height="58"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vrt-tc-b54">
<rect key="frame" x="42" y="-8" width="44" height="44"/>
<rect key="frame" x="34" y="20" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="BX8-gP-86t"/>
<constraint firstAttribute="height" constant="44" id="RUG-gG-ieX"/>
Expand Down Expand Up @@ -371,7 +370,7 @@
<outlet property="imageView" destination="TB3-Xf-nik" id="HVf-Zj-nzV"/>
<outlet property="overlayView" destination="SnZ-bd-Zia" id="27X-Fy-OP9"/>
<outlet property="pickButton" destination="vrt-tc-b54" id="MVQ-KJ-OAp"/>
<segue destination="r7t-t8-AuE" kind="show" id="Bed-w3-B1Q"/>
<segue destination="r7t-t8-AuE" kind="show" identifier="AssetDetailListViewController2" id="Bed-w3-B1Q"/>
</connections>
</collectionViewCell>
</cells>
Expand All @@ -380,7 +379,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNJ-Oh-VhZ">
<rect key="frame" x="4" y="13" width="120" height="17"/>
<rect key="frame" x="12" y="13.5" width="120" height="17"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="KSm-hH-VZX"/>
<constraint firstAttribute="width" constant="120" id="QzC-0j-DZA"/>
Expand All @@ -395,7 +394,7 @@
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Location" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Aa-PA-AHS">
<rect key="frame" x="124" y="15.5" width="192" height="14.5"/>
<rect key="frame" x="132" y="15" width="176" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -442,7 +441,7 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="vma-iJ-kti"/>
<segue reference="Bed-w3-B1Q"/>
<segue reference="tQI-o9-h2w"/>
</inferredMetricsTieBreakers>
</document>
9 changes: 9 additions & 0 deletions NohanaImagePicker/NohanaImagePickerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ open class NohanaImagePickerController: UIViewController {
open var shouldShowMoment: Bool = true
open var shouldShowEmptyAlbum: Bool = false
open var toolbarHidden: Bool = false

public enum CellMainAction {
case tapShowLargeImage

// A single tap on the main part of the cell toggles the selected state; a long press shows the start image.
case longPressShowLargeImage
}
open var cellMainAction: CellMainAction? = .tapShowLargeImage

open var canPickAsset = { (asset: Asset) -> Bool in
return true
}
Expand Down