From ea2f1a0372760dab999985d6ec4c0b0528607ff9 Mon Sep 17 00:00:00 2001
From: Igor Solomennikov <igor@signal.org>
Date: Tue, 15 Feb 2022 10:32:54 -0800
Subject: [PATCH] Change photo library picker to always be presented in "dark
 mode".

---
 .../Photos/ImagePickerController.swift             | 14 +++++++-------
 .../Photos/SendMediaNavigationController.swift     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift
index 47106ba440..a535b057b1 100644
--- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift
+++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift
@@ -65,6 +65,8 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = Theme.darkThemeBackgroundColor
+
         library.add(delegate: self)
 
         guard let collectionView = collectionView else {
@@ -72,14 +74,16 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
             return
         }
         collectionView.allowsMultipleSelection = true
-        collectionView.backgroundColor = Theme.backgroundColor
+        collectionView.backgroundColor = Theme.darkThemeBackgroundColor
         collectionView.register(PhotoGridViewCell.self, forCellWithReuseIdentifier: PhotoGridViewCell.reuseIdentifier)
 
         let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didPressCancel))
+        cancelButton.tintColor = .ows_gray05
         navigationItem.leftBarButtonItem = cancelButton
 
         let titleView = TitleView()
         titleView.delegate = self
+        titleView.tintColor = .ows_gray05
         titleView.text = photoCollection.localizedTitle()
         navigationItem.titleView = titleView
         self.titleView = titleView
@@ -90,7 +94,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
         bottomBar.autoPinBottomToSuperviewMargin()
         bottomBar.autoPinHorizontalEdges(toEdgesOf: view)
 
-        cameraButton = PhotoControl(imageName: "media-composer-camera-outline-28") { [weak self] in
+        cameraButton = PhotoControl(imageName: "media-composer-camera-outline-28", userInterfaceStyleOverride: .dark) { [weak self] in
             guard let self = self else { return }
             self.didTapCameraButton()
         }
@@ -102,6 +106,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
         cameraButton.autoPinBottomToSuperviewMargin()
 
         doneButton = MediaDoneButton()
+        doneButton.userInterfaceStyleOverride = .dark
         doneButton.addTarget(self, action: #selector(didTapDoneButton), for: .touchUpInside)
         bottomBar.addSubview(doneButton)
         doneButton.autoPinTopToSuperviewMargin()
@@ -267,11 +272,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
         }
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        collectionView.backgroundColor = Theme.backgroundColor
-    }
-
     private func updateDoneButtonAppearance() {
         guard let dataSource = dataSource else { return }
 
diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
index 2c99a0f96c..8ae2be7ddf 100644
--- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
+++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
@@ -248,7 +248,7 @@ extension SendMediaNavigationController: UINavigationControllerDelegate {
         case is AttachmentApprovalViewController:
             showNavbar(.alwaysDarkAndClear)
         case is ImagePickerGridController:
-            showNavbar(.default)
+            showNavbar(.alwaysDarkAndClear)
         case is ConversationPickerViewController:
             showNavbar(.default)
         default: