From 1395a6c37b40a0b0132444de5f2c796f1624f806 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 24 Apr 2018 11:42:04 -0400 Subject: [PATCH] Respond to CR. --- Podfile.lock | 21 +++- Signal.xcodeproj/project.pbxproj | 99 +------------------ .../HomeView/HomeViewController.m | 21 ++-- 3 files changed, 30 insertions(+), 111 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 683c22158..9911e27b3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -144,6 +144,23 @@ DEPENDENCIES: - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `release/unencryptedHeaders`) - YYImage +SPEC REPOS: + https://github.com/CocoaPods/Specs.git: + - AFNetworking + - ATAppUpdater + - CocoaLumberjack + - JSQSystemSoundPlayer + - libPhoneNumber-iOS + - Mantle + - ProtocolBuffers + - PureLayout + - Reachability + - SAMKeychain + - SSZipArchive + - TwistedOakCollapsingFutures + - UnionFind + - YYImage + EXTERNAL SOURCES: AxolotlKit: :git: https://github.com/signalapp/SignalProtocolKit.git @@ -159,7 +176,7 @@ EXTERNAL SOURCES: :branch: mkirk/share-compatible :git: https://github.com/signalapp/JSQMessagesViewController.git SignalServiceKit: - :path: . + :path: "." SocketRocket: :git: https://github.com/facebook/SocketRocket.git SQLCipher: @@ -222,4 +239,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6a1bafb7c5bedfa4e577580ff12e487cc7111f38 -COCOAPODS: 1.4.0 +COCOAPODS: 1.5.0 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c8baf2705..85ee16cc0 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2412,7 +2412,6 @@ 453518641FC635DD00210559 /* Sources */, 453518651FC635DD00210559 /* Frameworks */, 453518661FC635DD00210559 /* Resources */, - 7B85A55670DC3D49AFBF7359 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2433,7 +2432,6 @@ 4535188E1FC63DBF00210559 /* Frameworks */, 4535188F1FC63DBF00210559 /* Headers */, 453518901FC63DBF00210559 /* Resources */, - 6C612B7B27FC78638EB7B113 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2454,7 +2452,6 @@ D221A086169C9E5E00537ABF /* Frameworks */, D221A087169C9E5E00537ABF /* Resources */, 59C9DBA462715B5C999FFB02 /* [CP] Embed Pods Frameworks */, - 3465F381B1856CC06933B3A8 /* [CP] Copy Pods Resources */, 451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */, 453518771FC635DD00210559 /* Embed App Extensions */, 4535189F1FC63DBF00210559 /* Embed Frameworks */, @@ -2479,7 +2476,6 @@ D221A0A6169C9E5F00537ABF /* Frameworks */, D221A0A7169C9E5F00537ABF /* Resources */, B4E9B04E862FB64FC9A8F79B /* [CP] Embed Pods Frameworks */, - F76686434770E2BBEBD9665A /* [CP] Copy Pods Resources */, 451DE9FB1DC18D4500810E42 /* [Carthage] Copy Frameworks */, ); buildRules = ( @@ -2780,39 +2776,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3465F381B1856CC06933B3A8 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Signal/Pods-Signal-resources.sh", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesLoadEarlierHeaderView.xib", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesToolbarContentView.xib", - "${PODS_ROOT}/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesTypingIndicatorFooterView.xib", - "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/textsecure.cer", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GIAG2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GSR2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GSR4.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR1.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR3.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR4.crt", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Signal/Pods-Signal-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2941,47 +2904,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6C612B7B27FC78638EB7B113 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalMessaging/Pods-SignalMessaging-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 7B85A55670DC3D49AFBF7359 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension-resources.sh", - "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/textsecure.cer", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GIAG2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GSR2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GSR4.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR1.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR2.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR3.crt", - "${PODS_ROOT}/../SignalServiceKit/src/Security/PinningCertificate/GTSR4.crt", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; B4E9B04E862FB64FC9A8F79B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -3058,21 +2980,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F76686434770E2BBEBD9665A /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -3512,11 +3419,7 @@ "DEBUG=1", "$(inherited)", ); - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ( - "DEBUG=1", - "$(inherited)", - "SSK_BUILDING_FOR_TESTS=1", - ); + "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1 $(inherited) SSK_BUILDING_FOR_TESTS=1"; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 3ea1f50cb..9c80b54be 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -273,6 +273,11 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations self.title = NSLocalizedString(@"HOME_VIEW_TITLE_ARCHIVE", @"Title for the home view's 'archive' mode."); break; } + self.navigationItem.backBarButtonItem = + [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BACK_BUTTON", @"button text for back button") + style:UIBarButtonItemStylePlain + target:nil + action:nil]; if ([self.traitCollection respondsToSelector:@selector(forceTouchCapability)] && (self.traitCollection.forceTouchCapability == UIForceTouchCapabilityAvailable)) { @@ -677,7 +682,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations OWSAssert(disclosureImage); UIImageView *disclosureImageView = [UIImageView new]; disclosureImageView.image = [disclosureImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - // TODO: disclosureImageView.tintColor = [UIColor colorWithRGBHex:0xd1d1d6]; [disclosureImageView setContentHuggingHigh]; [disclosureImageView setCompressionResistanceHigh]; @@ -691,13 +695,8 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations UIStackView *stackView = [UIStackView new]; stackView.axis = UILayoutConstraintAxisHorizontal; stackView.spacing = 5; - if (cell.isRTL) { - [stackView addArrangedSubview:disclosureImageView]; - [stackView addArrangedSubview:label]; - } else { - [stackView addArrangedSubview:label]; - [stackView addArrangedSubview:disclosureImageView]; - } + [stackView addArrangedSubview:label]; + [stackView addArrangedSubview:disclosureImageView]; [cell.contentView addSubview:stackView]; [stackView autoCenterInSuperview]; // Constrain to cell margins. @@ -1154,11 +1153,11 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations }]; if (self.homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0) { - [self setEmptyBoxText]; + [self updateEmptyBoxText]; [_tableView setHidden:YES]; [_emptyBoxLabel setHidden:NO]; } else if (self.homeViewMode == HomeViewMode_Archive && archiveCount == 0) { - [self setEmptyBoxText]; + [self updateEmptyBoxText]; [_tableView setHidden:YES]; [_emptyBoxLabel setHidden:NO]; } else { @@ -1167,7 +1166,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations } } -- (void)setEmptyBoxText +- (void)updateEmptyBoxText { _emptyBoxLabel.textColor = [UIColor grayColor]; _emptyBoxLabel.font = [UIFont ows_regularFontWithSize:18.f];