Fix packages

Revert "Fix StatusRowContentView invade SwipeActions area (#2007 )"
This reverts commit 3782300b27.
2024-05-08 23:52:42 +00:00 · 2024-04-19 06:56:48 -07:00 · 2024-04-19 06:46:56 -07:00 · 2024-04-19 06:46:49 -07:00
3 changed files with 33 additions and 34 deletions
--- a/IceCubesApp.xcodeproj/project.pbxproj
+++ b/IceCubesApp.xcodeproj/project.pbxproj
@ -721,6 +721,7 @@
 				be,
 				uk,
 				"zh-Hant",
+				Base,
 			);
 			mainGroup = 9FBFE630292A715500C250E9;
 			packageReferences = (
@ -937,7 +938,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@ -972,7 +973,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@ -1008,7 +1009,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@ -1042,7 +1043,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@ -1223,7 +1224,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
 				PRODUCT_NAME = "Ice Cubes";
 				SDKROOT = auto;
@ -1278,7 +1279,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
 				PRODUCT_NAME = "Ice Cubes";
 				SDKROOT = auto;
@ -1313,7 +1314,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@ -1348,7 +1349,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.34;
+				MARKETING_VERSION = 1.10.35;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
--- a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
@ -83,33 +83,33 @@ public struct StatusRowView: View {
                  viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
                }
            }
-            if !isCompact {
-              StatusRowHeaderView(viewModel: viewModel)
-            }
-          }
-          VStack(alignment: .leading, spacing: .statusComponentSpacing) {
-            StatusRowContentView(viewModel: viewModel)
-              .contentShape(Rectangle())
-              .onTapGesture {
-                guard !isFocused else { return }
-                viewModel.navigateToDetail()
+            VStack(alignment: .leading, spacing: .statusComponentSpacing) {
+              if !isCompact {
+                StatusRowHeaderView(viewModel: viewModel)
              }
-              .accessibilityActions {
-                if isFocused, viewModel.showActions {
-                  accessibilityActions
+              StatusRowContentView(viewModel: viewModel)
+                .contentShape(Rectangle())
+                .onTapGesture {
+                  guard !isFocused else { return }
+                  viewModel.navigateToDetail()
                }
+                .accessibilityActions {
+                  if isFocused, viewModel.showActions {
+                    accessibilityActions
+                  }
+                }
+              if !reasons.contains(.placeholder),
+                 viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
+                 !isInCaptureMode
+              {
+                StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
+                                     viewModel: viewModel)
+                  .tint(isFocused ? theme.tintColor : .gray)
              }
-            if !reasons.contains(.placeholder),
-               viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
-               !isInCaptureMode
-            {
-              StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
-                                   viewModel: viewModel)
-                .tint(isFocused ? theme.tintColor : .gray)
-            }

-            if isFocused, !isCompact {
-              StatusRowDetailView(viewModel: viewModel)
+              if isFocused, !isCompact {
+                StatusRowDetailView(viewModel: viewModel)
+              }
            }
          }
        }
--- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
@ -54,7 +54,6 @@ public struct StatusRowMediaPreviewView: View {
            : CGSize(width: imageMaxHeight, height: imageMaxHeight),
          sensitive: sensitive
        )
-        .padding(.horizontal, .layoutPadding)
        .accessibilityElement(children: .ignore)
        .accessibilityLabel(Self.accessibilityLabel(for: attachments[0]))
        .accessibilityAddTraits([.isButton, .isImage])
@ -67,11 +66,10 @@ public struct StatusRowMediaPreviewView: View {
            }
          }
          .padding(.bottom, scrollBottomPadding)
-          .padding(.horizontal, .layoutPadding)
        }
+        .scrollClipDisabled()
      }
    }
-    .padding(.horizontal, -1 * .layoutPadding)
  }

  @ViewBuilder
Author	SHA1	Message	Date
Thomas Ricouard	4c3047b0b9	Fix packages	2024-04-19 06:56:48 -07:00
Thomas Ricouard	899b92e390	Revert "Fix StatusRowContentView invade SwipeActions area (#2007 )" This reverts commit `3782300b27`.	2024-04-19 06:46:56 -07:00
Thomas Ricouard	e71c55b488	Bump version to 1.10.35	2024-04-19 06:46:49 -07:00