Skip to content

[stable-5.5.5] NMC/2341 - NCTrashView #249

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

Closed
github-actions wants to merge 1 commit into from
Closed

[stable-5.5.5] NMC/2341 - NCTrashView #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
1 change: 0 additions & 1 deletion Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
150 changes: 63 additions & 87 deletions iOSClient/Trash/Cell/NCTrashGridCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,74 @@
// NCTrashGridCell.swift
// Nextcloud
//
// Created by Marino Faggiana on 19/03/2024.
// Copyright © 2024 Marino Faggiana. All rights reserved.
//
// Author Marino Faggiana <marino.faggiana@nextcloud.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// Created by A200073704 on 27/06/23.
// Copyright © 2023 Marino Faggiana. All rights reserved.
//

import UIKit

protocol NCTrashGridCellDelegate: AnyObject {
func tapMoreGridItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any)
}

class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {


@IBOutlet weak var imageItem: UIImageView!
@IBOutlet weak var imageSelect: UIImageView!
@IBOutlet weak var imageStatus: UIImageView!
@IBOutlet weak var imageFavorite: UIImageView!
@IBOutlet weak var imageLocal: UIImageView!
@IBOutlet weak var labelTitle: UILabel!
@IBOutlet weak var labelInfo: UILabel!
@IBOutlet weak var labelSubinfo: UILabel!
@IBOutlet weak var buttonMore: UIButton!
@IBOutlet weak var imageVisualEffect: UIVisualEffectView!
@IBOutlet weak var progressView: UIProgressView!

weak var delegate: NCTrashGridCellDelegate?
var objectId = ""
internal var objectId = ""
var indexPath = IndexPath()
var user = ""
private var user = ""

weak var delegate: NCGridCellDelegate?
var namedButtonMore = ""

var fileObjectId: String? {
get { return objectId }
set { objectId = newValue ?? "" }
}
var filePreviewImageView: UIImageView? {
get { return imageItem }
set { imageItem = newValue }
}
var fileUser: String? {
get { return user }
set { user = newValue ?? "" }
}
var fileTitleLabel: UILabel? {
get { return labelTitle }
set { labelTitle = newValue }
}
var fileInfoLabel: UILabel? {
get { return labelInfo }
set { labelInfo = newValue }
}
var fileProgressView: UIProgressView? {
get { return progressView }
set { progressView = newValue }
}
var fileSelectImage: UIImageView? {
get { return imageSelect }
set { imageSelect = newValue }
}
var fileStatusImage: UIImageView? {
get { return imageStatus }
set { imageStatus = newValue }
}
var fileLocalImage: UIImageView? {
get { return imageLocal }
set { imageLocal = newValue }
}
var fileFavoriteImage: UIImageView? {
get { return imageFavorite }
set { imageFavorite = newValue }
}

override func awakeFromNib() {
super.awakeFromNib()
initCell()
Expand All @@ -66,9 +93,14 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
imageVisualEffect.clipsToBounds = true
imageVisualEffect.alpha = 0.5

progressView.tintColor = NCBrandColor.shared.brandElement
progressView.transform = CGAffineTransform(scaleX: 1.0, y: 0.5)
progressView.trackTintColor = .clear

labelTitle.text = ""
labelInfo.text = ""
labelSubinfo.text = ""
labelTitle.textColor = .label
labelInfo.textColor = .systemGray
}

override func snapshotView(afterScreenUpdates afterUpdates: Bool) -> UIView? {
Expand All @@ -79,17 +111,18 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
delegate?.tapMoreGridItem(with: objectId, namedButtonMore: namedButtonMore, image: imageItem.image, indexPath: indexPath, sender: sender)
}


fileprivate func setA11yActions() {
let moreName = namedButtonMore == NCGlobal.shared.buttonMoreStop ? "_cancel_" : "_more_"

self.accessibilityCustomActions = [
UIAccessibilityCustomAction(
name: NSLocalizedString(moreName, comment: ""),
target: self,
selector: #selector(touchUpInsideMore))
]
}

func setButtonMore(named: String, image: UIImage) {
namedButtonMore = named
buttonMore.setImage(image, for: .normal)
Expand All @@ -113,7 +146,7 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
imageSelect.isHidden = false
imageVisualEffect.isHidden = false
} else {
imageSelect.isHidden = true
imageSelect.image = NCImageCache.images.checkedNo
imageVisualEffect.isHidden = true
}
}
Expand All @@ -124,68 +157,11 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
dateFormatter.timeStyle = .none
dateFormatter.locale = Locale.current

labelInfo.text = dateFormatter.string(from: date as Date)
labelSubinfo.text = NCUtilityFileSystem().transformedSize(size)
labelInfo.text = dateFormatter.string(from: date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
}

func setAccessibility(label: String, value: String) {
accessibilityLabel = label
accessibilityValue = value
}
}

// MARK: - Grid Layout

class NCTrashGridLayout: UICollectionViewFlowLayout {

var heightLabelPlusButton: CGFloat = 60
var marginLeftRight: CGFloat = 10
var itemForLine: CGFloat = 3
var itemWidthDefault: CGFloat = 140

// MARK: - View Life Cycle

override init() {
super.init()

sectionHeadersPinToVisibleBounds = false

minimumInteritemSpacing = 1
minimumLineSpacing = marginLeftRight

self.scrollDirection = .vertical
self.sectionInset = UIEdgeInsets(top: 10, left: marginLeftRight, bottom: 0, right: marginLeftRight)
}

required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

override var itemSize: CGSize {
get {
if let collectionView = collectionView {

if collectionView.frame.width < 400 {
itemForLine = 3
} else {
itemForLine = collectionView.frame.width / itemWidthDefault
}

let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (itemForLine - 1)) / itemForLine
let itemHeight: CGFloat = itemWidth + heightLabelPlusButton

return CGSize(width: itemWidth, height: itemHeight)
}

// Default fallback
return CGSize(width: itemWidthDefault, height: itemWidthDefault)
}
set {
super.itemSize = newValue
}
}

override func targetContentOffset(forProposedContentOffset proposedContentOffset: CGPoint) -> CGPoint {
return proposedContentOffset
}
}
Loading