Skip to content

Commit e2dc77d

Browse files
DimillianDimillian
committed
iOS 14 release
1 parent 0ce1bbf commit e2dc77d

6 files changed

Lines changed: 146 additions & 16 deletions

File tree

‎ACHNBrowserUI/ACHNBrowserUI.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@
13841384
CODE_SIGN_IDENTITY = "Apple Development";
13851385
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13861386
CODE_SIGN_STYLE = Automatic;
1387-
CURRENT_PROJECT_VERSION = 082632020;
1387+
CURRENT_PROJECT_VERSION = 092232020;
13881388
DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
13891389
DEVELOPMENT_TEAM = Z6P74P6T99;
13901390
ENABLE_PREVIEWS = YES;
@@ -1394,7 +1394,7 @@
13941394
"$(inherited)",
13951395
"@executable_path/Frameworks",
13961396
);
1397-
MARKETING_VERSION = 2.0.0;
1397+
MARKETING_VERSION = 2.0.2;
13981398
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
13991399
PRODUCT_NAME = "AC Helper";
14001400
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1417,7 +1417,7 @@
14171417
CODE_SIGN_IDENTITY = "iPhone Distribution";
14181418
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
14191419
CODE_SIGN_STYLE = Manual;
1420-
CURRENT_PROJECT_VERSION = 082632020;
1420+
CURRENT_PROJECT_VERSION = 092232020;
14211421
DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
14221422
DEVELOPMENT_TEAM = Z6P74P6T99;
14231423
ENABLE_PREVIEWS = YES;
@@ -1427,7 +1427,7 @@
14271427
"$(inherited)",
14281428
"@executable_path/Frameworks",
14291429
);
1430-
MARKETING_VERSION = 2.0.0;
1430+
MARKETING_VERSION = 2.0.2;
14311431
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
14321432
PRODUCT_NAME = "AC Helper";
14331433
PROVISIONING_PROFILE_SPECIFIER = "AC prod";
@@ -1449,7 +1449,8 @@
14491449
CODE_SIGN_IDENTITY = "Apple Development";
14501450
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
14511451
CODE_SIGN_STYLE = Automatic;
1452-
CURRENT_PROJECT_VERSION = 082632020;
1452+
CURRENT_PROJECT_VERSION = 092232020;
1453+
DEAD_CODE_STRIPPING = NO;
14531454
DEVELOPMENT_TEAM = Z6P74P6T99;
14541455
INFOPLIST_FILE = Widgets/Info.plist;
14551456
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -1458,7 +1459,7 @@
14581459
"@executable_path/Frameworks",
14591460
"@executable_path/../../Frameworks",
14601461
);
1461-
MARKETING_VERSION = 2.0.0;
1462+
MARKETING_VERSION = 2.0.2;
14621463
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH.Widgets;
14631464
PRODUCT_NAME = "$(TARGET_NAME)";
14641465
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1480,7 +1481,8 @@
14801481
CODE_SIGN_IDENTITY = "iPhone Distribution";
14811482
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
14821483
CODE_SIGN_STYLE = Manual;
1483-
CURRENT_PROJECT_VERSION = 082632020;
1484+
CURRENT_PROJECT_VERSION = 092232020;
1485+
DEAD_CODE_STRIPPING = NO;
14841486
DEVELOPMENT_TEAM = Z6P74P6T99;
14851487
INFOPLIST_FILE = Widgets/Info.plist;
14861488
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -1489,7 +1491,7 @@
14891491
"@executable_path/Frameworks",
14901492
"@executable_path/../../Frameworks",
14911493
);
1492-
MARKETING_VERSION = 2.0.0;
1494+
MARKETING_VERSION = 2.0.2;
14931495
PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH.Widgets;
14941496
PRODUCT_NAME = "$(TARGET_NAME)";
14951497
PROVISIONING_PROFILE_SPECIFIER = "AC Helper Widgets";

