-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Focused auto upload #4096
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.
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
Open
mpivchev
wants to merge
9
commits into
master
Choose a base branch
from
focused-autoupload
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Focused auto upload #4096
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
900ec2a
WIP
mpivchev d33093a
Animation
mpivchev 7e8a275
WIP
mpivchev 68c8b2d
WIP
mpivchev eb7f7cf
WIP
mpivchev 5ed0887
Merge branch 'master' into focused-autoupload
mpivchev 13f1c2f
PR WIP
mpivchev 8dff9b2
Merge branch 'master' of https://github.com/nextcloud/ios into focuse…
mpivchev f43c8ac
WIP
mpivchev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // SPDX-FileCopyrightText: Nextcloud GmbH | ||
| // SPDX-FileCopyrightText: 2026 Milen Pivchev | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
|
|
||
| import Foundation | ||
| import Observation | ||
|
|
||
| @MainActor | ||
| @Observable | ||
| final class NCAutoUploadCounter { | ||
| private(set) var count = 0 | ||
| private(set) var isLoaded = false | ||
|
|
||
| var hasItemsToUpload: Bool { | ||
| return isLoaded && count > 0 | ||
| } | ||
|
|
||
| var itemsLeftMessage: String { | ||
| if count == 0 { | ||
| return NSLocalizedString("_auto_upload_no_new_items_to_upload_", comment: "") | ||
| } | ||
|
|
||
| return String.localizedStringWithFormat(NSLocalizedString("_focused_auto_upload_items_left_", comment: ""), count) | ||
| } | ||
|
|
||
| var photosToBackUpMessage: String { | ||
| return String.localizedStringWithFormat(NSLocalizedString("_focused_auto_upload_photos_to_back_up_", comment: ""), count) | ||
| } | ||
|
|
||
| @ObservationIgnored private var pollTask: Task<Void, Never>? | ||
|
|
||
| func start(account: String, | ||
| urlBase: String, | ||
| userId: String, | ||
| autoUploadStart: Bool) { | ||
| guard autoUploadStart else { | ||
| stopPolling(reset: true) | ||
| return | ||
| } | ||
|
|
||
| startPolling(account: account, urlBase: urlBase, userId: userId) | ||
| } | ||
|
|
||
| func stop(reset: Bool = false) { | ||
| stopPolling(reset: reset) | ||
| } | ||
|
|
||
| private func startPolling(account: String, urlBase: String, userId: String) { | ||
| stopPolling(reset: false) | ||
| isLoaded = false | ||
|
|
||
| pollTask = Task { @MainActor in | ||
| let autoUploadServerUrlBase = await NCManageDatabase.shared.getAccountAutoUploadServerUrlBaseAsync(account: account, | ||
| urlBase: urlBase, | ||
| userId: userId) | ||
|
|
||
| while !Task.isCancelled { | ||
| let transfersSuccess = await NCNetworking.shared.metadataTranfersSuccess.getAll() | ||
| let newCount = await NCManageDatabase.shared.countAutoUploadMetadatasAsync(account: account, | ||
| autoUploadServerUrlBase: autoUploadServerUrlBase, | ||
| transfersSuccess: transfersSuccess) | ||
|
|
||
| guard !Task.isCancelled else { | ||
| return | ||
| } | ||
|
|
||
| count = newCount | ||
| isLoaded = true | ||
|
|
||
| try? await Task.sleep(for: .seconds(2)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private func stopPolling(reset: Bool) { | ||
| pollTask?.cancel() | ||
| pollTask = nil | ||
|
|
||
| if reset { | ||
| count = 0 | ||
| isLoaded = false | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
iOSClient/Settings/AutoUpload/NCFocusedAutoUploadCloudAnimation.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // SPDX-FileCopyrightText: Nextcloud GmbH | ||
| // SPDX-FileCopyrightText: 2026 Milen Pivchev | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct NCFocusedAutoUploadCloudAnimation: View { | ||
| let size: CGFloat | ||
| let cloudColor: Color | ||
| let arrowColor: Color | ||
| let isAnimated: Bool | ||
|
|
||
| init(size: CGFloat = 176, | ||
| cloudColor: Color = .white, | ||
| arrowColor: Color = .black.opacity(0.82), | ||
| isAnimated: Bool = true) { | ||
| self.size = size | ||
| self.cloudColor = cloudColor | ||
| self.arrowColor = arrowColor | ||
| self.isAnimated = isAnimated | ||
| } | ||
|
|
||
| var body: some View { | ||
| if isAnimated { | ||
| animatedCloud | ||
| } else { | ||
| staticCloud | ||
| } | ||
| } | ||
|
|
||
| private var animatedCloud: some View { | ||
| TimelineView(.animation) { timeline in | ||
| cloud(progress: animationProgress(at: timeline.date), includesMotion: true) | ||
| } | ||
| .frame(width: size, height: size * 0.82) | ||
| .accessibilityHidden(true) | ||
| } | ||
|
|
||
| private var staticCloud: some View { | ||
| cloud(progress: 0, includesMotion: false) | ||
| .frame(width: size, height: size * 0.82) | ||
| .accessibilityHidden(true) | ||
| } | ||
|
|
||
| private func cloud(progress: Double, includesMotion: Bool) -> some View { | ||
| ZStack { | ||
| Image(systemName: includesMotion ? "icloud.fill" : "icloud") | ||
| .font(.system(size: size * 0.53, weight: .regular)) | ||
| .foregroundStyle(cloudColor) | ||
| .scaleEffect(includesMotion ? interpolate(from: 0.96, to: 1.03, progress: progress) : 1) | ||
| .offset(y: includesMotion ? interpolate(from: size * 0.03, to: -size * 0.03, progress: progress) : 0) | ||
|
|
||
| Image(systemName: "arrow.up") | ||
| .font(.system(size: includesMotion ? size * 0.17 : size * 0.22, weight: .bold)) | ||
| .foregroundStyle(arrowColor) | ||
| .offset(y: includesMotion ? interpolate(from: -size * 0.02, to: -size * 0.09, progress: progress) : 0) | ||
| } | ||
| } | ||
|
|
||
| private func animationProgress(at date: Date) -> Double { | ||
| let duration = 1.45 | ||
| let cycleDuration = duration * 2 | ||
| let elapsed = date.timeIntervalSinceReferenceDate.truncatingRemainder(dividingBy: cycleDuration) | ||
| let linearProgress = elapsed <= duration ? elapsed / duration : (cycleDuration - elapsed) / duration | ||
|
|
||
| return (1 - cos(linearProgress * .pi)) / 2 | ||
| } | ||
|
|
||
| private func interpolate(from start: CGFloat, to end: CGFloat, progress: Double) -> CGFloat { | ||
| start + (end - start) * CGFloat(progress) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We filter out auto upload success files. Is that ok? @marinofaggiana