diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 027e7fc1b..2b0e1d6a2 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2703,8 +2703,11 @@ B8439518228510E9000563FE /* Loki */ = { isa = PBXGroup; children = ( + B8CCF63B239757C10091D419 /* Components */, B8BFFF392355426100102A27 /* Messaging */, - B8CCF63A2397572B0091D419 /* Redesign */, + B8BB82A3238F356800BA5194 /* Style Guide */, + B8CCF63C239757DB0091D419 /* Utilities */, + B8CCF63D2397580E0091D419 /* View Controllers */, ); path = Loki; sourceTree = ""; @@ -2749,17 +2752,6 @@ path = Messaging; sourceTree = ""; }; - B8CCF63A2397572B0091D419 /* Redesign */ = { - isa = PBXGroup; - children = ( - B8CCF63B239757C10091D419 /* Components */, - B8BB82A3238F356800BA5194 /* Style Guide */, - B8CCF63C239757DB0091D419 /* Utilities */, - B8CCF63D2397580E0091D419 /* View Controllers */, - ); - path = Redesign; - sourceTree = ""; - }; B8CCF63B239757C10091D419 /* Components */ = { isa = PBXGroup; children = ( diff --git a/Signal/src/Loki/Redesign/Components/Button.swift b/Signal/src/Loki/Components/Button.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/Button.swift rename to Signal/src/Loki/Components/Button.swift diff --git a/Signal/src/Loki/Redesign/Components/ConversationCell.swift b/Signal/src/Loki/Components/ConversationCell.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/ConversationCell.swift rename to Signal/src/Loki/Components/ConversationCell.swift diff --git a/Signal/src/Loki/Redesign/Components/ConversationTitleView.swift b/Signal/src/Loki/Components/ConversationTitleView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/ConversationTitleView.swift rename to Signal/src/Loki/Components/ConversationTitleView.swift diff --git a/Signal/src/Loki/Redesign/Components/FakeChatView.swift b/Signal/src/Loki/Components/FakeChatView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/FakeChatView.swift rename to Signal/src/Loki/Components/FakeChatView.swift diff --git a/Signal/src/Loki/Redesign/Components/FriendRequestView.swift b/Signal/src/Loki/Components/FriendRequestView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/FriendRequestView.swift rename to Signal/src/Loki/Components/FriendRequestView.swift diff --git a/Signal/src/Loki/Redesign/Components/FriendRequestViewDelegate.swift b/Signal/src/Loki/Components/FriendRequestViewDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/FriendRequestViewDelegate.swift rename to Signal/src/Loki/Components/FriendRequestViewDelegate.swift diff --git a/Signal/src/Loki/Redesign/Components/MentionCandidateSelectionView.swift b/Signal/src/Loki/Components/MentionCandidateSelectionView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/MentionCandidateSelectionView.swift rename to Signal/src/Loki/Components/MentionCandidateSelectionView.swift diff --git a/Signal/src/Loki/Redesign/Components/MentionCandidateSelectionViewDelegate.swift b/Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/MentionCandidateSelectionViewDelegate.swift rename to Signal/src/Loki/Components/MentionCandidateSelectionViewDelegate.swift diff --git a/Signal/src/Loki/Redesign/Components/ProfilePictureView.swift b/Signal/src/Loki/Components/ProfilePictureView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/ProfilePictureView.swift rename to Signal/src/Loki/Components/ProfilePictureView.swift diff --git a/Signal/src/Loki/Redesign/Components/SearchBar.swift b/Signal/src/Loki/Components/SearchBar.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/SearchBar.swift rename to Signal/src/Loki/Components/SearchBar.swift diff --git a/Signal/src/Loki/Redesign/Components/SeedReminderView.swift b/Signal/src/Loki/Components/SeedReminderView.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/SeedReminderView.swift rename to Signal/src/Loki/Components/SeedReminderView.swift diff --git a/Signal/src/Loki/Redesign/Components/SeedReminderViewDelegate.swift b/Signal/src/Loki/Components/SeedReminderViewDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/SeedReminderViewDelegate.swift rename to Signal/src/Loki/Components/SeedReminderViewDelegate.swift diff --git a/Signal/src/Loki/Redesign/Components/Separator.swift b/Signal/src/Loki/Components/Separator.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/Separator.swift rename to Signal/src/Loki/Components/Separator.swift diff --git a/Signal/src/Loki/Redesign/Components/TabBar.swift b/Signal/src/Loki/Components/TabBar.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/TabBar.swift rename to Signal/src/Loki/Components/TabBar.swift diff --git a/Signal/src/Loki/Redesign/Components/TextField.swift b/Signal/src/Loki/Components/TextField.swift similarity index 100% rename from Signal/src/Loki/Redesign/Components/TextField.swift rename to Signal/src/Loki/Components/TextField.swift diff --git a/Signal/src/Loki/Redesign/Style Guide/Colors.swift b/Signal/src/Loki/Style Guide/Colors.swift similarity index 100% rename from Signal/src/Loki/Redesign/Style Guide/Colors.swift rename to Signal/src/Loki/Style Guide/Colors.swift diff --git a/Signal/src/Loki/Redesign/Style Guide/Fonts.swift b/Signal/src/Loki/Style Guide/Fonts.swift similarity index 100% rename from Signal/src/Loki/Redesign/Style Guide/Fonts.swift rename to Signal/src/Loki/Style Guide/Fonts.swift diff --git a/Signal/src/Loki/Redesign/Style Guide/Gradients.swift b/Signal/src/Loki/Style Guide/Gradients.swift similarity index 100% rename from Signal/src/Loki/Redesign/Style Guide/Gradients.swift rename to Signal/src/Loki/Style Guide/Gradients.swift diff --git a/Signal/src/Loki/Redesign/Style Guide/Values.swift b/Signal/src/Loki/Style Guide/Values.swift similarity index 100% rename from Signal/src/Loki/Redesign/Style Guide/Values.swift rename to Signal/src/Loki/Style Guide/Values.swift diff --git a/Signal/src/Loki/Redesign/Utilities/MentionUtilities.swift b/Signal/src/Loki/Utilities/MentionUtilities.swift similarity index 100% rename from Signal/src/Loki/Redesign/Utilities/MentionUtilities.swift rename to Signal/src/Loki/Utilities/MentionUtilities.swift diff --git a/Signal/src/Loki/Redesign/Utilities/QRCode.swift b/Signal/src/Loki/Utilities/QRCode.swift similarity index 100% rename from Signal/src/Loki/Redesign/Utilities/QRCode.swift rename to Signal/src/Loki/Utilities/QRCode.swift diff --git a/Signal/src/Loki/Redesign/Utilities/UIView+Constraints.swift b/Signal/src/Loki/Utilities/UIView+Constraints.swift similarity index 100% rename from Signal/src/Loki/Redesign/Utilities/UIView+Constraints.swift rename to Signal/src/Loki/Utilities/UIView+Constraints.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DeviceLinkingModal.swift b/Signal/src/Loki/View Controllers/DeviceLinkingModal.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DeviceLinkingModal.swift rename to Signal/src/Loki/View Controllers/DeviceLinkingModal.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DeviceLinkingModalDelegate.swift b/Signal/src/Loki/View Controllers/DeviceLinkingModalDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DeviceLinkingModalDelegate.swift rename to Signal/src/Loki/View Controllers/DeviceLinkingModalDelegate.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DeviceLinksVC.swift b/Signal/src/Loki/View Controllers/DeviceLinksVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DeviceLinksVC.swift rename to Signal/src/Loki/View Controllers/DeviceLinksVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DeviceNameModal.swift b/Signal/src/Loki/View Controllers/DeviceNameModal.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DeviceNameModal.swift rename to Signal/src/Loki/View Controllers/DeviceNameModal.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DeviceNameModalDelegate.swift b/Signal/src/Loki/View Controllers/DeviceNameModalDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DeviceNameModalDelegate.swift rename to Signal/src/Loki/View Controllers/DeviceNameModalDelegate.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift b/Signal/src/Loki/View Controllers/DisplayNameVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift rename to Signal/src/Loki/View Controllers/DisplayNameVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/HomeVC.swift b/Signal/src/Loki/View Controllers/HomeVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/HomeVC.swift rename to Signal/src/Loki/View Controllers/HomeVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/JoinPublicChatVC.swift b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/JoinPublicChatVC.swift rename to Signal/src/Loki/View Controllers/JoinPublicChatVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/LandingVC.swift b/Signal/src/Loki/View Controllers/LandingVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/LandingVC.swift rename to Signal/src/Loki/View Controllers/LandingVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/LinkDeviceVC.swift b/Signal/src/Loki/View Controllers/LinkDeviceVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/LinkDeviceVC.swift rename to Signal/src/Loki/View Controllers/LinkDeviceVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/LinkDeviceVCDelegate.swift b/Signal/src/Loki/View Controllers/LinkDeviceVCDelegate.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/LinkDeviceVCDelegate.swift rename to Signal/src/Loki/View Controllers/LinkDeviceVCDelegate.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/Modal.swift b/Signal/src/Loki/View Controllers/Modal.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/Modal.swift rename to Signal/src/Loki/View Controllers/Modal.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/NewPrivateChatVC.swift b/Signal/src/Loki/View Controllers/NewPrivateChatVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/NewPrivateChatVC.swift rename to Signal/src/Loki/View Controllers/NewPrivateChatVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/NukeDataModal.swift b/Signal/src/Loki/View Controllers/NukeDataModal.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/NukeDataModal.swift rename to Signal/src/Loki/View Controllers/NukeDataModal.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/QRCodeVC.swift b/Signal/src/Loki/View Controllers/QRCodeVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/QRCodeVC.swift rename to Signal/src/Loki/View Controllers/QRCodeVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/RegisterVC.swift b/Signal/src/Loki/View Controllers/RegisterVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/RegisterVC.swift rename to Signal/src/Loki/View Controllers/RegisterVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift b/Signal/src/Loki/View Controllers/RestoreVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift rename to Signal/src/Loki/View Controllers/RestoreVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/ScanQRCodeWrapperVC.swift b/Signal/src/Loki/View Controllers/ScanQRCodeWrapperVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/ScanQRCodeWrapperVC.swift rename to Signal/src/Loki/View Controllers/ScanQRCodeWrapperVC.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/SeedModal.swift b/Signal/src/Loki/View Controllers/SeedModal.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/SeedModal.swift rename to Signal/src/Loki/View Controllers/SeedModal.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/SeedVCV2.swift b/Signal/src/Loki/View Controllers/SeedVCV2.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/SeedVCV2.swift rename to Signal/src/Loki/View Controllers/SeedVCV2.swift diff --git a/Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift b/Signal/src/Loki/View Controllers/SettingsVC.swift similarity index 100% rename from Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift rename to Signal/src/Loki/View Controllers/SettingsVC.swift