mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-01-11 16:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into iOS-18

Browse source
This commit is contained in:
Thomas Ricouard 2024-07-31 14:35:51 +02:00
commit 17bb066e00
11 changed files with 85 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
IceCubesApp.xcodeproj/project.pbxproj
View file

@ -1193,7 +1193,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1228,7 +1228,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1267,7 +1267,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1303,7 +1303,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesAppWidgetsExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1336,7 +1336,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1370,7 +1370,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1552,7 +1552,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "Ice Cubes";
SDKROOT = auto;
@ -1619,7 +1619,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "Ice Cubes";
SDKROOT = auto;
@ -1665,7 +1665,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
@ -1700,7 +1700,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.10.46;
MARKETING_VERSION = 1.10.47;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;

2
Packages/Account/Sources/Account/AccountsList/AccountsListViewModel.swift
View file

@ -150,7 +150,7 @@ public enum AccountsListMode {
state = .loading
try await Task.sleep(for: .milliseconds(250))
var results: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery,
type: "accounts",
type: .accounts,
offset: nil,
following: true),
forceVersion: .v2)

4
Packages/Env/Sources/Env/Router.swift
View file

@ -260,7 +260,7 @@ public enum SettingsStartingPoint {
public func navigateToAccountFrom(acct: String, url: URL) async {
guard let client else { return }
let results: SearchResults? = try? await client.get(endpoint: Search.search(query: acct,
type: "accounts",
type: .accounts,
offset: nil,
following: nil),
forceVersion: .v2)
@ -274,7 +274,7 @@ public enum SettingsStartingPoint {
public func navigateToAccountFrom(url: URL) async {
guard let client else { return }
let results: SearchResults? = try? await client.get(endpoint: Search.search(query: url.absoluteString,
type: "accounts",
type: .accounts,
offset: nil,
following: nil),
forceVersion: .v2)

19
Packages/Explore/Sources/Explore/ExploreView.swift
View file

@ -168,6 +168,9 @@ public struct ExploreView: View {
#endif
}
}
if viewModel.searchScope == .people {
makeNextPageView(for: .accounts)
}
}
}
if !results.hashtags.isEmpty, viewModel.searchScope == .all || viewModel.searchScope == .hashtags {
@ -183,6 +186,9 @@ public struct ExploreView: View {
#endif
.padding(.vertical, 4)
}
if viewModel.searchScope == .hashtags {
makeNextPageView(for: .hashtags)
}
}
}
if !results.statuses.isEmpty, viewModel.searchScope == .all || viewModel.searchScope == .posts {
@ -198,6 +204,9 @@ public struct ExploreView: View {
#endif
.padding(.vertical, 8)
}
if viewModel.searchScope == .posts {
makeNextPageView(for: .statuses)
}
}
}
}
@ -332,4 +341,14 @@ public struct ExploreView: View {
viewModel.scrollToTopVisible = false
}
}
private func makeNextPageView(for type: Search.EntityType) -> some View {
NextPageView {
await viewModel.fetchNextPage(of: type)
}
.padding(.horizontal, .layoutPadding)
#if !os(visionOS)
.listRowBackground(theme.primaryBackgroundColor)
#endif
}
}

38
Packages/Explore/Sources/Explore/ExploreViewModel.swift
View file

@ -115,4 +115,42 @@ import SwiftUI
isSearching = false
}
}
func fetchNextPage(of type: Search.EntityType) async {
guard let client, !searchQuery.isEmpty,
let results = results[searchQuery] else { return }
do {
let offset = switch type {
case .accounts:
results.accounts.count
case .hashtags:
results.hashtags.count
case .statuses:
results.statuses.count
}
var newPageResults: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery,
type: type,
offset: offset,
following: nil),
forceVersion: .v2)
if type == .accounts {
let relationships: [Relationship] =
try await client.get(endpoint: Accounts.relationships(ids: newPageResults.accounts.map(\.id)))
newPageResults.relationships = relationships
}
switch type {
case .accounts:
self.results[searchQuery]?.accounts.append(contentsOf: newPageResults.accounts)
self.results[searchQuery]?.relationships.append(contentsOf: newPageResults.relationships)
case .hashtags:
self.results[searchQuery]?.hashtags.append(contentsOf: newPageResults.hashtags)
case .statuses:
self.results[searchQuery]?.statuses.append(contentsOf: newPageResults.statuses)
}
} catch {
}
}
}

