From f2f6eb81f7fe07b1c547fcff897ebdb2b5b01847 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 16 May 2023 11:28:28 -0400 Subject: [PATCH] Change favorite/reblog action order to match Mastodon --- .../ConversationMainStatusCollectionViewCell.swift | 4 ++-- .../Status/TimelineStatusCollectionViewCell.swift | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift index da31db2e..bdc4151a 100644 --- a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift +++ b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift @@ -210,13 +210,13 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status } private var actionButtons: [UIButton] { - [replyButton, favoriteButton, reblogButton, moreButton] + [replyButton, reblogButton, favoriteButton, moreButton] } private lazy var actionsHStack = UIStackView(arrangedSubviews: [ replyButton, - favoriteButton, reblogButton, + favoriteButton, moreButton, ]).configure { $0.axis = .horizontal diff --git a/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift b/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift index 4748b6ab..5c0a203e 100644 --- a/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift +++ b/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift @@ -217,15 +217,15 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti replyButton.topAnchor.constraint(equalTo: $0.topAnchor), replyButton.bottomAnchor.constraint(equalTo: $0.bottomAnchor), - favoriteButton.leadingAnchor.constraint(equalTo: replyButton.trailingAnchor), - favoriteButton.topAnchor.constraint(equalTo: $0.topAnchor), - favoriteButton.bottomAnchor.constraint(equalTo: $0.bottomAnchor), - - reblogButton.leadingAnchor.constraint(equalTo: favoriteButton.trailingAnchor), + reblogButton.leadingAnchor.constraint(equalTo: replyButton.trailingAnchor), reblogButton.topAnchor.constraint(equalTo: $0.topAnchor), reblogButton.bottomAnchor.constraint(equalTo: $0.bottomAnchor), - moreButton.leadingAnchor.constraint(equalTo: reblogButton.trailingAnchor), + favoriteButton.leadingAnchor.constraint(equalTo: reblogButton.trailingAnchor), + favoriteButton.topAnchor.constraint(equalTo: $0.topAnchor), + favoriteButton.bottomAnchor.constraint(equalTo: $0.bottomAnchor), + + moreButton.leadingAnchor.constraint(equalTo: favoriteButton.trailingAnchor), moreButton.trailingAnchor.constraint(equalTo: $0.trailingAnchor), moreButton.topAnchor.constraint(equalTo: $0.topAnchor), moreButton.bottomAnchor.constraint(equalTo: $0.bottomAnchor),