Skip to content

Commit

Permalink
Merge pull request #3 from Bentheminernz/watch-update
Browse files Browse the repository at this point in the history 
Update 1.2
  • Loading branch information
@Bentheminernz
Bentheminernz authored Sep 13, 2024
2 parents 2358481 + d3a81f9 commit 4b99ec1
Show file tree
Hide file tree
Showing 42 changed files with 736 additions and 727 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
62 changes: 62 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# fastlane
#
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output
118 changes: 87 additions & 31 deletions GrizzcoHandbook.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
250515982C75D27400EC37B5 /* Guide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 250515972C75D27400EC37B5 /* Guide.swift */; };
253168BC2C6618A600B65BC6 /* WhatsNewSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 253168BB2C6618A600B65BC6 /* WhatsNewSheet.swift */; };
254A30012C62188F0053A201 /* FieldGuideSponsorTest.json in Resources */ = {isa = PBXBuildFile; fileRef = 254A2FFF2C62188F0053A201 /* FieldGuideSponsorTest.json */; };
254A30022C62188F0053A201 /* handbookSponsorTest.json in Resources */ = {isa = PBXBuildFile; fileRef = 254A30002C62188F0053A201 /* handbookSponsorTest.json */; };
25A1552F2C54BEAC0034EAC4 /* GrizzcoHandbookApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25A1552E2C54BEAC0034EAC4 /* GrizzcoHandbookApp.swift */; };
25A155312C54BEAC0034EAC4 /* Handbook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25A155302C54BEAC0034EAC4 /* Handbook.swift */; };
25A155332C54BEAD0034EAC4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 25A155322C54BEAD0034EAC4 /* Assets.xcassets */; };
Expand Down Expand Up @@ -38,6 +37,9 @@
25A1557D2C54C31F0034EAC4 /* TabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25A1557C2C54C31F0034EAC4 /* TabView.swift */; };
25A1557F2C54C3300034EAC4 /* WeaponView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25A1557E2C54C3300034EAC4 /* WeaponView.swift */; };
25A155812C54C3670034EAC4 /* StageFetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25A155802C54C3670034EAC4 /* StageFetch.swift */; };
25BABCD82C6F63460029CD31 /* SalmonRunListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BABCD72C6F63460029CD31 /* SalmonRunListView.swift */; };
25BABCDA2C6F636C0029CD31 /* SalmonRunRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BABCD92C6F636C0029CD31 /* SalmonRunRow.swift */; };
25BABCDC2C6F65FE0029CD31 /* UpcomingCountdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25BABCDB2C6F65FE0029CD31 /* UpcomingCountdown.swift */; };
25D420EB2C62FEE400B3556A /* WhatsNewKit in Frameworks */ = {isa = PBXBuildFile; productRef = 25D420EA2C62FEE400B3556A /* WhatsNewKit */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -66,9 +68,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
250515972C75D27400EC37B5 /* Guide.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Guide.swift; sourceTree = "<group>"; };
253168BB2C6618A600B65BC6 /* WhatsNewSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhatsNewSheet.swift; sourceTree = "<group>"; };
254A2FFF2C62188F0053A201 /* FieldGuideSponsorTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = FieldGuideSponsorTest.json; sourceTree = "<group>"; };
254A30002C62188F0053A201 /* handbookSponsorTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = handbookSponsorTest.json; sourceTree = "<group>"; };
25A1552B2C54BEAC0034EAC4 /* GrizzcoHandbook.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GrizzcoHandbook.app; sourceTree = BUILT_PRODUCTS_DIR; };
25A1552E2C54BEAC0034EAC4 /* GrizzcoHandbookApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrizzcoHandbookApp.swift; sourceTree = "<group>"; };
25A155302C54BEAC0034EAC4 /* Handbook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Handbook.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -98,6 +99,9 @@
25A1557C2C54C31F0034EAC4 /* TabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = "<group>"; };
25A1557E2C54C3300034EAC4 /* WeaponView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeaponView.swift; sourceTree = "<group>"; };
25A155802C54C3670034EAC4 /* StageFetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StageFetch.swift; sourceTree = "<group>"; };
25BABCD72C6F63460029CD31 /* SalmonRunListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalmonRunListView.swift; sourceTree = "<group>"; };
25BABCD92C6F636C0029CD31 /* SalmonRunRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalmonRunRow.swift; sourceTree = "<group>"; };
25BABCDB2C6F65FE0029CD31 /* UpcomingCountdown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingCountdown.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -119,6 +123,36 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
250515992C75DAA300EC37B5 /* Guides */ = {
isa = PBXGroup;
children = (
250515972C75D27400EC37B5 /* Guide.swift */,
25A1555D2C54C0110034EAC4 /* GrizzcoDetail.swift */,
25A1555F2C54C01C0034EAC4 /* GrizzcoRow.swift */,
25A155302C54BEAC0034EAC4 /* Handbook.swift */,
25A155532C54BFC90034EAC4 /* FieldGuide.swift */,
);
path = Guides;
sourceTree = "<group>";
};
2505159A2C75DABC00EC37B5 /* Upcoming */ = {
isa = PBXGroup;
children = (
25A1555B2C54C0020034EAC4 /* SalmonRunRow.swift */,
25A155552C54BFD80034EAC4 /* SalmonRunListView.swift */,
);
path = Upcoming;
sourceTree = "<group>";
};
253505922C9165C2002D8715 /* StageViews */ = {
isa = PBXGroup;
children = (
25A1554C2C54BF810034EAC4 /* StageView.swift */,
25A1554E2C54BF920034EAC4 /* EggstraWorkView.swift */,
);
path = StageViews;
sourceTree = "<group>";
};
25A155222C54BEAC0034EAC4 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -160,8 +194,7 @@
25A1553C2C54BECE0034EAC4 /* Helpers */ = {
isa = PBXGroup;
children = (
254A2FFF2C62188F0053A201 /* FieldGuideSponsorTest.json */,
254A30002C62188F0053A201 /* handbookSponsorTest.json */,
253168BB2C6618A600B65BC6 /* WhatsNewSheet.swift */,
25A1553D2C54BEE40034EAC4 /* FieldGuide.json */,
25A1553F2C54BEFF0034EAC4 /* handbook.json */,
25A155412C54BF150034EAC4 /* StageFetch.swift */,
Expand All @@ -175,15 +208,9 @@
25A1554B2C54BF780034EAC4 /* Views */ = {
isa = PBXGroup;
children = (
25A1555B2C54C0020034EAC4 /* SalmonRunRow.swift */,
25A1555D2C54C0110034EAC4 /* GrizzcoDetail.swift */,
25A1555F2C54C01C0034EAC4 /* GrizzcoRow.swift */,
25A155302C54BEAC0034EAC4 /* Handbook.swift */,
253168BB2C6618A600B65BC6 /* WhatsNewSheet.swift */,
25A1554C2C54BF810034EAC4 /* StageView.swift */,
25A1554E2C54BF920034EAC4 /* EggstraWorkView.swift */,
25A155532C54BFC90034EAC4 /* FieldGuide.swift */,
25A155552C54BFD80034EAC4 /* SalmonRunListView.swift */,
253505922C9165C2002D8715 /* StageViews */,
250515992C75DAA300EC37B5 /* Guides */,
2505159A2C75DABC00EC37B5 /* Upcoming */,
25A155572C54BFE80034EAC4 /* tabView.swift */,
);
path = Views;
Expand All @@ -193,14 +220,10 @@
isa = PBXGroup;
children = (
25A155672C54C27D0034EAC4 /* GrizzcoHandbookWatchApp.swift */,
25A155692C54C27D0034EAC4 /* ContentView.swift */,
25BABCD62C6F630F0029CD31 /* Views */,
25A1556B2C54C27F0034EAC4 /* Assets.xcassets */,
25A1556D2C54C27F0034EAC4 /* Preview Content */,
25A155772C54C2E50034EAC4 /* CountdownView.swift */,
25A155792C54C2F10034EAC4 /* BossView.swift */,
25A1557C2C54C31F0034EAC4 /* TabView.swift */,
25A1557E2C54C3300034EAC4 /* WeaponView.swift */,
25A155802C54C3670034EAC4 /* StageFetch.swift */,
25BABCD52C6F62FB0029CD31 /* Helpers */,
);
path = "GrizzcoHandbookWatch Watch App";
sourceTree = "<group>";
Expand All @@ -213,6 +236,29 @@
path = "Preview Content";
sourceTree = "<group>";
};
25BABCD52C6F62FB0029CD31 /* Helpers */ = {
isa = PBXGroup;
children = (
25A155772C54C2E50034EAC4 /* CountdownView.swift */,
25A155802C54C3670034EAC4 /* StageFetch.swift */,
25BABCDB2C6F65FE0029CD31 /* UpcomingCountdown.swift */,
);
path = Helpers;
sourceTree = "<group>";
};
25BABCD62C6F630F0029CD31 /* Views */ = {
isa = PBXGroup;
children = (
25A155692C54C27D0034EAC4 /* ContentView.swift */,
25A155792C54C2F10034EAC4 /* BossView.swift */,
25A1557C2C54C31F0034EAC4 /* TabView.swift */,
25A1557E2C54C3300034EAC4 /* WeaponView.swift */,
25BABCD72C6F63460029CD31 /* SalmonRunListView.swift */,
25BABCD92C6F636C0029CD31 /* SalmonRunRow.swift */,
);
path = Views;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -304,9 +350,7 @@
files = (
25A1553E2C54BEE40034EAC4 /* FieldGuide.json in Resources */,
25A155362C54BEAD0034EAC4 /* Preview Assets.xcassets in Resources */,
254A30012C62188F0053A201 /* FieldGuideSponsorTest.json in Resources */,
25A155332C54BEAD0034EAC4 /* Assets.xcassets in Resources */,
254A30022C62188F0053A201 /* handbookSponsorTest.json in Resources */,
25A155402C54BEFF0034EAC4 /* handbook.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -331,6 +375,7 @@
25A1554A2C54BF5C0034EAC4 /* Data.swift in Sources */,
25A155542C54BFC90034EAC4 /* FieldGuide.swift in Sources */,
25A1555E2C54C0110034EAC4 /* GrizzcoDetail.swift in Sources */,
250515982C75D27400EC37B5 /* Guide.swift in Sources */,
25A1554D2C54BF810034EAC4 /* StageView.swift in Sources */,
25A155482C54BF4D0034EAC4 /* CountdownView.swift in Sources */,
25A1555C2C54C0020034EAC4 /* SalmonRunRow.swift in Sources */,
Expand All @@ -350,8 +395,11 @@
buildActionMask = 2147483647;
files = (
25A1557D2C54C31F0034EAC4 /* TabView.swift in Sources */,
25BABCDA2C6F636C0029CD31 /* SalmonRunRow.swift in Sources */,
25A155782C54C2E50034EAC4 /* CountdownView.swift in Sources */,
25A1556A2C54C27D0034EAC4 /* ContentView.swift in Sources */,
25BABCD82C6F63460029CD31 /* SalmonRunListView.swift in Sources */,
25BABCDC2C6F65FE0029CD31 /* UpcomingCountdown.swift in Sources */,
25A155682C54C27D0034EAC4 /* GrizzcoHandbookWatchApp.swift in Sources */,
25A1557F2C54C3300034EAC4 /* WeaponView.swift in Sources */,
25A155812C54C3670034EAC4 /* StageFetch.swift in Sources */,
Expand Down Expand Up @@ -496,7 +544,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"GrizzcoHandbook/Preview Content\"";
DEVELOPMENT_TEAM = 4TD3JXVDW7;
ENABLE_PREVIEWS = YES;
Expand All @@ -507,14 +555,18 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.GrizzcoHandbook;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -528,7 +580,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"GrizzcoHandbook/Preview Content\"";
DEVELOPMENT_TEAM = 4TD3JXVDW7;
ENABLE_PREVIEWS = YES;
Expand All @@ -539,14 +591,18 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.GrizzcoHandbook;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -570,7 +626,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.GrizzcoHandbook.watchkitapp;
PRODUCT_NAME = "Grizzco Handbook";
SDKROOT = watchos;
Expand Down Expand Up @@ -599,7 +655,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.GrizzcoHandbook.watchkitapp;
PRODUCT_NAME = "Grizzco Handbook";
SDKROOT = watchos;
Expand Down
Binary file removed ...roj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
Empty file modified GrizzcoHandbook.xcodeproj/xcshareddata/xcschemes/GrizzcoHandbookWatch Watch App.xcscheme
100755 → 100644
View file
Empty file.
Loading

0 comments on commit 4b99ec1

Please sign in to comment.