From a915c5ddaa7d0088b7d98ac1daf42f782c91fdae Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 12 Jan 2021 11:05:52 +1100 Subject: [PATCH] Re-organize files --- Session.xcodeproj/project.pbxproj | 542 ++++++++++-------- .../BackupRestoreViewController.swift | 0 Session/{Signal => Backups}/OWSBackup.h | 0 Session/{Signal => Backups}/OWSBackup.m | 0 .../{Signal => Backups}/OWSBackupAPI.swift | 0 .../{Signal => Backups}/OWSBackupExportJob.h | 0 .../{Signal => Backups}/OWSBackupExportJob.m | 0 Session/{Signal => Backups}/OWSBackupIO.h | 0 Session/{Signal => Backups}/OWSBackupIO.m | 0 .../{Signal => Backups}/OWSBackupImportJob.h | 0 .../{Signal => Backups}/OWSBackupImportJob.m | 0 Session/{Signal => Backups}/OWSBackupJob.h | 0 Session/{Signal => Backups}/OWSBackupJob.m | 0 .../OWSBackupLazyRestore.swift | 0 .../OWSBackupSettingsViewController.h | 0 .../OWSBackupSettingsViewController.m | 0 .../NewPrivateChatVC.swift | 0 .../EditClosedGroupVC.swift | 0 .../GroupMembersVC.swift | 0 .../NewClosedGroupVC.swift | 0 .../Components/SessionRestorationView.swift | 85 --- .../AddToBlockListViewController.h | 0 .../AddToBlockListViewController.m | 0 .../ConversationCollectionView.h | 0 .../ConversationCollectionView.m | 0 .../ConversationInputTextView.h | 0 .../ConversationInputTextView.m | 0 .../ConversationInputToolbar.h | 0 .../ConversationInputToolbar.m | 0 .../ConversationMessageMapping.swift | 0 .../ConversationScrollButton.h | 0 .../ConversationScrollButton.m | 0 .../ConversationSearch.swift | 0 .../ConversationTitleView.swift | 0 .../ConversationViewController.h | 0 .../ConversationViewController.m | 0 .../ConversationViewItem.h | 0 .../ConversationViewItem.m | 0 .../ConversationViewLayout.h | 0 .../ConversationViewLayout.m | 0 .../ConversationViewModel.h | 0 .../ConversationViewModel.m | 0 .../LongTextViewController.swift | 0 .../MenuActionsViewController.swift | 0 .../MessageActions.swift | 0 .../MessageDetailViewController.swift | 0 .../OWSConversationSettingsViewController.h | 0 .../OWSConversationSettingsViewController.m | 0 .../OWSConversationSettingsViewDelegate.h | 0 .../Views & Cells}/AttachmentUploadView.h | 0 .../Views & Cells}/AttachmentUploadView.m | 0 .../ConversationMediaView.swift | 0 .../Views & Cells}/ConversationViewCell.h | 0 .../Views & Cells}/ConversationViewCell.m | 0 .../Views & Cells}/LinkPreviewView.swift | 0 .../Views & Cells}/MediaAlbumCellView.swift | 0 .../Views & Cells}/MediaDownloadView.swift | 0 .../Views & Cells}/MediaUploadView.swift | 0 .../MentionCandidateSelectionView.swift | 0 .../Views & Cells}/OWSBubbleShapeView.h | 0 .../Views & Cells}/OWSBubbleShapeView.m | 0 .../Views & Cells}/OWSBubbleView.h | 0 .../Views & Cells}/OWSBubbleView.m | 0 .../Views & Cells}/OWSGenericAttachmentView.h | 0 .../Views & Cells}/OWSGenericAttachmentView.m | 0 .../Views & Cells}/OWSLabel.h | 0 .../Views & Cells}/OWSLabel.m | 0 .../Views & Cells}/OWSMessageBubbleView.h | 0 .../Views & Cells}/OWSMessageBubbleView.m | 0 .../Views & Cells}/OWSMessageCell.h | 0 .../Views & Cells}/OWSMessageCell.m | 0 .../Views & Cells}/OWSMessageFooterView.h | 0 .../Views & Cells}/OWSMessageFooterView.m | 0 .../Views & Cells}/OWSMessageHeaderView.h | 0 .../Views & Cells}/OWSMessageHeaderView.m | 0 .../Views & Cells}/OWSMessageTextView.h | 0 .../Views & Cells}/OWSMessageTextView.m | 0 .../Views & Cells}/OWSMessageTimerView.h | 0 .../Views & Cells}/OWSMessageTimerView.m | 0 .../Views & Cells}/OWSQuotedMessageView.h | 0 .../Views & Cells}/OWSQuotedMessageView.m | 0 .../Views & Cells}/OWSSystemMessageCell.h | 0 .../Views & Cells}/OWSSystemMessageCell.m | 0 .../Views & Cells}/QuotedReplyPreview.swift | 0 .../Views & Cells}/TypingIndicatorCell.swift | 0 .../TypingIndicatorInteraction.swift | 0 .../Views & Cells}/TypingIndicatorView.swift | 0 .../Views & Cells}/VoiceMessageView.swift | 0 .../Views & Cells}/VoiceNoteLock.swift | 0 .../Storage+Resetting.swift | 0 .../{View Controllers => Home}/HomeVC.swift | 0 .../NewConversationButtonSet.swift | 0 .../AudioProgressView.swift | 0 .../CropScaleImageViewController.swift | 0 .../GIFs}/GifPickerCell.swift | 0 .../GIFs}/GifPickerLayout.swift | 0 .../GIFs}/GifPickerViewController.swift | 0 .../GIFs}/GiphyAPI.swift | 0 .../GIFs}/GiphyDownloader.swift | 0 .../ImagePickerController.swift | 0 .../MediaDetailViewController.h | 0 .../MediaDetailViewController.m | 0 .../MediaGalleryViewController.swift | 0 .../MediaPageViewController.swift | 0 .../MediaTileViewController.swift | 0 .../OWSImagePickerController.swift | 0 .../PhotoCapture.swift | 0 .../PhotoCaptureViewController.swift | 0 .../PhotoCollectionPickerController.swift | 0 .../PhotoGridViewCell.swift | 0 .../PhotoLibrary.swift | 0 .../RemoteVideoView.h | 0 .../RemoteVideoView.m | 0 .../SendMediaNavigationController.swift | 0 Session/{Signal => Meta}/AppDelegate.h | 0 Session/{Signal => Meta}/AppDelegate.m | 0 Session/{Signal => Meta}/AppEnvironment.swift | 0 .../{Signal => Meta}/Launch Screen.storyboard | 0 Session/{Signal => Meta}/Main.storyboard | 0 Session/{Signal => Meta}/MainAppContext.h | 0 Session/{Signal => Meta}/MainAppContext.m | 0 Session/{Signal => Meta}/SignalApp.h | 0 Session/{Signal => Meta}/SignalApp.m | 0 Session/Meta/main.m | 2 - .../AppNotifications.swift | 0 .../LegacyNotificationsAdaptee.swift | 0 .../PushRegistrationManager.swift | 0 .../SyncPushTokensJob.swift | 0 .../UserNotificationsAdaptee.swift | 0 .../DisplayNameVC.swift | 0 .../FakeChatView.swift | 0 .../LandingVC.swift | 0 .../PNModeVC.swift | 0 .../PNOptionView.swift | 0 .../RegisterVC.swift | 0 .../RestoreVC.swift | 0 .../SeedReminderView.swift | 0 .../SeedVC.swift | 0 .../JoinPublicChatVC.swift | 0 .../{Components => Path}/PathStatusView.swift | 0 .../{View Controllers => Path}/PathVC.swift | 0 .../AboutTableViewController.h | 0 .../AboutTableViewController.m | 0 ...otificationSettingsOptionsViewController.h | 0 ...otificationSettingsOptionsViewController.m | 0 .../NotificationSettingsViewController.h | 0 .../NotificationSettingsViewController.m | 0 .../NukeDataModal.swift | 0 .../OWSSoundSettingsViewController.h | 0 .../OWSSoundSettingsViewController.m | 0 .../PrivacySettingsTableViewController.h | 0 .../PrivacySettingsTableViewController.m | 0 .../QRCodeVC.swift | 0 .../SeedModal.swift | 0 .../SettingsVC.swift | 0 .../AvatarTableViewCell.swift | 0 .../{View Controllers => Shared}/BaseVC.swift | 0 Session/{Signal => Shared}/CaptionView.swift | 0 .../ConversationCell.swift | 0 .../DismissableTextField.swift | 0 .../GroupTableViewCell.swift | 0 .../LoadingViewController.swift | 0 Session/{Signal => Shared}/MarqueeLabel.swift | 0 .../{Signal => Shared}/NeverClearView.swift | 0 .../{Signal => Shared}/OWSBezierPathView.h | 0 .../{Signal => Shared}/OWSBezierPathView.m | 0 Session/{Signal => Shared}/OWSProgressView.h | 0 Session/{Signal => Shared}/OWSProgressView.m | 0 .../OWSQRCodeScanningViewController.h | 0 .../OWSQRCodeScanningViewController.m | 0 Session/{Signal => Shared}/OWSScreenLockUI.h | 0 Session/{Signal => Shared}/OWSScreenLockUI.m | 0 Session/{Signal => Shared}/ReminderView.swift | 0 .../ScanQRCodeWrapperVC.swift | 0 Session/{Components => Shared}/UserCell.swift | 0 .../UserSelectionVC.swift | 0 .../KeyPairMigrationSheet.swift | 0 .../KeyPairMigrationSuccessSheet.swift | 0 .../Modal.swift | 0 .../Sheet.swift | 0 .../AVAudioSession+OWS.h | 0 .../AVAudioSession+OWS.m | 0 .../AccountManager.swift | 0 .../{Signal => Utilities}/AppUpdateNag.swift | 0 .../{Signal => Utilities}/AvatarViewHelper.h | 0 .../{Signal => Utilities}/AvatarViewHelper.m | 0 Session/{Signal => Utilities}/DateUtil.h | 0 Session/{Signal => Utilities}/DateUtil.m | 0 .../HapticFeedback.swift | 0 .../MessageRecipientStatusUtils.swift | 0 .../OWSOrphanDataCleaner.h | 0 .../OWSOrphanDataCleaner.m | 0 .../OWSWebRTCDataProtos.pb.swift | 0 Session/{Signal => Utilities}/Platform.swift | 0 .../TextFieldHelper.swift | 0 Session/{Signal => Utilities}/UIAlerts+iOS9.m | 0 .../UIApplication+OWS.swift | 0 .../UIResponder+OWS.swift | 0 .../UIStoryboard+OWS.swift | 0 .../UIViewController+CameraPermissions.h | 0 .../UIViewController+Permissions.h | 0 .../UIViewController+Permissions.m | 0 .../{Signal => Utilities}/WebRTCProto.swift | 0 Session/View Controllers/LightModeSheet.swift | 50 -- 204 files changed, 307 insertions(+), 372 deletions(-) rename Session/{Signal => Backups}/BackupRestoreViewController.swift (100%) rename Session/{Signal => Backups}/OWSBackup.h (100%) rename Session/{Signal => Backups}/OWSBackup.m (100%) rename Session/{Signal => Backups}/OWSBackupAPI.swift (100%) rename Session/{Signal => Backups}/OWSBackupExportJob.h (100%) rename Session/{Signal => Backups}/OWSBackupExportJob.m (100%) rename Session/{Signal => Backups}/OWSBackupIO.h (100%) rename Session/{Signal => Backups}/OWSBackupIO.m (100%) rename Session/{Signal => Backups}/OWSBackupImportJob.h (100%) rename Session/{Signal => Backups}/OWSBackupImportJob.m (100%) rename Session/{Signal => Backups}/OWSBackupJob.h (100%) rename Session/{Signal => Backups}/OWSBackupJob.m (100%) rename Session/{Signal => Backups}/OWSBackupLazyRestore.swift (100%) rename Session/{Signal => Backups}/OWSBackupSettingsViewController.h (100%) rename Session/{Signal => Backups}/OWSBackupSettingsViewController.m (100%) rename Session/{View Controllers => Basic Chats}/NewPrivateChatVC.swift (100%) rename Session/{View Controllers => Closed Groups}/EditClosedGroupVC.swift (100%) rename Session/{View Controllers => Closed Groups}/GroupMembersVC.swift (100%) rename Session/{View Controllers => Closed Groups}/NewClosedGroupVC.swift (100%) delete mode 100644 Session/Components/SessionRestorationView.swift rename Session/{Signal => Conversations}/AddToBlockListViewController.h (100%) rename Session/{Signal => Conversations}/AddToBlockListViewController.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationCollectionView.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationCollectionView.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationInputTextView.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationInputTextView.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationInputToolbar.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationInputToolbar.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationMessageMapping.swift (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationScrollButton.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationScrollButton.m (100%) rename Session/{Signal => Conversations}/ConversationSearch.swift (100%) rename Session/{Components => Conversations}/ConversationTitleView.swift (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewController.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewController.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewItem.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewItem.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewLayout.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewLayout.m (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewModel.h (100%) rename Session/{Signal/ConversationView => Conversations}/ConversationViewModel.m (100%) rename Session/{Signal => Conversations}/LongTextViewController.swift (100%) rename Session/{Signal => Conversations}/MenuActionsViewController.swift (100%) rename Session/{Signal => Conversations}/MessageActions.swift (100%) rename Session/{Signal => Conversations}/MessageDetailViewController.swift (100%) rename Session/{Signal => Conversations}/OWSConversationSettingsViewController.h (100%) rename Session/{Signal => Conversations}/OWSConversationSettingsViewController.m (100%) rename Session/{Signal => Conversations}/OWSConversationSettingsViewDelegate.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/AttachmentUploadView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/AttachmentUploadView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/ConversationMediaView.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/ConversationViewCell.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/ConversationViewCell.m (100%) rename Session/{Signal => Conversations/Views & Cells}/LinkPreviewView.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/MediaAlbumCellView.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/MediaDownloadView.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/MediaUploadView.swift (100%) rename Session/{Components => Conversations/Views & Cells}/MentionCandidateSelectionView.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSBubbleShapeView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSBubbleShapeView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSBubbleView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSBubbleView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSGenericAttachmentView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSGenericAttachmentView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSLabel.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSLabel.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageBubbleView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageBubbleView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageCell.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageCell.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageFooterView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageFooterView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageHeaderView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageHeaderView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageTextView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageTextView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageTimerView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSMessageTimerView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSQuotedMessageView.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSQuotedMessageView.m (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSSystemMessageCell.h (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/OWSSystemMessageCell.m (100%) rename Session/{Signal => Conversations/Views & Cells}/QuotedReplyPreview.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/TypingIndicatorCell.swift (100%) rename Session/{Signal/ConversationView/Cells => Conversations/Views & Cells}/TypingIndicatorInteraction.swift (100%) rename Session/{Signal => Conversations/Views & Cells}/TypingIndicatorView.swift (100%) rename Session/{Components => Conversations/Views & Cells}/VoiceMessageView.swift (100%) rename Session/{Signal => Conversations/Views & Cells}/VoiceNoteLock.swift (100%) rename Session/{Utilities => Database}/Storage+Resetting.swift (100%) rename Session/{View Controllers => Home}/HomeVC.swift (100%) rename Session/{Components => Home}/NewConversationButtonSet.swift (100%) rename Session/{Signal => Media Viewing & Editing}/AudioProgressView.swift (100%) rename Session/{Signal => Media Viewing & Editing}/CropScaleImageViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing/GIFs}/GifPickerCell.swift (100%) rename Session/{Signal => Media Viewing & Editing/GIFs}/GifPickerLayout.swift (100%) rename Session/{Signal => Media Viewing & Editing/GIFs}/GifPickerViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing/GIFs}/GiphyAPI.swift (100%) rename Session/{Signal => Media Viewing & Editing/GIFs}/GiphyDownloader.swift (100%) rename Session/{Signal => Media Viewing & Editing}/ImagePickerController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/MediaDetailViewController.h (100%) rename Session/{Signal => Media Viewing & Editing}/MediaDetailViewController.m (100%) rename Session/{Signal => Media Viewing & Editing}/MediaGalleryViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/MediaPageViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/MediaTileViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/OWSImagePickerController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/PhotoCapture.swift (100%) rename Session/{Signal => Media Viewing & Editing}/PhotoCaptureViewController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/PhotoCollectionPickerController.swift (100%) rename Session/{Signal => Media Viewing & Editing}/PhotoGridViewCell.swift (100%) rename Session/{Signal => Media Viewing & Editing}/PhotoLibrary.swift (100%) rename Session/{Signal => Media Viewing & Editing}/RemoteVideoView.h (100%) rename Session/{Signal => Media Viewing & Editing}/RemoteVideoView.m (100%) rename Session/{Signal => Media Viewing & Editing}/SendMediaNavigationController.swift (100%) rename Session/{Signal => Meta}/AppDelegate.h (100%) rename Session/{Signal => Meta}/AppDelegate.m (100%) rename Session/{Signal => Meta}/AppEnvironment.swift (100%) rename Session/{Signal => Meta}/Launch Screen.storyboard (100%) rename Session/{Signal => Meta}/Main.storyboard (100%) rename Session/{Signal => Meta}/MainAppContext.h (100%) rename Session/{Signal => Meta}/MainAppContext.m (100%) rename Session/{Signal => Meta}/SignalApp.h (100%) rename Session/{Signal => Meta}/SignalApp.m (100%) rename Session/{Signal => Notifications}/AppNotifications.swift (100%) rename Session/{Signal => Notifications}/LegacyNotificationsAdaptee.swift (100%) rename Session/{Signal => Notifications}/PushRegistrationManager.swift (100%) rename Session/{Signal => Notifications}/SyncPushTokensJob.swift (100%) rename Session/{Signal => Notifications}/UserNotificationsAdaptee.swift (100%) rename Session/{View Controllers => Onboarding}/DisplayNameVC.swift (100%) rename Session/{Components => Onboarding}/FakeChatView.swift (100%) rename Session/{View Controllers => Onboarding}/LandingVC.swift (100%) rename Session/{View Controllers => Onboarding}/PNModeVC.swift (100%) rename Session/{Components => Onboarding}/PNOptionView.swift (100%) rename Session/{View Controllers => Onboarding}/RegisterVC.swift (100%) rename Session/{View Controllers => Onboarding}/RestoreVC.swift (100%) rename Session/{Components => Onboarding}/SeedReminderView.swift (100%) rename Session/{View Controllers => Onboarding}/SeedVC.swift (100%) rename Session/{View Controllers => Open Groups}/JoinPublicChatVC.swift (100%) rename Session/{Components => Path}/PathStatusView.swift (100%) rename Session/{View Controllers => Path}/PathVC.swift (100%) rename Session/{Signal => Settings}/AboutTableViewController.h (100%) rename Session/{Signal => Settings}/AboutTableViewController.m (100%) rename Session/{Signal => Settings}/NotificationSettingsOptionsViewController.h (100%) rename Session/{Signal => Settings}/NotificationSettingsOptionsViewController.m (100%) rename Session/{Signal => Settings}/NotificationSettingsViewController.h (100%) rename Session/{Signal => Settings}/NotificationSettingsViewController.m (100%) rename Session/{View Controllers => Settings}/NukeDataModal.swift (100%) rename Session/{Signal => Settings}/OWSSoundSettingsViewController.h (100%) rename Session/{Signal => Settings}/OWSSoundSettingsViewController.m (100%) rename Session/{Signal => Settings}/PrivacySettingsTableViewController.h (100%) rename Session/{Signal => Settings}/PrivacySettingsTableViewController.m (100%) rename Session/{View Controllers => Settings}/QRCodeVC.swift (100%) rename Session/{View Controllers => Settings}/SeedModal.swift (100%) rename Session/{View Controllers => Settings}/SettingsVC.swift (100%) rename Session/{Signal => Shared}/AvatarTableViewCell.swift (100%) rename Session/{View Controllers => Shared}/BaseVC.swift (100%) rename Session/{Signal => Shared}/CaptionView.swift (100%) rename Session/{Components => Shared}/ConversationCell.swift (100%) rename Session/{Signal => Shared}/DismissableTextField.swift (100%) rename Session/{Signal => Shared}/GroupTableViewCell.swift (100%) rename Session/{Signal => Shared}/LoadingViewController.swift (100%) rename Session/{Signal => Shared}/MarqueeLabel.swift (100%) rename Session/{Signal => Shared}/NeverClearView.swift (100%) rename Session/{Signal => Shared}/OWSBezierPathView.h (100%) rename Session/{Signal => Shared}/OWSBezierPathView.m (100%) rename Session/{Signal => Shared}/OWSProgressView.h (100%) rename Session/{Signal => Shared}/OWSProgressView.m (100%) rename Session/{Signal => Shared}/OWSQRCodeScanningViewController.h (100%) rename Session/{Signal => Shared}/OWSQRCodeScanningViewController.m (100%) rename Session/{Signal => Shared}/OWSScreenLockUI.h (100%) rename Session/{Signal => Shared}/OWSScreenLockUI.m (100%) rename Session/{Signal => Shared}/ReminderView.swift (100%) rename Session/{View Controllers => Shared}/ScanQRCodeWrapperVC.swift (100%) rename Session/{Components => Shared}/UserCell.swift (100%) rename Session/{View Controllers => Shared}/UserSelectionVC.swift (100%) rename Session/{View Controllers => Sheets & Modals}/KeyPairMigrationSheet.swift (100%) rename Session/{View Controllers => Sheets & Modals}/KeyPairMigrationSuccessSheet.swift (100%) rename Session/{View Controllers => Sheets & Modals}/Modal.swift (100%) rename Session/{View Controllers => Sheets & Modals}/Sheet.swift (100%) rename Session/{Signal => Utilities}/AVAudioSession+OWS.h (100%) rename Session/{Signal => Utilities}/AVAudioSession+OWS.m (100%) rename Session/{Signal => Utilities}/AccountManager.swift (100%) rename Session/{Signal => Utilities}/AppUpdateNag.swift (100%) rename Session/{Signal => Utilities}/AvatarViewHelper.h (100%) rename Session/{Signal => Utilities}/AvatarViewHelper.m (100%) rename Session/{Signal => Utilities}/DateUtil.h (100%) rename Session/{Signal => Utilities}/DateUtil.m (100%) rename Session/{Signal => Utilities}/HapticFeedback.swift (100%) rename Session/{Signal => Utilities}/MessageRecipientStatusUtils.swift (100%) rename Session/{Signal => Utilities}/OWSOrphanDataCleaner.h (100%) rename Session/{Signal => Utilities}/OWSOrphanDataCleaner.m (100%) rename Session/{Signal => Utilities}/OWSWebRTCDataProtos.pb.swift (100%) rename Session/{Signal => Utilities}/Platform.swift (100%) rename Session/{Signal => Utilities}/TextFieldHelper.swift (100%) rename Session/{Signal => Utilities}/UIAlerts+iOS9.m (100%) rename Session/{Signal => Utilities}/UIApplication+OWS.swift (100%) rename Session/{Signal => Utilities}/UIResponder+OWS.swift (100%) rename Session/{Signal => Utilities}/UIStoryboard+OWS.swift (100%) rename Session/{Signal => Utilities}/UIViewController+CameraPermissions.h (100%) rename Session/{Signal => Utilities}/UIViewController+Permissions.h (100%) rename Session/{Signal => Utilities}/UIViewController+Permissions.m (100%) rename Session/{Signal => Utilities}/WebRTCProto.swift (100%) delete mode 100644 Session/View Controllers/LightModeSheet.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index e34c8e0e7..c91e46d59 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 10AC6C7D50A0C865C5E4779B /* Pods_SessionUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CFEDD2D3C54277731012DF /* Pods_SessionUIKit.framework */; }; - 2400888E239F30A600305217 /* SessionRestorationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2400888D239F30A600305217 /* SessionRestorationView.swift */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; 340FC8AC204DAC8D007AEB0F /* PrivacySettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87E204DAC8C007AEB0F /* PrivacySettingsTableViewController.m */; }; @@ -316,7 +315,6 @@ C31D1DE32521718E005D4DA8 /* UserSelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31D1DE22521718E005D4DA8 /* UserSelectionVC.swift */; }; C31D1DE9252172D4005D4DA8 /* ContactUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31D1DE8252172D4005D4DA8 /* ContactUtilities.swift */; }; C31FFE57254A5FFE00F19441 /* KeyPairUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C31FFE56254A5FFE00F19441 /* KeyPairUtilities.swift */; }; - C329FEEC24F7277900B1C64C /* LightModeSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C329FEEB24F7277900B1C64C /* LightModeSheet.swift */; }; C32A025A25A7FC55000ED5D4 /* ClosedGroupsV2Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C32A025925A7FC55000ED5D4 /* ClosedGroupsV2Migration.swift */; }; C32A026325A801AA000ED5D4 /* NSData+messagePadding.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A71D4825589FF20043A11F /* NSData+messagePadding.m */; }; C32A026C25A801AF000ED5D4 /* NSData+messagePadding.h in Headers */ = {isa = PBXBuildFile; fileRef = C3A71D4E25589FF30043A11F /* NSData+messagePadding.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -933,7 +931,6 @@ 1CE3CD5C23334683BDD3D78C /* Pods-Signal.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Signal.test.xcconfig"; path = "Pods/Target Support Files/Pods-Signal/Pods-Signal.test.xcconfig"; sourceTree = ""; }; 200605FD180CB8B89F566B41 /* Pods_SessionShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SessionShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2183DCA28E0620BC73FCC554 /* Pods_SessionProtocolKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SessionProtocolKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2400888D239F30A600305217 /* SessionRestorationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionRestorationView.swift; sourceTree = ""; }; 264033E641846B67E0CB21B0 /* Pods-SessionUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SessionUtilitiesKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SessionUtilitiesKit/Pods-SessionUtilitiesKit.debug.xcconfig"; sourceTree = ""; }; 264242150E87D10A357DB07B /* Pods_SignalMessaging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SignalMessaging.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3303495F6651CE2F3CC9693B /* Pods-SessionUtilities.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SessionUtilities.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SessionUtilities/Pods-SessionUtilities.app store release.xcconfig"; sourceTree = ""; }; @@ -1134,10 +1131,10 @@ 45BD60811DE9547E00A8F436 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; }; 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+OWS.swift"; sourceTree = ""; }; 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard+OWS.swift"; sourceTree = ""; }; - 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "Session/Signal/Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; }; + 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "Session/Meta/Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; }; 45CD81EE1DC030E7004C9430 /* SyncPushTokensJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncPushTokensJob.swift; sourceTree = ""; }; 45E5A6981F61E6DD001E4A8A /* MarqueeLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarqueeLabel.swift; sourceTree = ""; }; - 45F32C1D205718B000A300D5 /* MediaPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MediaPageViewController.swift; path = Session/Signal/MediaPageViewController.swift; sourceTree = SOURCE_ROOT; }; + 45F32C1D205718B000A300D5 /* MediaPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MediaPageViewController.swift; path = "Session/Media Viewing & Editing/MediaPageViewController.swift"; sourceTree = SOURCE_ROOT; }; 4C043929220A9EC800BAEA63 /* VoiceNoteLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceNoteLock.swift; sourceTree = ""; }; 4C090A1A210FD9C7001FD7F9 /* HapticFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticFeedback.swift; sourceTree = ""; }; 4C1885D1218F8E1C00B67051 /* PhotoGridViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoGridViewCell.swift; sourceTree = ""; }; @@ -1322,7 +1319,6 @@ C31D1DE8252172D4005D4DA8 /* ContactUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactUtilities.swift; sourceTree = ""; }; C31F812525258FB000DD9FD9 /* Storage+VolumeSamples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Storage+VolumeSamples.swift"; sourceTree = ""; }; C31FFE56254A5FFE00F19441 /* KeyPairUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPairUtilities.swift; sourceTree = ""; }; - C329FEEB24F7277900B1C64C /* LightModeSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LightModeSheet.swift; sourceTree = ""; }; C32A025925A7FC55000ED5D4 /* ClosedGroupsV2Migration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClosedGroupsV2Migration.swift; sourceTree = ""; }; C32C5A87256DBCF9003C73A2 /* MessageReceiver+Handling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MessageReceiver+Handling.swift"; sourceTree = ""; }; C32C5B3E256DC1DF003C73A2 /* TSQuotedMessage+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TSQuotedMessage+Conversion.swift"; sourceTree = ""; }; @@ -2020,31 +2016,6 @@ path = Fonts; sourceTree = ""; }; - 3448BFC01EDF0EA7005B2D69 /* ConversationView */ = { - isa = PBXGroup; - children = ( - 34D1F0951F867BFC0066283D /* Cells */, - 34D1F0B21F86D31D0066283D /* ConversationCollectionView.h */, - 34D1F0B31F86D31D0066283D /* ConversationCollectionView.m */, - 34D1F0671F8678AA0066283D /* ConversationInputTextView.h */, - 34D1F0681F8678AA0066283D /* ConversationInputTextView.m */, - 34D1F0691F8678AA0066283D /* ConversationInputToolbar.h */, - 34D1F06A1F8678AA0066283D /* ConversationInputToolbar.m */, - 34ABC0E321DD20C500ED9469 /* ConversationMessageMapping.swift */, - 343A65971FC4CFE7000477A1 /* ConversationScrollButton.h */, - 343A65961FC4CFE6000477A1 /* ConversationScrollButton.m */, - 34D1F06D1F8678AA0066283D /* ConversationViewController.h */, - 34D1F06E1F8678AA0066283D /* ConversationViewController.m */, - 34D1F06F1F8678AA0066283D /* ConversationViewItem.h */, - 34D1F0701F8678AA0066283D /* ConversationViewItem.m */, - 34D1F0711F8678AA0066283D /* ConversationViewLayout.h */, - 34D1F0721F8678AA0066283D /* ConversationViewLayout.m */, - 341341ED2187467900192D59 /* ConversationViewModel.h */, - 341341EE2187467900192D59 /* ConversationViewModel.m */, - ); - path = ConversationView; - sourceTree = ""; - }; 34C3C78B20409F320000134C /* ringtoneSounds */ = { isa = PBXGroup; children = ( @@ -2054,47 +2025,6 @@ path = Session/Meta/AudioFiles/ringtoneSounds; sourceTree = SOURCE_ROOT; }; - 34D1F0951F867BFC0066283D /* Cells */ = { - isa = PBXGroup; - children = ( - 34B6A904218B4C90007C4606 /* TypingIndicatorInteraction.swift */, - 34D1F0BB1F8D108C0066283D /* AttachmentUploadView.h */, - 34D1F0BC1F8D108C0066283D /* AttachmentUploadView.m */, - 3488F9352191CC4000E524CC /* ConversationMediaView.swift */, - 34D1F0961F867BFC0066283D /* ConversationViewCell.h */, - 34D1F0971F867BFC0066283D /* ConversationViewCell.m */, - 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */, - 34EA693F2194933900702471 /* MediaDownloadView.swift */, - 34EA69412194DE7F00702471 /* MediaUploadView.swift */, - 34DBF005206C3CB100025978 /* OWSBubbleShapeView.h */, - 34DBF006206C3CB200025978 /* OWSBubbleShapeView.m */, - 34DBF002206BD5A500025978 /* OWSBubbleView.h */, - 34DBF001206BD5A500025978 /* OWSBubbleView.m */, - 34D1F0B51F87F8850066283D /* OWSGenericAttachmentView.h */, - 34D1F0B61F87F8850066283D /* OWSGenericAttachmentView.m */, - 34AC0A22211C829E00997B47 /* OWSLabel.h */, - 34AC0A21211C829E00997B47 /* OWSLabel.m */, - 3496744B2076768600080B5F /* OWSMessageBubbleView.h */, - 3496744C2076768700080B5F /* OWSMessageBubbleView.m */, - 34D1F0A11F867BFC0066283D /* OWSMessageCell.h */, - 34D1F0A21F867BFC0066283D /* OWSMessageCell.m */, - 34D920E520E179C100D51158 /* OWSMessageFooterView.h */, - 34D920E620E179C200D51158 /* OWSMessageFooterView.m */, - 348570A720F67574004FF32B /* OWSMessageHeaderView.h */, - 348570A620F67574004FF32B /* OWSMessageHeaderView.m */, - 34DBF000206BD5A400025978 /* OWSMessageTextView.h */, - 34DBEFFF206BD5A400025978 /* OWSMessageTextView.m */, - 3427C64120F500DE00EEC730 /* OWSMessageTimerView.h */, - 3427C64220F500DF00EEC730 /* OWSMessageTimerView.m */, - 34277A5D20751BDC006049F2 /* OWSQuotedMessageView.h */, - 34277A5C20751BDC006049F2 /* OWSQuotedMessageView.m */, - 34D1F0A51F867BFC0066283D /* OWSSystemMessageCell.h */, - 34D1F0A61F867BFC0066283D /* OWSSystemMessageCell.m */, - 34B6A906218B5240007C4606 /* TypingIndicatorCell.swift */, - ); - path = Cells; - sourceTree = ""; - }; 453518691FC635DD00210559 /* SessionShareExtension */ = { isa = PBXGroup; children = ( @@ -2111,109 +2041,20 @@ path = SessionShareExtension; sourceTree = ""; }; - 76EB03C118170B33006006FC /* Signal */ = { + 76EB03C118170B33006006FC /* Utilities */ = { isa = PBXGroup; children = ( - 3448BFC01EDF0EA7005B2D69 /* ConversationView */, - 76EB03C218170B33006006FC /* AppDelegate.h */, - 76EB03C318170B33006006FC /* AppDelegate.m */, - 34D99CE3217509C1000AFB39 /* AppEnvironment.swift */, - 4539B5851F79348F007141FF /* PushRegistrationManager.swift */, - 346129981FD1E4DA00532771 /* SignalApp.h */, - 346129971FD1E4D900532771 /* SignalApp.m */, 34C4E2552118957600BEA353 /* OWSWebRTCDataProtos.pb.swift */, 34C4E2562118957600BEA353 /* WebRTCProto.swift */, - 45CD81EE1DC030E7004C9430 /* SyncPushTokensJob.swift */, - 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */, - A5509EC91A69AB8B00ABA4BC /* Main.storyboard */, - 3430FE171F7751D4000EC51B /* GiphyAPI.swift */, - 34D1F0511F7E8EA30066283D /* GiphyDownloader.swift */, 451166BF1FD86B98000739BA /* AccountManager.swift */, - 4CB5F26820F7D060004D1B42 /* MessageActions.swift */, - 451A13B01E13DED2000A50FD /* AppNotifications.swift */, - 450DF2081E0DD2C6003D14BE /* UserNotificationsAdaptee.swift */, - 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */, 4C090A1A210FD9C7001FD7F9 /* HapticFeedback.swift */, - 340FC884204DAC8C007AEB0F /* AboutTableViewController.h */, - 340FC893204DAC8C007AEB0F /* AboutTableViewController.m */, - 340FC892204DAC8C007AEB0F /* AddToBlockListViewController.h */, - 340FC886204DAC8C007AEB0F /* AddToBlockListViewController.m */, - 340FC88B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.h */, - 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */, - 340FC88A204DAC8C007AEB0F /* NotificationSettingsViewController.h */, - 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */, - 340FC87F204DAC8C007AEB0F /* OWSBackupSettingsViewController.h */, - 340FC88E204DAC8C007AEB0F /* OWSBackupSettingsViewController.m */, - 340FC888204DAC8C007AEB0F /* OWSQRCodeScanningViewController.h */, - 340FC896204DAC8C007AEB0F /* OWSQRCodeScanningViewController.m */, - 340FC894204DAC8C007AEB0F /* OWSSoundSettingsViewController.h */, - 340FC883204DAC8C007AEB0F /* OWSSoundSettingsViewController.m */, - 340FC88F204DAC8C007AEB0F /* PrivacySettingsTableViewController.h */, - 340FC87E204DAC8C007AEB0F /* PrivacySettingsTableViewController.m */, 34D5CCA71EAE3D30005515DB /* AvatarViewHelper.h */, 34D5CCA81EAE3D30005515DB /* AvatarViewHelper.m */, - 346B66301F4E29B200E5122F /* CropScaleImageViewController.swift */, - 34D1F04F1F7D45A60066283D /* GifPickerCell.swift */, - 34BECE2F1F7ABCF800D7438D /* GifPickerLayout.swift */, - 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */, - 4542DF53208D40AC007B4E76 /* LoadingViewController.swift */, - 3496744E2076ACCE00080B5F /* LongTextViewController.swift */, - 45B9EE9A200E91FB005D2F2D /* MediaDetailViewController.h */, - 45B9EE9B200E91FB005D2F2D /* MediaDetailViewController.m */, - 452EC6DE205E9E30000E787C /* MediaGalleryViewController.swift */, - 45F32C1D205718B000A300D5 /* MediaPageViewController.swift */, - 454A84032059C787008B8C75 /* MediaTileViewController.swift */, - 4CFF4C0920F55BBA005DA313 /* MenuActionsViewController.swift */, - 34CA1C261F7156F300E51C51 /* MessageDetailViewController.swift */, - 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */, - 34969559219B605E00DCFE74 /* ImagePickerController.swift */, - 3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */, - 3496955B219B605E00DCFE74 /* PhotoLibrary.swift */, - 4CA485BA2232339F004B9E7D /* PhotoCaptureViewController.swift */, - 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */, - 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, - 340FC8A0204DAC8D007AEB0F /* OWSConversationSettingsViewController.h */, - 340FC89A204DAC8D007AEB0F /* OWSConversationSettingsViewController.m */, - 34E3E5671EC4B19400495BAC /* AudioProgressView.swift */, - 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */, - 4CA46F4B219CCC630038ABDE /* CaptionView.swift */, - 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */, - 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */, - 34129B8521EF8779005457A8 /* LinkPreviewView.swift */, - 45E5A6981F61E6DD001E4A8A /* MarqueeLabel.swift */, - 34386A53207D271C009F5D9C /* NeverClearView.swift */, - 34F308A01ECB469700BB7697 /* OWSBezierPathView.h */, - 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */, - 34330AA11E79686200DF2FB9 /* OWSProgressView.h */, - 34330AA21E79686200DF2FB9 /* OWSProgressView.m */, - 4C1885D1218F8E1C00B67051 /* PhotoGridViewCell.swift */, - 457F671A20746193000EABCD /* QuotedReplyPreview.swift */, - 45A6DAD51EBBF85500893231 /* ReminderView.swift */, - 450D19111F85236600970622 /* RemoteVideoView.h */, - 450D19121F85236600970622 /* RemoteVideoView.m */, - 34B6A902218B3F62007C4606 /* TypingIndicatorView.swift */, - 4C043929220A9EC800BAEA63 /* VoiceNoteLock.swift */, 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */, - 3496956421A301A100DCFE74 /* OWSBackup.h */, - 3496956921A301A100DCFE74 /* OWSBackup.m */, - 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */, - 3496956821A301A100DCFE74 /* OWSBackupExportJob.h */, - 3496956221A301A100DCFE74 /* OWSBackupExportJob.m */, - 3496956C21A301A100DCFE74 /* OWSBackupImportJob.h */, - 3496956621A301A100DCFE74 /* OWSBackupImportJob.m */, - 3496956D21A301A100DCFE74 /* OWSBackupIO.h */, - 3496956521A301A100DCFE74 /* OWSBackupIO.m */, - 3496956721A301A100DCFE74 /* OWSBackupJob.h */, - 3496956A21A301A100DCFE74 /* OWSBackupJob.m */, - 3496956321A301A100DCFE74 /* OWSBackupLazyRestore.swift */, B90418E4183E9DD40038554A /* DateUtil.h */, B90418E5183E9DD40038554A /* DateUtil.m */, - 34B0796C1FCF46B000E248C2 /* MainAppContext.h */, - 34B0796B1FCF46B000E248C2 /* MainAppContext.m */, 344825C4211390C700DB4BD8 /* OWSOrphanDataCleaner.h */, 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */, - 34D2CCD82062E7D000CB1A14 /* OWSScreenLockUI.h */, - 34D2CCD92062E7D000CB1A14 /* OWSScreenLockUI.m */, 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */, 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */, 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */, @@ -2224,12 +2065,22 @@ 4C586925224FAB83003FD070 /* AVAudioSession+OWS.m */, 450DF2041E0D74AC003D14BE /* Platform.swift */, 4521C3BF1F59F3BA00B4C582 /* TextFieldHelper.swift */, - 4CC613352227A00400E21A3A /* ConversationSearch.swift */, - 340FC899204DAC8D007AEB0F /* OWSConversationSettingsViewDelegate.h */, - 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */, 34D1F0BF1F8EC1760066283D /* MessageRecipientStatusUtils.swift */, + B8544E3223D50E4900299F14 /* AppearanceUtilities.swift */, + C364535B252467900045C478 /* AudioUtilities.swift */, + C3D0972A2510499C00F6E3E4 /* BackgroundPoller.swift */, + C31A6C5B247F2CF3001123EF /* CGRect+Utilities.swift */, + C31D1DE8252172D4005D4DA8 /* ContactUtilities.swift */, + C35E8AAD2485E51D00ACB629 /* IP2Country.swift */, + C31FFE56254A5FFE00F19441 /* KeyPairUtilities.swift */, + B84664F4235022F30083A1CD /* MentionUtilities.swift */, + B886B4A82398BA1500211ABE /* QRCode.swift */, + B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */, + B83F2B87240CB75A000A54AB /* UIImage+Scaling.swift */, + C31A6C59247F214E001123EF /* UIView+Glow.swift */, + C3548F0724456AB6009433A8 /* UIView+Wrapping.swift */, ); - path = Signal; + path = Utilities; sourceTree = ""; }; 7BC01A3C241F40AB00BC7C55 /* SessionNotificationServiceExtension */ = { @@ -2446,75 +2297,32 @@ path = Contacts; sourceTree = ""; }; - B8CCF63B239757C10091D419 /* Components */ = { - isa = PBXGroup; - children = ( - B8BB82AA238F669C00BA5194 /* ConversationCell.swift */, - B83F2B85240C7B8F000A54AB /* NewConversationButtonSet.swift */, - C31D1DDC25217014005D4DA8 /* UserCell.swift */, - B82B4093239DF15900A248E7 /* ConversationTitleView.swift */, - B82B40892399EC0600A248E7 /* FakeChatView.swift */, - B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, - B879D44A247E1D9200DB3608 /* PathStatusView.swift */, - C353F8F8244809150011121A /* PNOptionView.swift */, - B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */, - 2400888D239F30A600305217 /* SessionRestorationView.swift */, - C364534F252449260045C478 /* VoiceMessageView.swift */, - ); - path = Components; - sourceTree = ""; - }; - B8CCF63C239757DB0091D419 /* Utilities */ = { - isa = PBXGroup; - children = ( - B8544E3223D50E4900299F14 /* AppearanceUtilities.swift */, - C364535B252467900045C478 /* AudioUtilities.swift */, - C3D0972A2510499C00F6E3E4 /* BackgroundPoller.swift */, - C31A6C5B247F2CF3001123EF /* CGRect+Utilities.swift */, - C31D1DE8252172D4005D4DA8 /* ContactUtilities.swift */, - C35E8AAD2485E51D00ACB629 /* IP2Country.swift */, - C31FFE56254A5FFE00F19441 /* KeyPairUtilities.swift */, - B84664F4235022F30083A1CD /* MentionUtilities.swift */, - B886B4A82398BA1500211ABE /* QRCode.swift */, - B85A68B02587141A008CC492 /* Storage+Resetting.swift */, - B8783E9D23EB948D00404FB8 /* UILabel+Interaction.swift */, - B83F2B87240CB75A000A54AB /* UIImage+Scaling.swift */, - C31A6C59247F214E001123EF /* UIView+Glow.swift */, - C3548F0724456AB6009433A8 /* UIView+Wrapping.swift */, - ); - path = Utilities; - sourceTree = ""; - }; - B8CCF63D2397580E0091D419 /* View Controllers */ = { + B8CCF63B239757C10091D419 /* Shared */ = { isa = PBXGroup; children = ( + 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */, + 4CA46F4B219CCC630038ABDE /* CaptionView.swift */, + 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */, + 45A663C41F92EC760027B59E /* GroupTableViewCell.swift */, + 45E5A6981F61E6DD001E4A8A /* MarqueeLabel.swift */, + 34386A53207D271C009F5D9C /* NeverClearView.swift */, + 34F308A01ECB469700BB7697 /* OWSBezierPathView.h */, + 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */, + 34330AA11E79686200DF2FB9 /* OWSProgressView.h */, + 34330AA21E79686200DF2FB9 /* OWSProgressView.m */, + 45A6DAD51EBBF85500893231 /* ReminderView.swift */, C354E75923FE2A7600CE22E3 /* BaseVC.swift */, - B82B408D239DC00D00A248E7 /* DisplayNameVC.swift */, - C3E5C2F9251DBABB0040DFFC /* EditClosedGroupVC.swift */, - B88847BB23E10BC6009836D2 /* GroupMembersVC.swift */, - B8BB82A4238F627000BA5194 /* HomeVC.swift */, - B8CCF63E23975CFB0091D419 /* JoinPublicChatVC.swift */, - B837867F2586D296003CE78E /* KeyPairMigrationSheet.swift */, - B8A14D6F2589CE9000E70D57 /* KeyPairMigrationSuccessSheet.swift */, - B82B40872399EB0E00A248E7 /* LandingVC.swift */, - C329FEEB24F7277900B1C64C /* LightModeSheet.swift */, - B86BD08323399ACF000F5AE3 /* Modal.swift */, - B80A579E23DFF1F300876683 /* NewClosedGroupVC.swift */, - B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, - B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, - B879D448247E1BE300DB3608 /* PathVC.swift */, - C3548F0524456447009433A8 /* PNModeVC.swift */, - B886B4A62398B23E00211ABE /* QRCodeVC.swift */, - B82B408B239A068800A248E7 /* RegisterVC.swift */, - B82B408F239DD75000A248E7 /* RestoreVC.swift */, + B8BB82AA238F669C00BA5194 /* ConversationCell.swift */, + 4542DF53208D40AC007B4E76 /* LoadingViewController.swift */, + 340FC888204DAC8C007AEB0F /* OWSQRCodeScanningViewController.h */, + 340FC896204DAC8C007AEB0F /* OWSQRCodeScanningViewController.m */, B893063E2383961A005EAA8E /* ScanQRCodeWrapperVC.swift */, - B86BD08523399CEF000F5AE3 /* SeedModal.swift */, - B85357C223A1BD1200AAF6CD /* SeedVC.swift */, - B8CCF6422397711F0091D419 /* SettingsVC.swift */, - C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */, + C31D1DDC25217014005D4DA8 /* UserCell.swift */, C31D1DE22521718E005D4DA8 /* UserSelectionVC.swift */, + 34D2CCD82062E7D000CB1A14 /* OWSScreenLockUI.h */, + 34D2CCD92062E7D000CB1A14 /* OWSScreenLockUI.m */, ); - path = "View Controllers"; + path = Shared; sourceTree = ""; }; C300A5BB2554AFFB00555489 /* Messages */ = { @@ -2777,6 +2585,7 @@ C32C5D49256DD522003C73A2 /* Database */ = { isa = PBXGroup; children = ( + B85A68B02587141A008CC492 /* Storage+Resetting.swift */, C31F812525258FB000DD9FD9 /* Storage+VolumeSamples.swift */, ); path = Database; @@ -2931,6 +2740,252 @@ path = CSV; sourceTree = ""; }; + C360968D25AD16B4008B62B2 /* Onboarding */ = { + isa = PBXGroup; + children = ( + B82B408D239DC00D00A248E7 /* DisplayNameVC.swift */, + B82B40892399EC0600A248E7 /* FakeChatView.swift */, + B82B40872399EB0E00A248E7 /* LandingVC.swift */, + C3548F0524456447009433A8 /* PNModeVC.swift */, + C353F8F8244809150011121A /* PNOptionView.swift */, + B82B408B239A068800A248E7 /* RegisterVC.swift */, + B82B408F239DD75000A248E7 /* RestoreVC.swift */, + B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */, + B85357C223A1BD1200AAF6CD /* SeedVC.swift */, + ); + path = Onboarding; + sourceTree = ""; + }; + C360968E25AD16E8008B62B2 /* Home */ = { + isa = PBXGroup; + children = ( + B8BB82A4238F627000BA5194 /* HomeVC.swift */, + B83F2B85240C7B8F000A54AB /* NewConversationButtonSet.swift */, + ); + path = Home; + sourceTree = ""; + }; + C360969125AD1765008B62B2 /* Settings */ = { + isa = PBXGroup; + children = ( + 340FC884204DAC8C007AEB0F /* AboutTableViewController.h */, + 340FC893204DAC8C007AEB0F /* AboutTableViewController.m */, + 340FC88B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.h */, + 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */, + 340FC88A204DAC8C007AEB0F /* NotificationSettingsViewController.h */, + 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */, + B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, + 340FC894204DAC8C007AEB0F /* OWSSoundSettingsViewController.h */, + 340FC883204DAC8C007AEB0F /* OWSSoundSettingsViewController.m */, + 340FC88F204DAC8C007AEB0F /* PrivacySettingsTableViewController.h */, + 340FC87E204DAC8C007AEB0F /* PrivacySettingsTableViewController.m */, + B886B4A62398B23E00211ABE /* QRCodeVC.swift */, + B86BD08523399CEF000F5AE3 /* SeedModal.swift */, + B8CCF6422397711F0091D419 /* SettingsVC.swift */, + ); + path = Settings; + sourceTree = ""; + }; + C360969A25AD17E3008B62B2 /* Path */ = { + isa = PBXGroup; + children = ( + B879D44A247E1D9200DB3608 /* PathStatusView.swift */, + B879D448247E1BE300DB3608 /* PathVC.swift */, + ); + path = Path; + sourceTree = ""; + }; + C360969B25AD180B008B62B2 /* Open Groups */ = { + isa = PBXGroup; + children = ( + B8CCF63E23975CFB0091D419 /* JoinPublicChatVC.swift */, + ); + path = "Open Groups"; + sourceTree = ""; + }; + C360969C25AD18BA008B62B2 /* Closed Groups */ = { + isa = PBXGroup; + children = ( + C3E5C2F9251DBABB0040DFFC /* EditClosedGroupVC.swift */, + B88847BB23E10BC6009836D2 /* GroupMembersVC.swift */, + B80A579E23DFF1F300876683 /* NewClosedGroupVC.swift */, + ); + path = "Closed Groups"; + sourceTree = ""; + }; + C36096A525AD18D7008B62B2 /* Basic Chats */ = { + isa = PBXGroup; + children = ( + B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, + ); + path = "Basic Chats"; + sourceTree = ""; + }; + C36096AE25AD1909008B62B2 /* Conversations */ = { + isa = PBXGroup; + children = ( + C36096B825AD196A008B62B2 /* Views & Cells */, + 340FC892204DAC8C007AEB0F /* AddToBlockListViewController.h */, + 340FC886204DAC8C007AEB0F /* AddToBlockListViewController.m */, + 34D1F0B21F86D31D0066283D /* ConversationCollectionView.h */, + 34D1F0B31F86D31D0066283D /* ConversationCollectionView.m */, + 34D1F0671F8678AA0066283D /* ConversationInputTextView.h */, + 34D1F0681F8678AA0066283D /* ConversationInputTextView.m */, + 34D1F0691F8678AA0066283D /* ConversationInputToolbar.h */, + 34D1F06A1F8678AA0066283D /* ConversationInputToolbar.m */, + 34ABC0E321DD20C500ED9469 /* ConversationMessageMapping.swift */, + 343A65971FC4CFE7000477A1 /* ConversationScrollButton.h */, + 343A65961FC4CFE6000477A1 /* ConversationScrollButton.m */, + B82B4093239DF15900A248E7 /* ConversationTitleView.swift */, + 34D1F06D1F8678AA0066283D /* ConversationViewController.h */, + 34D1F06E1F8678AA0066283D /* ConversationViewController.m */, + 34D1F06F1F8678AA0066283D /* ConversationViewItem.h */, + 34D1F0701F8678AA0066283D /* ConversationViewItem.m */, + 34D1F0711F8678AA0066283D /* ConversationViewLayout.h */, + 34D1F0721F8678AA0066283D /* ConversationViewLayout.m */, + 341341ED2187467900192D59 /* ConversationViewModel.h */, + 341341EE2187467900192D59 /* ConversationViewModel.m */, + 4CC613352227A00400E21A3A /* ConversationSearch.swift */, + 3496744E2076ACCE00080B5F /* LongTextViewController.swift */, + 4CFF4C0920F55BBA005DA313 /* MenuActionsViewController.swift */, + 4CB5F26820F7D060004D1B42 /* MessageActions.swift */, + 34CA1C261F7156F300E51C51 /* MessageDetailViewController.swift */, + 340FC8A0204DAC8D007AEB0F /* OWSConversationSettingsViewController.h */, + 340FC89A204DAC8D007AEB0F /* OWSConversationSettingsViewController.m */, + 340FC899204DAC8D007AEB0F /* OWSConversationSettingsViewDelegate.h */, + ); + path = Conversations; + sourceTree = ""; + }; + C36096AF25AD1932008B62B2 /* Sheets & Modals */ = { + isa = PBXGroup; + children = ( + B837867F2586D296003CE78E /* KeyPairMigrationSheet.swift */, + B8A14D6F2589CE9000E70D57 /* KeyPairMigrationSuccessSheet.swift */, + B86BD08323399ACF000F5AE3 /* Modal.swift */, + C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */, + ); + path = "Sheets & Modals"; + sourceTree = ""; + }; + C36096B825AD196A008B62B2 /* Views & Cells */ = { + isa = PBXGroup; + children = ( + 457F671A20746193000EABCD /* QuotedReplyPreview.swift */, + 34B6A902218B3F62007C4606 /* TypingIndicatorView.swift */, + 4C043929220A9EC800BAEA63 /* VoiceNoteLock.swift */, + 34129B8521EF8779005457A8 /* LinkPreviewView.swift */, + 34D1F0BB1F8D108C0066283D /* AttachmentUploadView.h */, + 34D1F0BC1F8D108C0066283D /* AttachmentUploadView.m */, + 3488F9352191CC4000E524CC /* ConversationMediaView.swift */, + 34D1F0961F867BFC0066283D /* ConversationViewCell.h */, + 34D1F0971F867BFC0066283D /* ConversationViewCell.m */, + 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */, + 34EA693F2194933900702471 /* MediaDownloadView.swift */, + 34EA69412194DE7F00702471 /* MediaUploadView.swift */, + B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */, + 34DBF005206C3CB100025978 /* OWSBubbleShapeView.h */, + 34DBF006206C3CB200025978 /* OWSBubbleShapeView.m */, + 34DBF002206BD5A500025978 /* OWSBubbleView.h */, + 34DBF001206BD5A500025978 /* OWSBubbleView.m */, + 34D1F0B51F87F8850066283D /* OWSGenericAttachmentView.h */, + 34D1F0B61F87F8850066283D /* OWSGenericAttachmentView.m */, + 34AC0A22211C829E00997B47 /* OWSLabel.h */, + 34AC0A21211C829E00997B47 /* OWSLabel.m */, + 3496744B2076768600080B5F /* OWSMessageBubbleView.h */, + 3496744C2076768700080B5F /* OWSMessageBubbleView.m */, + 34D1F0A11F867BFC0066283D /* OWSMessageCell.h */, + 34D1F0A21F867BFC0066283D /* OWSMessageCell.m */, + 34D920E520E179C100D51158 /* OWSMessageFooterView.h */, + 34D920E620E179C200D51158 /* OWSMessageFooterView.m */, + 348570A720F67574004FF32B /* OWSMessageHeaderView.h */, + 348570A620F67574004FF32B /* OWSMessageHeaderView.m */, + 34DBF000206BD5A400025978 /* OWSMessageTextView.h */, + 34DBEFFF206BD5A400025978 /* OWSMessageTextView.m */, + 3427C64120F500DE00EEC730 /* OWSMessageTimerView.h */, + 3427C64220F500DF00EEC730 /* OWSMessageTimerView.m */, + 34277A5D20751BDC006049F2 /* OWSQuotedMessageView.h */, + 34277A5C20751BDC006049F2 /* OWSQuotedMessageView.m */, + 34D1F0A51F867BFC0066283D /* OWSSystemMessageCell.h */, + 34D1F0A61F867BFC0066283D /* OWSSystemMessageCell.m */, + 34B6A906218B5240007C4606 /* TypingIndicatorCell.swift */, + 34B6A904218B4C90007C4606 /* TypingIndicatorInteraction.swift */, + C364534F252449260045C478 /* VoiceMessageView.swift */, + ); + path = "Views & Cells"; + sourceTree = ""; + }; + C36096B925AD1ACF008B62B2 /* GIFs */ = { + isa = PBXGroup; + children = ( + 3430FE171F7751D4000EC51B /* GiphyAPI.swift */, + 34D1F0511F7E8EA30066283D /* GiphyDownloader.swift */, + 34D1F04F1F7D45A60066283D /* GifPickerCell.swift */, + 34BECE2F1F7ABCF800D7438D /* GifPickerLayout.swift */, + 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */, + ); + path = GIFs; + sourceTree = ""; + }; + C36096BA25AD1B14008B62B2 /* Media Viewing & Editing */ = { + isa = PBXGroup; + children = ( + C36096B925AD1ACF008B62B2 /* GIFs */, + 34E3E5671EC4B19400495BAC /* AudioProgressView.swift */, + 450D19111F85236600970622 /* RemoteVideoView.h */, + 450D19121F85236600970622 /* RemoteVideoView.m */, + 346B66301F4E29B200E5122F /* CropScaleImageViewController.swift */, + 34969559219B605E00DCFE74 /* ImagePickerController.swift */, + 45B9EE9A200E91FB005D2F2D /* MediaDetailViewController.h */, + 45B9EE9B200E91FB005D2F2D /* MediaDetailViewController.m */, + 452EC6DE205E9E30000E787C /* MediaGalleryViewController.swift */, + 45F32C1D205718B000A300D5 /* MediaPageViewController.swift */, + 454A84032059C787008B8C75 /* MediaTileViewController.swift */, + 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */, + 3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */, + 3496955B219B605E00DCFE74 /* PhotoLibrary.swift */, + 4CA485BA2232339F004B9E7D /* PhotoCaptureViewController.swift */, + 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */, + 4C1885D1218F8E1C00B67051 /* PhotoGridViewCell.swift */, + 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */, + ); + path = "Media Viewing & Editing"; + sourceTree = ""; + }; + C36096BB25AD1BBB008B62B2 /* Notifications */ = { + isa = PBXGroup; + children = ( + 4539B5851F79348F007141FF /* PushRegistrationManager.swift */, + 45CD81EE1DC030E7004C9430 /* SyncPushTokensJob.swift */, + 451A13B01E13DED2000A50FD /* AppNotifications.swift */, + 450DF2081E0DD2C6003D14BE /* UserNotificationsAdaptee.swift */, + 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */, + ); + path = Notifications; + sourceTree = ""; + }; + C36096BC25AD1C3E008B62B2 /* Backups */ = { + isa = PBXGroup; + children = ( + 340FC87F204DAC8C007AEB0F /* OWSBackupSettingsViewController.h */, + 340FC88E204DAC8C007AEB0F /* OWSBackupSettingsViewController.m */, + 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, + 3496956421A301A100DCFE74 /* OWSBackup.h */, + 3496956921A301A100DCFE74 /* OWSBackup.m */, + 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */, + 3496956821A301A100DCFE74 /* OWSBackupExportJob.h */, + 3496956221A301A100DCFE74 /* OWSBackupExportJob.m */, + 3496956C21A301A100DCFE74 /* OWSBackupImportJob.h */, + 3496956621A301A100DCFE74 /* OWSBackupImportJob.m */, + 3496956D21A301A100DCFE74 /* OWSBackupIO.h */, + 3496956521A301A100DCFE74 /* OWSBackupIO.m */, + 3496956721A301A100DCFE74 /* OWSBackupJob.h */, + 3496956A21A301A100DCFE74 /* OWSBackupJob.m */, + 3496956321A301A100DCFE74 /* OWSBackupLazyRestore.swift */, + ); + path = Backups; + sourceTree = ""; + }; C379DC6825672B5E0002D4EB /* Notifications */ = { isa = PBXGroup; children = ( @@ -3403,14 +3458,23 @@ C3F0A58F255C8E3D007BE2A3 /* Meta */ = { isa = PBXGroup; children = ( + 76EB03C218170B33006006FC /* AppDelegate.h */, + 76EB03C318170B33006006FC /* AppDelegate.m */, + 34D99CE3217509C1000AFB39 /* AppEnvironment.swift */, C35E8AA42485C83B00ACB629 /* CSV */, 34330A581E7875FB00DF2FB9 /* Fonts */, B633C4FD1A1D190B0059AC12 /* Images */, B66DBF4919D5BBC8006EA940 /* Images.xcassets */, + 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */, + A5509EC91A69AB8B00ABA4BC /* Main.storyboard */, D221A099169C9E5E00537ABF /* main.m */, + 34B0796C1FCF46B000E248C2 /* MainAppContext.h */, + 34B0796B1FCF46B000E248C2 /* MainAppContext.m */, C3CA3AA0255CDA7000F4C6D4 /* Mnemonic */, B67EBF5C19194AC60084CCFD /* Settings.bundle */, B657DDC91911A40500F45B0C /* Signal.entitlements */, + 346129981FD1E4DA00532771 /* SignalApp.h */, + 346129971FD1E4D900532771 /* SignalApp.m */, 45B201741DAECBFD00C461E0 /* Signal-Bridging-Header.h */, D221A095169C9E5E00537ABF /* Session-Info.plist */, D221A09B169C9E5E00537ABF /* Session-Prefix.pch */, @@ -3512,12 +3576,22 @@ isa = PBXGroup; children = ( C3F0A58F255C8E3D007BE2A3 /* Meta */, - B8CCF63B239757C10091D419 /* Components */, + C36096BC25AD1C3E008B62B2 /* Backups */, + C36096A525AD18D7008B62B2 /* Basic Chats */, + C360969C25AD18BA008B62B2 /* Closed Groups */, + C36096AE25AD1909008B62B2 /* Conversations */, C32C5D49256DD522003C73A2 /* Database */, C32B405424A961E1001117B5 /* Dependencies */, - 76EB03C118170B33006006FC /* Signal */, - B8CCF63C239757DB0091D419 /* Utilities */, - B8CCF63D2397580E0091D419 /* View Controllers */, + C360968E25AD16E8008B62B2 /* Home */, + C36096BA25AD1B14008B62B2 /* Media Viewing & Editing */, + C36096BB25AD1BBB008B62B2 /* Notifications */, + C360968D25AD16B4008B62B2 /* Onboarding */, + C360969B25AD180B008B62B2 /* Open Groups */, + C360969A25AD17E3008B62B2 /* Path */, + C360969125AD1765008B62B2 /* Settings */, + B8CCF63B239757C10091D419 /* Shared */, + C36096AF25AD1932008B62B2 /* Sheets & Modals */, + 76EB03C118170B33006006FC /* Utilities */, ); path = Session; sourceTree = ""; @@ -4943,7 +5017,6 @@ 45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */, 34D1F0881F8678AA0066283D /* ConversationViewLayout.m in Sources */, B82B408E239DC00D00A248E7 /* DisplayNameVC.swift in Sources */, - C329FEEC24F7277900B1C64C /* LightModeSheet.swift in Sources */, 4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */, 34330AA31E79686200DF2FB9 /* OWSProgressView.m in Sources */, 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */, @@ -4957,7 +5030,6 @@ 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */, 34B6A903218B3F63007C4606 /* TypingIndicatorView.swift in Sources */, 34B6A905218B4C91007C4606 /* TypingIndicatorInteraction.swift in Sources */, - 2400888E239F30A600305217 /* SessionRestorationView.swift in Sources */, B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */, 34EA69402194933900702471 /* MediaDownloadView.swift in Sources */, B8544E3323D50E4900299F14 /* AppearanceUtilities.swift in Sources */, diff --git a/Session/Signal/BackupRestoreViewController.swift b/Session/Backups/BackupRestoreViewController.swift similarity index 100% rename from Session/Signal/BackupRestoreViewController.swift rename to Session/Backups/BackupRestoreViewController.swift diff --git a/Session/Signal/OWSBackup.h b/Session/Backups/OWSBackup.h similarity index 100% rename from Session/Signal/OWSBackup.h rename to Session/Backups/OWSBackup.h diff --git a/Session/Signal/OWSBackup.m b/Session/Backups/OWSBackup.m similarity index 100% rename from Session/Signal/OWSBackup.m rename to Session/Backups/OWSBackup.m diff --git a/Session/Signal/OWSBackupAPI.swift b/Session/Backups/OWSBackupAPI.swift similarity index 100% rename from Session/Signal/OWSBackupAPI.swift rename to Session/Backups/OWSBackupAPI.swift diff --git a/Session/Signal/OWSBackupExportJob.h b/Session/Backups/OWSBackupExportJob.h similarity index 100% rename from Session/Signal/OWSBackupExportJob.h rename to Session/Backups/OWSBackupExportJob.h diff --git a/Session/Signal/OWSBackupExportJob.m b/Session/Backups/OWSBackupExportJob.m similarity index 100% rename from Session/Signal/OWSBackupExportJob.m rename to Session/Backups/OWSBackupExportJob.m diff --git a/Session/Signal/OWSBackupIO.h b/Session/Backups/OWSBackupIO.h similarity index 100% rename from Session/Signal/OWSBackupIO.h rename to Session/Backups/OWSBackupIO.h diff --git a/Session/Signal/OWSBackupIO.m b/Session/Backups/OWSBackupIO.m similarity index 100% rename from Session/Signal/OWSBackupIO.m rename to Session/Backups/OWSBackupIO.m diff --git a/Session/Signal/OWSBackupImportJob.h b/Session/Backups/OWSBackupImportJob.h similarity index 100% rename from Session/Signal/OWSBackupImportJob.h rename to Session/Backups/OWSBackupImportJob.h diff --git a/Session/Signal/OWSBackupImportJob.m b/Session/Backups/OWSBackupImportJob.m similarity index 100% rename from Session/Signal/OWSBackupImportJob.m rename to Session/Backups/OWSBackupImportJob.m diff --git a/Session/Signal/OWSBackupJob.h b/Session/Backups/OWSBackupJob.h similarity index 100% rename from Session/Signal/OWSBackupJob.h rename to Session/Backups/OWSBackupJob.h diff --git a/Session/Signal/OWSBackupJob.m b/Session/Backups/OWSBackupJob.m similarity index 100% rename from Session/Signal/OWSBackupJob.m rename to Session/Backups/OWSBackupJob.m diff --git a/Session/Signal/OWSBackupLazyRestore.swift b/Session/Backups/OWSBackupLazyRestore.swift similarity index 100% rename from Session/Signal/OWSBackupLazyRestore.swift rename to Session/Backups/OWSBackupLazyRestore.swift diff --git a/Session/Signal/OWSBackupSettingsViewController.h b/Session/Backups/OWSBackupSettingsViewController.h similarity index 100% rename from Session/Signal/OWSBackupSettingsViewController.h rename to Session/Backups/OWSBackupSettingsViewController.h diff --git a/Session/Signal/OWSBackupSettingsViewController.m b/Session/Backups/OWSBackupSettingsViewController.m similarity index 100% rename from Session/Signal/OWSBackupSettingsViewController.m rename to Session/Backups/OWSBackupSettingsViewController.m diff --git a/Session/View Controllers/NewPrivateChatVC.swift b/Session/Basic Chats/NewPrivateChatVC.swift similarity index 100% rename from Session/View Controllers/NewPrivateChatVC.swift rename to Session/Basic Chats/NewPrivateChatVC.swift diff --git a/Session/View Controllers/EditClosedGroupVC.swift b/Session/Closed Groups/EditClosedGroupVC.swift similarity index 100% rename from Session/View Controllers/EditClosedGroupVC.swift rename to Session/Closed Groups/EditClosedGroupVC.swift diff --git a/Session/View Controllers/GroupMembersVC.swift b/Session/Closed Groups/GroupMembersVC.swift similarity index 100% rename from Session/View Controllers/GroupMembersVC.swift rename to Session/Closed Groups/GroupMembersVC.swift diff --git a/Session/View Controllers/NewClosedGroupVC.swift b/Session/Closed Groups/NewClosedGroupVC.swift similarity index 100% rename from Session/View Controllers/NewClosedGroupVC.swift rename to Session/Closed Groups/NewClosedGroupVC.swift diff --git a/Session/Components/SessionRestorationView.swift b/Session/Components/SessionRestorationView.swift deleted file mode 100644 index 654020006..000000000 --- a/Session/Components/SessionRestorationView.swift +++ /dev/null @@ -1,85 +0,0 @@ -import SessionUIKit - -@objc(LKSessionRestorationView) -final class SessionRestorationView : UIView { - private let thread: TSThread - @objc public var onRestore: (() -> Void)? - @objc public var onDismiss: (() -> Void)? - - // MARK: Lifecycle - @objc init(thread: TSThread) { - self.thread = thread; - super.init(frame: CGRect.zero) - initialize() - } - - required init?(coder: NSCoder) { fatalError("Using SessionRestorationView.init(coder:) isn't allowed. Use SessionRestorationView.init(thread:) instead.") } - override init(frame: CGRect) { fatalError("Using SessionRestorationView.init(frame:) isn't allowed. Use SessionRestorationView.init(thread:) instead.") } - - private func initialize() { - // Set up background - backgroundColor = Colors.modalBackground - layer.cornerRadius = Values.modalCornerRadius - layer.masksToBounds = false - layer.borderColor = Colors.modalBorder.cgColor - layer.borderWidth = Values.borderThickness - layer.shadowColor = UIColor.black.cgColor - layer.shadowRadius = 8 - layer.shadowOpacity = 0.64 - // Set up title label - let titleLabel = UILabel() - titleLabel.textColor = Colors.text - titleLabel.font = .boldSystemFont(ofSize: Values.mediumFontSize) - titleLabel.text = "Session Out of Sync" - titleLabel.numberOfLines = 0 - titleLabel.lineBreakMode = .byWordWrapping - titleLabel.textAlignment = .center - // Set up explanation label - let explanationLabel = UILabel() - explanationLabel.textColor = Colors.text - explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) - explanationLabel.text = "Would you like to restore your session? This can help resolve issues. Your messages will be preserved." - explanationLabel.numberOfLines = 0 - explanationLabel.textAlignment = .center - explanationLabel.lineBreakMode = .byWordWrapping - // Set up restore button - let restoreButton = UIButton() - restoreButton.set(.height, to: Values.mediumButtonHeight) - restoreButton.layer.cornerRadius = Values.modalButtonCornerRadius - restoreButton.backgroundColor = Colors.accent - restoreButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) - restoreButton.setTitleColor(Colors.text, for: UIControl.State.normal) - restoreButton.setTitle(NSLocalizedString("session_reset_banner_restore_button_title", comment: ""), for: UIControl.State.normal) - restoreButton.addTarget(self, action: #selector(restore), for: UIControl.Event.touchUpInside) - // Set up dismiss button - let dismissButton = UIButton() - dismissButton.set(.height, to: Values.mediumButtonHeight) - dismissButton.layer.cornerRadius = Values.modalButtonCornerRadius - dismissButton.backgroundColor = Colors.buttonBackground - dismissButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) - dismissButton.setTitleColor(Colors.text, for: UIControl.State.normal) - dismissButton.setTitle(NSLocalizedString("session_reset_banner_dismiss_button_title", comment: ""), for: UIControl.State.normal) - dismissButton.addTarget(self, action: #selector(dismiss), for: UIControl.Event.touchUpInside) - // Set up button stack view - let buttonStackView = UIStackView(arrangedSubviews: [ dismissButton, restoreButton ]) - buttonStackView.axis = .horizontal - buttonStackView.spacing = Values.mediumSpacing - buttonStackView.distribution = .fillEqually - // Set up main stack view - let mainStackView = UIStackView(arrangedSubviews: [ titleLabel, explanationLabel, buttonStackView ]) - mainStackView.axis = .vertical - mainStackView.spacing = Values.smallSpacing - addSubview(mainStackView) - mainStackView.pin(to: self, withInset: Values.mediumSpacing) - // Update explanation label if possible - if let contactID = thread.contactIdentifier() { - let displayName = UserDisplayNameUtilities.getPrivateChatDisplayName(for: contactID) ?? contactID - explanationLabel.text = String(format: "Would you like to restore your session with %@? This can help resolve issues. Your messages will be preserved.", displayName) - } - } - - // MARK: Interaction - @objc private func restore() { onRestore?() } - - @objc private func dismiss() { onDismiss?() } -} diff --git a/Session/Signal/AddToBlockListViewController.h b/Session/Conversations/AddToBlockListViewController.h similarity index 100% rename from Session/Signal/AddToBlockListViewController.h rename to Session/Conversations/AddToBlockListViewController.h diff --git a/Session/Signal/AddToBlockListViewController.m b/Session/Conversations/AddToBlockListViewController.m similarity index 100% rename from Session/Signal/AddToBlockListViewController.m rename to Session/Conversations/AddToBlockListViewController.m diff --git a/Session/Signal/ConversationView/ConversationCollectionView.h b/Session/Conversations/ConversationCollectionView.h similarity index 100% rename from Session/Signal/ConversationView/ConversationCollectionView.h rename to Session/Conversations/ConversationCollectionView.h diff --git a/Session/Signal/ConversationView/ConversationCollectionView.m b/Session/Conversations/ConversationCollectionView.m similarity index 100% rename from Session/Signal/ConversationView/ConversationCollectionView.m rename to Session/Conversations/ConversationCollectionView.m diff --git a/Session/Signal/ConversationView/ConversationInputTextView.h b/Session/Conversations/ConversationInputTextView.h similarity index 100% rename from Session/Signal/ConversationView/ConversationInputTextView.h rename to Session/Conversations/ConversationInputTextView.h diff --git a/Session/Signal/ConversationView/ConversationInputTextView.m b/Session/Conversations/ConversationInputTextView.m similarity index 100% rename from Session/Signal/ConversationView/ConversationInputTextView.m rename to Session/Conversations/ConversationInputTextView.m diff --git a/Session/Signal/ConversationView/ConversationInputToolbar.h b/Session/Conversations/ConversationInputToolbar.h similarity index 100% rename from Session/Signal/ConversationView/ConversationInputToolbar.h rename to Session/Conversations/ConversationInputToolbar.h diff --git a/Session/Signal/ConversationView/ConversationInputToolbar.m b/Session/Conversations/ConversationInputToolbar.m similarity index 100% rename from Session/Signal/ConversationView/ConversationInputToolbar.m rename to Session/Conversations/ConversationInputToolbar.m diff --git a/Session/Signal/ConversationView/ConversationMessageMapping.swift b/Session/Conversations/ConversationMessageMapping.swift similarity index 100% rename from Session/Signal/ConversationView/ConversationMessageMapping.swift rename to Session/Conversations/ConversationMessageMapping.swift diff --git a/Session/Signal/ConversationView/ConversationScrollButton.h b/Session/Conversations/ConversationScrollButton.h similarity index 100% rename from Session/Signal/ConversationView/ConversationScrollButton.h rename to Session/Conversations/ConversationScrollButton.h diff --git a/Session/Signal/ConversationView/ConversationScrollButton.m b/Session/Conversations/ConversationScrollButton.m similarity index 100% rename from Session/Signal/ConversationView/ConversationScrollButton.m rename to Session/Conversations/ConversationScrollButton.m diff --git a/Session/Signal/ConversationSearch.swift b/Session/Conversations/ConversationSearch.swift similarity index 100% rename from Session/Signal/ConversationSearch.swift rename to Session/Conversations/ConversationSearch.swift diff --git a/Session/Components/ConversationTitleView.swift b/Session/Conversations/ConversationTitleView.swift similarity index 100% rename from Session/Components/ConversationTitleView.swift rename to Session/Conversations/ConversationTitleView.swift diff --git a/Session/Signal/ConversationView/ConversationViewController.h b/Session/Conversations/ConversationViewController.h similarity index 100% rename from Session/Signal/ConversationView/ConversationViewController.h rename to Session/Conversations/ConversationViewController.h diff --git a/Session/Signal/ConversationView/ConversationViewController.m b/Session/Conversations/ConversationViewController.m similarity index 100% rename from Session/Signal/ConversationView/ConversationViewController.m rename to Session/Conversations/ConversationViewController.m diff --git a/Session/Signal/ConversationView/ConversationViewItem.h b/Session/Conversations/ConversationViewItem.h similarity index 100% rename from Session/Signal/ConversationView/ConversationViewItem.h rename to Session/Conversations/ConversationViewItem.h diff --git a/Session/Signal/ConversationView/ConversationViewItem.m b/Session/Conversations/ConversationViewItem.m similarity index 100% rename from Session/Signal/ConversationView/ConversationViewItem.m rename to Session/Conversations/ConversationViewItem.m diff --git a/Session/Signal/ConversationView/ConversationViewLayout.h b/Session/Conversations/ConversationViewLayout.h similarity index 100% rename from Session/Signal/ConversationView/ConversationViewLayout.h rename to Session/Conversations/ConversationViewLayout.h diff --git a/Session/Signal/ConversationView/ConversationViewLayout.m b/Session/Conversations/ConversationViewLayout.m similarity index 100% rename from Session/Signal/ConversationView/ConversationViewLayout.m rename to Session/Conversations/ConversationViewLayout.m diff --git a/Session/Signal/ConversationView/ConversationViewModel.h b/Session/Conversations/ConversationViewModel.h similarity index 100% rename from Session/Signal/ConversationView/ConversationViewModel.h rename to Session/Conversations/ConversationViewModel.h diff --git a/Session/Signal/ConversationView/ConversationViewModel.m b/Session/Conversations/ConversationViewModel.m similarity index 100% rename from Session/Signal/ConversationView/ConversationViewModel.m rename to Session/Conversations/ConversationViewModel.m diff --git a/Session/Signal/LongTextViewController.swift b/Session/Conversations/LongTextViewController.swift similarity index 100% rename from Session/Signal/LongTextViewController.swift rename to Session/Conversations/LongTextViewController.swift diff --git a/Session/Signal/MenuActionsViewController.swift b/Session/Conversations/MenuActionsViewController.swift similarity index 100% rename from Session/Signal/MenuActionsViewController.swift rename to Session/Conversations/MenuActionsViewController.swift diff --git a/Session/Signal/MessageActions.swift b/Session/Conversations/MessageActions.swift similarity index 100% rename from Session/Signal/MessageActions.swift rename to Session/Conversations/MessageActions.swift diff --git a/Session/Signal/MessageDetailViewController.swift b/Session/Conversations/MessageDetailViewController.swift similarity index 100% rename from Session/Signal/MessageDetailViewController.swift rename to Session/Conversations/MessageDetailViewController.swift diff --git a/Session/Signal/OWSConversationSettingsViewController.h b/Session/Conversations/OWSConversationSettingsViewController.h similarity index 100% rename from Session/Signal/OWSConversationSettingsViewController.h rename to Session/Conversations/OWSConversationSettingsViewController.h diff --git a/Session/Signal/OWSConversationSettingsViewController.m b/Session/Conversations/OWSConversationSettingsViewController.m similarity index 100% rename from Session/Signal/OWSConversationSettingsViewController.m rename to Session/Conversations/OWSConversationSettingsViewController.m diff --git a/Session/Signal/OWSConversationSettingsViewDelegate.h b/Session/Conversations/OWSConversationSettingsViewDelegate.h similarity index 100% rename from Session/Signal/OWSConversationSettingsViewDelegate.h rename to Session/Conversations/OWSConversationSettingsViewDelegate.h diff --git a/Session/Signal/ConversationView/Cells/AttachmentUploadView.h b/Session/Conversations/Views & Cells/AttachmentUploadView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/AttachmentUploadView.h rename to Session/Conversations/Views & Cells/AttachmentUploadView.h diff --git a/Session/Signal/ConversationView/Cells/AttachmentUploadView.m b/Session/Conversations/Views & Cells/AttachmentUploadView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/AttachmentUploadView.m rename to Session/Conversations/Views & Cells/AttachmentUploadView.m diff --git a/Session/Signal/ConversationView/Cells/ConversationMediaView.swift b/Session/Conversations/Views & Cells/ConversationMediaView.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/ConversationMediaView.swift rename to Session/Conversations/Views & Cells/ConversationMediaView.swift diff --git a/Session/Signal/ConversationView/Cells/ConversationViewCell.h b/Session/Conversations/Views & Cells/ConversationViewCell.h similarity index 100% rename from Session/Signal/ConversationView/Cells/ConversationViewCell.h rename to Session/Conversations/Views & Cells/ConversationViewCell.h diff --git a/Session/Signal/ConversationView/Cells/ConversationViewCell.m b/Session/Conversations/Views & Cells/ConversationViewCell.m similarity index 100% rename from Session/Signal/ConversationView/Cells/ConversationViewCell.m rename to Session/Conversations/Views & Cells/ConversationViewCell.m diff --git a/Session/Signal/LinkPreviewView.swift b/Session/Conversations/Views & Cells/LinkPreviewView.swift similarity index 100% rename from Session/Signal/LinkPreviewView.swift rename to Session/Conversations/Views & Cells/LinkPreviewView.swift diff --git a/Session/Signal/ConversationView/Cells/MediaAlbumCellView.swift b/Session/Conversations/Views & Cells/MediaAlbumCellView.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/MediaAlbumCellView.swift rename to Session/Conversations/Views & Cells/MediaAlbumCellView.swift diff --git a/Session/Signal/ConversationView/Cells/MediaDownloadView.swift b/Session/Conversations/Views & Cells/MediaDownloadView.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/MediaDownloadView.swift rename to Session/Conversations/Views & Cells/MediaDownloadView.swift diff --git a/Session/Signal/ConversationView/Cells/MediaUploadView.swift b/Session/Conversations/Views & Cells/MediaUploadView.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/MediaUploadView.swift rename to Session/Conversations/Views & Cells/MediaUploadView.swift diff --git a/Session/Components/MentionCandidateSelectionView.swift b/Session/Conversations/Views & Cells/MentionCandidateSelectionView.swift similarity index 100% rename from Session/Components/MentionCandidateSelectionView.swift rename to Session/Conversations/Views & Cells/MentionCandidateSelectionView.swift diff --git a/Session/Signal/ConversationView/Cells/OWSBubbleShapeView.h b/Session/Conversations/Views & Cells/OWSBubbleShapeView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSBubbleShapeView.h rename to Session/Conversations/Views & Cells/OWSBubbleShapeView.h diff --git a/Session/Signal/ConversationView/Cells/OWSBubbleShapeView.m b/Session/Conversations/Views & Cells/OWSBubbleShapeView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSBubbleShapeView.m rename to Session/Conversations/Views & Cells/OWSBubbleShapeView.m diff --git a/Session/Signal/ConversationView/Cells/OWSBubbleView.h b/Session/Conversations/Views & Cells/OWSBubbleView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSBubbleView.h rename to Session/Conversations/Views & Cells/OWSBubbleView.h diff --git a/Session/Signal/ConversationView/Cells/OWSBubbleView.m b/Session/Conversations/Views & Cells/OWSBubbleView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSBubbleView.m rename to Session/Conversations/Views & Cells/OWSBubbleView.m diff --git a/Session/Signal/ConversationView/Cells/OWSGenericAttachmentView.h b/Session/Conversations/Views & Cells/OWSGenericAttachmentView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSGenericAttachmentView.h rename to Session/Conversations/Views & Cells/OWSGenericAttachmentView.h diff --git a/Session/Signal/ConversationView/Cells/OWSGenericAttachmentView.m b/Session/Conversations/Views & Cells/OWSGenericAttachmentView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSGenericAttachmentView.m rename to Session/Conversations/Views & Cells/OWSGenericAttachmentView.m diff --git a/Session/Signal/ConversationView/Cells/OWSLabel.h b/Session/Conversations/Views & Cells/OWSLabel.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSLabel.h rename to Session/Conversations/Views & Cells/OWSLabel.h diff --git a/Session/Signal/ConversationView/Cells/OWSLabel.m b/Session/Conversations/Views & Cells/OWSLabel.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSLabel.m rename to Session/Conversations/Views & Cells/OWSLabel.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageBubbleView.h b/Session/Conversations/Views & Cells/OWSMessageBubbleView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageBubbleView.h rename to Session/Conversations/Views & Cells/OWSMessageBubbleView.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageBubbleView.m b/Session/Conversations/Views & Cells/OWSMessageBubbleView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageBubbleView.m rename to Session/Conversations/Views & Cells/OWSMessageBubbleView.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageCell.h b/Session/Conversations/Views & Cells/OWSMessageCell.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageCell.h rename to Session/Conversations/Views & Cells/OWSMessageCell.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageCell.m b/Session/Conversations/Views & Cells/OWSMessageCell.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageCell.m rename to Session/Conversations/Views & Cells/OWSMessageCell.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageFooterView.h b/Session/Conversations/Views & Cells/OWSMessageFooterView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageFooterView.h rename to Session/Conversations/Views & Cells/OWSMessageFooterView.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageFooterView.m b/Session/Conversations/Views & Cells/OWSMessageFooterView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageFooterView.m rename to Session/Conversations/Views & Cells/OWSMessageFooterView.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageHeaderView.h b/Session/Conversations/Views & Cells/OWSMessageHeaderView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageHeaderView.h rename to Session/Conversations/Views & Cells/OWSMessageHeaderView.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageHeaderView.m b/Session/Conversations/Views & Cells/OWSMessageHeaderView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageHeaderView.m rename to Session/Conversations/Views & Cells/OWSMessageHeaderView.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageTextView.h b/Session/Conversations/Views & Cells/OWSMessageTextView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageTextView.h rename to Session/Conversations/Views & Cells/OWSMessageTextView.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageTextView.m b/Session/Conversations/Views & Cells/OWSMessageTextView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageTextView.m rename to Session/Conversations/Views & Cells/OWSMessageTextView.m diff --git a/Session/Signal/ConversationView/Cells/OWSMessageTimerView.h b/Session/Conversations/Views & Cells/OWSMessageTimerView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageTimerView.h rename to Session/Conversations/Views & Cells/OWSMessageTimerView.h diff --git a/Session/Signal/ConversationView/Cells/OWSMessageTimerView.m b/Session/Conversations/Views & Cells/OWSMessageTimerView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSMessageTimerView.m rename to Session/Conversations/Views & Cells/OWSMessageTimerView.m diff --git a/Session/Signal/ConversationView/Cells/OWSQuotedMessageView.h b/Session/Conversations/Views & Cells/OWSQuotedMessageView.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSQuotedMessageView.h rename to Session/Conversations/Views & Cells/OWSQuotedMessageView.h diff --git a/Session/Signal/ConversationView/Cells/OWSQuotedMessageView.m b/Session/Conversations/Views & Cells/OWSQuotedMessageView.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSQuotedMessageView.m rename to Session/Conversations/Views & Cells/OWSQuotedMessageView.m diff --git a/Session/Signal/ConversationView/Cells/OWSSystemMessageCell.h b/Session/Conversations/Views & Cells/OWSSystemMessageCell.h similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSSystemMessageCell.h rename to Session/Conversations/Views & Cells/OWSSystemMessageCell.h diff --git a/Session/Signal/ConversationView/Cells/OWSSystemMessageCell.m b/Session/Conversations/Views & Cells/OWSSystemMessageCell.m similarity index 100% rename from Session/Signal/ConversationView/Cells/OWSSystemMessageCell.m rename to Session/Conversations/Views & Cells/OWSSystemMessageCell.m diff --git a/Session/Signal/QuotedReplyPreview.swift b/Session/Conversations/Views & Cells/QuotedReplyPreview.swift similarity index 100% rename from Session/Signal/QuotedReplyPreview.swift rename to Session/Conversations/Views & Cells/QuotedReplyPreview.swift diff --git a/Session/Signal/ConversationView/Cells/TypingIndicatorCell.swift b/Session/Conversations/Views & Cells/TypingIndicatorCell.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/TypingIndicatorCell.swift rename to Session/Conversations/Views & Cells/TypingIndicatorCell.swift diff --git a/Session/Signal/ConversationView/Cells/TypingIndicatorInteraction.swift b/Session/Conversations/Views & Cells/TypingIndicatorInteraction.swift similarity index 100% rename from Session/Signal/ConversationView/Cells/TypingIndicatorInteraction.swift rename to Session/Conversations/Views & Cells/TypingIndicatorInteraction.swift diff --git a/Session/Signal/TypingIndicatorView.swift b/Session/Conversations/Views & Cells/TypingIndicatorView.swift similarity index 100% rename from Session/Signal/TypingIndicatorView.swift rename to Session/Conversations/Views & Cells/TypingIndicatorView.swift diff --git a/Session/Components/VoiceMessageView.swift b/Session/Conversations/Views & Cells/VoiceMessageView.swift similarity index 100% rename from Session/Components/VoiceMessageView.swift rename to Session/Conversations/Views & Cells/VoiceMessageView.swift diff --git a/Session/Signal/VoiceNoteLock.swift b/Session/Conversations/Views & Cells/VoiceNoteLock.swift similarity index 100% rename from Session/Signal/VoiceNoteLock.swift rename to Session/Conversations/Views & Cells/VoiceNoteLock.swift diff --git a/Session/Utilities/Storage+Resetting.swift b/Session/Database/Storage+Resetting.swift similarity index 100% rename from Session/Utilities/Storage+Resetting.swift rename to Session/Database/Storage+Resetting.swift diff --git a/Session/View Controllers/HomeVC.swift b/Session/Home/HomeVC.swift similarity index 100% rename from Session/View Controllers/HomeVC.swift rename to Session/Home/HomeVC.swift diff --git a/Session/Components/NewConversationButtonSet.swift b/Session/Home/NewConversationButtonSet.swift similarity index 100% rename from Session/Components/NewConversationButtonSet.swift rename to Session/Home/NewConversationButtonSet.swift diff --git a/Session/Signal/AudioProgressView.swift b/Session/Media Viewing & Editing/AudioProgressView.swift similarity index 100% rename from Session/Signal/AudioProgressView.swift rename to Session/Media Viewing & Editing/AudioProgressView.swift diff --git a/Session/Signal/CropScaleImageViewController.swift b/Session/Media Viewing & Editing/CropScaleImageViewController.swift similarity index 100% rename from Session/Signal/CropScaleImageViewController.swift rename to Session/Media Viewing & Editing/CropScaleImageViewController.swift diff --git a/Session/Signal/GifPickerCell.swift b/Session/Media Viewing & Editing/GIFs/GifPickerCell.swift similarity index 100% rename from Session/Signal/GifPickerCell.swift rename to Session/Media Viewing & Editing/GIFs/GifPickerCell.swift diff --git a/Session/Signal/GifPickerLayout.swift b/Session/Media Viewing & Editing/GIFs/GifPickerLayout.swift similarity index 100% rename from Session/Signal/GifPickerLayout.swift rename to Session/Media Viewing & Editing/GIFs/GifPickerLayout.swift diff --git a/Session/Signal/GifPickerViewController.swift b/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift similarity index 100% rename from Session/Signal/GifPickerViewController.swift rename to Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift diff --git a/Session/Signal/GiphyAPI.swift b/Session/Media Viewing & Editing/GIFs/GiphyAPI.swift similarity index 100% rename from Session/Signal/GiphyAPI.swift rename to Session/Media Viewing & Editing/GIFs/GiphyAPI.swift diff --git a/Session/Signal/GiphyDownloader.swift b/Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift similarity index 100% rename from Session/Signal/GiphyDownloader.swift rename to Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift diff --git a/Session/Signal/ImagePickerController.swift b/Session/Media Viewing & Editing/ImagePickerController.swift similarity index 100% rename from Session/Signal/ImagePickerController.swift rename to Session/Media Viewing & Editing/ImagePickerController.swift diff --git a/Session/Signal/MediaDetailViewController.h b/Session/Media Viewing & Editing/MediaDetailViewController.h similarity index 100% rename from Session/Signal/MediaDetailViewController.h rename to Session/Media Viewing & Editing/MediaDetailViewController.h diff --git a/Session/Signal/MediaDetailViewController.m b/Session/Media Viewing & Editing/MediaDetailViewController.m similarity index 100% rename from Session/Signal/MediaDetailViewController.m rename to Session/Media Viewing & Editing/MediaDetailViewController.m diff --git a/Session/Signal/MediaGalleryViewController.swift b/Session/Media Viewing & Editing/MediaGalleryViewController.swift similarity index 100% rename from Session/Signal/MediaGalleryViewController.swift rename to Session/Media Viewing & Editing/MediaGalleryViewController.swift diff --git a/Session/Signal/MediaPageViewController.swift b/Session/Media Viewing & Editing/MediaPageViewController.swift similarity index 100% rename from Session/Signal/MediaPageViewController.swift rename to Session/Media Viewing & Editing/MediaPageViewController.swift diff --git a/Session/Signal/MediaTileViewController.swift b/Session/Media Viewing & Editing/MediaTileViewController.swift similarity index 100% rename from Session/Signal/MediaTileViewController.swift rename to Session/Media Viewing & Editing/MediaTileViewController.swift diff --git a/Session/Signal/OWSImagePickerController.swift b/Session/Media Viewing & Editing/OWSImagePickerController.swift similarity index 100% rename from Session/Signal/OWSImagePickerController.swift rename to Session/Media Viewing & Editing/OWSImagePickerController.swift diff --git a/Session/Signal/PhotoCapture.swift b/Session/Media Viewing & Editing/PhotoCapture.swift similarity index 100% rename from Session/Signal/PhotoCapture.swift rename to Session/Media Viewing & Editing/PhotoCapture.swift diff --git a/Session/Signal/PhotoCaptureViewController.swift b/Session/Media Viewing & Editing/PhotoCaptureViewController.swift similarity index 100% rename from Session/Signal/PhotoCaptureViewController.swift rename to Session/Media Viewing & Editing/PhotoCaptureViewController.swift diff --git a/Session/Signal/PhotoCollectionPickerController.swift b/Session/Media Viewing & Editing/PhotoCollectionPickerController.swift similarity index 100% rename from Session/Signal/PhotoCollectionPickerController.swift rename to Session/Media Viewing & Editing/PhotoCollectionPickerController.swift diff --git a/Session/Signal/PhotoGridViewCell.swift b/Session/Media Viewing & Editing/PhotoGridViewCell.swift similarity index 100% rename from Session/Signal/PhotoGridViewCell.swift rename to Session/Media Viewing & Editing/PhotoGridViewCell.swift diff --git a/Session/Signal/PhotoLibrary.swift b/Session/Media Viewing & Editing/PhotoLibrary.swift similarity index 100% rename from Session/Signal/PhotoLibrary.swift rename to Session/Media Viewing & Editing/PhotoLibrary.swift diff --git a/Session/Signal/RemoteVideoView.h b/Session/Media Viewing & Editing/RemoteVideoView.h similarity index 100% rename from Session/Signal/RemoteVideoView.h rename to Session/Media Viewing & Editing/RemoteVideoView.h diff --git a/Session/Signal/RemoteVideoView.m b/Session/Media Viewing & Editing/RemoteVideoView.m similarity index 100% rename from Session/Signal/RemoteVideoView.m rename to Session/Media Viewing & Editing/RemoteVideoView.m diff --git a/Session/Signal/SendMediaNavigationController.swift b/Session/Media Viewing & Editing/SendMediaNavigationController.swift similarity index 100% rename from Session/Signal/SendMediaNavigationController.swift rename to Session/Media Viewing & Editing/SendMediaNavigationController.swift diff --git a/Session/Signal/AppDelegate.h b/Session/Meta/AppDelegate.h similarity index 100% rename from Session/Signal/AppDelegate.h rename to Session/Meta/AppDelegate.h diff --git a/Session/Signal/AppDelegate.m b/Session/Meta/AppDelegate.m similarity index 100% rename from Session/Signal/AppDelegate.m rename to Session/Meta/AppDelegate.m diff --git a/Session/Signal/AppEnvironment.swift b/Session/Meta/AppEnvironment.swift similarity index 100% rename from Session/Signal/AppEnvironment.swift rename to Session/Meta/AppEnvironment.swift diff --git a/Session/Signal/Launch Screen.storyboard b/Session/Meta/Launch Screen.storyboard similarity index 100% rename from Session/Signal/Launch Screen.storyboard rename to Session/Meta/Launch Screen.storyboard diff --git a/Session/Signal/Main.storyboard b/Session/Meta/Main.storyboard similarity index 100% rename from Session/Signal/Main.storyboard rename to Session/Meta/Main.storyboard diff --git a/Session/Signal/MainAppContext.h b/Session/Meta/MainAppContext.h similarity index 100% rename from Session/Signal/MainAppContext.h rename to Session/Meta/MainAppContext.h diff --git a/Session/Signal/MainAppContext.m b/Session/Meta/MainAppContext.m similarity index 100% rename from Session/Signal/MainAppContext.m rename to Session/Meta/MainAppContext.m diff --git a/Session/Signal/SignalApp.h b/Session/Meta/SignalApp.h similarity index 100% rename from Session/Signal/SignalApp.h rename to Session/Meta/SignalApp.h diff --git a/Session/Signal/SignalApp.m b/Session/Meta/SignalApp.m similarity index 100% rename from Session/Signal/SignalApp.m rename to Session/Meta/SignalApp.m diff --git a/Session/Meta/main.m b/Session/Meta/main.m index 1f7772575..fef928bbc 100644 --- a/Session/Meta/main.m +++ b/Session/Meta/main.m @@ -1,5 +1,3 @@ - - #import "AppDelegate.h" int main(int argc, char *argv[]) diff --git a/Session/Signal/AppNotifications.swift b/Session/Notifications/AppNotifications.swift similarity index 100% rename from Session/Signal/AppNotifications.swift rename to Session/Notifications/AppNotifications.swift diff --git a/Session/Signal/LegacyNotificationsAdaptee.swift b/Session/Notifications/LegacyNotificationsAdaptee.swift similarity index 100% rename from Session/Signal/LegacyNotificationsAdaptee.swift rename to Session/Notifications/LegacyNotificationsAdaptee.swift diff --git a/Session/Signal/PushRegistrationManager.swift b/Session/Notifications/PushRegistrationManager.swift similarity index 100% rename from Session/Signal/PushRegistrationManager.swift rename to Session/Notifications/PushRegistrationManager.swift diff --git a/Session/Signal/SyncPushTokensJob.swift b/Session/Notifications/SyncPushTokensJob.swift similarity index 100% rename from Session/Signal/SyncPushTokensJob.swift rename to Session/Notifications/SyncPushTokensJob.swift diff --git a/Session/Signal/UserNotificationsAdaptee.swift b/Session/Notifications/UserNotificationsAdaptee.swift similarity index 100% rename from Session/Signal/UserNotificationsAdaptee.swift rename to Session/Notifications/UserNotificationsAdaptee.swift diff --git a/Session/View Controllers/DisplayNameVC.swift b/Session/Onboarding/DisplayNameVC.swift similarity index 100% rename from Session/View Controllers/DisplayNameVC.swift rename to Session/Onboarding/DisplayNameVC.swift diff --git a/Session/Components/FakeChatView.swift b/Session/Onboarding/FakeChatView.swift similarity index 100% rename from Session/Components/FakeChatView.swift rename to Session/Onboarding/FakeChatView.swift diff --git a/Session/View Controllers/LandingVC.swift b/Session/Onboarding/LandingVC.swift similarity index 100% rename from Session/View Controllers/LandingVC.swift rename to Session/Onboarding/LandingVC.swift diff --git a/Session/View Controllers/PNModeVC.swift b/Session/Onboarding/PNModeVC.swift similarity index 100% rename from Session/View Controllers/PNModeVC.swift rename to Session/Onboarding/PNModeVC.swift diff --git a/Session/Components/PNOptionView.swift b/Session/Onboarding/PNOptionView.swift similarity index 100% rename from Session/Components/PNOptionView.swift rename to Session/Onboarding/PNOptionView.swift diff --git a/Session/View Controllers/RegisterVC.swift b/Session/Onboarding/RegisterVC.swift similarity index 100% rename from Session/View Controllers/RegisterVC.swift rename to Session/Onboarding/RegisterVC.swift diff --git a/Session/View Controllers/RestoreVC.swift b/Session/Onboarding/RestoreVC.swift similarity index 100% rename from Session/View Controllers/RestoreVC.swift rename to Session/Onboarding/RestoreVC.swift diff --git a/Session/Components/SeedReminderView.swift b/Session/Onboarding/SeedReminderView.swift similarity index 100% rename from Session/Components/SeedReminderView.swift rename to Session/Onboarding/SeedReminderView.swift diff --git a/Session/View Controllers/SeedVC.swift b/Session/Onboarding/SeedVC.swift similarity index 100% rename from Session/View Controllers/SeedVC.swift rename to Session/Onboarding/SeedVC.swift diff --git a/Session/View Controllers/JoinPublicChatVC.swift b/Session/Open Groups/JoinPublicChatVC.swift similarity index 100% rename from Session/View Controllers/JoinPublicChatVC.swift rename to Session/Open Groups/JoinPublicChatVC.swift diff --git a/Session/Components/PathStatusView.swift b/Session/Path/PathStatusView.swift similarity index 100% rename from Session/Components/PathStatusView.swift rename to Session/Path/PathStatusView.swift diff --git a/Session/View Controllers/PathVC.swift b/Session/Path/PathVC.swift similarity index 100% rename from Session/View Controllers/PathVC.swift rename to Session/Path/PathVC.swift diff --git a/Session/Signal/AboutTableViewController.h b/Session/Settings/AboutTableViewController.h similarity index 100% rename from Session/Signal/AboutTableViewController.h rename to Session/Settings/AboutTableViewController.h diff --git a/Session/Signal/AboutTableViewController.m b/Session/Settings/AboutTableViewController.m similarity index 100% rename from Session/Signal/AboutTableViewController.m rename to Session/Settings/AboutTableViewController.m diff --git a/Session/Signal/NotificationSettingsOptionsViewController.h b/Session/Settings/NotificationSettingsOptionsViewController.h similarity index 100% rename from Session/Signal/NotificationSettingsOptionsViewController.h rename to Session/Settings/NotificationSettingsOptionsViewController.h diff --git a/Session/Signal/NotificationSettingsOptionsViewController.m b/Session/Settings/NotificationSettingsOptionsViewController.m similarity index 100% rename from Session/Signal/NotificationSettingsOptionsViewController.m rename to Session/Settings/NotificationSettingsOptionsViewController.m diff --git a/Session/Signal/NotificationSettingsViewController.h b/Session/Settings/NotificationSettingsViewController.h similarity index 100% rename from Session/Signal/NotificationSettingsViewController.h rename to Session/Settings/NotificationSettingsViewController.h diff --git a/Session/Signal/NotificationSettingsViewController.m b/Session/Settings/NotificationSettingsViewController.m similarity index 100% rename from Session/Signal/NotificationSettingsViewController.m rename to Session/Settings/NotificationSettingsViewController.m diff --git a/Session/View Controllers/NukeDataModal.swift b/Session/Settings/NukeDataModal.swift similarity index 100% rename from Session/View Controllers/NukeDataModal.swift rename to Session/Settings/NukeDataModal.swift diff --git a/Session/Signal/OWSSoundSettingsViewController.h b/Session/Settings/OWSSoundSettingsViewController.h similarity index 100% rename from Session/Signal/OWSSoundSettingsViewController.h rename to Session/Settings/OWSSoundSettingsViewController.h diff --git a/Session/Signal/OWSSoundSettingsViewController.m b/Session/Settings/OWSSoundSettingsViewController.m similarity index 100% rename from Session/Signal/OWSSoundSettingsViewController.m rename to Session/Settings/OWSSoundSettingsViewController.m diff --git a/Session/Signal/PrivacySettingsTableViewController.h b/Session/Settings/PrivacySettingsTableViewController.h similarity index 100% rename from Session/Signal/PrivacySettingsTableViewController.h rename to Session/Settings/PrivacySettingsTableViewController.h diff --git a/Session/Signal/PrivacySettingsTableViewController.m b/Session/Settings/PrivacySettingsTableViewController.m similarity index 100% rename from Session/Signal/PrivacySettingsTableViewController.m rename to Session/Settings/PrivacySettingsTableViewController.m diff --git a/Session/View Controllers/QRCodeVC.swift b/Session/Settings/QRCodeVC.swift similarity index 100% rename from Session/View Controllers/QRCodeVC.swift rename to Session/Settings/QRCodeVC.swift diff --git a/Session/View Controllers/SeedModal.swift b/Session/Settings/SeedModal.swift similarity index 100% rename from Session/View Controllers/SeedModal.swift rename to Session/Settings/SeedModal.swift diff --git a/Session/View Controllers/SettingsVC.swift b/Session/Settings/SettingsVC.swift similarity index 100% rename from Session/View Controllers/SettingsVC.swift rename to Session/Settings/SettingsVC.swift diff --git a/Session/Signal/AvatarTableViewCell.swift b/Session/Shared/AvatarTableViewCell.swift similarity index 100% rename from Session/Signal/AvatarTableViewCell.swift rename to Session/Shared/AvatarTableViewCell.swift diff --git a/Session/View Controllers/BaseVC.swift b/Session/Shared/BaseVC.swift similarity index 100% rename from Session/View Controllers/BaseVC.swift rename to Session/Shared/BaseVC.swift diff --git a/Session/Signal/CaptionView.swift b/Session/Shared/CaptionView.swift similarity index 100% rename from Session/Signal/CaptionView.swift rename to Session/Shared/CaptionView.swift diff --git a/Session/Components/ConversationCell.swift b/Session/Shared/ConversationCell.swift similarity index 100% rename from Session/Components/ConversationCell.swift rename to Session/Shared/ConversationCell.swift diff --git a/Session/Signal/DismissableTextField.swift b/Session/Shared/DismissableTextField.swift similarity index 100% rename from Session/Signal/DismissableTextField.swift rename to Session/Shared/DismissableTextField.swift diff --git a/Session/Signal/GroupTableViewCell.swift b/Session/Shared/GroupTableViewCell.swift similarity index 100% rename from Session/Signal/GroupTableViewCell.swift rename to Session/Shared/GroupTableViewCell.swift diff --git a/Session/Signal/LoadingViewController.swift b/Session/Shared/LoadingViewController.swift similarity index 100% rename from Session/Signal/LoadingViewController.swift rename to Session/Shared/LoadingViewController.swift diff --git a/Session/Signal/MarqueeLabel.swift b/Session/Shared/MarqueeLabel.swift similarity index 100% rename from Session/Signal/MarqueeLabel.swift rename to Session/Shared/MarqueeLabel.swift diff --git a/Session/Signal/NeverClearView.swift b/Session/Shared/NeverClearView.swift similarity index 100% rename from Session/Signal/NeverClearView.swift rename to Session/Shared/NeverClearView.swift diff --git a/Session/Signal/OWSBezierPathView.h b/Session/Shared/OWSBezierPathView.h similarity index 100% rename from Session/Signal/OWSBezierPathView.h rename to Session/Shared/OWSBezierPathView.h diff --git a/Session/Signal/OWSBezierPathView.m b/Session/Shared/OWSBezierPathView.m similarity index 100% rename from Session/Signal/OWSBezierPathView.m rename to Session/Shared/OWSBezierPathView.m diff --git a/Session/Signal/OWSProgressView.h b/Session/Shared/OWSProgressView.h similarity index 100% rename from Session/Signal/OWSProgressView.h rename to Session/Shared/OWSProgressView.h diff --git a/Session/Signal/OWSProgressView.m b/Session/Shared/OWSProgressView.m similarity index 100% rename from Session/Signal/OWSProgressView.m rename to Session/Shared/OWSProgressView.m diff --git a/Session/Signal/OWSQRCodeScanningViewController.h b/Session/Shared/OWSQRCodeScanningViewController.h similarity index 100% rename from Session/Signal/OWSQRCodeScanningViewController.h rename to Session/Shared/OWSQRCodeScanningViewController.h diff --git a/Session/Signal/OWSQRCodeScanningViewController.m b/Session/Shared/OWSQRCodeScanningViewController.m similarity index 100% rename from Session/Signal/OWSQRCodeScanningViewController.m rename to Session/Shared/OWSQRCodeScanningViewController.m diff --git a/Session/Signal/OWSScreenLockUI.h b/Session/Shared/OWSScreenLockUI.h similarity index 100% rename from Session/Signal/OWSScreenLockUI.h rename to Session/Shared/OWSScreenLockUI.h diff --git a/Session/Signal/OWSScreenLockUI.m b/Session/Shared/OWSScreenLockUI.m similarity index 100% rename from Session/Signal/OWSScreenLockUI.m rename to Session/Shared/OWSScreenLockUI.m diff --git a/Session/Signal/ReminderView.swift b/Session/Shared/ReminderView.swift similarity index 100% rename from Session/Signal/ReminderView.swift rename to Session/Shared/ReminderView.swift diff --git a/Session/View Controllers/ScanQRCodeWrapperVC.swift b/Session/Shared/ScanQRCodeWrapperVC.swift similarity index 100% rename from Session/View Controllers/ScanQRCodeWrapperVC.swift rename to Session/Shared/ScanQRCodeWrapperVC.swift diff --git a/Session/Components/UserCell.swift b/Session/Shared/UserCell.swift similarity index 100% rename from Session/Components/UserCell.swift rename to Session/Shared/UserCell.swift diff --git a/Session/View Controllers/UserSelectionVC.swift b/Session/Shared/UserSelectionVC.swift similarity index 100% rename from Session/View Controllers/UserSelectionVC.swift rename to Session/Shared/UserSelectionVC.swift diff --git a/Session/View Controllers/KeyPairMigrationSheet.swift b/Session/Sheets & Modals/KeyPairMigrationSheet.swift similarity index 100% rename from Session/View Controllers/KeyPairMigrationSheet.swift rename to Session/Sheets & Modals/KeyPairMigrationSheet.swift diff --git a/Session/View Controllers/KeyPairMigrationSuccessSheet.swift b/Session/Sheets & Modals/KeyPairMigrationSuccessSheet.swift similarity index 100% rename from Session/View Controllers/KeyPairMigrationSuccessSheet.swift rename to Session/Sheets & Modals/KeyPairMigrationSuccessSheet.swift diff --git a/Session/View Controllers/Modal.swift b/Session/Sheets & Modals/Modal.swift similarity index 100% rename from Session/View Controllers/Modal.swift rename to Session/Sheets & Modals/Modal.swift diff --git a/Session/View Controllers/Sheet.swift b/Session/Sheets & Modals/Sheet.swift similarity index 100% rename from Session/View Controllers/Sheet.swift rename to Session/Sheets & Modals/Sheet.swift diff --git a/Session/Signal/AVAudioSession+OWS.h b/Session/Utilities/AVAudioSession+OWS.h similarity index 100% rename from Session/Signal/AVAudioSession+OWS.h rename to Session/Utilities/AVAudioSession+OWS.h diff --git a/Session/Signal/AVAudioSession+OWS.m b/Session/Utilities/AVAudioSession+OWS.m similarity index 100% rename from Session/Signal/AVAudioSession+OWS.m rename to Session/Utilities/AVAudioSession+OWS.m diff --git a/Session/Signal/AccountManager.swift b/Session/Utilities/AccountManager.swift similarity index 100% rename from Session/Signal/AccountManager.swift rename to Session/Utilities/AccountManager.swift diff --git a/Session/Signal/AppUpdateNag.swift b/Session/Utilities/AppUpdateNag.swift similarity index 100% rename from Session/Signal/AppUpdateNag.swift rename to Session/Utilities/AppUpdateNag.swift diff --git a/Session/Signal/AvatarViewHelper.h b/Session/Utilities/AvatarViewHelper.h similarity index 100% rename from Session/Signal/AvatarViewHelper.h rename to Session/Utilities/AvatarViewHelper.h diff --git a/Session/Signal/AvatarViewHelper.m b/Session/Utilities/AvatarViewHelper.m similarity index 100% rename from Session/Signal/AvatarViewHelper.m rename to Session/Utilities/AvatarViewHelper.m diff --git a/Session/Signal/DateUtil.h b/Session/Utilities/DateUtil.h similarity index 100% rename from Session/Signal/DateUtil.h rename to Session/Utilities/DateUtil.h diff --git a/Session/Signal/DateUtil.m b/Session/Utilities/DateUtil.m similarity index 100% rename from Session/Signal/DateUtil.m rename to Session/Utilities/DateUtil.m diff --git a/Session/Signal/HapticFeedback.swift b/Session/Utilities/HapticFeedback.swift similarity index 100% rename from Session/Signal/HapticFeedback.swift rename to Session/Utilities/HapticFeedback.swift diff --git a/Session/Signal/MessageRecipientStatusUtils.swift b/Session/Utilities/MessageRecipientStatusUtils.swift similarity index 100% rename from Session/Signal/MessageRecipientStatusUtils.swift rename to Session/Utilities/MessageRecipientStatusUtils.swift diff --git a/Session/Signal/OWSOrphanDataCleaner.h b/Session/Utilities/OWSOrphanDataCleaner.h similarity index 100% rename from Session/Signal/OWSOrphanDataCleaner.h rename to Session/Utilities/OWSOrphanDataCleaner.h diff --git a/Session/Signal/OWSOrphanDataCleaner.m b/Session/Utilities/OWSOrphanDataCleaner.m similarity index 100% rename from Session/Signal/OWSOrphanDataCleaner.m rename to Session/Utilities/OWSOrphanDataCleaner.m diff --git a/Session/Signal/OWSWebRTCDataProtos.pb.swift b/Session/Utilities/OWSWebRTCDataProtos.pb.swift similarity index 100% rename from Session/Signal/OWSWebRTCDataProtos.pb.swift rename to Session/Utilities/OWSWebRTCDataProtos.pb.swift diff --git a/Session/Signal/Platform.swift b/Session/Utilities/Platform.swift similarity index 100% rename from Session/Signal/Platform.swift rename to Session/Utilities/Platform.swift diff --git a/Session/Signal/TextFieldHelper.swift b/Session/Utilities/TextFieldHelper.swift similarity index 100% rename from Session/Signal/TextFieldHelper.swift rename to Session/Utilities/TextFieldHelper.swift diff --git a/Session/Signal/UIAlerts+iOS9.m b/Session/Utilities/UIAlerts+iOS9.m similarity index 100% rename from Session/Signal/UIAlerts+iOS9.m rename to Session/Utilities/UIAlerts+iOS9.m diff --git a/Session/Signal/UIApplication+OWS.swift b/Session/Utilities/UIApplication+OWS.swift similarity index 100% rename from Session/Signal/UIApplication+OWS.swift rename to Session/Utilities/UIApplication+OWS.swift diff --git a/Session/Signal/UIResponder+OWS.swift b/Session/Utilities/UIResponder+OWS.swift similarity index 100% rename from Session/Signal/UIResponder+OWS.swift rename to Session/Utilities/UIResponder+OWS.swift diff --git a/Session/Signal/UIStoryboard+OWS.swift b/Session/Utilities/UIStoryboard+OWS.swift similarity index 100% rename from Session/Signal/UIStoryboard+OWS.swift rename to Session/Utilities/UIStoryboard+OWS.swift diff --git a/Session/Signal/UIViewController+CameraPermissions.h b/Session/Utilities/UIViewController+CameraPermissions.h similarity index 100% rename from Session/Signal/UIViewController+CameraPermissions.h rename to Session/Utilities/UIViewController+CameraPermissions.h diff --git a/Session/Signal/UIViewController+Permissions.h b/Session/Utilities/UIViewController+Permissions.h similarity index 100% rename from Session/Signal/UIViewController+Permissions.h rename to Session/Utilities/UIViewController+Permissions.h diff --git a/Session/Signal/UIViewController+Permissions.m b/Session/Utilities/UIViewController+Permissions.m similarity index 100% rename from Session/Signal/UIViewController+Permissions.m rename to Session/Utilities/UIViewController+Permissions.m diff --git a/Session/Signal/WebRTCProto.swift b/Session/Utilities/WebRTCProto.swift similarity index 100% rename from Session/Signal/WebRTCProto.swift rename to Session/Utilities/WebRTCProto.swift diff --git a/Session/View Controllers/LightModeSheet.swift b/Session/View Controllers/LightModeSheet.swift deleted file mode 100644 index 2e9a9e3bd..000000000 --- a/Session/View Controllers/LightModeSheet.swift +++ /dev/null @@ -1,50 +0,0 @@ - -final class LightModeSheet : Sheet { - - override func populateContentView() { - // Set up image view - let imageView = UIImageView(image: #imageLiteral(resourceName: "Sun")) - // Set up title label - let titleLabel = UILabel() - titleLabel.textColor = Colors.text - titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize) - titleLabel.text = "Light Mode" - titleLabel.numberOfLines = 0 - titleLabel.lineBreakMode = .byWordWrapping - // Set up top stack view - let topStackView = UIStackView(arrangedSubviews: [ imageView, titleLabel ]) - topStackView.axis = .vertical - topStackView.spacing = Values.largeSpacing - topStackView.alignment = .center - // Set up explanation label - let explanationLabel = UILabel() - explanationLabel.textColor = Colors.text - explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) - explanationLabel.textAlignment = .center - explanationLabel.text = """ - Whoops, who left the lights on? - - That’s right, Session has a spiffy new light mode! Take the fresh new color palette for a spin — it’s now the default mode. - - Want to go back to the dark side? Just tap the moon symbol in the in-app settings to switch modes. - """ - explanationLabel.numberOfLines = 0 - explanationLabel.lineBreakMode = .byWordWrapping - // Set up OK button - let okButton = Button(style: .prominentOutline, size: .large) - okButton.set(.width, to: 240) - okButton.setTitle(NSLocalizedString("OK", comment: ""), for: UIControl.State.normal) - okButton.addTarget(self, action: #selector(close), for: UIControl.Event.touchUpInside) - // Set up main stack view - let stackView = UIStackView(arrangedSubviews: [ topStackView, explanationLabel, okButton ]) - stackView.axis = .vertical - stackView.spacing = Values.veryLargeSpacing - stackView.alignment = .center - // Set up constraints - contentView.addSubview(stackView) - stackView.pin(.leading, to: .leading, of: contentView, withInset: Values.veryLargeSpacing) - stackView.pin(.top, to: .top, of: contentView, withInset: Values.largeSpacing) - contentView.pin(.trailing, to: .trailing, of: stackView, withInset: Values.veryLargeSpacing) - contentView.pin(.bottom, to: .bottom, of: stackView, withInset: Values.veryLargeSpacing + overshoot) - } -}