Skip to content

Commit 3ece5b5

Browse files
committed
iPad: Fix collection initial screen
1 parent c13b1af commit 3ece5b5

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

ACHNBrowserUI/ACHNBrowserUI.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@
13081308
CODE_SIGN_ENTITLEMENTS = ACHNBrowserUI/ACHNBrowserUI.entitlements;
13091309
CODE_SIGN_IDENTITY = "Apple Development: Thomas Ricouard (7MB55D6BJ5)";
13101310
CODE_SIGN_STYLE = Manual;
1311-
CURRENT_PROJECT_VERSION = 060432020;
1311+
CURRENT_PROJECT_VERSION = 060512020;
13121312
DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
13131313
DEVELOPMENT_TEAM = Z6P74P6T99;
13141314
ENABLE_PREVIEWS = YES;
@@ -1318,7 +1318,7 @@
13181318
"$(inherited)",
13191319
"@executable_path/Frameworks",
13201320
);
1321-
MARKETING_VERSION = 1.6.4;
1321+
MARKETING_VERSION = 1.6.5;
13221322
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
13231323
PRODUCT_NAME = "AC Helper";
13241324
PROVISIONING_PROFILE_SPECIFIER = "AC Dev";
@@ -1339,7 +1339,7 @@
13391339
CODE_SIGN_IDENTITY = "iPhone Developer";
13401340
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13411341
CODE_SIGN_STYLE = Manual;
1342-
CURRENT_PROJECT_VERSION = 060432020;
1342+
CURRENT_PROJECT_VERSION = 060512020;
13431343
DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
13441344
DEVELOPMENT_TEAM = Z6P74P6T99;
13451345
ENABLE_PREVIEWS = YES;
@@ -1349,7 +1349,7 @@
13491349
"$(inherited)",
13501350
"@executable_path/Frameworks",
13511351
);
1352-
MARKETING_VERSION = 1.6.4;
1352+
MARKETING_VERSION = 1.6.5;
13531353
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
13541354
PRODUCT_NAME = "AC Helper";
13551355
PROVISIONING_PROFILE_SPECIFIER = "AC Dev";

ACHNBrowserUI/ACHNBrowserUI/views/collection/CollectionListView.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,14 @@ struct CollectionListView: View {
4646
displayMode: .automatic)
4747
.sheet(item: $sheet, content: { Sheet(sheetType: $0) })
4848

49-
if collection.items.isEmpty {
50-
placeholderView
49+
if categories.isEmpty {
50+
List {
51+
placeholderView
52+
}
5153
} else {
52-
ItemDetailView(item: collection.items.first!)
54+
ItemsListView(category: Category(itemCategory: categories.first!),
55+
items: collection.items
56+
.filter({ Backend.Category(itemCategory: $0.category) == Category(itemCategory: categories.first!)}))
5357
}
5458
}
5559
}

ACHNBrowserUI/ACHNBrowserUI/views/todayDashboard/TodayView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct TodayView: View {
1616

1717
// MARK: - Vars
1818
@EnvironmentObject private var uiState: UIState
19-
19+
2020
@ObservedObject private var viewModel = DashboardViewModel()
2121

2222
@State private var selectedSheet: Sheet.SheetType?

0 commit comments

Comments
 (0)