6
Packages/Models/Sources/Models/SearchResults.swift
View file

@ -5,10 +5,10 @@ public struct SearchResults: Decodable {
case accounts, statuses, hashtags
}
public let accounts: [Account]
public var accounts: [Account]
public var relationships: [Relationship] = []
public let statuses: [Status]
public let hashtags: [Tag]
public var statuses: [Status]
public var hashtags: [Tag]
public var isEmpty: Bool {
accounts.isEmpty && statuses.isEmpty && hashtags.isEmpty

10
Packages/Network/Sources/Network/Endpoint/Search.swift
View file

@ -1,8 +1,12 @@
import Foundation
public enum Search: Endpoint {
case search(query: String, type: String?, offset: Int?, following: Bool?)
case accountsSearch(query: String, type: String?, offset: Int?, following: Bool?)
public enum EntityType: String, Sendable {
case accounts, hashtags, statuses
}
case search(query: String, type: EntityType?, offset: Int?, following: Bool?)
case accountsSearch(query: String, type: EntityType?, offset: Int?, following: Bool?)
public func path() -> String {
switch self {
@ -19,7 +23,7 @@ public enum Search: Endpoint {
let .accountsSearch(query, type, offset, following):
var params: [URLQueryItem] = [.init(name: "q", value: query)]
if let type {
params.append(.init(name: "type", value: type))
params.append(.init(name: "type", value: type.rawValue))
}
if let offset {
params.append(.init(name: "offset", value: String(offset)))

2
Packages/StatusKit/Sources/StatusKit/Detail/StatusDetailViewModel.swift
View file

@ -58,7 +58,7 @@ import SwiftUI
private func fetchRemoteStatus() async -> Bool {
guard let client, let remoteStatusURL else { return false }
let results: SearchResults? = try? await client.get(endpoint: Search.search(query: remoteStatusURL.absoluteString,
type: "statuses",
type: .statuses,
offset: nil,
following: nil),
forceVersion: .v2)

2
Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
View file

@ -591,7 +591,7 @@ public extension StatusEditor {
showRecentsTagsInline = false
query.removeFirst()
results = try await client.get(endpoint: Search.search(query: query,
type: "hashtags",
type: .hashtags,
offset: 0,
following: nil),
forceVersion: .v2)

4
Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
View file

@ -280,7 +280,7 @@ import SwiftUI
embed = try await client.get(endpoint: Statuses.status(id: String(id)))
} else {
let results: SearchResults = try await client.get(endpoint: Search.search(query: url.absoluteString,
type: "statuses",
type: .statuses,
offset: 0,
following: nil),
forceVersion: .v2)
@ -449,7 +449,7 @@ import SwiftUI
guard isRemote, let remoteStatusURL = URL(string: finalStatus.url ?? "") else { return false }
isLoadingRemoteContent = true
let results: SearchResults? = try? await client.get(endpoint: Search.search(query: remoteStatusURL.absoluteString,
type: "statuses",
type: .statuses,
offset: nil,
following: nil),
forceVersion: .v2)

2
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
View file

@ -262,7 +262,7 @@ public struct StatusRowCardView: View {
Text("More from")
AvatarView(account.avatar, config: .boost)
.padding(.top, 2)
EmojiTextApp(account.cachedDisplayName, emojis: account.emojis)
EmojiTextApp(account.cachedDisplayName, emojis: account.emojis, lineLimit: 1)
.fontWeight(.semibold)
.emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)