Mastodon/IceCubes
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-01-27 12:59:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make boost swipe buttons consistent with ones from inline & context menu (#999)

Browse Source 
* Show different label and icon for boosting my followers-only post

* Disable boost swipe actions on posts that can't be boosted

* Remove unnecessary function calls
This commit is contained in:
Chanhwi Joo 2023-02-22 20:49:36 +09:00 committed by GitHub
parent 76b8de1dad
commit 40386d6312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Packages/Env/Sources/Env/StatusAction.swift
View File

@ -7,7 +7,7 @@ public enum StatusAction: String, CaseIterable, Identifiable {
case none, reply, boost, favorite, bookmark, quote
public func displayName(isReblogged: Bool = false, isFavorited: Bool = false, isBookmarked: Bool = false) -> LocalizedStringKey {
public func displayName(isReblogged: Bool = false, isFavorited: Bool = false, isBookmarked: Bool = false, privateBoost: Bool = false) -> LocalizedStringKey {
switch self {
case .none:
return "settings.swipeactions.status.action.none"
@ -16,6 +16,10 @@ public enum StatusAction: String, CaseIterable, Identifiable {
case .quote:
return "settings.swipeactions.status.action.quote"
case .boost:
if privateBoost {
return isReblogged ? "status.action.unboost" : "status.action.boost-to-followers"
}
return isReblogged ? "status.action.unboost" : "settings.swipeactions.status.action.boost"
case .favorite:
return isFavorited ? "status.action.unfavorite" : "settings.swipeactions.status.action.favorite"
@ -24,7 +28,7 @@ public enum StatusAction: String, CaseIterable, Identifiable {
}
}
public func iconName(isReblogged: Bool = false, isFavorited: Bool = false, isBookmarked: Bool = false) -> String {
public func iconName(isReblogged: Bool = false, isFavorited: Bool = false, isBookmarked: Bool = false, privateBoost: Bool = false) -> String {
switch self {
case .none:
return "slash.circle"
@ -33,6 +37,10 @@ public enum StatusAction: String, CaseIterable, Identifiable {
case .quote:
return "quote.bubble"
case .boost:
if privateBoost {
return isReblogged ? "arrow.left.arrow.right.circle.fill" : "lock.rotation"
}
return isReblogged ? "arrow.left.arrow.right.circle.fill" : "arrow.left.arrow.right.circle"
case .favorite:
return isFavorited ? "star.fill" : "star"

18
Packages/Status/Sources/Status/Row/Subviews/StatusRowSwipeView.swift
View File

@ -6,10 +6,15 @@ import SwiftUI
struct StatusRowSwipeView: View {
@EnvironmentObject private var theme: Theme
@EnvironmentObject private var preferences: UserPreferences
@EnvironmentObject private var currentAccount: CurrentAccount
enum Mode {
case leading, trailing
}
func privateBoost() -> Bool {
return viewModel.status.visibility == .priv && viewModel.status.account.id == currentAccount.account?.id
}
let viewModel: StatusRowViewModel
let mode: Mode
@ -63,13 +68,14 @@ struct StatusRowSwipeView: View {
}
}
case .boost:
makeSwipeButtonForTask(action: action) {
makeSwipeButtonForTask(action: action, privateBoost: privateBoost()) {
if viewModel.isReblogged {
await viewModel.unReblog()
} else {
await viewModel.reblog()
}
}
.disabled(viewModel.status.visibility == .direct || viewModel.status.visibility == .priv && viewModel.status.account.id != currentAccount.account?.id)
case .bookmark:
makeSwipeButtonForTask(action: action) {
if viewModel.isBookmarked {
@ -95,26 +101,26 @@ struct StatusRowSwipeView: View {
}
@ViewBuilder
private func makeSwipeButtonForTask(action: StatusAction, task: @escaping () async -> Void) -> some View {
private func makeSwipeButtonForTask(action: StatusAction, privateBoost: Bool = false, task: @escaping () async -> Void) -> some View {
Button {
Task {
HapticManager.shared.fireHaptic(of: .notification(.success))
await task()
}
} label: {
makeSwipeLabel(action: action, style: preferences.swipeActionsIconStyle)
makeSwipeLabel(action: action, style: preferences.swipeActionsIconStyle, privateBoost: privateBoost)
}
}
@ViewBuilder
private func makeSwipeLabel(action: StatusAction, style: UserPreferences.SwipeActionsIconStyle) -> some View {
private func makeSwipeLabel(action: StatusAction, style: UserPreferences.SwipeActionsIconStyle, privateBoost: Bool = false) -> some View {
switch style {
case .iconOnly:
Label(action.displayName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked), systemImage: action.iconName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked))
Label(action.displayName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked, privateBoost: privateBoost), systemImage: action.iconName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked, privateBoost: privateBoost))
.labelStyle(.iconOnly)
.environment(\.symbolVariants, .none)
case .iconWithText:
Label(action.displayName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked), systemImage: action.iconName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked))
Label(action.displayName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked, privateBoost: privateBoost), systemImage: action.iconName(isReblogged: viewModel.isReblogged, isFavorited: viewModel.isFavorited, isBookmarked: viewModel.isBookmarked, privateBoost: privateBoost))
.labelStyle(.titleAndIcon)
.environment(\.symbolVariants, .none)
}