From eed8790e93fc1fc1cb2f060344e708ee82341ccf Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 4 Dec 2019 13:58:28 +1100 Subject: [PATCH] Re-order files --- Signal.xcodeproj/project.pbxproj | 54 +++++++++++++++---- .../{ => Redesign/Components}/Button.swift | 0 .../Components}/ConversationCell.swift | 0 .../Components}/ProfilePictureView.swift | 0 .../{ => Redesign/Components}/SearchBar.swift | 0 .../{ => Redesign/Components}/Separator.swift | 0 .../{ => Redesign/Components}/TabBar.swift | 0 .../{ => Redesign/Components}/TextField.swift | 0 .../Style Guide/Colors.swift | 0 .../Style Guide/Fonts.swift | 0 .../Style Guide/Gradients.swift | 0 .../Style Guide/Values.swift | 0 .../Utilities/UIView+Constraints.swift | 0 .../View Controllers}/HomeVC.swift | 0 .../View Controllers}/NewPrivateChatVC.swift | 0 15 files changed, 43 insertions(+), 11 deletions(-) rename Signal/src/Loki/{ => Redesign/Components}/Button.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/ConversationCell.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/ProfilePictureView.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/SearchBar.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/Separator.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/TabBar.swift (100%) rename Signal/src/Loki/{ => Redesign/Components}/TextField.swift (100%) rename Signal/src/Loki/{Utilities => Redesign}/Style Guide/Colors.swift (100%) rename Signal/src/Loki/{Utilities => Redesign}/Style Guide/Fonts.swift (100%) rename Signal/src/Loki/{Utilities => Redesign}/Style Guide/Gradients.swift (100%) rename Signal/src/Loki/{Utilities => Redesign}/Style Guide/Values.swift (100%) rename Signal/src/Loki/{ => Redesign}/Utilities/UIView+Constraints.swift (100%) rename Signal/src/Loki/{ => Redesign/View Controllers}/HomeVC.swift (100%) rename Signal/src/Loki/{Messaging => Redesign/View Controllers}/NewPrivateChatVC.swift (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index bd164c4ea..a5c815f44 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2683,14 +2683,7 @@ B86BD0872339A1ED000F5AE3 /* Onboarding */, B86BD08223399ABF000F5AE3 /* Settings */, B86BD0882339A253000F5AE3 /* Utilities */, - B8BB82A4238F627000BA5194 /* HomeVC.swift */, - B8BB82AA238F669C00BA5194 /* ConversationCell.swift */, - B8B5BCEB2394D869003823C9 /* Button.swift */, - B8BB82B02390C37000BA5194 /* SearchBar.swift */, - B8BB82B423947F2D00BA5194 /* TextField.swift */, - B8BB82B82394911B00BA5194 /* Separator.swift */, - B8BB82AC238F734800BA5194 /* ProfilePictureView.swift */, - B8CCF638239721E20091D419 /* TabBar.swift */, + B8CCF63A2397572B0091D419 /* Redesign */, ); path = Loki; sourceTree = ""; @@ -2735,8 +2728,6 @@ children = ( B84664F4235022F30083A1CD /* MentionUtilities.swift */, B86BD08323399ACF000F5AE3 /* Modal.swift */, - B8BB82A3238F356800BA5194 /* Style Guide */, - B885D5F52334A32100EE0D8E /* UIView+Constraints.swift */, ); path = Utilities; sourceTree = ""; @@ -2769,13 +2760,54 @@ B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */, B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */, - B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, 24BD2608234DA2050008EB0A /* JoinPublicChatVC.swift */, B893063E2383961A005EAA8E /* ScanQRCodeWrapperVC.swift */, ); 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 = ( + B8B5BCEB2394D869003823C9 /* Button.swift */, + B8BB82AA238F669C00BA5194 /* ConversationCell.swift */, + B8BB82AC238F734800BA5194 /* ProfilePictureView.swift */, + B8BB82B02390C37000BA5194 /* SearchBar.swift */, + B8BB82B82394911B00BA5194 /* Separator.swift */, + B8CCF638239721E20091D419 /* TabBar.swift */, + B8BB82B423947F2D00BA5194 /* TextField.swift */, + ); + path = Components; + sourceTree = ""; + }; + B8CCF63C239757DB0091D419 /* Utilities */ = { + isa = PBXGroup; + children = ( + B885D5F52334A32100EE0D8E /* UIView+Constraints.swift */, + ); + path = Utilities; + sourceTree = ""; + }; + B8CCF63D2397580E0091D419 /* View Controllers */ = { + isa = PBXGroup; + children = ( + B8BB82A4238F627000BA5194 /* HomeVC.swift */, + B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, + ); + path = "View Controllers"; + sourceTree = ""; + }; D221A07E169C9E5E00537ABF = { isa = PBXGroup; children = ( diff --git a/Signal/src/Loki/Button.swift b/Signal/src/Loki/Redesign/Components/Button.swift similarity index 100% rename from Signal/src/Loki/Button.swift rename to Signal/src/Loki/Redesign/Components/Button.swift diff --git a/Signal/src/Loki/ConversationCell.swift b/Signal/src/Loki/Redesign/Components/ConversationCell.swift similarity index 100% rename from Signal/src/Loki/ConversationCell.swift rename to Signal/src/Loki/Redesign/Components/ConversationCell.swift diff --git a/Signal/src/Loki/ProfilePictureView.swift b/Signal/src/Loki/Redesign/Components/ProfilePictureView.swift similarity index 100% rename from Signal/src/Loki/ProfilePictureView.swift rename to Signal/src/Loki/Redesign/Components/ProfilePictureView.swift diff --git a/Signal/src/Loki/SearchBar.swift b/Signal/src/Loki/Redesign/Components/SearchBar.swift similarity index 100% rename from Signal/src/Loki/SearchBar.swift rename to Signal/src/Loki/Redesign/Components/SearchBar.swift diff --git a/Signal/src/Loki/Separator.swift b/Signal/src/Loki/Redesign/Components/Separator.swift similarity index 100% rename from Signal/src/Loki/Separator.swift rename to Signal/src/Loki/Redesign/Components/Separator.swift diff --git a/Signal/src/Loki/TabBar.swift b/Signal/src/Loki/Redesign/Components/TabBar.swift similarity index 100% rename from Signal/src/Loki/TabBar.swift rename to Signal/src/Loki/Redesign/Components/TabBar.swift diff --git a/Signal/src/Loki/TextField.swift b/Signal/src/Loki/Redesign/Components/TextField.swift similarity index 100% rename from Signal/src/Loki/TextField.swift rename to Signal/src/Loki/Redesign/Components/TextField.swift diff --git a/Signal/src/Loki/Utilities/Style Guide/Colors.swift b/Signal/src/Loki/Redesign/Style Guide/Colors.swift similarity index 100% rename from Signal/src/Loki/Utilities/Style Guide/Colors.swift rename to Signal/src/Loki/Redesign/Style Guide/Colors.swift diff --git a/Signal/src/Loki/Utilities/Style Guide/Fonts.swift b/Signal/src/Loki/Redesign/Style Guide/Fonts.swift similarity index 100% rename from Signal/src/Loki/Utilities/Style Guide/Fonts.swift rename to Signal/src/Loki/Redesign/Style Guide/Fonts.swift diff --git a/Signal/src/Loki/Utilities/Style Guide/Gradients.swift b/Signal/src/Loki/Redesign/Style Guide/Gradients.swift similarity index 100% rename from Signal/src/Loki/Utilities/Style Guide/Gradients.swift rename to Signal/src/Loki/Redesign/Style Guide/Gradients.swift diff --git a/Signal/src/Loki/Utilities/Style Guide/Values.swift b/Signal/src/Loki/Redesign/Style Guide/Values.swift similarity index 100% rename from Signal/src/Loki/Utilities/Style Guide/Values.swift rename to Signal/src/Loki/Redesign/Style Guide/Values.swift diff --git a/Signal/src/Loki/Utilities/UIView+Constraints.swift b/Signal/src/Loki/Redesign/Utilities/UIView+Constraints.swift similarity index 100% rename from Signal/src/Loki/Utilities/UIView+Constraints.swift rename to Signal/src/Loki/Redesign/Utilities/UIView+Constraints.swift diff --git a/Signal/src/Loki/HomeVC.swift b/Signal/src/Loki/Redesign/View Controllers/HomeVC.swift similarity index 100% rename from Signal/src/Loki/HomeVC.swift rename to Signal/src/Loki/Redesign/View Controllers/HomeVC.swift diff --git a/Signal/src/Loki/Messaging/NewPrivateChatVC.swift b/Signal/src/Loki/Redesign/View Controllers/NewPrivateChatVC.swift similarity index 100% rename from Signal/src/Loki/Messaging/NewPrivateChatVC.swift rename to Signal/src/Loki/Redesign/View Controllers/NewPrivateChatVC.swift