diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index d739a4af..2a0d2109 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -71,8 +71,6 @@ B54E1D7D29CCE183006DBD8B /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = B54E1D8029CCE183006DBD8B /* Intents.intentdefinition */; }; B54E1D7E29CCE183006DBD8B /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = B54E1D8029CCE183006DBD8B /* Intents.intentdefinition */; }; B553BF91285F3FA10089DB8B /* AccessoryRectangularView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B553BF90285F3FA10089DB8B /* AccessoryRectangularView.swift */; }; - B567D9C928B4639A000DA25D /* PenguinLive.swift in Sources */ = {isa = PBXBuildFile; fileRef = B567D9C828B4639A000DA25D /* PenguinLive.swift */; }; - B567D9CA28B46993000DA25D /* PenguinLive.swift in Sources */ = {isa = PBXBuildFile; fileRef = B567D9C828B4639A000DA25D /* PenguinLive.swift */; }; B575978929D3DBA300B83885 /* Seaborn0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B575978329D3DBA300B83885 /* Seaborn0@2x.png */; }; B575978A29D3DBA300B83885 /* Seaborn1.png in Resources */ = {isa = PBXBuildFile; fileRef = B575978429D3DBA300B83885 /* Seaborn1.png */; }; B575978B29D3DBA300B83885 /* Seaborn0@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B575978529D3DBA300B83885 /* Seaborn0@3x.png */; }; @@ -197,7 +195,6 @@ B54E1D8529CCE1B4006DBD8B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Intents.strings"; sourceTree = ""; }; B54E1D8729CCE1B6006DBD8B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Intents.strings; sourceTree = ""; }; B553BF90285F3FA10089DB8B /* AccessoryRectangularView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryRectangularView.swift; sourceTree = ""; }; - B567D9C828B4639A000DA25D /* PenguinLive.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenguinLive.swift; sourceTree = ""; }; B575978329D3DBA300B83885 /* Seaborn0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Seaborn0@2x.png"; sourceTree = ""; }; B575978429D3DBA300B83885 /* Seaborn1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Seaborn1.png; sourceTree = ""; }; B575978529D3DBA300B83885 /* Seaborn0@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Seaborn0@3x.png"; sourceTree = ""; }; @@ -378,7 +375,6 @@ 504EC2FB1FED79650016851F = { isa = PBXGroup; children = ( - B567D9C828B4639A000DA25D /* PenguinLive.swift */, B5E9EF4628219840009F0F68 /* PenguinViewController.swift */, 3AF2C843259F544900761B04 /* SoundFX */, 3A001AC52599230E0078A265 /* Settings.bundle */, @@ -719,7 +715,6 @@ 3A1157B1258F2B5C00F4C6FD /* SmallWidgetView.swift in Sources */, B50305AC29CC1864000FDC32 /* IntentHandler.swift in Sources */, 3A06C12D2597454600B81F31 /* WidgetFooter.swift in Sources */, - B567D9CA28B46993000DA25D /* PenguinLive.swift in Sources */, 3A06C1252597447200B81F31 /* StageView.swift in Sources */, B54E1D7D29CCE183006DBD8B /* Intents.intentdefinition in Sources */, B553BF91285F3FA10089DB8B /* AccessoryRectangularView.swift in Sources */, @@ -749,7 +744,6 @@ 3A001AD32599A4A60078A265 /* ConsentView.swift in Sources */, 3A001AC225991E2C0078A265 /* WhatsNew.swift in Sources */, 3A679B012599166C00A685E9 /* WelcomeView.swift in Sources */, - B567D9C928B4639A000DA25D /* PenguinLive.swift in Sources */, 3A61615A259B0ED200FA06A2 /* ToggleNotificationPreference.swift in Sources */, 3A61616C259C7B8D00FA06A2 /* HapticButton.swift in Sources */, 3A001AD72599A68A0078A265 /* Helpers.swift in Sources */, @@ -859,7 +853,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 3.13.7; + MARKETING_VERSION = 3.13.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app.PenguinWidget; @@ -891,7 +885,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 3.13.7; + MARKETING_VERSION = 3.13.10; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app.PenguinWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1089,7 +1083,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.13.7; + MARKETING_VERSION = 3.13.10; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1121,7 +1115,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.13.7; + MARKETING_VERSION = 3.13.10; PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = NO; diff --git a/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index daa1f171..6cc321d6 100644 --- a/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,34 +1,32 @@ { - "object": { - "pins": [ - { - "package": "Alamofire", - "repositoryURL": "https://github.com/Alamofire/Alamofire", - "state": { - "branch": null, - "revision": "eaf6e622dd41b07b251d8f01752eab31bc811493", - "version": "5.4.1" - } - }, - { - "package": "RxBus", - "repositoryURL": "https://github.com/ridi/RxBus-Swift", - "state": { - "branch": null, - "revision": "542c47d46682a64867315867f45403a616ca40b0", - "version": "1.3.1" - } - }, - { - "package": "RxSwift", - "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", - "state": { - "branch": null, - "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa", - "version": "5.1.1" - } + "pins" : [ + { + "identity" : "alamofire", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Alamofire/Alamofire", + "state" : { + "revision" : "eaf6e622dd41b07b251d8f01752eab31bc811493", + "version" : "5.4.1" } - ] - }, - "version": 1 + }, + { + "identity" : "rxbus-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ridi/RxBus-Swift", + "state" : { + "revision" : "542c47d46682a64867315867f45403a616ca40b0", + "version" : "1.3.1" + } + }, + { + "identity" : "rxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveX/RxSwift.git", + "state" : { + "revision" : "002d325b0bdee94e7882e1114af5ff4fe1e96afa", + "version" : "5.1.1" + } + } + ], + "version" : 2 } diff --git a/ios/App/PenguinLive.swift b/ios/App/PenguinLive.swift deleted file mode 100644 index e18c4990..00000000 --- a/ios/App/PenguinLive.swift +++ /dev/null @@ -1,10 +0,0 @@ -// -// PenguinLive.swift -// App -// -// Created by Galvin Gao on 2022/8/22. -// - -import Foundation -import SwiftUI -import WidgetKit diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/31073.png b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/31073.png new file mode 100755 index 00000000..353fba5b Binary files /dev/null and b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/31073.png differ diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/Contents.json b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/Contents.json new file mode 100755 index 00000000..59ca740c --- /dev/null +++ b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31073.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images": [ + { + "filename": "31073.png", + "idiom": "universal" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/31074.png b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/31074.png new file mode 100755 index 00000000..73ed59b4 Binary files /dev/null and b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/31074.png differ diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/Contents.json b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/Contents.json new file mode 100755 index 00000000..0ab748ad --- /dev/null +++ b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31074.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images": [ + { + "filename": "31074.png", + "idiom": "universal" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/31083.png b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/31083.png new file mode 100755 index 00000000..f4d116e2 Binary files /dev/null and b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/31083.png differ diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/Contents.json b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/Contents.json new file mode 100755 index 00000000..1d1cd4e8 --- /dev/null +++ b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31083.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images": [ + { + "filename": "31083.png", + "idiom": "universal" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/31084.png b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/31084.png new file mode 100755 index 00000000..74657542 Binary files /dev/null and b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/31084.png differ diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/Contents.json b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/Contents.json new file mode 100755 index 00000000..5caa0cb3 --- /dev/null +++ b/ios/App/PenguinWidget/ItemIcons.xcassets/item_31084.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images": [ + { + "filename": "31084.png", + "idiom": "universal" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/Contents.json b/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/Contents.json new file mode 100755 index 00000000..94efe5c0 --- /dev/null +++ b/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images": [ + { + "filename": "randomMaterial_8.png", + "idiom": "universal" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/randomMaterial_8.png b/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/randomMaterial_8.png new file mode 100755 index 00000000..57dc06b6 Binary files /dev/null and b/ios/App/PenguinWidget/ItemIcons.xcassets/item_randomMaterial_8.imageset/randomMaterial_8.png differ diff --git a/ios/App/Settings.bundle/Root.plist b/ios/App/Settings.bundle/Root.plist index d0716f68..ed1ae6d1 100644 --- a/ios/App/Settings.bundle/Root.plist +++ b/ios/App/Settings.bundle/Root.plist @@ -6,7 +6,7 @@ DefaultValue - 3.13.6 (6) + 3.13.7 (0) Key version Title diff --git a/package.json b/package.json index e56bec85..575ae01e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "penguin-stats-frontend", - "version": "3.13.7", + "version": "3.13.10", "private": true, "author": "Penguin Statistics Contributors (https://github.com/orgs/penguin-statistics/people)", "scripts": {