From 8fe1b517ca2952d4e6945d6672d5880ed5595bf9 Mon Sep 17 00:00:00 2001
From: Igor Solomennikov <igor@signal.org>
Date: Fri, 4 Mar 2022 16:29:39 -0800
Subject: [PATCH] Fix inconsistent UI in the in-app camera.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Explicitly hide "Switch Camera" button if badged Done button is visible.
Previously Done button would just obscure "Switch Camera" button.

The following user actions would result in badged Done button visible
with '0' as badge value:
• open in-app camera, tap media library
• select one or more items and close media library picker
• tap media library again and unselect all previously selected items.
---
 .../ViewControllers/Photos/PhotoCaptureViewController.swift  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
index 9e9001f553..585d6d5a11 100644
--- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
+++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift
@@ -453,12 +453,15 @@ class PhotoCaptureViewController: OWSViewController, InteractiveDismissDelegate
     }
 
     func updateDoneButtonAppearance () {
-        if isInBatchMode, let badgeNumber = dataSource?.numberOfMediaItems {
+        if isInBatchMode, let badgeNumber = dataSource?.numberOfMediaItems, badgeNumber > 0 {
             doneButton.badgeNumber = badgeNumber
             doneButton.isHidden = false
         } else {
             doneButton.isHidden = true
         }
+        if bottomBar.isCompactHeightLayout {
+            bottomBar.switchCameraButton.isHidden = !doneButton.isHidden
+        }
     }
 
     // MARK: - Interactive Dismiss