Skip to content

Commit d9be265

Browse files
authored
Merge pull request #163 from makinosp/develop
update: bump up to 0.9.2
2 parents 7066e5d + ad89c62 commit d9be265

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

Harmonie.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@
473473
"$(inherited)",
474474
"@executable_path/Frameworks",
475475
);
476-
MARKETING_VERSION = 0.9.1;
476+
MARKETING_VERSION = 0.9.2;
477477
PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
478478
PRODUCT_NAME = "$(TARGET_NAME)";
479479
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -509,7 +509,7 @@
509509
"$(inherited)",
510510
"@executable_path/Frameworks",
511511
);
512-
MARKETING_VERSION = 0.9.1;
512+
MARKETING_VERSION = 0.9.2;
513513
PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
514514
PRODUCT_NAME = "$(TARGET_NAME)";
515515
SWIFT_EMIT_LOC_STRINGS = YES;

Harmonie.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

harmonie/Previews/Services/FavoritePreviewService.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ final actor FavoritePreviewService: APIService, FavoriteServiceProtocol {
2929
]
3030
}
3131

32-
func listFavorites(
33-
n: Int = 60,
34-
type: FavoriteType,
35-
tag: String? = nil
36-
) async throws -> [Favorite] {
32+
func listFavorites(type: FavoriteType) async throws -> [Favorite] {
3733
switch type {
3834
case .friend:
3935
PreviewDataProvider.shared.onlineFriends.prefix(5).map { friend in
@@ -44,7 +40,7 @@ final actor FavoritePreviewService: APIService, FavoriteServiceProtocol {
4440
}
4541
}
4642

47-
func fetchFavoriteList(favoriteGroups: [FavoriteGroup]) async throws -> [FavoriteList] {
43+
func fetchFavoriteList(favoriteGroups: [FavoriteGroup], type: FavoriteType) async throws -> [FavoriteList] {
4844
[]
4945
}
5046

harmonie/Previews/Services/WorldPreviewService.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ final actor WorldPreviewService: APIService, WorldServiceProtocol {
1919
PreviewDataProvider.world
2020
}
2121

22-
func fetchFavoritedWorlds(n: Int = 100) async throws -> [FavoriteWorld] {
23-
(0..<n).map { number in
22+
func fetchFavoritedWorlds() async throws -> [FavoriteWorld] {
23+
(0..<100).map { number in
2424
FavoriteWorld(
2525
world: PreviewDataProvider.world,
2626
favoriteId: "fvrt_\(UUID())",

harmonie/ViewModels/FavoriteViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ final class FavoriteViewModel {
7373
/// - friendVM: The `FriendViewModel` view model.
7474
func fetchFavoriteFriends(service: FavoriteServiceProtocol, friendVM: FriendViewModel) async throws {
7575
favoriteGroups = try await service.listFavoriteGroups()
76-
let favoriteDetails = try await service.fetchFavoriteList(favoriteGroups: favoriteGroups)
76+
let favoriteDetails = try await service.fetchFavoriteList(favoriteGroups: favoriteGroups, type: .friend)
7777
let favoriteDetailsOfFriends = favoriteDetails.filter { $0.allFavoritesAre(.friend) }
7878
favoriteFriends = favoriteDetailsOfFriends.map { favoriteDetail in
7979
FavoriteFriend(
@@ -171,7 +171,7 @@ final class FavoriteViewModel {
171171
// MARK: - World
172172

173173
func fetchFavoritedWorlds(service: WorldServiceProtocol) async throws {
174-
favoriteWorlds = try await service.fetchFavoritedWorlds(n: 100)
174+
favoriteWorlds = try await service.fetchFavoritedWorlds()
175175
}
176176

177177
func getFavoriteWorldsByGroup(groupName: String) -> [FavoriteWorld] {

0 commit comments

Comments
 (0)