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

feat(FloatingPanelActionCollectionViewCell): Chip capability #1429

Merged
merged 2 commits into from
Feb 12, 2025
Merged

feat(FloatingPanelActionCollectionViewCell): Chip capability #1429

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
84aa858
feat(FloatingPanelActionCollectionViewCell): Chip capability
adrien-coye Feb 12, 2025
55f28fd
feat: Enable chip for convertToDropbox action
adrien-coye Feb 12, 2025
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
3 changes: 2 additions & 1 deletion kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ final class FileActionsFloatingPanelViewController: UICollectionViewController {

var quickActions = FloatingPanelAction.quickActions
var actions = FloatingPanelAction.listActions
lazy var packId = DrivePackId(rawValue: driveFileManager.drive.pack.name)

private var downloadAction: FloatingPanelAction?
private var fileObserver: ObservationToken?
Expand Down Expand Up @@ -254,7 +255,7 @@ final class FileActionsFloatingPanelViewController: UICollectionViewController {
case .actions:
let cell = collectionView.dequeueReusableCell(type: FloatingPanelActionCollectionViewCell.self, for: indexPath)
let action = actions[indexPath.item]
cell.configure(with: action, file: file, showProgress: downloadAction == action)
cell.configure(with: action, file: file, showProgress: downloadAction == action, currentPackId: packId)
return cell
}
}
Expand Down
28 changes: 27 additions & 1 deletion kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
@IBOutlet var progressView: RPCircularProgress!
@IBOutlet var titleLabel: IKLabel!
@IBOutlet var switchView: UISwitch!
@IBOutlet var chipContainerView: UIView!

private var observationToken: ObservationToken?

Expand All @@ -51,10 +52,13 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
override func prepareForReuse() {
super.prepareForReuse()
switchView.isHidden = true
chipContainerView.subviews.forEach { $0.removeFromSuperview() }
observationToken?.cancel()
}

func configure(with action: FloatingPanelAction, file: File?, showProgress: Bool) {
func configure(with action: FloatingPanelAction,
file: File?, showProgress: Bool,
currentPackId: DrivePackId? = nil) {
titleLabel.text = action.name
iconImageView.image = action.image
iconImageView.tintColor = action.tintColor
Expand All @@ -70,6 +74,14 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
observeProgress(showProgress, file: file)
}
}

switch action {
case .upsaleColor, .convertToDropbox:
guard currentPackId == .myKSuite else { return }
configureChip()
default:
break
}
}

func configure(with action: FloatingPanelAction, files: [File], showProgress: Bool, archiveId: String?) {
Expand Down Expand Up @@ -106,6 +118,20 @@ class FloatingPanelActionCollectionViewCell: UICollectionViewCell {
}
}

func configureChip() {
let chipView = MyKSuiteChip.instantiateGrayChip()

chipView.translatesAutoresizingMaskIntoConstraints = false
chipContainerView.addSubview(chipView)

NSLayoutConstraint.activate([
chipView.leadingAnchor.constraint(equalTo: chipContainerView.leadingAnchor),
chipView.trailingAnchor.constraint(equalTo: chipContainerView.trailingAnchor),
chipView.topAnchor.constraint(equalTo: chipContainerView.topAnchor),
chipView.bottomAnchor.constraint(equalTo: chipContainerView.bottomAnchor)
])
}

