Skip to content

Split user status and user message in separate screens #3890

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

Merged
mpivchev merged 15 commits into from
Nov 27, 2025
Merged

Split user status and user message in separate screens #3890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5ea5172
WIP
mpivchev Nov 19, 2025
3892467
WIP
mpivchev Nov 19, 2025
18cd604
WIP
mpivchev Nov 20, 2025
9b8b989
WIP
mpivchev Nov 20, 2025
5569363
WIP
mpivchev Nov 26, 2025
67500a2
WIP
mpivchev Nov 26, 2025
41a4c1e
WIP
mpivchev Nov 26, 2025
f4b3bc7
WIP
mpivchev Nov 26, 2025
93e745e
WIP
mpivchev Nov 26, 2025
a08ab71
Remove old code
mpivchev Nov 26, 2025
ade9bfb
Remove comments
mpivchev Nov 26, 2025
d6a612c
Merge branch 'master' of https://github.com/nextcloud/ios into split-…
mpivchev Nov 26, 2025
c576fd9
PR fixes
mpivchev Nov 27, 2025
c2e8d47
Merge branch 'master' of https://github.com/nextcloud/ios into handle…
mpivchev Nov 27, 2025
1260500
WIP
mpivchev Nov 27, 2025
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
36 changes: 28 additions & 8 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
F343A4B32A1E01FF00DDA874 /* PHAsset+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4B22A1E01FF00DDA874 /* PHAsset+Extension.swift */; };
F343A4B62A1E084200DDA874 /* PHAsset+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4B22A1E01FF00DDA874 /* PHAsset+Extension.swift */; };
F343A4BB2A1E734600DDA874 /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */; };
F34E1AD72ECB937D00FA10C3 /* NCStatusMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34E1AD62ECB937D00FA10C3 /* NCStatusMessageView.swift */; };
F34E1AD92ECC839100FA10C3 /* EmojiTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34E1AD82ECC839100FA10C3 /* EmojiTextField.swift */; };
F34E1ADB2ECC842B00FA10C3 /* NCStatusMessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34E1ADA2ECC842200FA10C3 /* NCStatusMessageModel.swift */; };
F359D8672A7D03420023F405 /* NCUtility+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F359D8662A7D03420023F405 /* NCUtility+Exif.swift */; };
F36C514F2E89393C0097E5F7 /* UIView+BlurVibrancy.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36C514D2E89393C0097E5F7 /* UIView+BlurVibrancy.swift */; };
F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift */; };
Expand Down Expand Up @@ -158,6 +161,8 @@
F3A0479A2BD2668800658E7B /* NCAssistantTaskDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3A047952BD2668800658E7B /* NCAssistantTaskDetail.swift */; };
F3A0479B2BD2668800658E7B /* NCAssistant.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3A047962BD2668800658E7B /* NCAssistant.swift */; };
F3A0479E2BD268B500658E7B /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = F3A0479D2BD268B500658E7B /* PopupView */; };
F3A0B1F12EC76FE800F10B82 /* NCUserStatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3A0B1EF2EC76FE800F10B82 /* NCUserStatusModel.swift */; };
F3A0B1F22EC76FE800F10B82 /* NCUserStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3A0B1F02EC76FE800F10B82 /* NCUserStatusView.swift */; };
F3BB464D2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3BB464C2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib */; };
F3BB46522A39EC4900461F6E /* NCMoreAppSuggestionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3BB46512A39EC4900461F6E /* NCMoreAppSuggestionsCell.swift */; };
F3BB46542A3A1E9D00461F6E /* CCCellMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3BB46532A3A1E9D00461F6E /* CCCellMore.swift */; };
Expand Down Expand Up @@ -836,7 +841,6 @@
F7D7A7722DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D7A76B2DCDD437003D2007 /* NCManageDatabase+AutoUpload.swift */; };
F7D890752BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D890742BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift */; };
F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E0710028B13BB00001B882 /* DashboardData.swift */; };
F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */; };
F7E2B64F2DDCC5C30075B4D0 /* NCMedia+TransferDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E2B64E2DDCC5C30075B4D0 /* NCMedia+TransferDelegate.swift */; };
F7E402292BA85D1D007E5609 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = F7E402282BA85D1D007E5609 /* PrivacyInfo.xcprivacy */; };
F7E4022A2BA85D1D007E5609 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = F7E402282BA85D1D007E5609 /* PrivacyInfo.xcprivacy */; };
Expand Down Expand Up @@ -876,7 +880,6 @@
F7EF2AEB2E43157B0081B2C9 /* NCNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7EF2AE92E43157B0081B2C9 /* NCNotification.swift */; };
F7EF2AEC2E43157B0081B2C9 /* NCNotification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7EF2AE82E43157B0081B2C9 /* NCNotification.storyboard */; };
F7EFA47825ADBA500083159A /* NCViewerProviderContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7EFA47725ADBA500083159A /* NCViewerProviderContextMenu.swift */; };
F7EFC0CD256BF8DD00461AAD /* NCUserStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7EFC0CC256BF8DD00461AAD /* NCUserStatus.swift */; };
F7F1FB9D2E27CE7200C79E20 /* NCNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75A9EE523796C6F0044CFCE /* NCNetworking.swift */; };
F7F1FB9E2E27CE7200C79E20 /* NCNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75A9EE523796C6F0044CFCE /* NCNetworking.swift */; };
F7F1FBA82E27D13700C79E20 /* Queuer in Frameworks */ = {isa = PBXBuildFile; productRef = F7F1FBA72E27D13700C79E20 /* Queuer */; };
Expand Down Expand Up @@ -1241,6 +1244,9 @@
F33EE6F12BF4C9B200CA1A51 /* PKCS12.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PKCS12.swift; sourceTree = "<group>"; };
F343A4B22A1E01FF00DDA874 /* PHAsset+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PHAsset+Extension.swift"; sourceTree = "<group>"; };
F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Optional+Extension.swift"; sourceTree = "<group>"; };
F34E1AD62ECB937D00FA10C3 /* NCStatusMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCStatusMessageView.swift; sourceTree = "<group>"; };
F34E1AD82ECC839100FA10C3 /* EmojiTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiTextField.swift; sourceTree = "<group>"; };
F34E1ADA2ECC842200FA10C3 /* NCStatusMessageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCStatusMessageModel.swift; sourceTree = "<group>"; };
F351D1A52D0AF24A00930F94 /* PHAssetCollection+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PHAssetCollection+Extension.swift"; sourceTree = "<group>"; };
F359D8662A7D03420023F405 /* NCUtility+Exif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCUtility+Exif.swift"; sourceTree = "<group>"; };
F36C514D2E89393C0097E5F7 /* UIView+BlurVibrancy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+BlurVibrancy.swift"; sourceTree = "<group>"; };
Expand All @@ -1258,6 +1264,8 @@
F3A047932BD2668800658E7B /* NCAssistantModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCAssistantModel.swift; sourceTree = "<group>"; };
F3A047952BD2668800658E7B /* NCAssistantTaskDetail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCAssistantTaskDetail.swift; sourceTree = "<group>"; };
F3A047962BD2668800658E7B /* NCAssistant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCAssistant.swift; sourceTree = "<group>"; };
F3A0B1EF2EC76FE800F10B82 /* NCUserStatusModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUserStatusModel.swift; sourceTree = "<group>"; };
F3A0B1F02EC76FE800F10B82 /* NCUserStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUserStatusView.swift; sourceTree = "<group>"; };
F3BB464C2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCMoreAppSuggestionsCell.xib; sourceTree = "<group>"; };
F3BB46512A39EC4900461F6E /* NCMoreAppSuggestionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMoreAppSuggestionsCell.swift; sourceTree = "<group>"; };
F3BB46532A3A1E9D00461F6E /* CCCellMore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCCellMore.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1747,7 +1755,6 @@
F7D890742BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+DragDrop.swift"; sourceTree = "<group>"; };
F7DE9AB01F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
F7E0710028B13BB00001B882 /* DashboardData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardData.swift; sourceTree = "<group>"; };
F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCUserStatus.storyboard; sourceTree = "<group>"; };
F7E2B64E2DDCC5C30075B4D0 /* NCMedia+TransferDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+TransferDelegate.swift"; sourceTree = "<group>"; };
F7E402282BA85D1D007E5609 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
F7E402302BA891EB007E5609 /* NCTrash+SelectTabBarDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCTrash+SelectTabBarDelegate.swift"; sourceTree = "<group>"; };
Expand All @@ -1767,7 +1774,6 @@
F7EF2AE82E43157B0081B2C9 /* NCNotification.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCNotification.storyboard; sourceTree = "<group>"; };
F7EF2AE92E43157B0081B2C9 /* NCNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCNotification.swift; sourceTree = "<group>"; };
F7EFA47725ADBA500083159A /* NCViewerProviderContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerProviderContextMenu.swift; sourceTree = "<group>"; };
F7EFC0CC256BF8DD00461AAD /* NCUserStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUserStatus.swift; sourceTree = "<group>"; };
F7F3E58A2D3BB65000A32B14 /* NCNetworking+Recommendations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCNetworking+Recommendations.swift"; sourceTree = "<group>"; };
F7F4F0FD27ECDBDB008676F9 /* Inconsolata-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inconsolata-SemiBold.ttf"; sourceTree = "<group>"; };
F7F4F0FE27ECDBDB008676F9 /* Inconsolata-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inconsolata-Medium.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2112,6 +2118,16 @@
path = Components;
sourceTree = "<group>";
};
F34E1AD52ECB935E00FA10C3 /* StatusMessage */ = {
isa = PBXGroup;
children = (
F34E1AD82ECC839100FA10C3 /* EmojiTextField.swift */,
F34E1ADA2ECC842200FA10C3 /* NCStatusMessageModel.swift */,
F34E1AD62ECB937D00FA10C3 /* NCStatusMessageView.swift */,
);
path = StatusMessage;
sourceTree = "<group>";
};
F389C9F32CEE381E00049762 /* SelectAlbum */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3153,8 +3169,8 @@
F7EFC0CB256BF89300461AAD /* UserStatus */ = {
isa = PBXGroup;
children = (
F7EFC0CC256BF8DD00461AAD /* NCUserStatus.swift */,
F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */,
F3A0B1EF2EC76FE800F10B82 /* NCUserStatusModel.swift */,
F3A0B1F02EC76FE800F10B82 /* NCUserStatusView.swift */,
);
path = UserStatus;
sourceTree = "<group>";
Expand Down Expand Up @@ -3265,6 +3281,7 @@
F7132C6D2D085AD200B42D6A /* Terms of service */,
F7E9C41320F4CA870040CF18 /* Transfers */,
F78F74322163753B00C2ADAD /* Trash */,
F34E1AD52ECB935E00FA10C3 /* StatusMessage */,
F7EFC0CB256BF89300461AAD /* UserStatus */,
F7BFFA991A24D7BB0044ED85 /* Utility */,
F79630EC215526B60015EEA5 /* Viewer */,
Expand Down Expand Up @@ -3949,7 +3966,6 @@
F7B8B83025681C3400967775 /* GoogleService-Info.plist in Resources */,
F7381EE5218218C9000B1560 /* NCOffline.storyboard in Resources */,
F768822D2C0DD1E7001CF441 /* Acknowledgements.rtf in Resources */,
F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */,
F76D3CF32428B94E005DFA87 /* NCViewerPDFSearchCell.xib in Resources */,
F717402D24F699A5000C87D5 /* NCFavorite.storyboard in Resources */,
F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */,
Expand Down Expand Up @@ -4456,6 +4472,7 @@
F76B649C2ADFFAED00014640 /* NCImageCache.swift in Sources */,
F76341182EBE0BC60056F538 /* NCNetworking+NextcloudKitDelegate.swift in Sources */,
F78A18B823CDE2B300F681F3 /* NCViewerRichWorkspace.swift in Sources */,
F34E1AD92ECC839100FA10C3 /* EmojiTextField.swift in Sources */,
F768822E2C0DD1E7001CF441 /* NCSettingsBundleHelper.swift in Sources */,
F72408332B8A27C900F128E2 /* NCMedia+Command.swift in Sources */,
F755CB402B8CB13C00CE27E9 /* NCMediaLayout.swift in Sources */,
Expand Down Expand Up @@ -4514,6 +4531,8 @@
F7D4BF462CA2E8D800A5E746 /* TOPasscodeInputField.m in Sources */,
F7D4BF472CA2E8D800A5E746 /* TOSettingsKeypadImage.m in Sources */,
F7D4BF482CA2E8D800A5E746 /* TOPasscodeSettingsWarningLabel.m in Sources */,
F3A0B1F12EC76FE800F10B82 /* NCUserStatusModel.swift in Sources */,
F3A0B1F22EC76FE800F10B82 /* NCUserStatusView.swift in Sources */,
F7D4BF492CA2E8D800A5E746 /* TOPasscodeVariableInputView.m in Sources */,
F7D4BF4A2CA2E8D800A5E746 /* TOPasscodeCircleView.m in Sources */,
F7D4BF4B2CA2E8D800A5E746 /* TOPasscodeViewContentLayout.m in Sources */,
Expand Down Expand Up @@ -4583,6 +4602,7 @@
F718C24E254D507B00C5C256 /* NCViewerMediaDetailView.swift in Sources */,
F33EE6F22BF4C9B200CA1A51 /* PKCS12.swift in Sources */,
F7145610296433C80038D028 /* NCDocumentCamera.swift in Sources */,
F34E1AD72ECB937D00FA10C3 /* NCStatusMessageView.swift in Sources */,
F76882312C0DD1E7001CF441 /* NCFileNameView.swift in Sources */,
F7381EE1218218C9000B1560 /* NCOffline.swift in Sources */,
F751247C2C42919C00E63DB8 /* NCPhotoCell.swift in Sources */,
Expand Down Expand Up @@ -4619,7 +4639,6 @@
F7E8A391295DC5E0006CB2D0 /* View+Extension.swift in Sources */,
F79B869B265E19D40085C0E0 /* NSMutableAttributedString+Extension.swift in Sources */,
F7B7504B2397D38F004E13EC /* UIImage+Extension.swift in Sources */,
F7EFC0CD256BF8DD00461AAD /* NCUserStatus.swift in Sources */,
AF3FDCC22796ECC300710F60 /* NCTrash+CollectionView.swift in Sources */,
F70D7C3725FFBF82002B9E34 /* NCCollectionViewCommon.swift in Sources */,
F76D364628A4F8BF00214537 /* NCActivityIndicator.swift in Sources */,
Expand All @@ -4628,6 +4647,7 @@
F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift in Sources */,
F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */,
F75D19E325EFE09000D74598 /* NCTrash+Menu.swift in Sources */,
F34E1ADB2ECC842B00FA10C3 /* NCStatusMessageModel.swift in Sources */,
F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */,
AA8D316E2D4123B200FE2775 /* NCShareDownloadLimitTableViewControllerDelegate.swift in Sources */,
F36C514F2E89393C0097E5F7 /* UIView+BlurVibrancy.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Account/Account Settings/NCAccountSettingsModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ class NCAccountSettingsModel: ObservableObject, ViewOnAppearHandling {
init(controller: NCMainTabBarController?, delegate: NCAccountSettingsModelDelegate?) {
self.controller = controller
self.delegate = delegate
if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
if isXcodeRunningForPreviews {
Task {
await self.database.previewCreateDB()
await self.database.createDBForPreview()
}
}
onViewAppear()
Expand Down
Loading
Loading