Convert more NavigationLinks to router
This commit is contained in:
Scott Penrose
committed by
William Casarin
William Casarin
parent
f0b0eade37
commit
242455410e
@@ -8,71 +8,131 @@
|
||||
import SwiftUI
|
||||
|
||||
enum Route: Hashable {
|
||||
case Profile(damusSate: DamusState, profile: ProfileModel, followers: FollowersModel)
|
||||
case Followers(damusState: DamusState, environmentObject: FollowersModel)
|
||||
case Relay(damusState: DamusState, relay: String, showActionButtons: Binding<Bool>)
|
||||
case Following(damusState: DamusState, following: FollowingModel)
|
||||
case MuteList(damusState: DamusState, users: [String])
|
||||
case RelayConfig(damusState: DamusState)
|
||||
case Bookmarks(damusState: DamusState)
|
||||
case Config(damusState: DamusState)
|
||||
case EditMetadata(damusState: DamusState)
|
||||
case DMChat(damusState: DamusState, dms: DirectMessageModel)
|
||||
case UserRelays(damusState: DamusState, relays: [String])
|
||||
case ProfileByKey(pubkey: String)
|
||||
case Profile(profile: ProfileModel, followers: FollowersModel)
|
||||
case Followers(environmentObject: FollowersModel)
|
||||
case Relay(relay: String, showActionButtons: Binding<Bool>)
|
||||
case RelayDetail(relay: String, metadata: RelayMetadata)
|
||||
case Following(following: FollowingModel)
|
||||
case MuteList(users: [String])
|
||||
case RelayConfig
|
||||
case Bookmarks
|
||||
case Config
|
||||
case EditMetadata
|
||||
case DMChat(dms: DirectMessageModel)
|
||||
case UserRelays(relays: [String])
|
||||
case KeySettings(keypair: Keypair)
|
||||
case AppearanceSettings(settings: UserSettingsStore) // Observed object.. is this an issue?
|
||||
case NotificationSettings(settings: UserSettingsStore) // Observed object.. is this an issue?
|
||||
case ZapSettings(settings: UserSettingsStore) // Observed object.. is this an issue?
|
||||
case TranslationSettings(settings: UserSettingsStore) // Observed object.. is this an issue?
|
||||
case Thread(thread: ThreadModel)
|
||||
case Reposts(reposts: RepostsModel)
|
||||
case Reactions(reactions: ReactionsModel)
|
||||
case Zaps(target: ZapTarget)
|
||||
case Search(search: SearchModel)
|
||||
|
||||
@ViewBuilder
|
||||
func view(navigationCordinator: NavigationCoordinator) -> some View {
|
||||
func view(navigationCordinator: NavigationCoordinator, damusState: DamusState) -> some View {
|
||||
switch self {
|
||||
case .Profile (let damusState, let profile, let followers):
|
||||
case .ProfileByKey(let pubkey):
|
||||
ProfileView(damus_state: damusState, pubkey: pubkey)
|
||||
case .Profile(let profile, let followers):
|
||||
ProfileView(damus_state: damusState, profile: profile, followers: followers)
|
||||
case .Followers (let damusState, let environmentObject):
|
||||
case .Followers(let environmentObject):
|
||||
FollowersView(damus_state: damusState)
|
||||
.environmentObject(environmentObject)
|
||||
case .Relay (let damusState, let relay, let showActionButtons):
|
||||
case .Relay(let relay, let showActionButtons):
|
||||
RelayView(state: damusState, relay: relay, showActionButtons: showActionButtons)
|
||||
case .Following(let damusState, let following):
|
||||
case .RelayDetail(let relay, let metadata):
|
||||
RelayDetailView(state: damusState, relay: relay, nip11: metadata)
|
||||
case .Following(let following):
|
||||
FollowingView(damus_state: damusState, following: following)
|
||||
case .MuteList(let damusState, let users):
|
||||
case .MuteList(let users):
|
||||
MutelistView(damus_state: damusState, users: users)
|
||||
case .RelayConfig(let damusState):
|
||||
case .RelayConfig:
|
||||
RelayConfigView(state: damusState)
|
||||
case .Bookmarks(let damusState):
|
||||
case .Bookmarks:
|
||||
BookmarksView(state: damusState)
|
||||
case .Config(let damusState):
|
||||
case .Config:
|
||||
ConfigView(state: damusState)
|
||||
case .EditMetadata(let damusState):
|
||||
case .EditMetadata:
|
||||
EditMetadataView(damus_state: damusState)
|
||||
case .DMChat(let damusState, let dms):
|
||||
case .DMChat(let dms):
|
||||
DMChatView(damus_state: damusState, dms: dms)
|
||||
case .UserRelays(let damusState, let relays):
|
||||
case .UserRelays(let relays):
|
||||
UserRelaysView(state: damusState, relays: relays)
|
||||
case .KeySettings(let keypair):
|
||||
KeySettingsView(keypair: keypair)
|
||||
case .AppearanceSettings(let settings):
|
||||
AppearanceSettingsView(settings: settings)
|
||||
case .NotificationSettings(let settings):
|
||||
NotificationSettingsView(settings: settings)
|
||||
case .ZapSettings(let settings):
|
||||
ZapSettingsView(settings: settings)
|
||||
case .TranslationSettings(let settings):
|
||||
NotificationSettingsView(settings: settings)
|
||||
case .Thread(let thread):
|
||||
ThreadView(state: damusState, thread: thread)
|
||||
case .Reposts(let reposts):
|
||||
RepostsView(damus_state: damusState, model: reposts)
|
||||
case .Reactions(let reactions):
|
||||
ReactionsView(damus_state: damusState, model: reactions)
|
||||
case .Zaps(let target):
|
||||
ZapsView(state: damusState, target: target)
|
||||
case .Search(let search):
|
||||
SearchView(appstate: damusState, search: search)
|
||||
}
|
||||
}
|
||||
|
||||
static func == (lhs: Route, rhs: Route) -> Bool {
|
||||
switch (lhs, rhs) {
|
||||
case (.Profile (_, let lhs_profile, _), .Profile(_, let rhs_profile, _)):
|
||||
case (.ProfileByKey (let lhs_pubkey), .ProfileByKey(let rhs_pubkey)):
|
||||
return lhs_pubkey == rhs_pubkey
|
||||
case (.Profile (let lhs_profile, _), .Profile(let rhs_profile, _)):
|
||||
return lhs_profile == rhs_profile
|
||||
case (.Followers (_, _), .Followers (_, _)):
|
||||
case (.Followers (_), .Followers (_)):
|
||||
return true
|
||||
case (.Relay (_, let lhs_relay, _), .Relay (_, let rhs_relay, _)):
|
||||
case (.Relay (let lhs_relay, _), .Relay (let rhs_relay, _)):
|
||||
return lhs_relay == rhs_relay
|
||||
case (.Following(_, _), .Following(_, _)):
|
||||
case (.RelayDetail(let lhs_relay, _), .RelayDetail(let rhs_relay, _)):
|
||||
return lhs_relay == rhs_relay
|
||||
case (.Following(_), .Following(_)):
|
||||
return true
|
||||
case (.MuteList(_, let lhs_users), .MuteList(_, let rhs_users)):
|
||||
case (.MuteList(let lhs_users), .MuteList(let rhs_users)):
|
||||
return lhs_users == rhs_users
|
||||
case (.RelayConfig(_), .RelayConfig(_)):
|
||||
case (.RelayConfig, .RelayConfig):
|
||||
return true
|
||||
case (.Bookmarks(_), .Bookmarks(_)):
|
||||
case (.Bookmarks, .Bookmarks):
|
||||
return true
|
||||
case (.Config(_), .Config(_)):
|
||||
case (.Config, .Config):
|
||||
return true
|
||||
case (.EditMetadata(_), .EditMetadata(_)):
|
||||
case (.EditMetadata, .EditMetadata):
|
||||
return true
|
||||
case (.DMChat(_, let lhs_dms), .DMChat(_, let rhs_dms)):
|
||||
case (.DMChat(let lhs_dms), .DMChat(let rhs_dms)):
|
||||
return lhs_dms.our_pubkey == rhs_dms.our_pubkey
|
||||
case (.UserRelays(_, let lhs_relays), .UserRelays(_, let rhs_relays)):
|
||||
case (.UserRelays(let lhs_relays), .UserRelays(let rhs_relays)):
|
||||
return lhs_relays == rhs_relays
|
||||
case (.KeySettings(let lhs_keypair), .KeySettings(let rhs_keypair)):
|
||||
return lhs_keypair.pubkey == rhs_keypair.pubkey
|
||||
case (.AppearanceSettings(_), .AppearanceSettings(_)):
|
||||
return true
|
||||
case (.NotificationSettings(_), .NotificationSettings(_)):
|
||||
return true
|
||||
case (.ZapSettings(_), .ZapSettings(_)):
|
||||
return true
|
||||
case (.TranslationSettings(_), .TranslationSettings(_)):
|
||||
return true
|
||||
case (.Thread(let lhs_threadModel), .Thread(thread: let rhs_threadModel)):
|
||||
return lhs_threadModel.event.id == rhs_threadModel.event.id
|
||||
case (.Reposts(let lhs_reposts), .Reposts(let rhs_reposts)):
|
||||
return lhs_reposts.target == rhs_reposts.target
|
||||
case (.Reactions(let lhs_reactions), .Reactions(let rhs_reactions)):
|
||||
return lhs_reactions.target == rhs_reactions.target
|
||||
case (.Zaps(let lhs_target), .Zaps(let rhs_target)):
|
||||
return lhs_target == rhs_target
|
||||
case (.Search(let lhs_search), .Search(let rhs_search)):
|
||||
return lhs_search.sub_id == rhs_search.sub_id && lhs_search.profiles_subid == rhs_search.profiles_subid
|
||||
default:
|
||||
return false
|
||||
}
|
||||
@@ -80,28 +140,67 @@ enum Route: Hashable {
|
||||
|
||||
func hash(into hasher: inout Hasher) {
|
||||
switch self {
|
||||
case .Profile(_, let profile, _):
|
||||
case .ProfileByKey(let pubkey):
|
||||
hasher.combine("profilebykey")
|
||||
hasher.combine(pubkey)
|
||||
case .Profile(let profile, _):
|
||||
hasher.combine("profile")
|
||||
hasher.combine(profile.pubkey)
|
||||
case .Followers(_, _):
|
||||
case .Followers(_):
|
||||
hasher.combine("followers")
|
||||
case .Relay(_, let relay, _):
|
||||
case .Relay(let relay, _):
|
||||
hasher.combine("relay")
|
||||
hasher.combine(relay)
|
||||
case .Following(_, _):
|
||||
case .RelayDetail(let relay, _):
|
||||
hasher.combine("relayDetail")
|
||||
hasher.combine(relay)
|
||||
case .Following(_):
|
||||
hasher.combine("following")
|
||||
case .MuteList(_, let users):
|
||||
case .MuteList(let users):
|
||||
hasher.combine("muteList")
|
||||
hasher.combine(users)
|
||||
case .RelayConfig(_):
|
||||
case .RelayConfig:
|
||||
hasher.combine("relayConfig")
|
||||
case .Bookmarks(_):
|
||||
case .Bookmarks:
|
||||
hasher.combine("bookmarks")
|
||||
case .Config(_):
|
||||
case .Config:
|
||||
hasher.combine("config")
|
||||
case .EditMetadata(_):
|
||||
case .EditMetadata:
|
||||
hasher.combine("editMetadata")
|
||||
case .DMChat(_, let dms):
|
||||
case .DMChat(let dms):
|
||||
hasher.combine("dms")
|
||||
hasher.combine(dms.our_pubkey)
|
||||
case .UserRelays(_, let relays):
|
||||
case .UserRelays(let relays):
|
||||
hasher.combine("userRelays")
|
||||
hasher.combine(relays)
|
||||
case .KeySettings(let keypair):
|
||||
hasher.combine("keySettings")
|
||||
hasher.combine(keypair.pubkey)
|
||||
case .AppearanceSettings(_):
|
||||
hasher.combine("appearanceSettings")
|
||||
case .NotificationSettings(_):
|
||||
hasher.combine("notificationSettings")
|
||||
case .ZapSettings(_):
|
||||
hasher.combine("zapSettings")
|
||||
case .TranslationSettings(_):
|
||||
hasher.combine("translationSettings")
|
||||
case .Thread(let threadModel):
|
||||
hasher.combine("thread")
|
||||
hasher.combine(threadModel.event.id)
|
||||
case .Reposts(let reposts):
|
||||
hasher.combine("reposts")
|
||||
hasher.combine(reposts.target)
|
||||
case .Zaps(let target):
|
||||
hasher.combine("zaps")
|
||||
hasher.combine(target.id)
|
||||
hasher.combine(target.pubkey)
|
||||
case .Reactions(let reactions):
|
||||
hasher.combine("reactions")
|
||||
hasher.combine(reactions.target)
|
||||
case .Search(let search):
|
||||
hasher.combine("search")
|
||||
hasher.combine(search.sub_id)
|
||||
hasher.combine(search.profiles_subid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user