mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 12:25:19 +00:00
Fix compile warnings: remove unused primaryColor in formatMessageAsText; remove unused CryptoKit import; mark peerColor/formatMessageAsText @MainActor to call main-actor helpers
This commit is contained in:
@@ -80,7 +80,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
import Combine
|
import Combine
|
||||||
import CryptoKit
|
|
||||||
import CommonCrypto
|
import CommonCrypto
|
||||||
import CoreBluetooth
|
import CoreBluetooth
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
@@ -2679,6 +2678,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
|
|||||||
return processedContent
|
return processedContent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
func formatMessageAsText(_ message: BitchatMessage, colorScheme: ColorScheme) -> AttributedString {
|
func formatMessageAsText(_ message: BitchatMessage, colorScheme: ColorScheme) -> AttributedString {
|
||||||
// Determine if this message was sent by self (mesh, geo, or DM)
|
// Determine if this message was sent by self (mesh, geo, or DM)
|
||||||
let isSelf: Bool = {
|
let isSelf: Bool = {
|
||||||
@@ -2706,7 +2706,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
|
|||||||
// Not cached, format the message
|
// Not cached, format the message
|
||||||
var result = AttributedString()
|
var result = AttributedString()
|
||||||
|
|
||||||
let primaryColor = isDark ? Color.green : Color(red: 0, green: 0.5, blue: 0)
|
|
||||||
let baseColor: Color = isSelf ? .orange : peerColor(for: message, isDark: isDark)
|
let baseColor: Color = isSelf ? .orange : peerColor(for: message, isDark: isDark)
|
||||||
|
|
||||||
if message.sender != "system" {
|
if message.sender != "system" {
|
||||||
@@ -3157,6 +3156,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
|
|||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
private func peerColor(for message: BitchatMessage, isDark: Bool) -> Color {
|
private func peerColor(for message: BitchatMessage, isDark: Bool) -> Color {
|
||||||
var seed: String
|
var seed: String
|
||||||
if let spid = message.senderPeerID {
|
if let spid = message.senderPeerID {
|
||||||
|
|||||||
Reference in New Issue
Block a user