Merge branch 'main' into iOS-18

Dimillian · Jul 2, 2024 · 416dc70 · 416dc70
2 parents a56afca + 7b9cfc2
commit 416dc70
Show file tree

Hide file tree

Showing 9 changed files with 758 additions and 297 deletions.
diff --git a/IceCubesApp/App/AppRegistry.swift b/IceCubesApp/App/AppRegistry.swift
@@ -44,6 +44,12 @@ extension View {
  selectedTagGroup: .constant(nil),
  scrollToTopSignal: .constant(0),
  canFilterTimeline: false)
+ case let .linkTimeline(url, title):
+ TimelineView(timeline: .constant(.link(url: url, title: title)),
+ pinnedFilters: .constant([]),
+ selectedTagGroup: .constant(nil),
+ scrollToTopSignal: .constant(0),
+ canFilterTimeline: false)
  case let .following(id):
  AccountsListView(mode: .following(accountId: id))
  case let .followers(id):

diff --git a/IceCubesApp/App/Tabs/Tabs.swift b/IceCubesApp/App/Tabs/Tabs.swift
@@ -186,6 +186,7 @@ class SidebarTabs {
  .init(tab: .favorites, enabled: true),
  .init(tab: .followedTags, enabled: true),
  .init(tab: .lists, enabled: true),
+ .init(tab: .links, enabled: true),
 
  .init(tab: .settings, enabled: true),
  .init(tab: .profile, enabled: true),
@@ -221,7 +222,7 @@ class iOSTabs {
  @AppStorage(TabEntries.first.rawValue) var firstTab = Tab.timeline
  @AppStorage(TabEntries.second.rawValue) var secondTab = Tab.notifications
  @AppStorage(TabEntries.third.rawValue) var thirdTab = Tab.explore
- @AppStorage(TabEntries.fourth.rawValue) var fourthTab = Tab.messages
+ @AppStorage(TabEntries.fourth.rawValue) var fourthTab = Tab.links
  @AppStorage(TabEntries.fifth.rawValue) var fifthTab = Tab.profile
  }