Improve dynamic size of shipment details bottom sheet (#15648)

Author: RafaelKayumov

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShippingCreateLabelsView.swift

@@ -305,9 +305,13 @@ private extension WooShippingCreateLabelsView {
             if isiPhonePortrait {
                 VStack(spacing: Layout.bottomSheetSpacing) {
                     if isShipmentDetailsExpanded {
-                        Toggle(Localization.BottomSheet.markComplete, isOn: $viewModel.markOrderComplete)
-                            .font(.subheadline)
-                            .tint(Color(.primary))
+                        Toggle(isOn: $viewModel.markOrderComplete) {
+                            Text(Localization.BottomSheet.markComplete)
+                                .font(.subheadline)
+                                .lineLimit(Layout.toggleTextLineLimit)
+                                .dynamicTypeSize(...Layout.toggleTextMaxDynamicTypeSizePortrait)
+                        }
+                        .tint(Color(.primary))
                     }
                     if isShipmentDetailsExpanded || viewModel.currentShipmentDetailsViewModel.selectedPackage != nil {
                         purchaseButton
@@ -317,10 +321,14 @@ private extension WooShippingCreateLabelsView {
             else {
                 HStack(spacing: Layout.bottomSheetSpacing) {
                     if viewModel.currentShipmentDetailsViewModel.selectedPackage != nil || isShipmentDetailsExpanded {
-                        Toggle(Localization.BottomSheet.markComplete, isOn: $viewModel.markOrderComplete)
-                            .font(.subheadline)
-                            .tint(Color(.primary))
-                            .fixedSize(horizontal: false, vertical: true)
+                        Toggle(isOn: $viewModel.markOrderComplete) {
+                            Text(Localization.BottomSheet.markComplete)
+                                .font(.subheadline)
+                                .lineLimit(Layout.toggleTextLineLimit)
+                                .dynamicTypeSize(...Layout.toggleTextMaxDynamicTypeSizeLandscape)
+                        }
+                        .tint(Color(.primary))
+                        .fixedSize(horizontal: false, vertical: true)
                         purchaseButton
                     }
                 }
@@ -400,17 +408,16 @@ private extension WooShippingCreateLabelsView {
                 Text(Localization.BottomSheet.orderDetails)
                     .footnoteStyle()
             }
-            AdaptiveStack {
+            HStack {
                 Image(uiImage: .productIcon)
                     .frame(width: Layout.iconSize)
                 Text(viewModel.orderItems.itemsCountLabel)
                     .bold()
                 Spacer()
                 Text(viewModel.orderItems.itemsPriceLabel)
             }
-            .frame(idealHeight: Layout.rowHeight)
             ForEach(viewModel.shippingLines) { shippingLine in
-                AdaptiveStack {
+                HStack {
                     Image(uiImage: .shippingIcon)
                         .frame(width: Layout.iconSize)
                     Text(shippingLine.title)
@@ -419,7 +426,6 @@ private extension WooShippingCreateLabelsView {
                     Spacer()
                     Text(shippingLine.formattedTotal)
                 }
-                .frame(idealHeight: Layout.rowHeight)
             }
         }
     }
@@ -491,12 +497,11 @@ private extension WooShippingCreateLabelsView {
                 shippingRateRow(label: Localization.BottomSheet.total, amount: viewModel.totalCost)
                     .bold()
             }
-            .frame(idealHeight: Layout.rowHeight)
         }
     }
 
     func shippingRateRow(label: String, amount: String?) -> some View {
-        AdaptiveStack {
+        HStack {
             Text(label)
             Spacer()
             Text(amount ?? "$0.00")
@@ -611,6 +616,10 @@ private extension WooShippingCreateLabelsView {
         static let gradientViewWidth: CGFloat = 32
         static let purchasedIconWidth: CGFloat = 16
         static let purchasedIcon = UIImage(systemName: "checkmark.circle.fill")?.withRenderingMode(.alwaysTemplate)
+
+        static let toggleTextLineLimit = 3
+        static let toggleTextMaxDynamicTypeSizePortrait = DynamicTypeSize.accessibility1
+        static let toggleTextMaxDynamicTypeSizeLandscape = DynamicTypeSize.xxxLarge
     }
 
     enum Localization {

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/TopTabView.swift

@@ -164,6 +164,15 @@ struct TopTabView<Content: View>: View {
                                                     scrollFocusTab(in: scrollViewProxy, at: index)
                                                 }
                                             }
+                                            .onChange(of: geometry.size) { newSize in
+                                                /// Support dynamic type size change
+                                                if index < tabWidths.count {
+                                                    tabWidths[index] = newSize.width
+                                                    if index == selectedTab {
+                                                        underlineTabWith(tabGeometry: geometry)
+                                                    }
+                                                }
+                                            }
                                         })
                                 }
                             }