Skip to content

Commit 3fc8c0f

Browse files
mpivchevmpivchev
committed
Merge branch 'master' of https://github.com/nextcloud/ios into declarative-ui
2 parents 0a793b1 + 6cff614 commit 3fc8c0f

File tree

155 files changed

+635
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+635
-417
lines changed

‎Brand/NCBrand.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ final class NCBrandOptions: @unchecked Sendable {
7575
let httpMaximumConnectionsPerHostInDownload: Int = 8
7676
let httpMaximumConnectionsPerHostInUpload: Int = 8
7777

78+
// Max request/download/upload process
79+
let numMaximumProcess: Int = 50
80+
7881
// Number of failed attempts after reset app
7982
let resetAppPasscodeAttempts: Int = 10
8083
let passcodeSecondsFail: Int = 60
@@ -130,7 +133,7 @@ final class NCBrandColor: @unchecked Sendable {
130133
static let shared = NCBrandColor()
131134

132135
// This is rewrited from customet theme, default is Nextcloud color
133-
let customer: UIColor = UIColor(red: 0.0 / 255.0, green: 103.0 / 255.0, blue: 158.0 / 255.0, alpha: 1.0) // Nextcloud : #00679e
136+
let customer: UIColor = UIColor(red: 0.0 / 255.0, green: 130.0 / 255.0, blue: 201.0 / 255.0, alpha: 1.0) // Nextcloud : #0082C9
134137
var customerText: UIColor = .white
135138

136139
// INTERNAL DEFINE COLORS

‎File Provider Extension/FileProviderData.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class FileProviderData: NSObject {
188188
size: Int64,
189189
task: URLSessionTask,
190190
error: NKError) async {
191-
guard let metadata = await self.database.getMetadataAsync(predicate: NSPredicate(format: "serverUrl == %@ AND fileName == %@", serverUrl, fileName)) else {
191+
guard let metadata = await self.database.getMetadataAsync(predicate: NSPredicate(format: "serverUrl == %@ AND fileName == %@ AND sessionTaskIdentifier == %d", serverUrl, fileName, task.taskIdentifier)) else {
192192
let predicate = NSPredicate(format: "fileName == %@ AND serverUrl == %@", fileName, serverUrl)
193193
await self.database.deleteMetadataAsync(predicate: predicate)
194194

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,13 @@
962962
F7D7A7712DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D7A76B2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift */; };
963963
F7D7A7722DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D7A76B2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift */; };
964964
F7D890752BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D890742BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift */; };
965+
F7DB7DE92E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
966+
F7DB7DEA2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
967+
F7DB7DEB2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
968+
F7DB7DEC2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
969+
F7DB7DED2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
970+
F7DB7DEE2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
971+
F7DB7DEF2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */; };
965972
F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E0710028B13BB00001B882 /* DashboardData.swift */; };
966973
F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */; };
967974
F7E2B64F2DDCC5C30075B4D0 /* NCMedia+TransferDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E2B64E2DDCC5C30075B4D0 /* NCMedia+TransferDelegate.swift */; };
@@ -1876,6 +1883,7 @@
18761883
F7D68FCB28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+DashboardWidget.swift"; sourceTree = "<group>"; };
18771884
F7D7A76B2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+AutoUpload.swift"; sourceTree = "<group>"; };
18781885
F7D890742BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+DragDrop.swift"; sourceTree = "<group>"; };
1886+
F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCStorageEstimator.swift; sourceTree = "<group>"; };
18791887
F7DE9AB01F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
18801888
F7E0710028B13BB00001B882 /* DashboardData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardData.swift; sourceTree = "<group>"; };
18811889
F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCUserStatus.storyboard; sourceTree = "<group>"; };
@@ -3041,6 +3049,7 @@
30413049
F77C97382953131000FDDD09 /* NCCameraRoll.swift */,
30423050
F765608E23BF813500765969 /* NCContentPresenter.swift */,
30433051
F70968A324212C4E00ED60E5 /* NCLivePhoto.swift */,
3052+
F7DB7DE82E8173160017AF90 /* NCStorageEstimator.swift */,
30443053
F7386E452DA90E02009A00F6 /* NCAppVersionManager.swift */,
30453054
F7A560412AE1593700BE8FD6 /* NCOperationSaveLivePhoto.swift */,
30463055
F702F30725EE5D47008F8E80 /* NCPopupViewController.swift */,
@@ -4174,6 +4183,7 @@
41744183
F76D364928A4F8BF00214537 /* NCActivityIndicator.swift in Sources */,
41754184
F7817CFD29801A3500FFBC65 /* Data+Extension.swift in Sources */,
41764185
F77E8C1F2E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */,
4186+
F7DB7DED2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
41774187
F7D7A7712DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */,
41784188
AF4BF62127562B3F0081CEEF /* NCManageDatabase+Activity.swift in Sources */,
41794189
F702F2D225EE5B5C008F8E80 /* NCGlobal.swift in Sources */,
@@ -4278,6 +4288,7 @@
42784288
F7490E8329882C84009DCE94 /* NCManageDatabase+LayoutForView.swift in Sources */,
42794289
AA8D31582D41052300FE2775 /* NCManageDatabase+DownloadLimit.swift in Sources */,
42804290
F77E8C222E79717D00EAE68F /* NCManageDatabase+LivePhoto.swift in Sources */,
4291+
F7DB7DE92E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
42814292
F73EF7DC2B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */,
42824293
F7490E8029882C76009DCE94 /* NCManageDatabase+Avatar.swift in Sources */,
42834294
F343A4B82A1E084300DDA874 /* PHAsset+Extension.swift in Sources */,
@@ -4413,6 +4424,7 @@
44134424
F7327E3B2B73B8D600A462C7 /* Array+Extension.swift in Sources */,
44144425
F7D7A76C2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */,
44154426
F39170AF2CB82024006127BC /* FileAutoRenamer+Extensions.swift in Sources */,
4427+
F7DB7DEF2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
44164428
F799DF832C4B7DCC003410B5 /* NCSectionFooter.swift in Sources */,
44174429
AF22B218277D196700DAB0CC /* NCShareExtension+Files.swift in Sources */,
44184430
F799DF862C4B7E56003410B5 /* NCSectionHeader.swift in Sources */,
@@ -4505,6 +4517,7 @@
45054517
F77DD6A92C5CC093009448FB /* NCSession.swift in Sources */,
45064518
F7F563022E15762B00631A11 /* MigrationMultiDomains.swift in Sources */,
45074519
F783030728B4C52800B84583 /* UIColor+Extension.swift in Sources */,
4520+
F7DB7DEE2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
45084521
F783030028B4C45800B84583 /* NCGlobal.swift in Sources */,
45094522
F793E59D28B761E7005E4B02 /* NCNetworking.swift in Sources */,
45104523
F7BF9D832934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
@@ -4607,6 +4620,7 @@
46074620
F70460542499095400BB98A7 /* NotificationCenter+MainThread.swift in Sources */,
46084621
F78A10C329322E8A008499B8 /* NCManageDatabase+Directory.swift in Sources */,
46094622
F36E64FE2B9735920085ABB5 /* NCCellProtocol.swift in Sources */,
4623+
F7DB7DEC2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
46104624
F7BF9D862934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
46114625
F7E98C1827E0D0FC001F9F19 /* NCManageDatabase+Video.swift in Sources */,
46124626
F785EEA42461A4A600B3F945 /* NCUtility.swift in Sources */,
@@ -4774,6 +4788,7 @@
47744788
F7D4BF492CA2E8D800A5E746 /* TOPasscodeVariableInputView.m in Sources */,
47754789
F7D4BF4A2CA2E8D800A5E746 /* TOPasscodeCircleView.m in Sources */,
47764790
F7D4BF4B2CA2E8D800A5E746 /* TOPasscodeViewContentLayout.m in Sources */,
4791+
F7DB7DEA2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
47774792
F7D4BF4C2CA2E8D800A5E746 /* TOPasscodeSettingsKeypadButton.m in Sources */,
47784793
F7D4BF4D2CA2E8D800A5E746 /* TOPasscodeViewController.m in Sources */,
47794794
F75C0C4823D1FAE300163CC8 /* NCRichWorkspaceCommon.swift in Sources */,
@@ -4990,6 +5005,7 @@
49905005
F343A4BD2A1E734600DDA874 /* Optional+Extension.swift in Sources */,
49915006
F7A8D73528F17E16008BBE1C /* NCManageDatabase.swift in Sources */,
49925007
F3F442F02DDE2A7700FD701F /* NCMetadataPermissions.swift in Sources */,
5008+
F7DB7DEB2E81731B0017AF90 /* NCStorageEstimator.swift in Sources */,
49935009
F7A8D74428F1827B008BBE1C /* ThreadSafeDictionary.swift in Sources */,
49945010
F7C9739528F17131002C43E2 /* IntentHandler.swift in Sources */,
49955011
F7A8D73D28F181D3008BBE1C /* NCUtilityFileSystem.swift in Sources */,
@@ -6017,7 +6033,7 @@
60176033
"@executable_path/Frameworks",
60186034
"@executable_path/../../Frameworks",
60196035
);
6020-
MARKETING_VERSION = 7.1.7;
6036+
MARKETING_VERSION = 7.1.8;
60216037
ONLY_ACTIVE_ARCH = YES;
60226038
OTHER_CFLAGS = "-v";
60236039
OTHER_LDFLAGS = "";
@@ -6080,7 +6096,7 @@
60806096
"@executable_path/Frameworks",
60816097
"@executable_path/../../Frameworks",
60826098
);
6083-
MARKETING_VERSION = 7.1.7;
6099+
MARKETING_VERSION = 7.1.8;
60846100
ONLY_ACTIVE_ARCH = YES;
60856101
OTHER_CFLAGS = "-v";
60866102
OTHER_LDFLAGS = "";
@@ -6362,7 +6378,7 @@
63626378
repositoryURL = "https://github.com/nextcloud/NextcloudKit";
63636379
requirement = {
63646380
kind = exactVersion;
6365-
version = 7.1.4;
6381+
version = 7.1.5;
63666382
};
63676383
};
63686384
F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

