Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Brand/Database.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import Foundation
//
let databaseName = "nextcloud.realm"
let tableAccountBackup = "tableAccountBackup.json"
let databaseSchemaVersion: UInt64 = 424
let databaseSchemaVersion: UInt64 = 425
28 changes: 0 additions & 28 deletions Nextcloud.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@
F733598125C1C188002ABA72 /* NCAskAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F733598025C1C188002ABA72 /* NCAskAuthorization.swift */; };
F7346E1628B0EF5C006CE2D2 /* Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7346E1528B0EF5C006CE2D2 /* Widget.swift */; };
F7346E1C28B0EF5E006CE2D2 /* Widget.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F7346E1028B0EF5B006CE2D2 /* Widget.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F7346E2328B0FEBA006CE2D2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7346E2228B0FEBA006CE2D2 /* Assets.xcassets */; };
F734B06628E75C0100E180D5 /* TLPhotoPicker in Frameworks */ = {isa = PBXBuildFile; productRef = F734B06528E75C0100E180D5 /* TLPhotoPicker */; };
F7362A1F220C853A005101B5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7362A1E220C853A005101B5 /* LaunchScreen.storyboard */; };
F7381EE1218218C9000B1560 /* NCOffline.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7381EDA218218C9000B1560 /* NCOffline.swift */; };
Expand Down Expand Up @@ -728,9 +727,6 @@
F77E8C232E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77E8C1E2E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift */; };
F77E8C242E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77E8C1E2E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift */; };
F77E8C252E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77E8C1E2E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift */; };
F77ED59128C9CE9D00E24ED0 /* ToolbarData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77ED59028C9CE9D00E24ED0 /* ToolbarData.swift */; };
F77ED59328C9CEA000E24ED0 /* ToolbarWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77ED59228C9CEA000E24ED0 /* ToolbarWidgetProvider.swift */; };
F77ED59528C9CEA400E24ED0 /* ToolbarWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77ED59428C9CEA300E24ED0 /* ToolbarWidgetView.swift */; };
F78026102E9CFA3700B63436 /* NCTransfersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F780260F2E9CF9DE00B63436 /* NCTransfersView.swift */; };
F78026122E9CFA6300B63436 /* NCTransfersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78026112E9CFA6000B63436 /* NCTransfersModel.swift */; };
F7802B322BD5584F00D74270 /* NCMedia+DragDrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7802B312BD5584F00D74270 /* NCMedia+DragDrop.swift */; };
Expand Down Expand Up @@ -1591,7 +1587,6 @@
F7346E1028B0EF5B006CE2D2 /* Widget.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Widget.appex; sourceTree = BUILT_PRODUCTS_DIR; };
F7346E1528B0EF5C006CE2D2 /* Widget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widget.swift; sourceTree = "<group>"; };
F7346E2028B0FA3A006CE2D2 /* Widget-Brinding-header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Widget-Brinding-header.h"; sourceTree = "<group>"; };
F7346E2228B0FEBA006CE2D2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F7362A1E220C853A005101B5 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
F7381EDA218218C9000B1560 /* NCOffline.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCOffline.swift; sourceTree = "<group>"; };
F7381EDE218218C9000B1560 /* NCOffline.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCOffline.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1825,9 +1820,6 @@
F77C97382953131000FDDD09 /* NCCameraRoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCameraRoll.swift; sourceTree = "<group>"; };
F77DD6A72C5CC093009448FB /* NCSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSession.swift; sourceTree = "<group>"; };
F77E8C1E2E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+LivePhoto.swift"; sourceTree = "<group>"; };
F77ED59028C9CE9D00E24ED0 /* ToolbarData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarData.swift; sourceTree = "<group>"; };
F77ED59228C9CEA000E24ED0 /* ToolbarWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarWidgetProvider.swift; sourceTree = "<group>"; };
F77ED59428C9CEA300E24ED0 /* ToolbarWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarWidgetView.swift; sourceTree = "<group>"; };
F780260F2E9CF9DE00B63436 /* NCTransfersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCTransfersView.swift; sourceTree = "<group>"; };
F78026112E9CFA6000B63436 /* NCTransfersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCTransfersModel.swift; sourceTree = "<group>"; };
F7802B312BD5584F00D74270 /* NCMedia+DragDrop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+DragDrop.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2725,11 +2717,9 @@
F7346E1428B0EF5B006CE2D2 /* Widget */ = {
isa = PBXGroup;
children = (
F7346E2228B0FEBA006CE2D2 /* Assets.xcassets */,
F72EA95528B7BAD100C88F0C /* Dashboard */,
F72EA95628B7BAE700C88F0C /* Files */,
F76DEE9A28F808BC0041B1C9 /* Lockscreen */,
F77ED59628C9CEEE00E24ED0 /* Toolbar */,
F75DD764290AB369002EB562 /* Intent */,
F7346E2028B0FA3A006CE2D2 /* Widget-Brinding-header.h */,
F7346E1528B0EF5C006CE2D2 /* Widget.swift */,
Expand Down Expand Up @@ -3325,16 +3315,6 @@
path = Test;
sourceTree = "<group>";
};
F77ED59628C9CEEE00E24ED0 /* Toolbar */ = {
isa = PBXGroup;
children = (
F77ED59028C9CE9D00E24ED0 /* ToolbarData.swift */,
F77ED59228C9CEA000E24ED0 /* ToolbarWidgetProvider.swift */,
F77ED59428C9CEA300E24ED0 /* ToolbarWidgetView.swift */,
);
path = Toolbar;
sourceTree = "<group>";
};
F78ACD4721903F850088454D /* Cell */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4478,7 +4458,6 @@
F7C7B25028B8AD4500E7115D /* Localizable.strings in Resources */,
F7E4022A2BA85D1D007E5609 /* PrivacyInfo.xcprivacy in Resources */,
AA517B832D660EFE00F8D37C /* Localizable.stringsdict in Resources */,
F7346E2328B0FEBA006CE2D2 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -4916,7 +4895,6 @@
F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */,
F783030328B4C4DD00B84583 /* ThreadSafeDictionary.swift in Sources */,
F7CAFE1E2F17A37C00DB35A5 /* ProgressQuantizer.swift in Sources */,
F77ED59128C9CE9D00E24ED0 /* ToolbarData.swift in Sources */,
F78302F728B4C3C900B84583 /* NCManageDatabase.swift in Sources */,
F7346E1628B0EF5C006CE2D2 /* Widget.swift in Sources */,
F7D61EAA2EBF1694007F865B /* NCManageDatabase+TableCapabilities.swift in Sources */,
Expand Down Expand Up @@ -4955,9 +4933,7 @@
F763D29E2A249C4500A3C901 /* NCManageDatabase+Capabilities.swift in Sources */,
F711A4DD2AF92CAE00095DD8 /* NCUtility+Date.swift in Sources */,
F724377C2C10B92200C7C68D /* NCSharePermissions.swift in Sources */,
F77ED59328C9CEA000E24ED0 /* ToolbarWidgetProvider.swift in Sources */,
F72A17D828B221E300F3F159 /* DashboardWidgetView.swift in Sources */,
F77ED59528C9CEA400E24ED0 /* ToolbarWidgetView.swift in Sources */,
F78302FB28B4C3EE00B84583 /* NCManageDatabase+Video.swift in Sources */,
F760A4902FE95D06001B212E /* NCTransferDelegateDispatcher.swift in Sources */,
F7C687EA2D22BDE5004757BC /* NCManageDatabase+RecommendedFiles.swift in Sources */,
Expand Down Expand Up @@ -6291,8 +6267,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
Expand Down Expand Up @@ -6325,8 +6299,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SPDX-FileCopyrightText = "2016-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = ["iOSClient/Images.xcassets/**", "Widget/Assets.xcassets/**", "Action Assistant/Images.xcassets/**"]
path = ["iOSClient/Images.xcassets/**", "Action Assistant/Images.xcassets/**"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2016-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"
Expand All @@ -56,7 +56,7 @@ SPDX-License-Identifier = "GPL-3.0-or-later"

# The Nextcloud name and logo are trademarks; see LICENSES/LicenseRef-NextcloudTrademarks.txt
[[annotations]]
path = ["AppIcon.icon/**", "Brand/Custom.xcassets/AppIcon.appiconset/**", "Brand/Custom.xcassets/logo.imageset/**", "Action Assistant/Images.xcassets/AppIcon.appiconset/**", "Widget/Assets.xcassets/AppIcon.imageset/**", "iOSClient/Images.xcassets/logo.imageset/**"]
path = ["AppIcon.icon/**", "Brand/Custom.xcassets/AppIcon.appiconset/**", "Brand/Custom.xcassets/logo.imageset/**", "Action Assistant/Images.xcassets/AppIcon.appiconset/**", "iOSClient/Images.xcassets/logo.imageset/**"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Nextcloud GmbH"
SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks"
Expand Down
5 changes: 5 additions & 0 deletions Share/Model/NCShareViewModel+Folders.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ extension NCShareViewModel {
func resetFolderBrowser(preservingContent: Bool = false) {
folderBrowserID = UUID()
folderSelectionTask?.cancel()
pendingFolderSelection = nil
for task in folderTasks.values { task.cancel() }
for request in folderRequests.values { request.cancel() }
folderTasks.removeAll()
Expand Down Expand Up @@ -117,12 +118,16 @@ extension NCShareViewModel {
let session = sessionStore.getSession()
let browserID = folderBrowserID
isLoading = true
if !automatically {
pendingFolderSelection = (folder.serverUrl, fromRecents)
}
folderSelectionTask = Task { @MainActor in
defer {
if isCurrentBrowser(browserID, account: session.account) {
if automatically, isAuthenticated, selectedFolder == nil {
selectedFolder = rootFolder
}
pendingFolderSelection = nil
isLoading = false
}
}
Expand Down
2 changes: 2 additions & 0 deletions Share/Model/NCShareViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ final class NCShareViewModel: NSObject, ObservableObject {
@Published var recentFolders: [NCShareFolderItem] = []
@Published var selectedFolder: NCShareFolderItem?
@Published var isRecentFolderSelected = false
@Published var pendingFolderSelection: (serverUrl: String, fromRecents: Bool)?
@Published var folderScrollTarget: String?
@Published var folderChildren: [String: [NCShareFolderItem]] = [:]
@Published var expandedFolderURLs: Set<String> = []
Expand Down Expand Up @@ -335,6 +336,7 @@ final class NCShareViewModel: NSObject, ObservableObject {
func cancel(with error: NCShareRequestError? = nil) {
guard !isClosing else { return }
isClosing = true
pendingFolderSelection = nil
alertDismissAction = nil
stopRequestWork()
thumbnailRequests.removeAll()
Expand Down
10 changes: 7 additions & 3 deletions Share/View/NCShareView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,11 @@ struct NCShareView: View {
}

private func folderRow(_ folder: NCShareFolderItem, depth: Int?) -> some View {
let isSelected = model.selectedFolder?.serverUrl == folder.serverUrl && model.isRecentFolderSelected == (depth == nil)
let fromRecents = depth == nil
let isSelected = model.selectedFolder?.serverUrl == folder.serverUrl && model.isRecentFolderSelected == fromRecents
let isPending = model.pendingFolderSelection?.serverUrl == folder.serverUrl &&
model.pendingFolderSelection?.fromRecents == fromRecents
let highlightOpacity: Double = isSelected ? 0.1 : (isPending ? 0.05 : 0)
return HStack(spacing: 4) {
if let depth {
Button {
Expand All @@ -253,7 +257,7 @@ struct NCShareView: View {
.accessibilityHidden(true)
}
Button {
model.selectFolder(folder, fromRecents: depth == nil)
model.selectFolder(folder, fromRecents: fromRecents)
} label: {
HStack(spacing: 8) {
if let image = folder.image {
Expand Down Expand Up @@ -310,7 +314,7 @@ struct NCShareView: View {
.disabled(!model.canUseFolderBrowser)
.background {
RoundedRectangle(cornerRadius: 8)
.fill(Color.accentColor.opacity(isSelected ? 0.1 : 0))
.fill(Color.accentColor.opacity(highlightOpacity))
.padding(.horizontal, 5)
}
.listRowSeparator(.hidden)
Expand Down
11 changes: 0 additions & 11 deletions Widget/Assets.xcassets/AccentColor.colorset/Contents.json

This file was deleted.

11 changes: 0 additions & 11 deletions Widget/Assets.xcassets/AppIcon.imageset/Contents.json

This file was deleted.

6 changes: 0 additions & 6 deletions Widget/Assets.xcassets/Contents.json

This file was deleted.

11 changes: 0 additions & 11 deletions Widget/Assets.xcassets/WidgetBackground.colorset/Contents.json

This file was deleted.

12 changes: 0 additions & 12 deletions Widget/Assets.xcassets/activity.imageset/Contents.json

This file was deleted.

Binary file not shown.
Loading
Loading