From 0dbc3095104acc557c27f4b959693d32869fa6d0 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 15 Oct 2019 10:59:09 +1100 Subject: [PATCH] Re-order files --- Signal.xcodeproj/project.pbxproj | 32 ++++++++++++------- .../{ => Messaging}/FriendRequestView.swift | 0 .../FriendRequestViewDelegate.swift | 0 .../Loki/{ => Messaging}/LokiP2PServer.swift | 0 .../{ => Messaging}/LokiRSSFeedPoller.swift | 0 .../MentionCandidateSelectionView.swift | 0 ...entionCandidateSelectionViewDelegate.swift | 0 .../{ => Messaging}/NewConversationVC.swift | 0 .../{ => Messaging}/NewPublicChatVC.swift | 0 .../src/Loki/{ => Messaging}/ScanQRCodeVC.h | 0 .../src/Loki/{ => Messaging}/ScanQRCodeVC.m | 0 11 files changed, 20 insertions(+), 12 deletions(-) rename Signal/src/Loki/{ => Messaging}/FriendRequestView.swift (100%) rename Signal/src/Loki/{ => Messaging}/FriendRequestViewDelegate.swift (100%) rename Signal/src/Loki/{ => Messaging}/LokiP2PServer.swift (100%) rename Signal/src/Loki/{ => Messaging}/LokiRSSFeedPoller.swift (100%) rename Signal/src/Loki/{ => Messaging}/MentionCandidateSelectionView.swift (100%) rename Signal/src/Loki/{ => Messaging}/MentionCandidateSelectionViewDelegate.swift (100%) rename Signal/src/Loki/{ => Messaging}/NewConversationVC.swift (100%) rename Signal/src/Loki/{ => Messaging}/NewPublicChatVC.swift (100%) rename Signal/src/Loki/{ => Messaging}/ScanQRCodeVC.h (100%) rename Signal/src/Loki/{ => Messaging}/ScanQRCodeVC.m (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index e7ef3e96a..d0f072ebb 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2647,19 +2647,10 @@ B8439518228510E9000563FE /* Loki */ = { isa = PBXGroup; children = ( + B8BFFF392355426100102A27 /* Messaging */, B86BD0872339A1ED000F5AE3 /* Onboarding */, B86BD08223399ABF000F5AE3 /* Settings */, B86BD0882339A253000F5AE3 /* Utilities */, - B8162F0222891AD600D46544 /* FriendRequestView.swift */, - B8162F0422892C5F00D46544 /* FriendRequestViewDelegate.swift */, - 24A830A12293CD0100F4CAC0 /* LokiP2PServer.swift */, - B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */, - B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */, - B8258491230FA5DA001B41CB /* ScanQRCodeVC.h */, - B8258492230FA5E9001B41CB /* ScanQRCodeVC.m */, - 24BD2608234DA2050008EB0A /* NewPublicChatVC.swift */, - B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, - B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */, ); path = Loki; sourceTree = ""; @@ -2680,9 +2671,9 @@ children = ( B885D5F3233491AB00EE0D8E /* DeviceLinkingModal.swift */, B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */, + B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, B86BD08023399883000F5AE3 /* QRCodeModal.swift */, B86BD08523399CEF000F5AE3 /* SeedModal.swift */, - B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, ); path = Settings; sourceTree = ""; @@ -2699,13 +2690,30 @@ B86BD0882339A253000F5AE3 /* Utilities */ = { isa = PBXGroup; children = ( + B84664F4235022F30083A1CD /* MentionUtilities.swift */, B86BD08323399ACF000F5AE3 /* Modal.swift */, B885D5F52334A32100EE0D8E /* UIView+Constraint.swift */, - B84664F4235022F30083A1CD /* MentionUtilities.swift */, ); path = Utilities; sourceTree = ""; }; + B8BFFF392355426100102A27 /* Messaging */ = { + isa = PBXGroup; + children = ( + B8162F0222891AD600D46544 /* FriendRequestView.swift */, + B8162F0422892C5F00D46544 /* FriendRequestViewDelegate.swift */, + 24A830A12293CD0100F4CAC0 /* LokiP2PServer.swift */, + B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */, + B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, + B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */, + B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */, + 24BD2608234DA2050008EB0A /* NewPublicChatVC.swift */, + B8258491230FA5DA001B41CB /* ScanQRCodeVC.h */, + B8258492230FA5E9001B41CB /* ScanQRCodeVC.m */, + ); + path = Messaging; + sourceTree = ""; + }; D221A07E169C9E5E00537ABF = { isa = PBXGroup; children = ( diff --git a/Signal/src/Loki/FriendRequestView.swift b/Signal/src/Loki/Messaging/FriendRequestView.swift similarity index 100% rename from Signal/src/Loki/FriendRequestView.swift rename to Signal/src/Loki/Messaging/FriendRequestView.swift diff --git a/Signal/src/Loki/FriendRequestViewDelegate.swift b/Signal/src/Loki/Messaging/FriendRequestViewDelegate.swift similarity index 100% rename from Signal/src/Loki/FriendRequestViewDelegate.swift rename to Signal/src/Loki/Messaging/FriendRequestViewDelegate.swift diff --git a/Signal/src/Loki/LokiP2PServer.swift b/Signal/src/Loki/Messaging/LokiP2PServer.swift similarity index 100% rename from Signal/src/Loki/LokiP2PServer.swift rename to Signal/src/Loki/Messaging/LokiP2PServer.swift diff --git a/Signal/src/Loki/LokiRSSFeedPoller.swift b/Signal/src/Loki/Messaging/LokiRSSFeedPoller.swift similarity index 100% rename from Signal/src/Loki/LokiRSSFeedPoller.swift rename to Signal/src/Loki/Messaging/LokiRSSFeedPoller.swift diff --git a/Signal/src/Loki/MentionCandidateSelectionView.swift b/Signal/src/Loki/Messaging/MentionCandidateSelectionView.swift similarity index 100% rename from Signal/src/Loki/MentionCandidateSelectionView.swift rename to Signal/src/Loki/Messaging/MentionCandidateSelectionView.swift diff --git a/Signal/src/Loki/MentionCandidateSelectionViewDelegate.swift b/Signal/src/Loki/Messaging/MentionCandidateSelectionViewDelegate.swift similarity index 100% rename from Signal/src/Loki/MentionCandidateSelectionViewDelegate.swift rename to Signal/src/Loki/Messaging/MentionCandidateSelectionViewDelegate.swift diff --git a/Signal/src/Loki/NewConversationVC.swift b/Signal/src/Loki/Messaging/NewConversationVC.swift similarity index 100% rename from Signal/src/Loki/NewConversationVC.swift rename to Signal/src/Loki/Messaging/NewConversationVC.swift diff --git a/Signal/src/Loki/NewPublicChatVC.swift b/Signal/src/Loki/Messaging/NewPublicChatVC.swift similarity index 100% rename from Signal/src/Loki/NewPublicChatVC.swift rename to Signal/src/Loki/Messaging/NewPublicChatVC.swift diff --git a/Signal/src/Loki/ScanQRCodeVC.h b/Signal/src/Loki/Messaging/ScanQRCodeVC.h similarity index 100% rename from Signal/src/Loki/ScanQRCodeVC.h rename to Signal/src/Loki/Messaging/ScanQRCodeVC.h diff --git a/Signal/src/Loki/ScanQRCodeVC.m b/Signal/src/Loki/Messaging/ScanQRCodeVC.m similarity index 100% rename from Signal/src/Loki/ScanQRCodeVC.m rename to Signal/src/Loki/Messaging/ScanQRCodeVC.m