‎ACHNBrowserUI/ACHNBrowserUI.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1220"
4+
wasCreatedForAppExtension = "YES"
5+
version = "2.0">
6+
<BuildAction
7+
parallelizeBuildables = "YES"
8+
buildImplicitDependencies = "YES">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "698584DA24A1F70F002D103C"
19+
BuildableName = "WidgetsExtension.appex"
20+
BlueprintName = "WidgetsExtension"
21+
ReferencedContainer = "container:ACHNBrowserUI.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
<BuildActionEntry
25+
buildForTesting = "YES"
26+
buildForRunning = "YES"
27+
buildForProfiling = "YES"
28+
buildForArchiving = "YES"
29+
buildForAnalyzing = "YES">
30+
<BuildableReference
31+
BuildableIdentifier = "primary"
32+
BlueprintIdentifier = "69157B762471A5A1005B9002"
33+
BuildableName = "AC Helper.app"
34+
BlueprintName = "ACHNBrowserUI"
35+
ReferencedContainer = "container:ACHNBrowserUI.xcodeproj">
36+
</BuildableReference>
37+
</BuildActionEntry>
38+
</BuildActionEntries>
39+
</BuildAction>
40+
<TestAction
41+
buildConfiguration = "Debug"
42+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
43+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
44+
shouldUseLaunchSchemeArgsEnv = "YES">
45+
<Testables>
46+
</Testables>
47+
</TestAction>
48+
<LaunchAction
49+
buildConfiguration = "Debug"
50+
selectedDebuggerIdentifier = ""
51+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
52+
launchStyle = "0"
53+
askForAppToLaunch = "Yes"
54+
useCustomWorkingDirectory = "NO"
55+
ignoresPersistentStateOnLaunch = "NO"
56+
debugDocumentVersioning = "YES"
57+
debugServiceExtension = "internal"
58+
allowLocationSimulation = "YES"
59+
launchAutomaticallySubstyle = "2">
60+
<RemoteRunnable
61+
runnableDebuggingMode = "2"
62+
BundleIdentifier = "com.apple.springboard">
63+
<BuildableReference
64+
BuildableIdentifier = "primary"
65+
BlueprintIdentifier = "698584DA24A1F70F002D103C"
66+
BuildableName = "WidgetsExtension.appex"
67+
BlueprintName = "WidgetsExtension"
68+
ReferencedContainer = "container:ACHNBrowserUI.xcodeproj">
69+
</BuildableReference>
70+
</RemoteRunnable>
71+
<MacroExpansion>
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "69157B762471A5A1005B9002"
75+
BuildableName = "AC Helper.app"
76+
BlueprintName = "ACHNBrowserUI"
77+
ReferencedContainer = "container:ACHNBrowserUI.xcodeproj">
78+
</BuildableReference>
79+
</MacroExpansion>
80+
<EnvironmentVariables>
81+
<EnvironmentVariable
82+
key = "_XCWidgetKind"
83+
value = "VillagerBirthday"
84+
isEnabled = "YES">
85+
</EnvironmentVariable>
86+
<EnvironmentVariable
87+
key = "_XCWidgetDefaultView"
88+
value = "timeline"
89+
isEnabled = "NO">
90+
</EnvironmentVariable>
91+
<EnvironmentVariable
92+
key = "_XCWidgetFamily"
93+
value = "small"
94+
isEnabled = "YES">
95+
</EnvironmentVariable>
96+
</EnvironmentVariables>
97+
</LaunchAction>
98+
<ProfileAction
99+
buildConfiguration = "Release"
100+
shouldUseLaunchSchemeArgsEnv = "YES"
101+
savedToolIdentifier = ""
102+
useCustomWorkingDirectory = "NO"
103+
debugDocumentVersioning = "YES"
104+
launchAutomaticallySubstyle = "2">
105+
<BuildableProductRunnable
106+
runnableDebuggingMode = "0">
107+
<BuildableReference
108+
BuildableIdentifier = "primary"
109+
BlueprintIdentifier = "69157B762471A5A1005B9002"
110+
BuildableName = "AC Helper.app"
111+
BlueprintName = "ACHNBrowserUI"
112+
ReferencedContainer = "container:ACHNBrowserUI.xcodeproj">
113+
</BuildableReference>
114+
</BuildableProductRunnable>
115+
</ProfileAction>
116+
<AnalyzeAction
117+
buildConfiguration = "Debug">
118+
</AnalyzeAction>
119+
<ArchiveAction
120+
buildConfiguration = "Release"
121+
revealArchiveInOrganizer = "YES">
122+
</ArchiveAction>
123+
</Scheme>