‎iOSClient/Account/Account Settings/NCAccountSettingsModel.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ class NCAccountSettingsModel: ObservableObject, ViewOnAppearHandling {
114114
}
115115

116116
/// Function to update the user data
117-
func getUserStatus() -> (statusImage: UIImage?, statusMessage: String, descriptionMessage: String) {
117+
func getUserStatus() -> (statusImage: UIImage?, statusImageColor: UIColor, statusMessage: String, descriptionMessage: String) {
118118
guard let tblAccount,
119119
let capabilities = NCNetworking.shared.capabilities[tblAccount.account] else {
120-
return (UIImage(), "", "")
120+
return (UIImage(), .black, "", "")
121121
}
122122
if capabilities.userStatusEnabled,
123123
let tableAccount = database.getTableAccount(predicate: NSPredicate(format: "account == %@", tblAccount.account)) {
124124
return NCUtility().getUserStatus(userIcon: tableAccount.userStatusIcon, userStatus: tableAccount.userStatusStatus, userMessage: tableAccount.userStatusMessage)
125125
}
126-
return (nil, "", "")
126+
return (nil, .black, "", "")
127127
}
128128

129129
/// Is the user an Admin

‎iOSClient/Account/Account Settings/NCAccountSettingsView.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ struct NCAccountSettingsView: View {
3030
ForEach(0..<model.tblAccounts.count, id: \.self) { index in
3131
let status = model.getUserStatus()
3232
let avatar = NCUtility().loadUserImage(for: model.tblAccounts[index].user, displayName: model.tblAccounts[index].displayName, urlBase: model.tblAccounts[index].urlBase)
33+
3334
//
3435
// User
3536
VStack {
@@ -43,9 +44,11 @@ struct NCAccountSettingsView: View {
4344
.fill(.white)
4445
.frame(width: 30, height: 30)
4546
Image(uiImage: statusImage)
47+
.renderingMode(.template)
4648
.resizable()
4749
.scaledToFit()
4850
.frame(width: 30, height: 30)
51+
.foregroundStyle(Color(uiColor: status.statusImageColor))
4952
}
5053
.offset(x: 30, y: -30)
5154
}

0 commit comments

Comments
 (0)