From 6b0454317e2feedf9eb57e58dc8ae24c99c49c77 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 10 Sep 2019 15:47:34 +1000
Subject: [PATCH] Re-enable search for regular conversations

---
 .../OWSConversationSettingsViewController.m   | 21 +++++++++++--------
 SignalMessaging/appearance/Theme.m            |  2 +-
 SignalMessaging/categories/UIColor+OWS.m      |  7 +------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index f80b9a945..378adbaf0 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -374,8 +374,10 @@ const CGFloat kIconViewLength = 24;
                              actionBlock:^{
                                  [weakSelf showMediaGallery];
                              }]];
-
-    if (SSKFeatureFlags.conversationSearch) {
+     
+     if (SSKFeatureFlags.conversationSearch) {
+     * ========
+     */
         [mainSection addItem:[OWSTableItem
                                  itemWithCustomCellBlock:^{
                                      NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH",
@@ -390,6 +392,7 @@ const CGFloat kIconViewLength = 24;
                                  actionBlock:^{
                                      [weakSelf tappedConversationSearch];
                                  }]];
+    /*
     }
 
     if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) {
@@ -652,12 +655,12 @@ const CGFloat kIconViewLength = 24;
     // Mute thread section.
 
     if (!isNoteToSelf) {
-        OWSTableSection *notificationsSection = [OWSTableSection new];
+//        OWSTableSection *notificationsSection = [OWSTableSection new];
         // We need a section header to separate the notifications UI from the group settings UI.
-        notificationsSection.headerTitle = NSLocalizedString(
-            @"SETTINGS_SECTION_NOTIFICATIONS", @"Label for the notifications section of conversation settings view.");
+//        notificationsSection.headerTitle = NSLocalizedString(
+//            @"SETTINGS_SECTION_NOTIFICATIONS", @"Label for the notifications section of conversation settings view.");
 
-        [notificationsSection
+        [mainSection
             addItem:[OWSTableItem
                         itemWithCustomCellBlock:^{
                             UITableViewCell *cell =
@@ -700,7 +703,7 @@ const CGFloat kIconViewLength = 24;
                             [weakSelf.navigationController pushViewController:vc animated:YES];
                         }]];
 
-        [notificationsSection
+        [mainSection
             addItem:
                 [OWSTableItem
                     itemWithCustomCellBlock:^{
@@ -769,9 +772,9 @@ const CGFloat kIconViewLength = 24;
                     actionBlock:^{
                         [weakSelf showMuteUnmuteActionSheet];
                     }]];
-        notificationsSection.footerTitle = NSLocalizedString(
+        mainSection.footerTitle = NSLocalizedString(
             @"MUTE_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of muting a thread.");
-        [contents addSection:notificationsSection];
+//        [contents addSection:notificationsSection];
     }
     // Block Conversation section.
 
diff --git a/SignalMessaging/appearance/Theme.m b/SignalMessaging/appearance/Theme.m
index 5b892d9da..92b5d2046 100644
--- a/SignalMessaging/appearance/Theme.m
+++ b/SignalMessaging/appearance/Theme.m
@@ -175,7 +175,7 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 
 + (UIColor *)galleryHighlightColor
 {
-    return [UIColor colorWithRGBHex:0x1f8fe8];
+    return UIColor.lokiGreen;
 }
 
 + (UIColor *)conversationButtonBackgroundColor
diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m
index d7ed5e09f..da53d6d1b 100644
--- a/SignalMessaging/categories/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@@ -81,12 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (UIColor *)ows_systemPrimaryButtonColor
 {
-    static UIColor *sharedColor;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^(void) {
-        sharedColor = [UIView new].tintColor;
-    });
-    return sharedColor;
+    return UIColor.lokiGreen;
 }
 
 + (UIColor *)ows_messageBubbleLightGrayColor