taler-ios

commit 0a71cf14dde80a2a2dfe5afcea59b02a637c6aa3
parent 19a4996925fef47fd3f8476321407a02b616564a
Author: Marc Stibane <marc@taler.net>
Date:   Mon,  3 Aug 2026 17:57:27 +0200

simplify, ViewThatFits

Diffstat:
M
TalerWallet1/Views/HelperViews/CopyShare.swift
 | 
31
++++++++++++++++++++++++++-----
M
TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
 | 
2
+-
M
TalerWallet1/Views/Settings/ReportView.swift
 | 
2
+-
M
TalerWallet1/Views/Transactions/QRcodesForPayto.swift
 | 
2
+-

4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/CopyShare.swift b/TalerWallet1/Views/HelperViews/CopyShare.swift
@@ -232,18 +232,39 @@ struct CopyShare: View {
     let textToCopy: String
     let image: UIImage?
 
+    init(_ string: String, image: UIImage? = nil) {
+        self.textToCopy = string
+        self.image = image
+    }
+
     var body: some View {
-        HStack {
-            CopyButton(textToCopy: textToCopy, isCopied: $isCopied, vertical: false, image: image)
+        let copyB = CopyButton(textToCopy: textToCopy, isCopied: $isCopied, vertical: false, image: image)
                 .buttonStyle(TalerButtonStyle(type: .bordered))
-            ShareButton(textToShare: textToCopy, image: image)
+        let share = ShareButton(textToShare: textToCopy, image: image)
                 .buttonStyle(TalerButtonStyle(type: .bordered))
-        } // two buttons
+
+        let vLayout = VStack {
+            copyB
+            share
+        }
+
+        if #available(iOS 16.0, *) {
+            let hLayout = HStack(spacing: HSPACING) {
+                copyB
+                share
+            }
+            ViewThatFits(in: .horizontal) {
+                hLayout
+                vLayout
+            }
+        } else {
+            vLayout
+        }
     }
 }
 // MARK: -
 struct CopyShare_Previews: PreviewProvider {
     static var previews: some View {
-        CopyShare(textToCopy: "Hallö", image: nil)
+        CopyShare("Hallö", image: nil)
     }
 }
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -89,7 +89,7 @@ struct QRCodeDetailView: View {
                         withAnimation { showQRcode = true }
                     }.buttonStyle(TalerButtonStyle(type: .prominent))
                 }
-                CopyShare(textToCopy: talerCopyShare, image: qrImage)
+                CopyShare(talerCopyShare, image: qrImage)
                     .disabled(false)
 //                  .padding(.bottom)
                     .listRowSeparator(.hidden)
diff --git a/TalerWallet1/Views/Settings/ReportView.swift b/TalerWallet1/Views/Settings/ReportView.swift
@@ -59,7 +59,7 @@ struct ReportView: View {
                         .onTapGesture {
                             expanded.toggle()
                         }
-                    CopyShare(textToCopy: report, image: nil)
+                    CopyShare(report, image: nil)
                 }
             }
             .listRowSeparator(.hidden)
diff --git a/TalerWallet1/Views/Transactions/QRcodesForPayto.swift b/TalerWallet1/Views/Transactions/QRcodesForPayto.swift
@@ -26,7 +26,7 @@ struct QRcodeCopyShare: View {
                 .accessibilityHidden(true)
                 .foregroundColor(Color.clear)
             //                  Spacer()
-            CopyShare(textToCopy: textToShare, image: qrImage)
+            CopyShare(textToShare, image: qrImage)
                 .disabled(false)
         }
     }