chore(Mobile): Fixed popover issues on iPadOS

macmade · Dec 9, 2024 · 5896ead · 5896ead
1 parent 750fcec
commit 5896ead
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 68 deletions.
diff --git a/SDO-Mobile/Views/ImageInfoView.swift b/SDO-Mobile/Views/ImageInfoView.swift
@@ -28,17 +28,10 @@ struct ImageInfoView: View
 {
     @State public var image: ImageData
 
-    @Environment( \.dismiss ) var dismiss
-
     var body: some View
     {
         VStack
         {
-            if UIDevice.current.userInterfaceIdiom == .pad
-            {
-                Spacer()
-            }
-
             Text( self.image.title )
                 .font( .largeTitle )
                 .bold()
@@ -74,16 +67,6 @@ struct ImageInfoView: View
             }
             .padding( .top, 20 )
             .frame( maxWidth: .infinity, alignment: .leading )
-
-            if UIDevice.current.userInterfaceIdiom == .pad
-            {
-                Spacer()
-                SymbolButton( image: "xmark.circle.fill", title: "Close" )
-                {
-                    dismiss()
-                }
-                .padding( .top )
-            }
         }
     }
 }

diff --git a/SDO-Mobile/Views/ImageView.swift b/SDO-Mobile/Views/ImageView.swift
@@ -26,10 +26,10 @@ import SwiftUI
 
 struct ImageView: View
 {
-    @State public var image:                   ImageData
-    @State private var isShowingInfoPopover  = false
-    @State private var isShowingVideoPopover = false
-    @State private var isShowingShareSheet   = false
+    @State public var image:                 ImageData
+    @State private var isShowingInfoSheet  = false
+    @State private var isShowingVideoSheet = false
+    @State private var isShowingShareSheet = false
 
     var body: some View
     {
@@ -55,18 +55,18 @@ struct ImageView: View
                     {
                         SymbolButton( image: "video.circle.fill", title: "Show Video" )
                         {
-                            self.isShowingVideoPopover = true
+                            self.isShowingVideoSheet = true
                         }
                         .iPadOnly
                         {
-                            $0.fullScreenCover( isPresented: $isShowingVideoPopover )
+                            $0.fullScreenCover( isPresented: $isShowingVideoSheet )
                             {
                                 VideoView( title: self.image.title, video: video )
                             }
                         }
                         .iPhoneOnly
                         {
-                            $0.popover( isPresented: $isShowingVideoPopover, arrowEdge: .bottom )
+                            $0.sheet( isPresented: $isShowingVideoSheet )
                             {
                                 VideoView( title: self.image.title, video: video )
                             }
@@ -77,47 +77,25 @@ struct ImageView: View
                     {
                         SymbolButton( image: "info.circle.fill", title: "Show Info" )
                         {
-                            self.isShowingInfoPopover = true
+                            self.isShowingInfoSheet = true
                         }
-                        .iPadOnly
-                        {
-                            $0.fullScreenCover( isPresented: $isShowingInfoPopover )
-                            {
-                                ImageInfoView( image: self.image )
-                                    .padding()
-                                    .presentationBackground( .regularMaterial )
-                            }
-                        }
-                        .iPhoneOnly
+                        .sheet( isPresented: $isShowingInfoSheet )
                         {
-                            $0.popover( isPresented: $isShowingInfoPopover, arrowEdge: .bottom )
-                            {
-                                ImageInfoView( image: self.image )
-                                    .padding()
-                                    .presentationBackground( .regularMaterial )
-                            }
+                            ImageInfoView( image: self.image )
+                                .padding()
+                                .presentationBackground( .regularMaterial )
                         }
                     }
 
                     if let url = self.image.imageURL
                     {
                         SymbolButton( image: "paperplane.circle.fill", title: "Share" )
                         {
-                            if UIDevice.current.userInterfaceIdiom == .pad
-                            {
-                                self.isShowingShareSheet = true
-                            }
-                            else
-                            {
-                                SDOApp.share( url: url )
-                            }
+                            self.isShowingShareSheet = true
                         }
-                        .iPadOnly
+                        .sheet( isPresented: $isShowingShareSheet )
                         {
-                            $0.sheet( isPresented: $isShowingShareSheet )
-                            {
-                                ActivityViewController( activityItems: [ url ] )
-                            }
+                            ActivityViewController( activityItems: [ url ] )
                         }
                     }
                 }

diff --git a/SDO-Mobile/Views/VideoView.swift b/SDO-Mobile/Views/VideoView.swift
@@ -43,6 +43,7 @@ struct VideoView: View
             {
                 Spacer()
             }
+
             ZStack
             {
                 if let url = self.download?.url
@@ -55,23 +56,13 @@ struct VideoView: View
                                 .font( .largeTitle )
                                 .bold()
                                 .frame( maxWidth: .infinity )
-                            SymbolButton( image: "paperplane", title: "Share" )
+                            SymbolButton( image: "paperplane.circle.fill", title: "Share" )
                             {
-                                if UIDevice.current.userInterfaceIdiom == .pad
-                                {
-                                    self.isShowingShareSheet = true
-                                }
-                                else
-                                {
-                                    SDOApp.share( url: url )
-                                }
+                                self.isShowingShareSheet = true
                             }
-                            .iPadOnly
+                            .sheet( isPresented: $isShowingShareSheet )
                             {
-                                $0.sheet( isPresented: $isShowingShareSheet )
-                                {
-                                    ActivityViewController( activityItems: [ url ] )
-                                }
+                                ActivityViewController( activityItems: [ url ] )
                             }
                             .padding( .trailing )
                         }