‎ACHNBrowserUI/ACHNBrowserUI/views/collection/CollectionListView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct CollectionListView: View {
9191
}
9292

9393
private var emptyView: some View {
94-
MessageView(collectionName: selectedTab.rawValue)
94+
MessageView(collectionName: selectedTab.rawValue).listRowBackground(Color.acBackground)
9595
}
9696

9797
private var picker: some View {

‎ACHNBrowserUI/ACHNBrowserUI/views/turnips/TurnipsView.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ struct TurnipsView: View {
4242
// MARK: - Body
4343
var body: some View {
4444
NavigationView {
45-
if UIDevice.current.userInterfaceIdiom == .pad {
46-
TurnipsFormView().environmentObject(subManager)
47-
}
4845
List {
4946
Group {
5047
if subManager.subscriptionStatus == .notSubscribed {
@@ -78,6 +75,7 @@ struct TurnipsView: View {
7875
})
7976
}
8077
.onAppear(perform: NotificationManager.shared.registerForNotifications)
78+
.navigationViewStyle(StackNavigationViewStyle())
8179
}
8280
}
8381

‎ACHNBrowserUI/Packages/Backend/Sources/Backend/Environments/UserCollection.swift‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,17 @@ public class UserCollection: ObservableObject {
103103
return inCollection
104104
}
105105

106-
public func itemsIn(category: Category) -> Int {
106+
public func itemsIn(useItems: Bool = true, category: Category) -> Int {
107107
os_signpost(.begin,
108108
log: logHandler,
109109
name: "Counting items",
110110
"Begin for category %{public}s",
111111
category.rawValue)
112112

113-
let items = Items.shared.categories[category] ?? []
113+
var items: [Item] = []
114+
if useItems {
115+
items = Items.shared.categories[category] ?? []
116+
}
114117
var caught = self.critters.count(where: { items.contains($0) || items.isEmpty && $0.appCategory == category } )
115118
caught += self.items.count(where: { (items.contains($0) || items.isEmpty && $0.appCategory == category) && !$0.name.contains("(fake)") })
116119

‎ACHNBrowserUI/Widgets/models/WidgetProvider.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct WidgetProvider: TimelineProvider {
6969
total = 43
7070
}
7171
museumProgress.append(MuseumProgress(category: category,
72-
have: collection.itemsIn(category: category),
72+
have: collection.itemsIn(useItems: false, category: category),
7373
total: total))
7474
}
7575
return museumProgress
@@ -87,6 +87,10 @@ struct WidgetProvider: TimelineProvider {
8787
WidgetModel(date: Date(),
8888
villager: nil,
8989
villagerImage: nil,
90-
museumCollection: generateMuseumProgress())
90+
museumCollection: [MuseumProgress(category: .fish, have: 0, total: 0),
91+
MuseumProgress(category: .bugs, have: 0, total: 0),
92+
MuseumProgress(category: .seaCreatures, have: 0, total: 0),
93+
MuseumProgress(category: .fossils, have: 0, total: 0),
94+
MuseumProgress(category: .art, have: 0, total: 0)])
9195
}
9296
}

0 commit comments

Comments
 (0)