damus

commit 0038d42f71665ff9b4d133b846f54370c9d56b14
parent d9f2317728e7152d6fce47ae75f8554bd209cd21
Author: William Casarin <jb55@jb55.com>
Date:   Sat, 26 Oct 2024 11:25:13 -0700

Merge 'dismiss button in full screen carousel' #2611

Swift Coder (2):
      Fix: dismiss button in full screen carousel
      Address PR Feedback

Diffstat:
M
damus/Views/Images/FullScreenCarouselView.swift
 | 
2
+-
M
damus/Views/Images/ProfilePicImageView.swift
 | 
22
+++++++++++++++-------

2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/damus/Views/Images/FullScreenCarouselView.swift b/damus/Views/Images/FullScreenCarouselView.swift
@@ -96,7 +96,7 @@ struct FullScreenCarouselView<Content: View>: View {
                 GeometryReader { geo in
                     VStack {
                         if showMenu {
-                            NavDismissBarView(showBackgroundCircle: false)
+                            NavDismissBarView(navDismissBarContainer: .fullScreenCarousel)
                                 .foregroundColor(.white)
                             Spacer()
                             
diff --git a/damus/Views/Images/ProfilePicImageView.swift b/damus/Views/Images/ProfilePicImageView.swift
@@ -40,13 +40,18 @@ struct ProfileImageContainerView: View {
     }
 }
 
+enum NavDismissBarContainer {
+    case fullScreenCarousel
+    case profilePicImageView
+}
+
 struct NavDismissBarView: View {
     
     @Environment(\.presentationMode) var presentationMode
-    let showBackgroundCircle: Bool
+    let navDismissBarContainer: NavDismissBarContainer
     
-    init(showBackgroundCircle: Bool = true) {
-        self.showBackgroundCircle = showBackgroundCircle
+    init(navDismissBarContainer: NavDismissBarContainer) {
+        self.navDismissBarContainer = navDismissBarContainer
     }
     
     var body: some View {
@@ -54,15 +59,18 @@ struct NavDismissBarView: View {
             Button(action: {
                 presentationMode.wrappedValue.dismiss()
             }, label: {
-                if showBackgroundCircle {
+                switch navDismissBarContainer {
+                case .profilePicImageView:
                     Image("close")
                         .frame(width: 33, height: 33)
                         .background(.regularMaterial)
                         .clipShape(Circle())
-                }
-                else {
+                    
+                case .fullScreenCarousel:
                     Image("close")
                         .frame(width: 33, height: 33)
+                        .background(.damusBlack)
+                        .clipShape(Circle())
                 }
             })
             
@@ -96,7 +104,7 @@ struct ProfilePicImageView: View {
                 presentationMode.wrappedValue.dismiss()
             }))
         }
-        .overlay(NavDismissBarView(), alignment: .top)
+        .overlay(NavDismissBarView(navDismissBarContainer: .profilePicImageView), alignment: .top)
     }
 }