From 245d35db82248a3894ccef2a6514b1db0019ae59 Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Mon, 22 Jan 2024 21:20:43 +0100 Subject: [PATCH] Fix buttons touch zone --- IceCubesApp.xcodeproj/project.pbxproj | 4 ++-- Packages/Models/Sources/Models/Status.swift | 6 +++--- .../Sources/StatusKit/Row/StatusActionButtonStyle.swift | 1 - .../StatusKit/Row/Subviews/StatusRowActionsView.swift | 9 ++++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/IceCubesApp.xcodeproj/project.pbxproj b/IceCubesApp.xcodeproj/project.pbxproj index 29df2dbb..18f67f5f 100644 --- a/IceCubesApp.xcodeproj/project.pbxproj +++ b/IceCubesApp.xcodeproj/project.pbxproj @@ -1208,7 +1208,7 @@ INFOPLIST_FILE = IceCubesApp/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Ice Cubes"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - INFOPLIST_KEY_NSCameraUsageDescription = "Upload photos & videos to Mastodon"; + INFOPLIST_KEY_NSCameraUsageDescription = "Upload photos & videos to attach to your Mastodon posts."; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Upload photos & videos to Mastodon"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; @@ -1262,7 +1262,7 @@ INFOPLIST_FILE = IceCubesApp/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Ice Cubes"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - INFOPLIST_KEY_NSCameraUsageDescription = "Upload photos & videos to Mastodon"; + INFOPLIST_KEY_NSCameraUsageDescription = "Upload photos & videos to attach to your Mastodon posts."; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Upload photos & videos to Mastodon"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; diff --git a/Packages/Models/Sources/Models/Status.swift b/Packages/Models/Sources/Models/Status.swift index 1469e9c7..172662f8 100644 --- a/Packages/Models/Sources/Models/Status.swift +++ b/Packages/Models/Sources/Models/Status.swift @@ -119,9 +119,9 @@ public final class Status: AnyStatus, Codable, Identifiable, Equatable, Hashable reblog: nil, mediaAttachments: [], mentions: [], - repliesCount: 0, - reblogsCount: 0, - favouritesCount: 0, + repliesCount: 34, + reblogsCount: 8, + favouritesCount: 150, card: nil, favourited: false, reblogged: false, diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift index 8370d81f..7cc4d2f8 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusActionButtonStyle.swift @@ -35,7 +35,6 @@ struct StatusActionButtonStyle: ButtonStyle { sparklesCounter += 1 } } - .contentShape(Rectangle()) } func brightness(configuration: Configuration) -> Double { diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift index a3bae1fc..5b6221bf 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowActionsView.swift @@ -144,11 +144,12 @@ struct StatusRowActionsView: View { .font(.scaledBody) } .padding(.vertical, 6) - .padding(.trailing, 8) + .padding(.horizontal, 8) #if os(visionOS) .buttonStyle(.borderless) #else .buttonStyle(.statusAction()) + .offset(x: -8) #endif .accessibilityElement(children: .combine) .accessibilityLabel("status.action.share-link") @@ -161,11 +162,12 @@ struct StatusRowActionsView: View { .font(.scaledBody) } .padding(.vertical, 6) - .padding(.trailing, 8) + .padding(.horizontal, 8) #if os(visionOS) .buttonStyle(.borderless) #else .buttonStyle(.statusAction()) + .offset(x: -8) #endif .accessibilityElement(children: .combine) .accessibilityLabel("status.action.share-link") @@ -234,7 +236,7 @@ struct StatusRowActionsView: View { } } .padding(.vertical, 6) - .padding(.trailing, 8) + .padding(.horizontal, 8) .contentShape(Rectangle()) } #if os(visionOS) @@ -246,6 +248,7 @@ struct StatusRowActionsView: View { tintColor: action.tintColor(theme: theme) ) ) + .offset(x: -8) #endif .disabled(action == .boost && (viewModel.status.visibility == .direct || viewModel.status.visibility == .priv && viewModel.status.account.id != currentAccount.account?.id))