diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index ff94c02a..66d2ea1f 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -1 +1 @@ -Hey y'all - this update fixes a crash in the Team@Event view, fixes crashes when opening links from Handoff, and attempts to fix the nasty periodic random crashes y'all have been reporting! The Blue Alliance is built and maintained by volunteers - help us build The Blue Alliance for iOS at https://github.com/the-blue-alliance +Hey y'all - this update adds support for the 2024 match breakdown and adds a 2024 CRESCENDO app icon! The Blue Alliance is built and maintained by volunteers - help us build The Blue Alliance for iOS at https://github.com/the-blue-alliance diff --git a/spotlight-index/Info.plist b/spotlight-index/Info.plist index f7be56b6..c91894c3 100644 --- a/spotlight-index/Info.plist +++ b/spotlight-index/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.1.1 + 3.2.0 CFBundleVersion 1 NSExtension diff --git a/tba-unit-tests/Info.plist b/tba-unit-tests/Info.plist index 735d79fb..d9fff867 100644 --- a/tba-unit-tests/Info.plist +++ b/tba-unit-tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.1.1 + 3.2.0 CFBundleVersion 1 diff --git a/the-blue-alliance-ios.xcodeproj/project.pbxproj b/the-blue-alliance-ios.xcodeproj/project.pbxproj index b169d9da..9cbd9fe0 100644 --- a/the-blue-alliance-ios.xcodeproj/project.pbxproj +++ b/the-blue-alliance-ios.xcodeproj/project.pbxproj @@ -40,6 +40,8 @@ 9223AC831EE7003C00F54F93 /* CollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9223AC821EE7003C00F54F93 /* CollectionViewDataSource.swift */; }; 9223AC851EE7214A00F54F93 /* MediaCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9223AC841EE7214A00F54F93 /* MediaCollectionViewCell.swift */; }; 92269EE1219B9CF300FAA610 /* DistrictViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92269EE0219B9CF300FAA610 /* DistrictViewControllerTests.swift */; }; + 922FF7492BAA1E5E0075AD53 /* 2024Crescendo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 922FF7472BAA1E5E0075AD53 /* 2024Crescendo@2x.png */; }; + 922FF74A2BAA1E5E0075AD53 /* 2024Crescendo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 922FF7482BAA1E5E0075AD53 /* 2024Crescendo@3x.png */; }; 923AEE8C21658C5800EF50C8 /* Bundle+Version_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 923AEE8B21658C5800EF50C8 /* Bundle+Version_Tests.swift */; }; 92435E2E23CBC2ED00CDD2D4 /* EventInsightsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92435E2D23CBC2ED00CDD2D4 /* EventInsightsView.swift */; }; 924459C420CB796B0007570D /* Int16+Suffix_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924459BE20CB796A0007570D /* Int16+Suffix_Tests.swift */; }; @@ -298,6 +300,8 @@ 9223AC821EE7003C00F54F93 /* CollectionViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewDataSource.swift; sourceTree = ""; }; 9223AC841EE7214A00F54F93 /* MediaCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaCollectionViewCell.swift; sourceTree = ""; }; 92269EE0219B9CF300FAA610 /* DistrictViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DistrictViewControllerTests.swift; sourceTree = ""; }; + 922FF7472BAA1E5E0075AD53 /* 2024Crescendo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "2024Crescendo@2x.png"; sourceTree = ""; }; + 922FF7482BAA1E5E0075AD53 /* 2024Crescendo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "2024Crescendo@3x.png"; sourceTree = ""; }; 923AEE8B21658C5800EF50C8 /* Bundle+Version_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Version_Tests.swift"; sourceTree = ""; }; 92435E2D23CBC2ED00CDD2D4 /* EventInsightsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventInsightsView.swift; sourceTree = ""; }; 924459BE20CB796A0007570D /* Int16+Suffix_Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Int16+Suffix_Tests.swift"; sourceTree = ""; }; @@ -580,6 +584,7 @@ 92004C6221C21BC600A858C8 /* AppIcons */ = { isa = PBXGroup; children = ( + 922FF7462BAA1E5E0075AD53 /* 2024Crescendo */, 9244ABB02B00398B007BA24C /* 2019DeepSpace */, 9244ABAA2B00398B007BA24C /* 2020InfiniteRecharge */, 9244ABAD2B00398B007BA24C /* 2022RapidReact */, @@ -604,6 +609,15 @@ path = Breakdown; sourceTree = ""; }; + 922FF7462BAA1E5E0075AD53 /* 2024Crescendo */ = { + isa = PBXGroup; + children = ( + 922FF7472BAA1E5E0075AD53 /* 2024Crescendo@2x.png */, + 922FF7482BAA1E5E0075AD53 /* 2024Crescendo@3x.png */, + ); + path = 2024Crescendo; + sourceTree = ""; + }; 923A0D7620D21D3800BF5E31 /* LaunchViews */ = { isa = PBXGroup; children = ( @@ -1555,7 +1569,9 @@ 304ED0411EF1D2D300E31791 /* RankingTableViewCell.xib in Resources */, 92942DA21E2154DA008E79CA /* LaunchScreen.storyboard in Resources */, 929BBB081EC55A22006D3854 /* InfoTableViewCell.xib in Resources */, + 922FF74A2BAA1E5E0075AD53 /* 2024Crescendo@3x.png in Resources */, 924AFD792171AB1A00D7BE7E /* NoDataView.xib in Resources */, + 922FF7492BAA1E5E0075AD53 /* 2024Crescendo@2x.png in Resources */, 92942D9F1E2154DA008E79CA /* Assets.xcassets in Resources */, 92B5566021601D9B00C1D9A3 /* MatchSummaryView.xib in Resources */, 9244ABB52B00398B007BA24C /* 2022RapidReact@3x.png in Resources */, diff --git a/the-blue-alliance-ios/App Icons/2024Crescendo/2024Crescendo@2x.png b/the-blue-alliance-ios/AppIcons/2024Crescendo/2024Crescendo@2x.png similarity index 100% rename from the-blue-alliance-ios/App Icons/2024Crescendo/2024Crescendo@2x.png rename to the-blue-alliance-ios/AppIcons/2024Crescendo/2024Crescendo@2x.png diff --git a/the-blue-alliance-ios/App Icons/2024Crescendo/2024Crescendo@3x.png b/the-blue-alliance-ios/AppIcons/2024Crescendo/2024Crescendo@3x.png similarity index 100% rename from the-blue-alliance-ios/App Icons/2024Crescendo/2024Crescendo@3x.png rename to the-blue-alliance-ios/AppIcons/2024Crescendo/2024Crescendo@3x.png diff --git a/the-blue-alliance-ios/Info.plist b/the-blue-alliance-ios/Info.plist index 3c61b968..24446270 100755 --- a/the-blue-alliance-ios/Info.plist +++ b/the-blue-alliance-ios/Info.plist @@ -12,11 +12,11 @@ CFBundleAlternateIcons - RAPID REACT + CRESCENDO CFBundleIconFiles - 2022RapidReact + 2024Crescendo UIPrerenderedIcon @@ -34,11 +34,11 @@ CFBundleAlternateIcons - RAPID REACT + CRESCENDO CFBundleIconFiles - 2022RapidReact + 2024Crescendo UIPrerenderedIcon @@ -46,11 +46,11 @@ CFBundleIcons~ipad - RAPID REACT + CRESCENDO CFBundleIconFiles - 2022RapidReact + 2024Crescendo UIPrerenderedIcon @@ -73,7 +73,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.1.1 + 3.2.0 CFBundleURLTypes diff --git a/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamMediaCollectionViewController.swift b/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamMediaCollectionViewController.swift index 85164cb3..0ee5bdad 100755 --- a/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamMediaCollectionViewController.swift +++ b/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamMediaCollectionViewController.swift @@ -303,9 +303,9 @@ extension TeamMediaCollectionViewController: Refreshable { guard let self = self else { return } // Reload our cell, so we can get rid of our loading state // TODO: Fix this so we're only reloading the cells we need - var snapshot = dataSource.snapshot() + var snapshot = self.dataSource.snapshot() snapshot.reloadSections(snapshot.sectionIdentifiers) - dataSource.applySnapshotUsingReloadData(snapshot) + self.dataSource.applySnapshotUsingReloadData(snapshot) } let fetchMediaOperation = FetchMediaOperation(errorRecorder: errorRecorder, media: media, persistentContainer: persistentContainer)