zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Show new avatar image as soon as it has been chosen.

Browse Source 
Also, lighten the editing overlay effect on the header and avatar images.
This commit is contained in:
shannon 2025-03-13 13:05:55 -04:00
parent 48be2e2f8f
commit eb2b874ab5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
View File

@ -116,7 +116,9 @@ extension ProfileHeaderView.ViewModel {
)
.sink { avatarImageURL, avatarImageEditing, isEditing, _ in
view.avatarButton.avatarImageView.image = avatarImageEditing
view.avatarButton.avatarImageView.configure(with: (!isEditing || avatarImageEditing == nil) ? avatarImageURL : nil)
if !isEditing || avatarImageEditing == nil {
view.avatarButton.avatarImageView.configure(with: avatarImageURL)
}
}
.store(in: &disposeBag)
// blur for blocking & blockingBy

6
Mastodon/Scene/Profile/Header/View/ProfileHeaderView.swift
View File

@ -32,8 +32,8 @@ final class ProfileHeaderView: UIView {
static let friendshipActionButtonSize = CGSize(width: 108, height: 34)
static let bannerImageViewPlaceholderColor = UIColor.systemGray
static let bannerImageViewOverlayViewBackgroundNormalColor = UIColor.black.withAlphaComponent(0.5)
static let bannerImageViewOverlayViewBackgroundEditingColor = UIColor.black.withAlphaComponent(0.8)
static let bannerImageViewOverlayViewBackgroundNormalColor = UIColor.black.withAlphaComponent(0.1)
static let bannerImageViewOverlayViewBackgroundEditingColor = UIColor.black.withAlphaComponent(0.2)
weak var delegate: ProfileHeaderViewDelegate?
var disposeBag = Set<AnyCancellable>()
@ -99,7 +99,7 @@ final class ProfileHeaderView: UIView {
func setupImageOverlayViews() {
editBannerButton.tintColor = .white
editAvatarBackgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.6)
editAvatarBackgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.2)
editAvatarButtonOverlayIndicatorView.tintColor = .white
}

3
Mastodon/Scene/Profile/ProfileViewController.swift
View File

@ -599,6 +599,9 @@ extension ProfileViewController {
let newBannerImage: UIImage?
let newAvatarImage: UIImage?
profileHeaderViewController?.viewModel.isUpdating = true
defer { profileHeaderViewController?.viewModel.isUpdating = false }
if case let .local(image) = headerDetails.bannerImage {
if image.size.width <= ProfileHeaderViewModel.bannerImageMaxSizeInPixel.width {
newBannerImage = image