Merge branch 'nt/little-things'

Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m

@@ -317,7 +317,7 @@ const CGFloat kMaxTextViewHeight = 98;
     _suggestedStickerView = [[StickerHorizontalListView alloc] initWithCellSize:suggestedStickerSize
                                                                       cellInset:0
                                                                         spacing:suggestedStickerSpacing];
-    self.suggestedStickerView.backgroundColor = UIColor.clearColor;
+    self.suggestedStickerView.backgroundColor = Theme.conversationButtonBackgroundColor;
     self.suggestedStickerView.contentInset = UIEdgeInsetsMake(
         suggestedStickerSpacing, suggestedStickerSpacing, suggestedStickerSpacing, suggestedStickerSpacing);
     self.suggestedStickerView.hidden = YES;

SignalMessaging/appearance/Theme.h

@@ -39,6 +39,8 @@ extern NSString *const ThemeDidChangeNotification;
 @property (class, readonly, nonatomic) UIColor *cellSelectedColor;
 @property (class, readonly, nonatomic) UIColor *cellSeparatorColor;
 
+@property (class, readonly, nonatomic) UIColor *cursorColor;
+
 // In some contexts, e.g. media viewing/sending, we always use "dark theme" UI regardless of the
 // users chosen theme.
 @property (class, readonly, nonatomic) UIColor *darkThemeNavbarIconColor;

SignalMessaging/appearance/Theme.m

@@ -168,6 +168,11 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
     return Theme.hairlineColor;
 }
 
++ (UIColor *)cursorColor
+{
+    return Theme.isDarkThemeEnabled ? UIColor.ows_whiteColor : UIColor.ows_materialBlueColor;
+}
+
 + (UIColor *)darkThemeBackgroundColor
 {
     return UIColor.ows_gray95Color;

SignalMessaging/utils/UIUtil.m

@@ -54,6 +54,9 @@
     
     // If we set NSShadowAttributeName, the NSForegroundColorAttributeName value is ignored.
     UINavigationBar.appearance.titleTextAttributes = @{ NSForegroundColorAttributeName : Theme.navbarTitleColor };
+
+    UITextView.appearance.tintColor = Theme.cursorColor;
+    UITextField.appearance.tintColor = Theme.cursorColor;
 }
 
 @end