Skip to content

Commit

Permalink
Merge branch 'api-v3' into menu-v3
Browse files Browse the repository at this point in the history
Signed-off-by: Philippe Weidmann <[email protected]>

# Conflicts:
#	.package.resolved
#	kDriveCore/Data/Models/File.swift
  • Loading branch information
PhilippeWeidmann committed Jan 29, 2024
2 parents 538a428 + b79c4b0 commit da028d5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"location" : "https://github.com/Infomaniak/ios-core",
"state" : {
"branch" : "cursored-api-response",
"revision" : "6989d94a64ae14047442e02538820e244224a4b3"
"revision" : "eb17c44e90e1df9267b385cf8da93d7d6fa08d7c"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tuist/ProjectDescriptionHelpers/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public enum Constants {
public static let baseSettings = SettingsDictionary()
.automaticCodeSigning(devTeam: "864VDCS2QY")
.currentProjectVersion("1")
.marketingVersion("4.4.0")
.marketingVersion("4.4.1")

public static let deploymentTarget = DeploymentTarget.iOS(targetVersion: "13.4", devices: [.iphone, .ipad])

Expand Down
6 changes: 5 additions & 1 deletion kDrive/UI/View/Files/FileCollectionViewCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protocol FileCellDelegate: AnyObject {
]
var file: File
var selectionMode: Bool
var isSelected = false
private var downloadProgressObserver: ObservationToken?
private var downloadObserver: ObservationToken?
var thumbnailDownloadTask: Kingfisher.DownloadTask?
Expand Down Expand Up @@ -149,7 +150,8 @@ protocol FileCellDelegate: AnyObject {
// Fetch thumbnail
thumbnailDownloadTask = file.getThumbnail { [requestFileId = file.id, weak self] image, _ in
guard let self,
!self.file.isInvalidated else {
!self.file.isInvalidated,
!self.isSelected else {
return
}

Expand Down Expand Up @@ -197,6 +199,7 @@ class FileCollectionViewCell: UICollectionViewCell, SwipableCell {

override var isSelected: Bool {
didSet {
viewModel.isSelected = isSelected
configureForSelection()
}
}
Expand Down Expand Up @@ -331,6 +334,7 @@ class FileCollectionViewCell: UICollectionViewCell, SwipableCell {

func configureForSelection() {
guard viewModel?.selectionMode == true else { return }

if isSelected {
configureCheckmarkImage()
configureImport(shouldDisplay: false)
Expand Down

0 comments on commit da028d5

Please sign in to comment.