func configureAvailableOffline(with file: File) {
switchView.isHidden = false
if switchView.isOn != file.isAvailableOffline {
Expand Down
25 changes: 21 additions & 4 deletions kDrive/UI/View/Files/FloatingPanel/FloatingPanelActionCollectionViewCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="collection view cell content view" minToolsVersion="11.0"/>
Expand Down Expand Up @@ -35,7 +35,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0FA-dt-y7y" customClass="IKLabel" customModule="InfomaniakCoreUIKit">
<rect key="frame" x="52" y="19" width="241" height="15"/>
<rect key="frame" x="52" y="19" width="41.5" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand All @@ -46,6 +46,19 @@
<switch opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nG8-v1-MKX">
<rect key="frame" x="301" y="11" width="51" height="31"/>
</switch>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PH0-vR-Rh8">
<rect key="frame" x="330" y="16.5" width="20" height="20"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="20" placeholder="YES" id="Tii-0i-b35"/>
<constraint firstAttribute="height" constant="20" placeholder="YES" id="XOO-nQ-Ml6"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SnW-jI-CaQ" customClass="RPCircularProgress" customModule="kDrive" customModuleProvider="target">
<rect key="frame" x="20" y="14.5" width="24" height="24"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
Expand All @@ -59,25 +72,29 @@
<constraint firstAttribute="bottom" secondItem="bMd-r9-rAt" secondAttribute="bottom" id="4po-k6-UJP"/>
<constraint firstAttribute="trailing" secondItem="Y3Q-nc-2FL" secondAttribute="trailing" id="AIZ-vp-h5V"/>
<constraint firstAttribute="trailing" secondItem="nG8-v1-MKX" secondAttribute="trailing" constant="20" id="BFa-AM-x9S"/>
<constraint firstItem="PH0-vR-Rh8" firstAttribute="centerY" secondItem="0FA-dt-y7y" secondAttribute="centerY" id="Mdp-wA-O8s"/>
<constraint firstAttribute="bottom" secondItem="0FA-dt-y7y" secondAttribute="bottom" constant="19" id="PtP-Qp-euN"/>
<constraint firstItem="qXV-7J-B71" firstAttribute="leading" secondItem="u4L-yp-I0Z" secondAttribute="leading" constant="20" id="T9J-lz-Lta"/>
<constraint firstItem="nG8-v1-MKX" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="0FA-dt-y7y" secondAttribute="trailing" constant="8" id="Thz-cf-hYe"/>
<constraint firstAttribute="trailing" secondItem="PH0-vR-Rh8" secondAttribute="trailing" constant="20" id="UIC-eh-zg7"/>
<constraint firstAttribute="bottom" secondItem="Y3Q-nc-2FL" secondAttribute="bottom" id="VDw-Yv-hzH"/>
<constraint firstItem="nG8-v1-MKX" firstAttribute="centerY" secondItem="u4L-yp-I0Z" secondAttribute="centerY" id="aci-cf-Ovd"/>
<constraint firstItem="0FA-dt-y7y" firstAttribute="top" secondItem="u4L-yp-I0Z" secondAttribute="top" constant="19" id="bBS-jY-bRl"/>
<constraint firstItem="SnW-jI-CaQ" firstAttribute="centerY" secondItem="u4L-yp-I0Z" secondAttribute="centerY" id="cZF-qN-bEn"/>
<constraint firstItem="bMd-r9-rAt" firstAttribute="top" secondItem="u4L-yp-I0Z" secondAttribute="top" id="exm-Vu-h57"/>
<constraint firstItem="Y3Q-nc-2FL" firstAttribute="top" secondItem="u4L-yp-I0Z" secondAttribute="top" id="iEJ-xy-PIq"/>
<constraint firstItem="Y3Q-nc-2FL" firstAttribute="leading" secondItem="u4L-yp-I0Z" secondAttribute="leading" id="j1q-Xm-5GJ"/>
<constraint firstItem="PH0-vR-Rh8" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="0FA-dt-y7y" secondAttribute="trailing" constant="8" id="m6B-lk-vW9"/>
<constraint firstItem="qXV-7J-B71" firstAttribute="centerY" secondItem="u4L-yp-I0Z" secondAttribute="centerY" id="oHS-QB-Dfe"/>
<constraint firstItem="0FA-dt-y7y" firstAttribute="leading" secondItem="qXV-7J-B71" secondAttribute="trailing" constant="8" symbolic="YES" id="pN0-1u-Tgk"/>
<constraint firstAttribute="trailing" secondItem="bMd-r9-rAt" secondAttribute="trailing" id="v88-Mh-fN9"/>
<constraint firstItem="nG8-v1-MKX" firstAttribute="leading" secondItem="0FA-dt-y7y" secondAttribute="trailing" constant="8" id="wYU-OO-UMq"/>
<constraint firstItem="bMd-r9-rAt" firstAttribute="leading" secondItem="u4L-yp-I0Z" secondAttribute="leading" id="xcg-PE-hNL"/>
<constraint firstItem="SnW-jI-CaQ" firstAttribute="leading" secondItem="u4L-yp-I0Z" secondAttribute="leading" constant="20" id="zmG-Ev-6ox"/>
</constraints>
</collectionViewCellContentView>
<size key="customSize" width="50" height="57"/>
<connections>
<outlet property="chipContainerView" destination="PH0-vR-Rh8" id="2mT-DU-vcl"/>
<outlet property="disabledView" destination="bMd-r9-rAt" id="kTs-of-LbH"/>
<outlet property="highlightedView" destination="Y3Q-nc-2FL" id="GTw-q2-zX8"/>
<outlet property="iconImageView" destination="qXV-7J-B71" id="0Pp-uD-tDM"/>
Expand Down
Loading