Skip to content

Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.

Swift

Adapted for iOS 26 Liquid Glass; added Light Mode appearance; adjusted the visual look of the UI

Aoshuang Leeb4f337343c1b
diff --git a/ManicEmu/Libretro/LibretroConfig.xcconfig b/ManicEmu/Libretro/LibretroConfig.xcconfig
index c443c668..a8959cff 100644
--- a/ManicEmu/Libretro/LibretroConfig.xcconfig
+++ b/ManicEmu/Libretro/LibretroConfig.xcconfig
@@ -118,7 +118,7 @@ OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_ONLINE_UPDATER
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_OPENGLES
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_OPENGLES3
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DIOS
-OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DPACKAGE_VERSION=\"1.7.1\"
+OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DPACKAGE_VERSION=\"1.7.2\"
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DRARCH_MOBILE
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) $(OTHER_CFLAGS_IOS_TVOS_SHARE)
diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
index 118a61c7..de99e5b8 100644
--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
@@ -568,7 +568,7 @@
577005D42D3F2F8E00762E8F /* WebServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577005D32D3F2F8200762E8F /* WebServer.swift */; };
577005D62D3F398100762E8F /* PasteImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577005D52D3F396C00762E8F /* PasteImporter.swift */; };
577005DA2D3F404F00762E8F /* ImportError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577005D92D3F404D00762E8F /* ImportError.swift */; };
- 577006092D3F980400762E8F /* BlackHaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577006082D3F980400762E8F /* BlackHaderReusableView.swift */; };
+ 577006092D3F980400762E8F /* LowestHaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577006082D3F980400762E8F /* LowestHaderReusableView.swift */; };
5770061B2D4089ED00762E8F /* CloudDriveConnetor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5770061A2D4089DD00762E8F /* CloudDriveConnetor.swift */; };
5770064F2D40E45F00762E8F /* CloudDriveBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5770064E2D40E45F00762E8F /* CloudDriveBrowserViewController.swift */; };
577006572D410D7F00762E8F /* BrowserItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577006562D410D7F00762E8F /* BrowserItemCollectionViewCell.swift */; };
@@ -680,7 +680,6 @@
57D029192E6C9C5200BF1F9D /* CheevosProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D029182E6C9C4000BF1F9D /* CheevosProgressView.swift */; };
57D0BC0A2E1AD2BE008C3049 /* N64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D0BC092E1AD2BB008C3049 /* N64.swift */; };
57D0BC0F2E1AD35D008C3049 /* mupen64plus.next.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57D0BC0D2E1AD31A008C3049 /* mupen64plus.next.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 57DA89002D828C6A0074052A /* TKSwitchExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DA88FF2D828C620074052A /* TKSwitchExtensions.swift */; };
57DA89132D82B0C20074052A /* SmartCodable in Frameworks */ = {isa = PBXBuildFile; productRef = 57DA89122D82B0C20074052A /* SmartCodable */; };
57DA89322D8328510074052A /* CKAccountStatusExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DA89312D8328420074052A /* CKAccountStatusExtensions.swift */; };
57DCE7A12E0C434C0079E3AA /* mednafen.saturn.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -765,6 +764,9 @@
57FC198D2DF04E160076D93C /* right_eye_disabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC198C2DF04E160076D93C /* right_eye_disabler.cpp */; };
57FC19982DF051180076D93C /* hack_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC19962DF051180076D93C /* hack_manager.cpp */; };
57FC19992DF051180076D93C /* hack_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FC19952DF051180076D93C /* hack_list.cpp */; };
+ A392D5652E96682C00F920E7 /* DisabledTapSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = A392D5632E96682600F920E7 /* DisabledTapSwitch.swift */; };
+ A392D5B32E9796B900F920E7 /* ServiceIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A392D5B22E9796B800F920E7 /* ServiceIconView.swift */; };
+ A3A043802E9BF57A006442C2 /* UIScrollViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A0437F2E9BF57A006442C2 /* UIScrollViewExtensions.swift */; };
A519A38A256FCA50008AD6CE /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A519A389256FCA50008AD6CE /* StringExtensions.swift */; };
A52C1D86257F91550029B15B /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A52C1D85257F91550029B15B /* BaseViewController.swift */; };
A52C1D89257F96C90029B15B /* UIViewControllerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A52C1D88257F96C90029B15B /* UIViewControllerExtensions.swift */; };
@@ -1522,7 +1524,7 @@
577005D32D3F2F8200762E8F /* WebServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServer.swift; sourceTree = "<group>"; };
577005D52D3F396C00762E8F /* PasteImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteImporter.swift; sourceTree = "<group>"; };
577005D92D3F404D00762E8F /* ImportError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportError.swift; sourceTree = "<group>"; };
- 577006082D3F980400762E8F /* BlackHaderReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlackHaderReusableView.swift; sourceTree = "<group>"; };
+ 577006082D3F980400762E8F /* LowestHaderReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LowestHaderReusableView.swift; sourceTree = "<group>"; };
5770061A2D4089DD00762E8F /* CloudDriveConnetor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudDriveConnetor.swift; sourceTree = "<group>"; };
5770064E2D40E45F00762E8F /* CloudDriveBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudDriveBrowserViewController.swift; sourceTree = "<group>"; };
577006562D410D7F00762E8F /* BrowserItemCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserItemCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -1700,7 +1702,6 @@
57D029182E6C9C4000BF1F9D /* CheevosProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheevosProgressView.swift; sourceTree = "<group>"; };
57D0BC092E1AD2BB008C3049 /* N64.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = N64.swift; sourceTree = "<group>"; };
57D0BC0D2E1AD31A008C3049 /* mupen64plus.next.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mupen64plus.next.libretro.framework; path = ../Cores/mupen64plus.next.libretro.framework; sourceTree = SOURCE_ROOT; };
- 57DA88FF2D828C620074052A /* TKSwitchExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKSwitchExtensions.swift; sourceTree = "<group>"; };
57DA89312D8328420074052A /* CKAccountStatusExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CKAccountStatusExtensions.swift; sourceTree = "<group>"; };
57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mednafen.saturn.libretro.framework; path = ../Cores/mednafen.saturn.libretro.framework; sourceTree = SOURCE_ROOT; };
57DCE7D62E0D2EEB0079E3AA /* ThreeDSAdvancedSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeDSAdvancedSettingViewController.swift; sourceTree = "<group>"; };
@@ -1782,6 +1783,9 @@
5D42AD15F67D97D2A7EF83B9 /* Pods-ManicEmu.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManicEmu.release.xcconfig"; path = "Target Support Files/Pods-ManicEmu/Pods-ManicEmu.release.xcconfig"; sourceTree = "<group>"; };
7436F3E00AF2863DB4D7DBA6 /* Pods-ManicEmu.debugsimulator.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManicEmu.debugsimulator.xcconfig"; path = "Target Support Files/Pods-ManicEmu/Pods-ManicEmu.debugsimulator.xcconfig"; sourceTree = "<group>"; };
8716E0FB35012D3F5C750B94 /* Pods-ManicEmu.devrelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManicEmu.devrelease.xcconfig"; path = "Target Support Files/Pods-ManicEmu/Pods-ManicEmu.devrelease.xcconfig"; sourceTree = "<group>"; };
+ A392D5632E96682600F920E7 /* DisabledTapSwitch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisabledTapSwitch.swift; sourceTree = "<group>"; };
+ A392D5B22E9796B800F920E7 /* ServiceIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceIconView.swift; sourceTree = "<group>"; };
+ A3A0437F2E9BF57A006442C2 /* UIScrollViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIScrollViewExtensions.swift; sourceTree = "<group>"; };
A519A389256FCA50008AD6CE /* StringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = "<group>"; };
A52C1D85257F91550029B15B /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
A52C1D88257F96C90029B15B /* UIViewControllerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewControllerExtensions.swift; sourceTree = "<group>"; };
@@ -4060,6 +4064,8 @@
A561F94D257DCB5200E800A8 /* Views */ = {
isa = PBXGroup;
children = (
+ A392D5B22E9796B800F920E7 /* ServiceIconView.swift */,
+ A392D5632E96682600F920E7 /* DisabledTapSwitch.swift */,
57399B182E42EDE800AB73DD /* DeadZoneControl.swift */,
5744C6FE2E368BA50088081A /* NoControllCollectionView.swift */,
57DCE82E2E0E9ACB0079E3AA /* LimitedTextInputView.swift */,
@@ -4078,7 +4084,7 @@
5760601B2D2393EB00A98B0C /* SymbolView.swift */,
57DE10462D606C4700CDD82A /* SymbolButton.swift */,
57CCB3FE2D69B3FE0036476B /* ContextMenuButton.swift */,
- 577006082D3F980400762E8F /* BlackHaderReusableView.swift */,
+ 577006082D3F980400762E8F /* LowestHaderReusableView.swift */,
57DF840B2D61B3D500AA0AAB /* BlankSlateCollectionView.swift */,
57B6ECEB2D79E19B002E619C /* BlankSlateTableView.swift */,
57DE104D2D6088BE00CDD82A /* BlankPlaceholderView.swift */,
@@ -4250,6 +4256,7 @@
A5DE1F73256BDE140099425B /* Extensions */ = {
isa = PBXGroup;
children = (
+ A3A0437F2E9BF57A006442C2 /* UIScrollViewExtensions.swift */,
5720E7C92E5446F700EC0DA5 /* ArrayExtensions.swift */,
57BA59B42E3F13C900110849 /* LibretroCoreExtensions.swift */,
575A39CF2DCD2B3500B28FC2 /* UIImageViewExtensions.swift */,
@@ -4260,7 +4267,6 @@
57E0CC8E2D8F0E170027FB8C /* EntryExtensions.swift */,
576F0DCB2D86D7B200D2A1BA /* ProductExtensions.swift */,
57DA89312D8328420074052A /* CKAccountStatusExtensions.swift */,
- 57DA88FF2D828C620074052A /* TKSwitchExtensions.swift */,
57AD35EB2D7DEF2E0092FD03 /* SheerExtensions.swift */,
57F1A9242D7D36CD00D0CC93 /* GameViewExtensions.swift */,
5706236B2D7BDFDC004F09E7 /* CIFilterExtensions.swift */,
@@ -5042,7 +5048,6 @@
57F0D7F22DE1634E00760F57 /* LibretroPreViewFilter.swift in Sources */,
A58C3F4F248E44AF0099E068 /* UIDeviceExtensions.swift in Sources */,
5720E7E72E5461CA00EC0DA5 /* RetroAchievementsProfileCell.swift in Sources */,
- 57DA89002D828C6A0074052A /* TKSwitchExtensions.swift in Sources */,
5720CACC2DB555990090C0F6 /* ThreeDSKeyboardView.swift in Sources */,
57047A162D8571D600C62FF6 /* PriceItemCollectionCell.swift in Sources */,
57A4816A2E7F05D2001D4598 /* NDS.swift in Sources */,
@@ -5068,6 +5073,7 @@
B2C97B4E2A09F3B900053A4C /* UIColorExtensions.swift in Sources */,
57B6ECF52D79F1EA002E619C /* SkinSettingsView.swift in Sources */,
575A39D42DCD9C7100B28FC2 /* GameCoverSearchView.swift in Sources */,
+ A3A043802E9BF57A006442C2 /* UIScrollViewExtensions.swift in Sources */,
5770061B2D4089ED00762E8F /* CloudDriveConnetor.swift in Sources */,
57AD35EC2D7DEF360092FD03 /* SheerExtensions.swift in Sources */,
57B6EBDB2D758819002E619C /* GameSaveMatchGameView.swift in Sources */,
@@ -5194,7 +5200,7 @@
570622E62D7B334E004F09E7 /* FilterSelectionView.swift in Sources */,
576F0E072D8806B500D2A1BA /* GameSavePurchaseGuideReusableView.swift in Sources */,
B2C97B502A09F3DE00053A4C /* UIimageExtensions.swift in Sources */,
- 577006092D3F980400762E8F /* BlackHaderReusableView.swift in Sources */,
+ 577006092D3F980400762E8F /* LowestHaderReusableView.swift in Sources */,
570F592E2DC885EF007BFD92 /* ThemeViewController.swift in Sources */,
57DA89322D8328510074052A /* CKAccountStatusExtensions.swift in Sources */,
5720E7652E540F7200EC0DA5 /* RetroAchievementsLoginView.swift in Sources */,
@@ -5215,6 +5221,7 @@
A5C889642574D82E00149D82 /* DispatchQueueExtensions.swift in Sources */,
5708351C2D3216980079D410 /* Log.swift in Sources */,
57047A142D856DBD00C62FF6 /* PriceView.swift in Sources */,
+ A392D5B32E9796B900F920E7 /* ServiceIconView.swift in Sources */,
5706AFCF2DF7FC730066122E /* SettingDescriptionCollectionViewCell.swift in Sources */,
575FF91D2D350F210043B2F3 /* PlayViewController.swift in Sources */,
5706B0452DFBF7DF0066122E /* MCD.swift in Sources */,
@@ -5229,6 +5236,7 @@
57CC33BE2DBCDF3400DF7418 /* CGRectExtensions.swift in Sources */,
57399B192E42EDEA00AB73DD /* DeadZoneControl.swift in Sources */,
57913AFB2D5D8FCF004D51AA /* ControllersCollectionViewCell.swift in Sources */,
+ A392D5652E96682C00F920E7 /* DisabledTapSwitch.swift in Sources */,
57F632852D6EB485007270E8 /* UIScreenExtensions.swift in Sources */,
57B6ECC92D797CA3002E619C /* AddCheatCodeTitleCell.swift in Sources */,
5706B0402DFBEC300066122E /* MS.swift in Sources */,
@@ -5424,7 +5432,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -5444,7 +5452,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -5489,7 +5497,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -5509,7 +5517,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -5658,7 +5666,6 @@
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit/SwipeCellKit.modulemap\"",
- "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection/TKSwitcherCollection.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Tiercel/Tiercel.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView/VisualEffectView.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap\"",
@@ -5743,7 +5750,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -5796,7 +5802,7 @@
"-weak_framework",
"\"UIKit\"",
);
- OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
+ OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";
@@ -5851,7 +5857,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -5871,7 +5877,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -6015,7 +6021,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -6122,7 +6127,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -6142,7 +6147,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -6554,7 +6559,6 @@
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit/SwipeCellKit.modulemap\"",
- "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection/TKSwitcherCollection.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Tiercel/Tiercel.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView/VisualEffectView.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap\"",
@@ -6643,7 +6647,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -6749,7 +6752,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -6810,7 +6812,7 @@
"-weak_framework",
"\"UIKit\"",
);
- OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
+ OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";
@@ -6867,7 +6869,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -6887,7 +6889,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -7038,7 +7040,6 @@
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit/SwipeCellKit.modulemap\"",
- "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection/TKSwitcherCollection.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Tiercel/Tiercel.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView/VisualEffectView.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap\"",
@@ -7127,7 +7128,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -7189,7 +7189,7 @@
"-weak_framework",
"\"UIKit\"",
);
- OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
+ OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";
@@ -7244,7 +7244,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../Cores/Citra/Dependencies/XCFrameworks",
- /opt/homebrew/Cellar/boost/1.88.0/lib,
+ /opt/homebrew/Cellar/boost/1.89.0/lib,
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACH_O_TYPE = staticlib;
@@ -7264,7 +7264,7 @@
/usr/local/include,
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include",
"$(HOME)/VulkanSDK/1.4.309.0/macOS/include/vma",
- /opt/homebrew/Cellar/boost/1.88.0/include,
+ /opt/homebrew/Cellar/boost/1.89.0/include,
);
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Cores/Citra/Core/include";
@@ -7481,7 +7481,6 @@
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit/SwipeCellKit.modulemap\"",
- "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection/TKSwitcherCollection.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Tiercel/Tiercel.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView/VisualEffectView.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap\"",
@@ -7570,7 +7569,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -7632,7 +7630,7 @@
"-weak_framework",
"\"UIKit\"",
);
- OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
+ OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FLEX\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/LookinServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";
@@ -7728,7 +7726,6 @@
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit/SwipeCellKit.modulemap\"",
- "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection/TKSwitcherCollection.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Tiercel/Tiercel.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView/VisualEffectView.modulemap\"",
"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap\"",
@@ -7813,7 +7810,6 @@
"-l\"SnapKit\"",
"-l\"SwifterSwift\"",
"-l\"SwipeCellKit\"",
- "-l\"TKSwitcherCollection\"",
"-l\"Tiercel\"",
"-l\"VisualEffectView\"",
"-l\"ZIPFoundation\"",
@@ -7866,7 +7862,7 @@
"-weak_framework",
"\"UIKit\"",
);
- OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/TKSwitcherCollection\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
+ OTHER_MODULE_VERIFIER_FLAGS = "$(inherited) \"-F${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Closures\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Device\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fireworks\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Fuse\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Haptica\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IQTextView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/IceCream\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXBanner\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ManicSupport\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Permission\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ProHUD\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Realm\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Schedule\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SideMenu\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SnapKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/SwipeCellKit\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/Tiercel\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/VisualEffectView\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation\" \"-F${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync\"";
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";
@@ -8053,7 +8049,7 @@
repositoryURL = "https://github.com/drewmccormack/SwiftCloudDrive.git";
requirement = {
kind = upToNextMajorVersion;
- minimumVersion = 1.4.3;
+ minimumVersion = 1.4.4;
};
};
57F632A12D6F17AB007270E8 /* XCRemoteSwiftPackageReference "SMBClient" */ = {
diff --git a/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme b/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
index 66429846..c03c91b3 100644
--- a/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
+++ b/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
@@ -82,7 +82,7 @@
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
- buildConfiguration = "SideloadDebug"
+ buildConfiguration = "SideloadRelease"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
diff --git a/ManicEmu/ManicEmu.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ManicEmu/ManicEmu.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 95e93c3c..62538102 100644
--- a/ManicEmu/ManicEmu.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ManicEmu/ManicEmu.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
{
- "originHash" : "58d06813ddef68ba4bf70b102474da72737b122a8f31efc4261f059b4a1d7e50",
+ "originHash" : "c1f726d877955a883bac09030beee84f4d41dd2dd03f72b144b7965f81a6c916",
"pins" : [
{
"identity" : "bluruikit",
@@ -123,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/drewmccormack/SwiftCloudDrive.git",
"state" : {
- "revision" : "75923845b0ddc82ea3fe5740da03ffacf29deced",
- "version" : "1.4.3"
+ "revision" : "4f2f38724d6a8724f727c1bc10d9cddd17fbb9e8",
+ "version" : "1.4.4"
}
},
{
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/Contents.json
new file mode 100644
index 00000000..3cfb43fe
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected]
new file mode 100644
index 00000000..a09327b0
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected]
new file mode 100644
index 00000000..b958b59d
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/app_title_light.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/Contents.json
index f6bd650d..773f31b5 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..c9c8e997
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..a9ee1f0e
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/dc_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/Contents.json
index b4f817f3..0ed43f19 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..4b24c664
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..2c77f5fe
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/Contents.json
index 7b1cd3c7..1448191b 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..725bdec3
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..233e2001
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gb_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/Contents.json
index 3a722521..4ec0da46 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..a3ef7b71
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..cd672491
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/gg_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Contents.json
index d01ec72c..784edea8 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "Group [email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "Group [email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected]
new file mode 100644
index 00000000..00e72ba2
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected]
new file mode 100644
index 00000000..768e2b52
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand.imageset/Group [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/Contents.json
index 88295907..f561161d 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected]
new file mode 100644
index 00000000..1fad2939
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected]
new file mode 100644
index 00000000..e6a169f2
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/md_group_brand_us.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Contents.json
index 49a14af5..dc9b04aa 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "Group [email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "Group [email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected]
new file mode 100644
index 00000000..a7c38696
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected]
new file mode 100644
index 00000000..e6be2253
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ps1_group_brand.imageset/Group [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/Contents.json
index 058563b4..c581cf52 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..758c8f09
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..6b4994d7
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/psp_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected]
new file mode 100644
index 00000000..a4e8867c
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected]
new file mode 100644
index 00000000..f96bd01b
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/Contents.json
index b5771f6f..23f13761 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/s2x_group_brand_us.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/Contents.json
index 7a2f077a..f8246353 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..4778e3bc
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..f97f6e10
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/sds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Contents.json
index 6f8bd6fa..7587f45b 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "Sega_Saturn_JP_wordmark [email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "Sega_Saturn_JP_wordmark [email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected]
new file mode 100644
index 00000000..136ccd09
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected]
new file mode 100644
index 00000000..a861e339
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/ss_group_brand.imageset/Sega_Saturn_JP_wordmark [email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Contents.json
index b89f93ee..2f01e45b 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "Vector 256 (Stroke).png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "Vector 256 (Stroke)-1.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke)-1.png b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke)-1.png
new file mode 100644
index 00000000..ec3864ad
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke)-1.png differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke).png b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke).png
new file mode 100644
index 00000000..40a24d8e
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand_icon.imageset/Vector 256 (Stroke).png differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/Contents.json
index 6f6232c6..4a6abfa6 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..2acd783b
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..68b4f02d
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cheatcode_empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/Contents.json
index 4d0ff840..68ebad81 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected]
new file mode 100644
index 00000000..85027edf
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected]
new file mode 100644
index 00000000..4e4830ff
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/controller_background.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/Contents.json
index c9c753fe..2b64ee2a 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..ed8a7bf4
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..71fd5c93
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/Contents.json
index c014b7b9..2e242d36 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected]
new file mode 100644
index 00000000..84b3d976
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected]
new file mode 100644
index 00000000..52c4641d
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/grabber_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected]
index eb55fc6d..b9058f29 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected]
index 10f4629b..b8712d99 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_aliyun.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected]
index 10b0b101..edb3b369 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected]
index 268c6abe..f51a4774 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_baiduyun.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected]
index 7817e4f7..bbd60814 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected]
index 4941616e..7eea6186 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_dropbox.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected]
index 2c45c13b..714ab3b9 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected]
index 739fef66..dacb58b1 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_file_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected]
index 3d4682cd..182e9d28 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected]
index f5a9f4e8..57451a96 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_google_drive.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/Contents.json
new file mode 100644
index 00000000..b35bc60a
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected]
new file mode 100644
index 00000000..9e218a77
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected]
new file mode 100644
index 00000000..0a82e2dd
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_multi_disc_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected]
index b1b34a90..ecc79a84 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected]
index 0c8f2412..571b2b98 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_onecloud.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected]
index da69515f..2afe85cb 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected]
index 0f714932..a89bfa8a 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_paste_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/Contents.json
new file mode 100644
index 00000000..438989ba
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected]
new file mode 100644
index 00000000..bc319f8f
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected]
new file mode 100644
index 00000000..c638b392
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_rom_patcher.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected]
index 1c6acad7..8ac3da6f 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected]
index 03bed04f..d46144f4 100644
Binary files a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/import_wifi_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/Contents.json
index 95d7f64d..90d4857b 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected]
new file mode 100644
index 00000000..a7666269
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected]
new file mode 100644
index 00000000..99b3cc10
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/lily.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected]
new file mode 100644
index 00000000..e054472a
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected]
new file mode 100644
index 00000000..003e631d
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/Contents.json
index 6d62a2f2..4b6967fd 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/place_holder.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/Contents.json
index a790563c..f945772d 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..7da090a6
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected]
new file mode 100644
index 00000000..c1a67c4f
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/play_history_empty_icon.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/Contents.json
index bf19c785..2705e842 100644
--- a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/Contents.json
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/Contents.json
@@ -5,11 +5,43 @@
"scale" : "1x"
},
{
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected]
new file mode 100644
index 00000000..f7ef3aa8
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected]
new file mode 100644
index 00000000..fe1aa90a
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/retro_bg.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/Contents.json
new file mode 100644
index 00000000..0e60c025
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.moon.fill.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/custom.moon.fill.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/custom.moon.fill.svg
new file mode 100644
index 00000000..481bee60
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moon.fill.symbolset/custom.moon.fill.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
+ <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+
+.monochrome-0 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:66fdb5669ee94526 moon.fill}
+
+.multicolor-0:white {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:66fdb5669ee94526 moon.fill}
+
+.hierarchical-0:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:66fdb5669ee94526 moon.fill}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.moon.fill</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2979.76" x2="2979.76" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2887.04" x2="2887.04" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1495.33" x2="1495.33" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1404.36" x2="1404.36" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.582" x2="603.582" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="515.84" x2="515.84" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2887.04 696)">
+ <path class="monochrome-0 multicolor-0:white hierarchical-0:primary SFSymbolsPreviewWireframe" d="M47.6562 4.78516C63.8672 4.78516 78.4668-4.78516 85.0586-19.6289C87.8418-25.9277 83.252-29.248 78.4668-26.9043C74.6094-25.0488 69.5312-23.877 65.3809-23.877C46.1426-23.877 35.4004-34.6191 35.4004-53.8574C35.4004-57.9102 36.5723-62.8906 38.3789-66.748C40.918-72.0703 37.1094-75.9766 31.25-73.4375C16.9434-67.1875 6.83594-52.7832 6.83594-36.0352C6.83594-13.4766 25.1465 4.78516 47.6562 4.78516Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1404.36 696)">
+ <path class="monochrome-0 multicolor-0:white hierarchical-0:primary SFSymbolsPreviewWireframe" d="M47.2656 3.75977C64.1113 3.75977 77.6367-6.39648 83.6426-19.043C85.1074-22.1191 83.1055-24.0723 80.3223-23.2422C77.3926-22.3145 72.8027-21.582 68.9453-21.582C46.0449-21.582 32.8613-34.7168 32.8613-57.6172C32.8613-61.6211 33.8379-66.6992 35.0586-69.873C36.3281-73.0957 34.082-75.0488 31.0547-73.6816C16.4551-67.2363 6.83594-52.7832 6.83594-36.6699C6.83594-14.3555 24.9512 3.75977 47.2656 3.75977Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 515.84 696)">
+ <path class="monochrome-0 multicolor-0:white hierarchical-0:primary SFSymbolsPreviewWireframe" d="M45.4038 1.48928C61.3413 1.48928 74.9121-8.07665 80.7818-21.6313C81.1568-22.5278 80.7442-23.6182 79.4141-23.0605C76.9839-22.042 71.8491-20.3106 65.5396-20.3106C42.1397-20.3106 29.0469-33.3999 29.0469-56.8452C29.0469-62.4839 30.1143-66.563 32.0615-71.3262C32.5137-72.46 31.8115-73.187 30.646-72.728C20.769-68.9165 6.83594-56.7339 6.83594-37.0786C6.83594-15.8086 24.1338 1.48928 45.4038 1.48928Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/Contents.json
new file mode 100644
index 00000000..ad86699f
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.moonphase.first.quarter.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/custom.moonphase.first.quarter.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/custom.moonphase.first.quarter.svg
new file mode 100644
index 00000000..9d621652
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.moonphase.first.quarter.symbolset/custom.moonphase.first.quarter.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
+ <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
+
+.monochrome-0 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:32311d35dc10e9c5 moonphase.first.quarter}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:32311d35dc10e9c5 moonphase.first.quarter}
+
+.hierarchical-0:tertiary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:32311d35dc10e9c5 moonphase.first.quarter}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:32311d35dc10e9c5 moonphase.first.quarter}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.moonphase.first.quarter</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.23" x2="2982.23" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.57" x2="2884.57" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1496.11" x2="1496.11" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1403.58" x2="1403.58" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.773" x2="603.773" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="515.649" x2="515.649" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.8281-7.37305L48.8281-63.0371C64.209-63.0371 76.6602-50.5859 76.6602-35.2051C76.6602-19.8242 64.209-7.37305 48.8281-7.37305Z"/>
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:tertiary hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.2402-3.07617L46.2402-66.9922C63.916-66.9922 78.2227-52.6855 78.2227-35.0098C78.2227-17.334 63.916-3.07617 46.2402-3.07617Z"/>
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:tertiary hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.5254 85.6934-35.2539C85.6934-56.9824 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-56.9824 6.83594-35.2539C6.83594-13.5254 24.5117 4.15039 46.2402 4.15039Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0606-0.260764L44.0606-70.2617C63.4165-70.2617 79.04-54.5928 79.04-35.2368C79.04-15.8809 63.4165-0.260764 44.0606-0.260764Z"/>
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:tertiary hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.521 1.97072 81.2886-14.7969 81.2886-35.2539C81.2886-55.7109 64.521-72.4785 44.0606-72.4785C23.6035-72.4785 6.83594-55.7109 6.83594-35.2539C6.83594-14.7969 23.6035 1.97072 44.0606 1.97072Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/Contents.json
new file mode 100644
index 00000000..5951b6d9
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.sun.max.fill.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/custom.sun.max.fill.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/custom.sun.max.fill.svg
new file mode 100644
index 00000000..447cd7e2
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.sun.max.fill.symbolset/custom.sun.max.fill.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
+ <style>.defaults {-sfsymbols-draw-reverses-motion-groups:false}
+
+.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+
+.multicolor-0:systemYellowColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+.multicolor-1:systemYellowColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+
+.hierarchical-0:primary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:7ce597d2688740e2 sun.max.fill}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.sun.max.fill</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2988.65" x2="2988.65" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2878.15" x2="2878.15" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1498.26" x2="1498.26" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1401.43" x2="1401.43" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="606.989" x2="606.989" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="512.433" x2="512.433" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2878.15 696)">
+ <path class="monochrome-0 multicolor-0:systemYellowColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M55.2246-64.3066C58.6426-64.3066 61.5234-67.1875 61.5234-70.6055L61.5234-77.1973C61.5234-80.6152 58.6426-83.5449 55.2246-83.5449C51.8066-83.5449 48.9258-80.6152 48.9258-77.1973L48.9258-70.6055C48.9258-67.1875 51.8066-64.3066 55.2246-64.3066ZM75.8789-55.5664C78.2227-53.2227 82.373-53.2715 84.7656-55.7129L89.4043-60.4004C91.748-62.7441 91.6992-66.8945 89.2578-69.3359C86.9141-71.6797 82.7637-71.582 80.3711-69.1895L75.7324-64.502C73.3887-62.1582 73.4375-58.0078 75.8789-55.5664ZM84.4238-35.2539C84.4238-31.8359 87.3047-28.9551 90.7227-28.9551L97.3145-28.9551C100.732-28.9551 103.662-31.8359 103.662-35.2539C103.662-38.6719 100.732-41.5527 97.3145-41.5527L90.7227-41.5527C87.3047-41.5527 84.4238-38.6719 84.4238-35.2539ZM75.7324-14.7461C73.3887-12.4023 73.4375-8.30078 75.8789-5.85938L80.5664-1.2207C82.9102 1.12305 87.0605 1.07422 89.502-1.36719C91.8457-3.71094 91.7969-7.86133 89.3555-10.2539L84.668-14.8926C82.3242-17.2363 78.1738-17.1875 75.7324-14.7461ZM55.2246-6.20117C51.8066-6.20117 48.9258-3.32031 48.9258 0.0976562L48.9258 6.68945C48.9258 10.1074 51.8066 13.0371 55.2246 13.0371C58.6426 13.0371 61.5234 10.1074 61.5234 6.68945L61.5234 0.0976562C61.5234-3.32031 58.6426-6.20117 55.2246-6.20117ZM34.7168-14.7461C32.2754-17.1875 28.125-17.2363 25.7812-14.8926L21.0938-10.2539C18.6523-7.86133 18.6035-3.71094 20.9473-1.36719C23.3887 1.07422 27.5391 1.12305 29.8828-1.2207L34.5703-5.85938C37.0117-8.30078 37.0605-12.4023 34.7168-14.7461ZM26.0742-35.2539C26.0742-38.6719 23.1445-41.5527 19.7266-41.5527L13.1348-41.5527C9.7168-41.5527 6.83594-38.6719 6.83594-35.2539C6.83594-31.8359 9.7168-28.9551 13.1348-28.9551L19.7266-28.9551C23.1445-28.9551 26.0742-31.8359 26.0742-35.2539ZM34.5703-55.5664C37.0117-58.0078 37.0605-62.1582 34.7168-64.502L30.0781-69.1895C27.6855-71.582 23.5352-71.6797 21.1914-69.3359C18.75-66.8945 18.7012-62.7441 21.0449-60.4004L25.6836-55.7129C28.0762-53.2715 32.2266-53.2227 34.5703-55.5664Z" data-clipstroke-keyframes="0 0 0 0.8158498 0.18815836 0 1 0.31523365 0.69072855 0 0 1.1839592 1.8072848 0 1 1.3152955 1.6878111 0 0 2.8158488 2.1901128 0 1 2.3092732 2.6847649 0 0 3.81518 3.1878693 0 1 3.3073096 3.6838803 0 0 4.8158507 4.1901107 0 1 4.3092704 4.6847672 0 0 5.816178 5.19462 0 1 5.3121014 5.684848 0 0 6.815233 6.1907287 0 1 6.3098884 6.6841497 0 0 7.8160405 7.192715 0 1 7.312189 7.6847043"/>
+ <path class="monochrome-1 multicolor-1:systemYellowColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M55.2246-12.793C67.627-12.793 77.6855-22.8516 77.6855-35.2539C77.6855-47.6562 67.627-57.7148 55.2246-57.7148C42.8223-57.7148 32.7637-47.6562 32.7637-35.2539C32.7637-22.8516 42.8223-12.793 55.2246-12.793Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1401.43 696)">
+ <path class="monochrome-0 multicolor-0:systemYellowColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M48.4375-61.4746C50.4883-61.4746 52.1973-63.2324 52.1973-65.2832L52.1973-73.1934C52.1973-75.2441 50.4883-76.9531 48.4375-76.9531C46.3379-76.9531 44.6289-75.2441 44.6289-73.1934L44.6289-65.2832C44.6289-63.2324 46.3379-61.4746 48.4375-61.4746ZM66.8945-53.7598C68.3594-52.2949 70.8008-52.2461 72.3145-53.7598L77.9297-59.3262C79.3457-60.791 79.3457-63.2812 77.9297-64.7461C76.4648-66.2109 74.0234-66.2109 72.5586-64.7461L66.8945-59.082C65.4785-57.666 65.4785-55.2246 66.8945-53.7598ZM74.5605-35.2539C74.5605-33.2031 76.3184-31.4453 78.3691-31.4453L86.1816-31.4453C88.2812-31.4453 89.9902-33.2031 89.9902-35.2539C89.9902-37.3047 88.2812-39.0625 86.1816-39.0625L78.3691-39.0625C76.3184-39.0625 74.5605-37.3047 74.5605-35.2539ZM66.8945-16.6992C65.4785-15.2344 65.4785-12.8418 66.8945-11.377L72.5586-5.71289C74.0234-4.24805 76.4648-4.29688 77.9297-5.76172C79.3457-7.22656 79.3457-9.66797 77.9297-11.1328L72.2656-16.6992C70.8008-18.1641 68.3594-18.1641 66.8945-16.6992ZM48.4375-9.0332C46.3379-9.0332 44.6289-7.27539 44.6289-5.22461L44.6289 2.68555C44.6289 4.73633 46.3379 6.44531 48.4375 6.44531C50.4883 6.44531 52.1973 4.73633 52.1973 2.68555L52.1973-5.22461C52.1973-7.27539 50.4883-9.0332 48.4375-9.0332ZM29.9316-16.6992C28.4668-18.1641 25.9766-18.1641 24.5117-16.6992L18.9453-11.1816C17.4805-9.7168 17.4805-7.27539 18.8965-5.81055C20.3613-4.3457 22.8027-4.29688 24.2676-5.76172L29.8828-11.377C31.3477-12.8418 31.3477-15.2344 29.9316-16.6992ZM22.2656-35.2539C22.2656-37.3047 20.5566-39.0625 18.457-39.0625L10.6445-39.0625C8.54492-39.0625 6.83594-37.3047 6.83594-35.2539C6.83594-33.2031 8.54492-31.4453 10.6445-31.4453L18.457-31.4453C20.5566-31.4453 22.2656-33.2031 22.2656-35.2539ZM29.8828-53.7598C31.3477-55.1758 31.3477-57.666 29.9316-59.082L24.3164-64.7461C22.9004-66.1621 20.4102-66.2109 18.9941-64.7461C17.5293-63.2812 17.5293-60.791 18.9453-59.375L24.5117-53.7598C25.9766-52.2949 28.418-52.2949 29.8828-53.7598Z" data-clipstroke-keyframes="0 0 0 0.85025066 0.15143974 0 1 0.3510761 0.650614 0 0 1.1501653 1.848937 0 1 1.351626 1.6552057 0 0 2.85027 2.1524916 0 1 2.3472416 2.6499681 0 0 3.8510494 3.1496997 0 1 3.3453753 3.6483707 0 0 4.851337 4.1525254 0 1 4.349385 4.6489253 0 0 5.8523126 5.1524577 0 1 5.351002 5.6491528 0 0 6.8501115 6.152677 0 1 6.347324 6.6498876 0 0 7.850734 7.1521764 0 1 7.3489957 7.648527"/>
+ <path class="monochrome-1 multicolor-1:systemYellowColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.4375-15.3809C59.375-15.3809 68.3105-24.2676 68.3105-35.2539C68.3105-46.2402 59.375-55.127 48.4375-55.127C37.4512-55.127 28.5156-46.2402 28.5156-35.2539C28.5156-24.2676 37.4512-15.3809 48.4375-15.3809Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 512.433 696)">
+ <path class="monochrome-0 multicolor-0:systemYellowColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M47.2568-63.5635C47.9453-63.5635 48.3828-64.0044 48.3828-64.6929L48.3828-74.6011C48.3828-75.2441 47.9453-75.6817 47.2568-75.6817C46.6103-75.6817 46.1728-75.2441 46.1728-74.6011L46.1728-64.6929C46.1728-64.0044 46.6103-63.5635 47.2568-63.5635ZM67.2578-55.2583C67.769-54.8379 68.4395-54.789 68.8633-55.2583L75.8862-62.2324C76.3487-62.6982 76.3032-63.3721 75.8862-63.8833C75.375-64.2583 74.7046-64.3037 74.2842-63.8833L67.2578-56.857C66.8408-56.3945 66.8862-55.7241 67.2578-55.2583ZM75.5596-35.2539C75.5596-34.6108 76.0459-34.1245 76.689-34.1245L86.5903-34.1245C87.2822-34.1245 87.7197-34.6108 87.7197-35.2539C87.7197-35.897 87.2822-36.3833 86.5903-36.3833L76.689-36.3833C76.0459-36.3833 75.5596-35.897 75.5596-35.2539ZM67.2578-15.2461C66.8862-14.7803 66.8408-14.1133 67.2578-13.6474L74.2842-6.62109C74.7046-6.20067 75.375-6.2495 75.8862-6.6245C76.3032-7.13574 76.3487-7.80617 75.8862-8.272L68.8599-15.2461C68.4395-15.7119 67.769-15.6665 67.2578-15.2461ZM47.2568-6.94435C46.6103-6.94435 46.1728-6.50342 46.1728-5.81494L46.1728 4.09325C46.1728 4.73633 46.6103 5.17384 47.2568 5.17384C47.9453 5.17384 48.3828 4.73633 48.3828 4.09325L48.3828-5.81494C48.3828-6.50342 47.9453-6.94435 47.2568-6.94435ZM27.2979-15.2461C26.7866-15.6665 26.1128-15.7119 25.6924-15.2461L18.6729-8.27541C18.207-7.80959 18.2524-7.13916 18.6694-6.62792C19.1353-6.25291 19.8511-6.20409 20.2715-6.6245L27.2945-13.6474C27.7149-14.1133 27.6695-14.7803 27.2979-15.2461ZM18.9507-35.2539C18.9507-35.897 18.5132-36.3833 17.8667-36.3833L7.96535-36.3833C7.27345-36.3833 6.83594-35.897 6.83594-35.2539C6.83594-34.6108 7.27345-34.1245 7.96535-34.1245L17.8667-34.1245C18.5132-34.1245 18.9507-34.6108 18.9507-35.2539ZM27.2945-55.2583C27.6695-55.7207 27.7149-56.3945 27.2979-56.857L20.2749-63.8833C19.8579-64.3003 19.1387-64.2583 18.6763-63.8833C18.2559-63.3721 18.2104-62.6982 18.6729-62.2358L25.6924-55.2583C26.1128-54.7925 26.7832-54.8379 27.2945-55.2583Z" data-clipstroke-keyframes="0 0 0 0.9367134 0.069928475 0 1 0.43814304 0.5669037 0 0 1.0640411 1.9374973 0 1 1.436091 1.5691603 0 0 2.9360824 2.0690074 0 1 2.4320214 2.5641644 0 0 3.9360893 3.0624998 0 1 3.4309173 3.5638936 0 0 4.9353294 4.067104 0 1 4.433096 4.561857 0 0 5.937454 5.071947 0 1 5.432332 5.5642023 0 0 6.937029 6.068078 0 1 6.4318748 6.5643024 0 0 7.936079 7.0625725 0 1 7.4309525 7.563922"/>
+ <path class="monochrome-1 multicolor-1:systemYellowColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M47.166-17.5605C56.9683-17.5605 64.8594-25.4936 64.8594-35.2539C64.8594-45.0142 56.9683-52.9473 47.166-52.9473C37.4058-52.9473 29.4692-45.0142 29.4692-35.2539C29.4692-25.4936 37.4058-17.5605 47.166-17.5605Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
index 988628cd..803c33b8 100644
--- a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
+++ b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
@@ -11,5 +11,5 @@
// https://help.apple.com/xcode/#/dev745c5c974
APP_BUNDLE_IDENTIFIER = com.aoshuang.manicemu
-APP_BUILD_VERSION = 1
-APP_VERSION = 1.7.1
+APP_BUILD_VERSION = 0
+APP_VERSION = 1.7.2
diff --git a/ManicEmu/ManicEmu/Resources/Info.plist b/ManicEmu/ManicEmu/Resources/Info.plist
index 8738d4ba..0fb8b11f 100644
--- a/ManicEmu/ManicEmu/Resources/Info.plist
+++ b/ManicEmu/ManicEmu/Resources/Info.plist
@@ -498,8 +498,6 @@
</array>
<key>UISupportsDocumentBrowser</key>
<true/>
- <key>UIUserInterfaceStyle</key>
- <string>Dark</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
<key>UTExportedTypeDeclarations</key>
diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
index e0307a7d..60fa5a9c 100644
--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
@@ -116,7 +116,7 @@
"ToastFailed" = "Save Failed";
// Games Section
-"GamesSearchPlaceHolder" = "Search games";
+"GamesSearchPlaceHolder" = "Search Games";
"GamesRename" = "Rename";
"GamesModifyCover" = "Edit Cover";
"GamesSpecifySkin" = "Assign Skin";
@@ -725,3 +725,8 @@ Press the controller button to complete mapping...";
"MicrophoneTips" = "Enabling the microphone will request access and keep it active during gameplay, which may stop music playback from other apps in the background.";
"Texture" = "Texture";
"TextureReplacement" = "Texture replacement";
+
+"Appearance" = "Appearance";
+"AppearanceLight" = "Light Mode";
+"AppearanceDark" = "Dark Mode";
+"AppearanceAuto" = "Follow the system";
diff --git a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
index 1c797b0d..3f5ed3b5 100644
--- a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
@@ -49,6 +49,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
//日志系统初始化
LogSetup()
+ //禁用UIScrollView的iOS26的边缘效果
+ UIScrollView.disableEdgeEffect()
+
//注册模拟器核心
System.allCores.forEach { ManicEmu.register($0) }
diff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
index 0d018485..a907a310 100644
--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
@@ -139,43 +139,49 @@ struct Constants {
struct Color {
//文本
static let LabelPrimary = UIColor(.dm,
- light: UIColor(hexString: "#ffffff")!,
+ light: UIColor(hexString: "#323443")!,
dark: UIColor(hexString: "#ffffff")!)
static let LabelSecondary = UIColor(.dm,
- light: UIColor(hexString: "#8F8F92")!,
+ light: UIColor(hexString: "#90929F")!,
dark: UIColor(hexString: "#8F8F92")!)
static let LabelTertiary = UIColor(.dm,
- light: UIColor(hexString: "#403E46")!,
+ light: UIColor(hexString: "#C1C0C6")!,
dark: UIColor(hexString: "#403E46")!)
- static let LabelQuaternary = UIColor(.dm,
- light: UIColor(hexString: "#3f3f3f", transparency: 0.8)!,
- dark: UIColor(hexString: "#3f3f3f", transparency: 0.8)!)
//分割线
static let Border = UIColor(.dm,
- light: .white.withAlphaComponent(0.1),
+ light: .black.withAlphaComponent(0.1),
dark: .white.withAlphaComponent(0.1))
//背景
static let Background = UIColor(.dm,
- light: UIColor(hexString: "#17171D")!,
+ light: UIColor(hexString: "#F1F4FE")!,
dark: UIColor(hexString: "#17171D")!)
static let BackgroundPrimary = UIColor(.dm,
- light: UIColor(hexString: "#1E1E24")!,
- dark: UIColor(hexString: "#1E1E24")!)
+ light: UIColor(hexString: "#FAFCFF")!,
+ dark: UIColor(hexString: "#222229")!)
static let BackgroundSecondary = UIColor(.dm,
- light: UIColor(hexString: "#26262E")!,
- dark: UIColor(hexString: "#26262E")!)
-
- static let BackgroundTertiary = UIColor(.dm,
- light: UIColor(hexString: "#464651")!,
+ light: UIColor(hexString: "#E1E2E5")!,
dark: UIColor(hexString: "#464651")!)
+ //Input
+ static let InputBackground = UIColor(.dm,
+ light: UIColor(hexString: "#E8EBF2")!,
+ dark: UIColor(hexString: "#121217")!)
+
+ //Segment
+ static let SegmentBackground = UIColor(.dm,
+ light: UIColor(hexString: "#E8EBF2")!,
+ dark: UIColor(hexString: "#222229")!)
+
+ static let SegmentHighlight = UIColor(.dm,
+ light: UIColor(hexString: "#FAFCFF")!,
+ dark: UIColor(hexString: "#464651")!)
- static let Selection = UIColor(.dm,
- light: UIColor(hexString: "#2c2c30")!,
- dark: UIColor(hexString: "#2c2c30")!)
+ static let AppearanceSegmentHighlight = UIColor(.dm,
+ light: UIColor(hexString: "#FFFFFF")!,
+ dark: UIColor(hexString: "#464651")!)
//阴影
static let Shadow = BackgroundPrimary
@@ -186,9 +192,6 @@ struct Constants {
static var MainDynamicColor = UIColor(hexString: "#FF2442")!
static let Main = UIColor(.dm) { traitCollection in
-// if (traitCollection.userInterfaceStyle == .light) {
-// return UIColor(hexString: "#FF2442")!
-// }
return MainDynamicColor
}
@@ -320,6 +323,7 @@ struct Constants {
static let HasShowSSPlayAlert = "HasShowSSPlayAlert"
static let HasShowPS1PlayAlert = "HasShowPS1PlayAlert"
static let HasShowJumpGameInfoAlert = "HasShowJumpGameInfoAlert"
+ static let Appearance = "Appearance"
}
struct Font {
diff --git a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeContentCell.swift b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeContentCell.swift
index 6225cdd4..a2b16f27 100644
--- a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeContentCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeContentCell.swift
@@ -78,7 +78,7 @@ class AddCheatCodeContentCell: UICollectionViewCell {
}
let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
- textFieldContainer.backgroundColor = Constants.Color.Background
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeTitleCell.swift b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeTitleCell.swift
index bdde8279..4ad4cbbb 100644
--- a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeTitleCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeTitleCell.swift
@@ -43,7 +43,7 @@ class AddCheatCodeTitleCell: UICollectionViewCell {
}
let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
- textFieldContainer.backgroundColor = Constants.Color.Background
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeView.swift b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeView.swift
index f893454b..1e38937d 100644
--- a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/AddCheatCodeView.swift
@@ -32,7 +32,7 @@ class AddCheatCodeView: BaseView {
}()
private lazy var confirmButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.saveTitle()) { [weak self] in
+ let view = HowToButton(title: R.string.localizable.saveTitle(), enableGlass: true) { [weak self] in
guard let self = self else { return }
self.collectionView.endEditing(true)
if let editGameCheat = self.editGameCheat,
@@ -100,14 +100,14 @@ class AddCheatCodeView: BaseView {
}()
private var howToButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.howToFetch()) {
+ let view = HowToButton(title: R.string.localizable.howToFetch(), enableGlass: true) {
topViewController()?.present(WebViewController(url: Constants.URLs.CheatCodesGuide), animated: true)
}
return view
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -298,15 +298,28 @@ class AddCheatCodeView: BaseView {
}
private func updateConfirmButton(enable: Bool) {
- if enable {
- confirmButton.backgroundColor = Constants.Color.Main
- confirmButton.label.textColor = Constants.Color.LabelPrimary
- confirmButton.isUserInteractionEnabled = true
+ if #available(iOS 26.0, *) {
+ if enable {
+ confirmButton.label.font = Constants.Font.caption(size: .l, weight: .semibold)
+ confirmButton.label.textColor = Constants.Color.LabelPrimary
+ confirmButton.isUserInteractionEnabled = true
+ } else {
+ confirmButton.label.font = Constants.Font.caption(size: .l, weight: .regular)
+ confirmButton.label.textColor = Constants.Color.LabelSecondary
+ confirmButton.isUserInteractionEnabled = false
+ }
} else {
- confirmButton.backgroundColor = Constants.Color.BackgroundSecondary
- confirmButton.label.textColor = Constants.Color.LabelSecondary
- confirmButton.isUserInteractionEnabled = false
+ if enable {
+ confirmButton.backgroundColor = Constants.Color.Main
+ confirmButton.label.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ confirmButton.isUserInteractionEnabled = true
+ } else {
+ confirmButton.backgroundColor = Constants.Color.BackgroundPrimary
+ confirmButton.label.textColor = Constants.Color.LabelSecondary
+ confirmButton.isUserInteractionEnabled = false
+ }
}
+
}
}
@@ -361,7 +374,7 @@ extension AddCheatCodeView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeCollectionViewCell.swift
index 4ca67f05..5d3268ce 100644
--- a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeCollectionViewCell.swift
@@ -8,7 +8,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import SwipeCellKit
-import TKSwitcherCollection
class CheatCodeCollectionViewCell: SwipeTableViewCell {
private var titleLabel: UILabel = {
@@ -18,12 +17,10 @@ class CheatCodeCollectionViewCell: SwipeTableViewCell {
return view
}()
- var switchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ var switchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -47,7 +44,7 @@ class CheatCodeCollectionViewCell: SwipeTableViewCell {
make.top.bottom.equalToSuperview().inset(10)
}
containerView.layerCornerRadius = Constants.Size.CornerRadiusMid
- containerView.backgroundColor = Constants.Color.BackgroundSecondary
+ containerView.backgroundColor = Constants.Color.BackgroundPrimary
containerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
@@ -60,13 +57,14 @@ class CheatCodeCollectionViewCell: SwipeTableViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(titleLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
}
-
- mainColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.MainColorChange, object: nil, queue: .main) { [weak self] notification in
- guard let self = self else { return }
- self.switchButton.onColor = Constants.Color.Main
- self.switchButton.reload()
+ if #available(iOS 26.0, *) {} else {
+ switchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
}
@@ -76,7 +74,7 @@ class CheatCodeCollectionViewCell: SwipeTableViewCell {
func setData(cheatCode: GameCheat) {
titleLabel.text = cheatCode.name
- switchButton.setOn(cheatCode.activate, animate: false)
+ switchButton.setOn(cheatCode.activate, animated: false)
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeListView.swift b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeListView.swift
index dcebdca3..29a92715 100644
--- a/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/CheatCode/Views/CheatCodeListView.swift
@@ -20,7 +20,7 @@ class CheatCodeListView: BaseView {
}()
private lazy var addButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -34,14 +34,14 @@ class CheatCodeListView: BaseView {
}()
private var howToButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.howToFetch()) {
+ let view = HowToButton(title: R.string.localizable.howToFetch(), enableGlass: true) {
topViewController()?.present(WebViewController(url: Constants.URLs.CheatCodesGuide), animated: true)
}
return view
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -50,9 +50,9 @@ class CheatCodeListView: BaseView {
return view
}()
- private lazy var deleteImage = UIImage(symbol: .trash, backgroundColor: Constants.Color.Red, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
+ private lazy var deleteImage = UIImage(symbol: .trash, color: Constants.Color.LabelPrimary.forceStyle(.dark), backgroundColor: Constants.Color.Red, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
- private lazy var editImage = UIImage(symbol: .squareAndPencil, backgroundColor: Constants.Color.Yellow, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
+ private lazy var editImage = UIImage(symbol: .squareAndPencil, color: Constants.Color.LabelPrimary.forceStyle(.dark), backgroundColor: Constants.Color.Yellow, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
private lazy var tableView: UITableView = {
let view = BlankSlateTableView()
@@ -186,7 +186,7 @@ extension CheatCodeListView: SwipeTableViewCellDelegate {
completionAnimation: .fill(.manual(timing: .with)))
options.expansionDelegate = self
options.transitionStyle = .border
- options.backgroundColor = Constants.Color.BackgroundPrimary
+ options.backgroundColor = Constants.Color.Background
options.maximumButtonWidth = Constants.Size.ItemHeightMin + Constants.Size.ContentSpaceTiny*2
return options
}
@@ -251,7 +251,7 @@ extension CheatCodeListView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/BaseViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/BaseViewController.swift
index 63a748c2..b801f46f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/BaseViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/BaseViewController.swift
@@ -12,7 +12,7 @@ import UIKit
class BaseViewController: UIViewController {
lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
return view
}()
@@ -58,7 +58,7 @@ class BaseViewController: UIViewController {
override func viewDidLoad() {
Log.debug("\(String(describing: Self.self)) viewDidLoad")
super.viewDidLoad()
- let backgroundColor = self.presentingViewController == nil ? Constants.Color.Background : Constants.Color.BackgroundPrimary
+ let backgroundColor = Constants.Color.Background
view.backgroundColor = backgroundColor
setPreferredContentSize()
if let navigationBar = self.navigationController?.navigationBar {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/WebViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/WebViewController.swift
index 0dd9f978..0d6e3306 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/WebViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/ViewControllers/WebViewController.swift
@@ -15,7 +15,7 @@ class WebViewController: BaseViewController {
private var navigationBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.Background)
+ view.makeBlur()
return view
}()
@@ -162,7 +162,7 @@ class WebViewController: BaseViewController {
}()
private lazy var backButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .chevronLeft, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .chevronLeft, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.BackgroundPrimary
view.addTapGesture { [weak self] gesture in
@@ -173,7 +173,7 @@ class WebViewController: BaseViewController {
}()
private lazy var refreshButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .arrowClockwise, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .arrowClockwise, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.BackgroundPrimary
view.addTapGesture { [weak self] gesture in
@@ -184,7 +184,7 @@ class WebViewController: BaseViewController {
}()
private lazy var searchButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .magnifyingglass, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .magnifyingglass, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.BackgroundPrimary
view.addTapGesture { [weak self] gesture in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/BlackHaderReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/BlackHaderReusableView.swift
deleted file mode 100644
index 72a0803b..00000000
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/BlackHaderReusableView.swift
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// TitleHaderCollectionReusableView.swift
-// ManicEmu
-//
-// Created by Max on 2025/1/21.
-// Copyright © 2025 Manic EMU. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import UIKit
-
-class BlackHaderReusableView: UICollectionReusableView {
- var titleLabel: UILabel = {
- let view = UILabel()
- view.textColor = Constants.Color.LabelPrimary
- view.font = Constants.Font.title(size: .s)
- return view
- }()
-
- override init(frame: CGRect) {
- super.init(frame: frame)
- addSubviews([titleLabel])
- makeBlur(blurColor: .black)
-
- titleLabel.snp.makeConstraints { make in
- make.centerY.equalToSuperview()
- make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
- }
- }
-
- required init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
-}
-
-class BackgroundHaderReusableView: UICollectionReusableView {
- var titleLabel: UILabel = {
- let view = UILabel()
- view.textColor = Constants.Color.LabelSecondary
- view.font = Constants.Font.body(size: .s, weight: .semibold)
- return view
- }()
-
- override init(frame: CGRect) {
- super.init(frame: frame)
- addSubviews([titleLabel])
- makeBlur(blurColor: Constants.Color.Background)
-
- titleLabel.snp.makeConstraints { make in
- make.centerY.equalToSuperview()
- make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
- }
- }
-
- required init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
-}
-
-class PrimaryHaderReusableView: UICollectionReusableView {
- var titleLabel: UILabel = {
- let view = UILabel()
- view.textColor = Constants.Color.LabelPrimary
- view.font = Constants.Font.title(size: .s)
- return view
- }()
-
- override init(frame: CGRect) {
- super.init(frame: frame)
- addSubviews([titleLabel])
- makeBlur(blurColor: Constants.Color.BackgroundPrimary)
-
- titleLabel.snp.makeConstraints { make in
- make.centerY.equalToSuperview()
- make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
- }
- }
-
- required init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
-}
-
-class PrimaryButtonHaderReusableView: UICollectionReusableView {
- var titleLabel: UILabel = {
- let view = UILabel()
- view.textColor = Constants.Color.LabelPrimary
- view.font = Constants.Font.title(size: .s)
- return view
- }()
-
- var button: SymbolButton = {
- let view = SymbolButton(image: R.image.customArrowTrianglehead2Clockwise()?.applySymbolConfig(font: Constants.Font.body(weight: .bold)))
- view.enableRoundCorner = true
- view.backgroundColor = Constants.Color.BackgroundPrimary
- return view
- }()
-
- override init(frame: CGRect) {
- super.init(frame: frame)
- addSubviews([titleLabel, button])
- makeBlur(blurColor: Constants.Color.BackgroundPrimary)
-
- titleLabel.snp.makeConstraints { make in
- make.centerY.equalToSuperview()
- make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
- }
-
- button.snp.makeConstraints { make in
- make.centerY.equalTo(titleLabel)
- make.leading.equalTo(titleLabel.snp.trailing)
- make.size.equalTo(Constants.Size.ItemHeightTiny)
- }
- }
-
- required init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
-}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/ContextMenuButton.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ContextMenuButton.swift
index 8166b81a..db444a48 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/ContextMenuButton.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ContextMenuButton.swift
@@ -8,11 +8,38 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
class ContextMenuButton: UIButton {
- init(image: UIImage? = nil, menu: UIMenu? = nil) {
+ /// 是否启用 Glass 效果(仅 iOS 26+ 有效)
+ private var isGlassEnabled: Bool = false
+
+ init(image: UIImage? = nil,
+ menu: UIMenu? = nil,
+ enableGlass: Bool = false,
+ cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
super.init(frame: .zero)
- if let image = image {
- setImageForAllStates(image)
+
+ self.isGlassEnabled = enableGlass
+
+ // 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
+ if #available(iOS 26.0, *), enableGlass {
+ // iOS 26 + Glass enabled: 使用 UIButton.Configuration.glass()
+ var config = UIButton.Configuration.glass()
+ config.cornerStyle = cornerStyle
+
+ if let image = image {
+ config.image = image
+ }
+
+ self.configuration = config
+ // iOS 26 的 Liquid Glass 自带按压效果,不需要 enableInteractive
+ } else {
+ // iOS 25 及以下 或 enableGlass 为 false: 使用传统方式
+ if let image = image {
+ setImageForAllStates(image)
+ }
+ // 使用 enableInteractive 提供按压动画
+ enableInteractive = true
}
+
if let menu = menu {
self.menu = menu
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/DeadZoneControl.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/DeadZoneControl.swift
index e3b01cd0..55b95be6 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/DeadZoneControl.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/DeadZoneControl.swift
@@ -16,12 +16,12 @@ class DeadZoneControl: UIView, UITextFieldDelegate {
// MARK: - Private UI
private let minusButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .minus, font: Constants.Font.body(size: .m, weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .minus, font: Constants.Font.body(size: .m, weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
return view
}()
private let plusButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
return view
}()
@@ -216,7 +216,7 @@ class DeadZoneControl: UIView, UITextFieldDelegate {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/DisabledTapSwitch.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/DisabledTapSwitch.swift
new file mode 100644
index 00000000..3e11cfcf
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/DisabledTapSwitch.swift
@@ -0,0 +1,82 @@
+//
+// DisabledTapSwitch.swift
+// ManicEmu
+//
+// Created by Aoshuang on 2025/10/8.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import UIKit
+
+class DisabledTapSwitch: UISwitch {
+ var disabledTapAction: (() -> Void)?
+
+ // 透明覆盖视图,用于在禁用状态下捕获点击
+ private lazy var overlayView: UIView = {
+ let view = UIView()
+ view.backgroundColor = .clear
+ view.isHidden = true
+ let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleOverlayTap))
+ view.addGestureRecognizer(tapGesture)
+ return view
+ }()
+
+ override var isEnabled: Bool {
+ didSet {
+ updateOverlayView()
+ }
+ }
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ setupOverlayView()
+ }
+
+ required init?(coder: NSCoder) {
+ super.init(coder: coder)
+ setupOverlayView()
+ }
+
+ private func setupOverlayView() {
+ // 将覆盖视图添加到父视图,而不是 switch 本身
+ // 在 layoutSubviews 中设置正确的位置和大小
+ }
+
+ override func didMoveToSuperview() {
+ super.didMoveToSuperview()
+
+ if let superview = superview {
+ // 将覆盖视图添加到父视图
+ superview.addSubview(overlayView)
+ updateOverlayView()
+ } else {
+ overlayView.removeFromSuperview()
+ }
+ }
+
+ override func layoutSubviews() {
+ super.layoutSubviews()
+
+ // 更新覆盖视图的位置和大小以匹配 switch
+ if overlayView.superview != nil {
+ overlayView.frame = frame
+ }
+ }
+
+ private func updateOverlayView() {
+ // 只在禁用状态下显示覆盖视图
+ overlayView.isHidden = isEnabled
+ }
+
+ @objc private func handleOverlayTap() {
+ disabledTapAction?()
+ }
+
+ func onDisableTap(handler: (() -> Void)? = nil) {
+ self.disabledTapAction = handler
+ }
+
+ deinit {
+ overlayView.removeFromSuperview()
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/GradientView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/GradientView.swift
index 58e7d069..ac581414 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/GradientView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/GradientView.swift
@@ -11,8 +11,10 @@ import UIKit
class GradientView: UIView {
private let gradientLayer = CAGradientLayer()
+ private var colors: [UIColor] = []
func setupGradient(colors: [SFColor], locations: [CGFloat] = [0.0, 1.0], direction: GradientDirection) {
+ self.colors = colors
gradientLayer.frame = bounds
gradientLayer.colors = colors.map(\.cgColor)
gradientLayer.locations = locations.map { NSNumber(value: $0) }
@@ -27,4 +29,11 @@ class GradientView: UIView {
super.layoutSubviews()
gradientLayer.frame = bounds
}
+
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ gradientLayer.colors = colors.map(\.cgColor)
+ }
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/HowToButton.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/HowToButton.swift
index db32318c..9eb09b10 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/HowToButton.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/HowToButton.swift
@@ -8,6 +8,17 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
class HowToButton: UIView {
+ // iOS 26+ 使用 UIButton 作为 glass 容器
+ private var glassButton: UIButton?
+
+ /// 返回应该接收手势识别器的视图(iOS 26 返回内部按钮,iOS 25 返回自身)
+ private var interactiveView: UIView {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ return glassButton
+ }
+ return self
+ }
+
var label: UILabel = {
let view = UILabel()
view.textAlignment = .center
@@ -16,19 +27,65 @@ class HowToButton: UIView {
return view
}()
- init(title: String, tapGesture: (()->Void)?) {
+ /// 是否启用 Glass 效果(仅 iOS 26+ 有效)
+ private var isGlassEnabled: Bool = false
+
+ init(title: String,
+ enableGlass: Bool = false,
+ cornerStyle: UIButton.Configuration.CornerStyle = .capsule,
+ tapGesture: (()->Void)?) {
super.init(frame: .zero)
+
+ self.isGlassEnabled = enableGlass
+ label.text = title
+
+ // 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
+ if #available(iOS 26.0, *), enableGlass {
+ setupGlassButton(cornerStyle: cornerStyle)
+ } else {
+ setupTraditionalView()
+ }
+
+ // 添加点击手势
+ addTapGesture { gesture in
+ tapGesture?()
+ }
+ }
+
+ @available(iOS 26.0, *)
+ private func setupGlassButton(cornerStyle: UIButton.Configuration.CornerStyle) {
+ backgroundColor = .clear
+
+ // 创建 glass 容器按钮(只提供 glass 效果,不显示内容)
+ var config = UIButton.Configuration.glass()
+ config.cornerStyle = cornerStyle
+
+ let button = UIButton(configuration: config)
+ button.isUserInteractionEnabled = true // iOS 26 的 Liquid Glass 需要处理触摸以显示视觉效果
+ glassButton = button
+ addSubview(button)
+
+ button.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ // 在 glass 容器内添加 label
+ button.addSubview(label)
+ label.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ }
+ }
+
+ private func setupTraditionalView() {
+ enableInteractive = true
backgroundColor = Constants.Color.BackgroundSecondary
+
addSubview(label)
label.snp.makeConstraints { make in
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
}
- enableInteractive = true
- label.text = title
- addTapGesture { gesture in
- tapGesture?()
- }
}
required init?(coder: NSCoder) {
@@ -37,6 +94,37 @@ class HowToButton: UIView {
override func layoutSubviews() {
super.layoutSubviews()
- layerCornerRadius = height/2
+ updateCornerRadius()
+ }
+
+ private func updateCornerRadius() {
+ let radius = height/2
+ layerCornerRadius = radius
+
+ // 同时更新 glassButton 的圆角
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.layer.cornerRadius = radius
+ glassButton.clipsToBounds = true
+ }
+ }
+
+ /// 重写 addGestureRecognizer,确保手势识别器添加到正确的视图
+ /// iOS 26: 添加到内部的 glassButton
+ /// iOS 25: 添加到父视图自身
+ override func addGestureRecognizer(_ gestureRecognizer: UIGestureRecognizer) {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.addGestureRecognizer(gestureRecognizer)
+ } else {
+ super.addGestureRecognizer(gestureRecognizer)
+ }
+ }
+
+ /// 重写 removeGestureRecognizer,确保从正确的视图移除
+ override func removeGestureRecognizer(_ gestureRecognizer: UIGestureRecognizer) {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.removeGestureRecognizer(gestureRecognizer)
+ } else {
+ super.removeGestureRecognizer(gestureRecognizer)
+ }
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/LimitedTextInputView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LimitedTextInputView.swift
index a20bbe9f..975c33bb 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/LimitedTextInputView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LimitedTextInputView.swift
@@ -34,7 +34,7 @@ struct LimitedTextInputView {
let textfiledWidth = UIDevice.isPhone ? 300 : 380
let containerView = RoundAndBorderView(roundCorner: .allCorners)
- containerView.backgroundColor = Constants.Color.BackgroundSecondary
+ containerView.backgroundColor = Constants.Color.Background
//标题
let titleLabel = UILabel()
@@ -50,8 +50,8 @@ struct LimitedTextInputView {
}
//输入框
- let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: .white.withAlphaComponent(0.05), borderWidth: 1)
- textFieldContainer.backgroundColor = Constants.Color.Background
+ let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: Constants.Color.Border, borderWidth: 1)
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
containerView.addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMid)
@@ -99,7 +99,7 @@ struct LimitedTextInputView {
}
let line = UIView()
- line.backgroundColor = Constants.Color.BackgroundTertiary
+ line.backgroundColor = Constants.Color.Border
containerView.addSubview(line)
line.snp.makeConstraints { make in
make.height.equalTo(1)
@@ -167,7 +167,7 @@ struct LimitedTextInputView {
containerView.addSubview(okButton)
let verticalLine = UIView()
- verticalLine.backgroundColor = Constants.Color.BackgroundTertiary
+ verticalLine.backgroundColor = Constants.Color.Border
containerView.addSubview(verticalLine)
verticalLine.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: 1, height: 26))
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift
new file mode 100644
index 00000000..2dc06baa
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift
@@ -0,0 +1,73 @@
+//
+// TitleHaderCollectionReusableView.swift
+// ManicEmu
+//
+// Created by Max on 2025/1/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import UIKit
+import VisualEffectView
+
+class LowestHaderReusableView: UICollectionReusableView {
+ var titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelPrimary
+ view.font = Constants.Font.title(size: .s)
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ addSubviews([titleLabel])
+ makeBlur(blurColor: UIColor(.dm, light: .white, dark: .black))
+
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+}
+
+class BackgroundColorHaderReusableView: UICollectionReusableView {
+ var titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelSecondary.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ view.font = Constants.Font.body(size: .s, weight: .semibold)
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ addSubviews([titleLabel])
+ makeBlur(blurColor: Constants.Color.Background)
+
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ //完全搞不懂为什么UICollectionView的滚动会导致UIColor的dynamicColor错乱,只能这样处理了
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.userInterfaceStyle.rawValue != previousTraitCollection?.userInterfaceStyle.rawValue {
+ if let blurView = subviews.first(where: { $0 is VisualEffectView }) as? VisualEffectView {
+ blurView.colorTint = Constants.Color.Background.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ blurView.colorTintAlpha = 0.9
+ }
+ titleLabel.textColor = Constants.Color.LabelSecondary.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ }
+ }
+
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/RadialGradientView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/RadialGradientView.swift
index 12697fe0..4f3c1e72 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/RadialGradientView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/RadialGradientView.swift
@@ -13,11 +13,15 @@ class RadialGradientView: UIView {
private var lastSize: CGSize? = nil
private let imageView = UIImageView()
private var gradientColorChangeNotification: Any? = nil
+ private var appearanceChangeNotification: Any? = nil
deinit {
- if let gradientColorChangeNotification = gradientColorChangeNotification {
+ if let gradientColorChangeNotification {
NotificationCenter.default.removeObserver(gradientColorChangeNotification)
}
+ if let appearanceChangeNotification {
+ NotificationCenter.default.removeObserver(appearanceChangeNotification)
+ }
}
init() {
@@ -39,9 +43,7 @@ class RadialGradientView: UIView {
gradientColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.GradientColorChange, object: nil, queue: .main) { [weak self] notification in
guard let self = self else { return }
- UIImage.radialGradientImage(size: self.size, colors: Constants.Color.Gradient + [Constants.Color.BackgroundPrimary]) {
- self.imageView.image = $0
- }
+ self.updateImage()
}
}
@@ -53,9 +55,18 @@ class RadialGradientView: UIView {
super.layoutSubviews()
guard size != .zero else { return }
if let lastSize, lastSize == size { return }
- UIImage.radialGradientImage(size: size, colors: Constants.Color.Gradient + [Constants.Color.BackgroundPrimary]) {
- self.imageView.image = $0
- }
+ updateImage()
lastSize = size
}
+
+ private func updateImage() {
+ let size = self.size
+ UIImage.radialGradientImage(size: size, colors: Constants.Color.Gradient + [Constants.Color.BackgroundPrimary.forceStyle(.dark)]) { [weak self] darkImage in
+ UIImage.radialGradientImage(size: size, colors: Constants.Color.Gradient + [Constants.Color.BackgroundPrimary.forceStyle(.light)]) { [weak self] lightImage in
+ if let darkImage, let lightImage {
+ self?.imageView.image = UIImage(.dm, light: lightImage, dark: darkImage)
+ }
+ }
+ }
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/RoundAndBorderView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/RoundAndBorderView.swift
index d9b25825..fc4ac740 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/RoundAndBorderView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/RoundAndBorderView.swift
@@ -58,4 +58,11 @@ class RoundAndBorderView: UIView {
borderLayer.lineWidth = borderWidth
borderLayer.strokeColor = borderColor.cgColor
}
+
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ borderLayer.strokeColor = borderColor.cgColor
+ }
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/ServiceIconView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ServiceIconView.swift
new file mode 100644
index 00000000..eb721e4b
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ServiceIconView.swift
@@ -0,0 +1,26 @@
+//
+// ServiceIconView.swift
+// ManicEmu
+//
+// Created by Aoshuang on 2025/10/9.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+class ServiceIconView: RoundAndBorderView {
+ var imageView: UIImageView = {
+ let view = UIImageView()
+ return view
+ }()
+
+ override init(roundCorner: UIRectCorner = [], radius: CGFloat = Constants.Size.CornerRadiusMax, borderColor: UIColor = Constants.Color.Border, borderWidth: CGFloat = 1) {
+ super.init(roundCorner: roundCorner, radius: radius, borderColor: borderColor, borderWidth: borderWidth)
+ addSubview(imageView)
+ imageView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+
+ @MainActor required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SettingItemCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SettingItemCollectionViewCell.swift
index 372e3b77..7b74ba6c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SettingItemCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SettingItemCollectionViewCell.swift
@@ -28,7 +28,7 @@ class SettingItemCollectionViewCell: UICollectionViewCell {
private var disableCover: UIView = {
let view = UIView()
view.isHidden = true
- view.backgroundColor = .black.withAlphaComponent(0.4)
+ view.backgroundColor = Constants.Color.Background.withAlphaComponent(0.8)
view.layerCornerRadius = Constants.Size.CornerRadiusMid
return view
}()
@@ -55,7 +55,7 @@ class SettingItemCollectionViewCell: UICollectionViewCell {
private var roundAndBorderView: RoundAndBorderView = {
let view = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
- view.makeBlur(blurColor: Constants.Color.BackgroundSecondary)
+ view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
return view
}()
@@ -157,10 +157,10 @@ class SettingItemCollectionViewCell: UICollectionViewCell {
enableInteractive = true
}
if isPlus {
- editIcon.image = UIImage(symbol: .plus, font: Constants.Font.caption(size: .l, weight: .medium))
+ editIcon.image = UIImage(symbol: .plus, font: Constants.Font.caption(size: .l, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
editButton.backgroundColor = Constants.Color.Green
} else {
- editIcon.image = UIImage(symbol: .minus, font: Constants.Font.caption(size: .l, weight: .medium))
+ editIcon.image = UIImage(symbol: .minus, font: Constants.Font.caption(size: .l, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
editButton.backgroundColor = Constants.Color.Red
}
disableCover.isHidden = enable
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
index f60b9cc7..e3e45801 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
@@ -24,7 +24,7 @@ class SparkleSeperatorView: UIView {
setupViews(isGradient: isGradient)
}
- private func setupViews(color: UIColor = Constants.Color.BackgroundPrimary, lineColor: UIColor? = nil, isGradient: Bool = false) {
+ private func setupViews(color: UIColor = Constants.Color.Border, lineColor: UIColor? = nil, isGradient: Bool = false) {
let starView = isGradient ? GradientImageView(image: UIImage(symbol: .sparkle, size: 24)) : UIImageView(image: UIImage(symbol: .sparkle, color: color))
addSubview(starView)
starView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
index a4ec1b06..27abdf92 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
@@ -9,8 +9,18 @@
import UIKit
class SymbolButton: UIView {
+ // iOS 26+ 使用 UIButton 作为 glass 容器
+ private var glassButton: UIButton?
private let containerView = UIView()
+ /// 返回应该接收手势识别器的视图(iOS 26 返回内部按钮,iOS 25 返回自身)
+ var interactiveView: UIView {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ return glassButton
+ }
+ return self
+ }
+
lazy var imageView: UIImageView = {
let view = UIImageView()
view.contentMode = .center
@@ -19,18 +29,32 @@ class SymbolButton: UIView {
let titleLabel = UILabel()
+ /// 是否启用 Glass 效果(仅 iOS 26+ 有效)
+ private var isGlassEnabled: Bool = false
+
var enableRoundCorner: Bool = false {
didSet {
- if enableRoundCorner {
- layer.cornerRadius = height/2
- }
+ updateCornerRadius()
}
}
override func layoutSubviews() {
super.layoutSubviews()
if enableRoundCorner {
- layer.cornerRadius = height/2
+ updateCornerRadius()
+ }
+ }
+
+ private func updateCornerRadius() {
+ if enableRoundCorner {
+ let radius = height/2
+ layer.cornerRadius = radius
+
+ // 同时更新 glassButton 的圆角
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.layer.cornerRadius = radius
+ glassButton.clipsToBounds = true
+ }
}
}
@@ -42,8 +66,10 @@ class SymbolButton: UIView {
edgeInsets: UIEdgeInsets? = nil,
horizontalContian: Bool = false,
titlePosition: UITextLayoutDirection = .down,
- imageAndTitlePadding: CGFloat = Constants.Size.ContentSpaceUltraTiny) {
- self.init(image: .symbolImage(symbol), title: title, titleFont: titleFont, titleColor: titleColor, titleAlignment: titleAlignment, edgeInsets: edgeInsets, horizontalContian: horizontalContian, titlePosition: titlePosition, imageAndTitlePadding: imageAndTitlePadding)
+ imageAndTitlePadding: CGFloat = Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: Bool = false,
+ cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
+ self.init(image: .symbolImage(symbol), title: title, titleFont: titleFont, titleColor: titleColor, titleAlignment: titleAlignment, edgeInsets: edgeInsets, horizontalContian: horizontalContian, titlePosition: titlePosition, imageAndTitlePadding: imageAndTitlePadding, enableGlass: enableGlass, cornerStyle: cornerStyle)
}
init(image: UIImage?,
@@ -54,10 +80,138 @@ class SymbolButton: UIView {
edgeInsets: UIEdgeInsets? = nil,
horizontalContian: Bool = false,
titlePosition: UITextLayoutDirection = .down,
- imageAndTitlePadding: CGFloat = Constants.Size.ContentSpaceUltraTiny) {
+ imageAndTitlePadding: CGFloat = Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: Bool = false,
+ cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
super.init(frame: .zero)
+
+ self.isGlassEnabled = enableGlass
+
+ // 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
+ if #available(iOS 26.0, *), enableGlass {
+ // iOS 26 + Glass enabled: 使用 UIButton.Configuration.glass() 作为容器
+ setupGlassButton(image: image,
+ title: title,
+ titleFont: titleFont,
+ titleColor: titleColor,
+ titleAlignment: titleAlignment,
+ edgeInsets: edgeInsets,
+ horizontalContian: horizontalContian,
+ titlePosition: titlePosition,
+ imageAndTitlePadding: imageAndTitlePadding,
+ cornerStyle: cornerStyle)
+ } else {
+ // iOS 25 及以下 或 enableGlass 为 false: 使用传统样式 + enableInteractive 动画
+ setupTraditionalView(image: image,
+ title: title,
+ titleFont: titleFont,
+ titleColor: titleColor,
+ titleAlignment: titleAlignment,
+ edgeInsets: edgeInsets,
+ horizontalContian: horizontalContian,
+ titlePosition: titlePosition,
+ imageAndTitlePadding: imageAndTitlePadding)
+ }
+ }
+
+ @available(iOS 26.0, *)
+ private func setupGlassButton(image: UIImage?,
+ title: String,
+ titleFont: UIFont,
+ titleColor: UIColor,
+ titleAlignment: NSTextAlignment,
+ edgeInsets: UIEdgeInsets?,
+ horizontalContian: Bool,
+ titlePosition: UITextLayoutDirection,
+ imageAndTitlePadding: CGFloat,
+ cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
+ backgroundColor = .clear
+
+ // 创建 glass 容器按钮(只提供 glass 效果,不显示内容)
+ var config = UIButton.Configuration.glass()
+ config.cornerStyle = cornerStyle
+
+ let button = UIButton(configuration: config)
+ button.isUserInteractionEnabled = true // iOS 26 的 Liquid Glass 需要处理触摸以显示视觉效果
+ glassButton = button
+ addSubview(button)
+
+ button.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ // 在 glass 容器内添加 containerView,使用 UIImageView 和 UILabel
+ button.addSubview(containerView)
+ containerView.addSubviews([imageView, titleLabel])
+
+ containerView.snp.makeConstraints { make in
+ if let edgeInsets = edgeInsets {
+ make.leading.equalToSuperview().inset(edgeInsets.left)
+ make.top.equalToSuperview().inset(edgeInsets.top)
+ make.trailing.equalToSuperview().inset(edgeInsets.right)
+ make.bottom.equalToSuperview().inset(edgeInsets.bottom)
+ } else {
+ make.center.equalToSuperview()
+ }
+ if horizontalContian {
+ make.leading.greaterThanOrEqualToSuperview()
+ make.trailing.lessThanOrEqualToSuperview()
+ }
+ }
+
+ imageView.snp.makeConstraints { make in
+ switch titlePosition {
+ case .right:
+ make.leading.top.bottom.equalToSuperview()
+ make.width.greaterThanOrEqualTo(0)
+ case .left:
+ make.trailing.top.bottom.equalToSuperview()
+ make.width.greaterThanOrEqualTo(0)
+ case .up:
+ make.leading.trailing.bottom.equalToSuperview()
+ case .down:
+ make.leading.top.trailing.equalToSuperview()
+ default:
+ break
+ }
+ }
+ imageView.image = image
+
+ titleLabel.font = titleFont
+ titleLabel.textColor = titleColor
+ titleLabel.textAlignment = titleAlignment
+ titleLabel.snp.makeConstraints { make in
+ switch titlePosition {
+ case .right:
+ make.top.trailing.bottom.equalToSuperview()
+ make.leading.equalTo(imageView.snp.trailing).offset(imageAndTitlePadding)
+ case .left:
+ make.top.leading.bottom.equalToSuperview()
+ make.trailing.equalTo(imageView.snp.leading).offset(-imageAndTitlePadding)
+ case .up:
+ make.top.trailing.leading.equalToSuperview()
+ make.bottom.equalTo(imageView.snp.top).offset(-imageAndTitlePadding)
+ case .down:
+ make.leading.trailing.bottom.equalToSuperview()
+ make.top.equalTo(imageView.snp.bottom).offset(imageAndTitlePadding)
+ default:
+ break
+ }
+ }
+ titleLabel.text = title
+ }
+
+ private func setupTraditionalView(image: UIImage?,
+ title: String,
+ titleFont: UIFont,
+ titleColor: UIColor,
+ titleAlignment: NSTextAlignment,
+ edgeInsets: UIEdgeInsets?,
+ horizontalContian: Bool,
+ titlePosition: UITextLayoutDirection,
+ imageAndTitlePadding: CGFloat) {
enableInteractive = true
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(containerView)
@@ -116,34 +270,89 @@ class SymbolButton: UIView {
default:
break
}
-
}
titleLabel.text = title
}
- convenience init(symbol: SFSymbol) {
- self.init(image: .symbolImage(symbol))
+ convenience init(symbol: SFSymbol, symbolColor: UIColor = Constants.Color.LabelPrimary, enableGlass: Bool = false, cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
+ self.init(image: .symbolImage(symbol).applySymbolConfig(color: symbolColor), enableGlass: enableGlass, cornerStyle: cornerStyle)
}
- init(image: UIImage?) {
+ init(image: UIImage?, enableGlass: Bool = false, cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
super.init(frame: .zero)
- enableInteractive = true
- backgroundColor = Constants.Color.BackgroundSecondary
- addSubview(imageView)
- imageView.snp.makeConstraints { make in
- make.center.equalToSuperview()
+
+ self.isGlassEnabled = enableGlass
+
+ // 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
+ if #available(iOS 26.0, *), enableGlass {
+ // iOS 26 + Glass enabled: 使用 UIButton.Configuration.glass() 作为容器
+ backgroundColor = .clear
+
+ var config = UIButton.Configuration.glass()
+ config.cornerStyle = cornerStyle
+
+ let button = UIButton(configuration: config)
+ button.isUserInteractionEnabled = true // iOS 26 的 Liquid Glass 需要处理触摸以显示视觉效果
+ glassButton = button
+ addSubview(button)
+
+ button.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ // 在 glass 容器内添加 imageView
+ button.addSubview(imageView)
+ imageView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ }
+ imageView.image = image
+ } else {
+ // iOS 25 及以下 或 enableGlass 为 false: 使用传统样式 + enableInteractive 动画
+ enableInteractive = true
+ backgroundColor = Constants.Color.BackgroundPrimary
+
+ addSubview(imageView)
+ imageView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ }
+ imageView.image = image
}
- imageView.image = image
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
+ /// 重写 addGestureRecognizer,确保手势识别器添加到正确的视图
+ /// iOS 26: 添加到内部的 glassButton
+ /// iOS 25: 添加到父视图自身
+ override func addGestureRecognizer(_ gestureRecognizer: UIGestureRecognizer) {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.addGestureRecognizer(gestureRecognizer)
+ } else {
+ super.addGestureRecognizer(gestureRecognizer)
+ }
+ }
+
+ /// 重写 removeGestureRecognizer,确保从正确的视图移除
+ override func removeGestureRecognizer(_ gestureRecognizer: UIGestureRecognizer) {
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.removeGestureRecognizer(gestureRecognizer)
+ } else {
+ super.removeGestureRecognizer(gestureRecognizer)
+ }
+ }
+
func triggerTapGesture() {
- for gestureRecognizer in gestureRecognizers ?? [] {
- if let tapGesture = gestureRecognizer as? UITapGestureRecognizer {
- tapGesture.state = .ended
+ // iOS 26 使用 UIButton,直接发送 touch 事件
+ if #available(iOS 26.0, *), let glassButton = glassButton {
+ glassButton.sendActions(for: .touchUpInside)
+ } else {
+ // iOS 25 及以下使用手势识别器
+ for gestureRecognizer in gestureRecognizers ?? [] {
+ if let tapGesture = gestureRecognizer as? UITapGestureRecognizer {
+ tapGesture.state = .ended
+ }
}
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/TransparentHoleView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/TransparentHoleView.swift
index b3303a68..1754fb5b 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/TransparentHoleView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/TransparentHoleView.swift
@@ -10,13 +10,13 @@
class TransparentHoleView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
- backgroundColor = .black
+ backgroundColor = UIColor(.dm, light: .white, dark: .black)
isUserInteractionEnabled = false
}
required init?(coder: NSCoder) {
super.init(coder: coder)
- backgroundColor = .black
+ backgroundColor = UIColor(.dm, light: .white, dark: .black)
isUserInteractionEnabled = false
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllerMappingView.swift b/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllerMappingView.swift
index 1dfc7b1b..315e19f8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllerMappingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllerMappingView.swift
@@ -23,9 +23,10 @@ class ControllerMappingView: UIView {
private lazy var navigationSymbolTitle: SymbolButton = {
let defaultTitle = self.gameType.localizedShortName
- let view = SymbolButton(image: UIImage(symbol: .chevronUpChevronDown, font: Constants.Font.caption(weight: .bold)),
+ let view = SymbolButton(image: UIImage(symbol: .chevronUpChevronDown, font: Constants.Font.caption(weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)),
title: defaultTitle,
titleFont: Constants.Font.title(size: .s),
+ titleColor: Constants.Color.LabelPrimary.forceStyle(.dark),
edgeInsets: .zero,
titlePosition: .left,
imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny)
@@ -45,6 +46,12 @@ class ControllerMappingView: UIView {
self.gameType = allGameTypes[index]
self.navigationSymbolTitle.titleLabel.text = itemTitles[index]
self.updateDatas()
+ var titleColor = Constants.Color.LabelPrimary
+ if #available(iOS 26.0, *), self.gameType != .psp {
+ titleColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ }
+ self.closeButton.imageView.image = UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold), color: titleColor)
+ self.resetButton.titleLabel.textColor = titleColor
}))
}
self.contextMenuButton.menu = UIMenu(children: items)
@@ -54,7 +61,11 @@ class ControllerMappingView: UIView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ var titleColor = Constants.Color.LabelPrimary
+ if #available(iOS 26.0, *), gameType != .psp {
+ titleColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ }
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold), color: titleColor), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -65,11 +76,17 @@ class ControllerMappingView: UIView {
}()
private lazy var resetButton: SymbolButton = {
+ var titleColor = Constants.Color.LabelPrimary
+ if #available(iOS 26.0, *), gameType != .psp {
+ titleColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ }
let view = SymbolButton(image: nil,
title: R.string.localizable.controllerMappingReset(),
titleFont: Constants.Font.body(size: .m),
+ titleColor: titleColor,
edgeInsets: UIEdgeInsets(top: 0, left: Constants.Size.ContentSpaceTiny+3, bottom: 0, right: Constants.Size.ContentSpaceTiny),
- titlePosition: .left)
+ titlePosition: .left,
+ enableGlass: true)
view.titleLabel.textAlignment = .center
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
@@ -113,7 +130,7 @@ class ControllerMappingView: UIView {
let view = UILabel()
view.numberOfLines = 0
view.textAlignment = .center
- view.textColor = Constants.Color.LabelPrimary
+ view.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
view.font = Constants.Font.body(size: .l, weight: .semibold)
view.text = R.string.localizable.controllerMappingGuideTitle()
return view
diff --git a/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllersSettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllersSettingView.swift
index d58ddc30..be3471c6 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllersSettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Controllers/Views/ControllersSettingView.swift
@@ -19,9 +19,9 @@ class ControllersSettingView: BaseView {
var topBlurView: UIView = {
let view = UIView()
if UIDevice.isPad {
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
} else {
- view.makeBlur(blurColor: .black)
+ view.makeBlur(blurColor: UIColor(.dm, light: .white, dark: .black))
}
return view
}()
@@ -37,7 +37,7 @@ class ControllersSettingView: BaseView {
view.backgroundColor = .clear
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: ControllersCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BlackHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: LowestHaderReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
view.delegate = self
@@ -214,13 +214,13 @@ extension ControllersSettingView: UICollectionViewDataSource {
self?.showPlayerIndexSelection(at: cell?.contextMenuButton, controller: controller)
}
if !asSideMenu {
- cell.backgroundColor = Constants.Color.BackgroundSecondary
+ cell.backgroundColor = Constants.Color.BackgroundPrimary
}
return cell
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BlackHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: LowestHaderReusableView.self, for: indexPath)
header.titleLabel.text = R.string.localizable.controllersHeaderTitle()
if !header.subviews.contains(where: { $0 is SymbolButton }) {
let moreContextMenuButton: ContextMenuButton = {
@@ -236,7 +236,7 @@ extension ControllersSettingView: UICollectionViewDataSource {
}()
let moreButton: SymbolButton = {
- let view = SymbolButton(symbol: .ellipsis)
+ let view = SymbolButton(symbol: .ellipsis, enableGlass: true)
view.enableRoundCorner = true
return view
}()
@@ -260,7 +260,7 @@ extension ControllersSettingView: UICollectionViewDataSource {
}
}
if UIDevice.isPad {
- header.backgroundColor = .black
+ header.backgroundColor = UIColor(.dm, light: .white, dark: .black)
}
return header
}
@@ -289,7 +289,7 @@ extension ControllersSettingView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterNameOnlyCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterNameOnlyCollectionCell.swift
index 6d63dfce..d14b1119 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterNameOnlyCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterNameOnlyCollectionCell.swift
@@ -23,11 +23,18 @@ class FilterNameOnlyCollectionCell: UICollectionViewCell {
view.layer.shadowColor = Constants.Color.Shadow.cgColor
view.layer.shadowOpacity = 0.5
view.layer.shadowRadius = 2
- view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary, Constants.Color.Main])
+ view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary.forceStyle(.dark), Constants.Color.Main])
view.alpha = 0
return view
}()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
+
override var isSelected: Bool {
willSet {
UIView.springAnimate {
@@ -41,7 +48,7 @@ class FilterNameOnlyCollectionCell: UICollectionViewCell {
enableInteractive = true
delayInteractiveTouchEnd = true
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterSelectionView.swift b/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterSelectionView.swift
index e21fb554..f5c1bab5 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Filter/Views/FilterSelectionView.swift
@@ -24,14 +24,14 @@ class FilterSelectionView: BaseView {
}()
private var howToFetchButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.howToFetch()) {
+ let view = HowToButton(title: R.string.localizable.howToFetch(), enableGlass: true) {
topViewController()?.present(WebViewController(url: Constants.URLs.GameImportGuide), animated: true)
}
return view
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -190,7 +190,7 @@ class FilterSelectionView: BaseView {
var backgroundView: UIView = {
let view = UIView()
view.layerCornerRadius = Constants.Size.CornerRadiusMax
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
return view
}()
@@ -281,7 +281,7 @@ extension FilterSelectionView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameCoverSearchView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameCoverSearchView.swift
index 7d20e437..73cf17c2 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameCoverSearchView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameCoverSearchView.swift
@@ -16,12 +16,12 @@ class GameCoverSearchView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -42,7 +42,7 @@ class GameCoverSearchView: BaseView {
lazy var collectionView: BlankSlateCollectionView = {
let view = BlankSlateCollectionView(frame: .zero, collectionViewLayout: createLayout())
- view.backgroundColor = Constants.Color.BackgroundPrimary
+ view.backgroundColor = .clear
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: GameCollectionViewCell.self)
view.showsVerticalScrollIndicator = false
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoCoverView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoCoverView.swift
index ac0565ee..b086a42f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoCoverView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoCoverView.swift
@@ -22,7 +22,7 @@ class GameInfoCoverView: BaseView {
private var backgroundGradientView: UIView = {
let view = GradientView()
- view.setupGradient(colors: [.clear, Constants.Color.BackgroundPrimary], locations: [0.0, 1.0], direction: .topToBottom)
+ view.setupGradient(colors: [.clear, Constants.Color.Background], locations: [0.0, 1.0], direction: .topToBottom)
return view
}()
@@ -39,9 +39,13 @@ class GameInfoCoverView: BaseView {
}()
lazy var editCoverButton: ContextMenuButton = {
- let view = ContextMenuButton(image: UIImage(symbol: .ellipsis), menu: generateMenu())
+ let view = ContextMenuButton(image: UIImage(symbol: .ellipsis), menu: generateMenu(), enableGlass: true)
view.layerCornerRadius = Constants.Size.IconSizeMid.height/2
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ if #available(iOS 26.0, *) {
+ view.backgroundColor = .clear
+ } else {
+ view.backgroundColor = Constants.Color.BackgroundSecondary
+ }
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
index 721b721c..c0b1ccce 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
@@ -786,7 +786,7 @@ class GameInfoDetailReusableView: UICollectionReusableView {
}()
private lazy var startGameButton: SymbolButton = {
- let view = SymbolButton(symbol: .playFill)
+ let view = SymbolButton(symbol: .playFill, symbolColor: Constants.Color.LabelPrimary.forceStyle(.dark))
view.backgroundColor = Constants.Color.Main
view.layerCornerRadius = Constants.Size.ItemHeightMid/2
view.addTapGesture { [weak self] gesture in
@@ -967,9 +967,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundSecondary),
+ .backgroundColor(Constants.Color.SegmentBackground),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundTertiary),
+ .indicatorViewBackgroundColor(Constants.Color.SegmentHighlight),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoView.swift
index 94bafcc9..63f33520 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoView.swift
@@ -31,7 +31,7 @@ class GameInfoView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -41,7 +41,7 @@ class GameInfoView: BaseView {
}()
private lazy var infoButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .info, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .info, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self else { return }
@@ -111,7 +111,7 @@ class GameInfoView: BaseView {
private var isGameSaveStatesPageEmpty: Bool {
(self.isManualGameSaveStatesPage && self.manualGameSaveStates.count == 0) || (!self.isManualGameSaveStatesPage && self.autoGameSaveStates.count == 0)
}
- private lazy var deleteImage = UIImage(symbol: .trash, backgroundColor: Constants.Color.Red, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
+ private lazy var deleteImage = UIImage(symbol: .trash, color: Constants.Color.LabelPrimary.forceStyle(.dark), backgroundColor: Constants.Color.Red, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
///点击关闭按钮回调
var didTapClose: (()->Void)? = nil
@@ -543,7 +543,7 @@ extension GameInfoView: SwipeCollectionViewCellDelegate {
completionAnimation: .fill(.manual(timing: .with)))
options.expansionDelegate = self
options.transitionStyle = .border
- options.backgroundColor = Constants.Color.BackgroundPrimary
+ options.backgroundColor = Constants.Color.Background
options.maximumButtonWidth = Constants.Size.ItemHeightMin + Constants.Size.ContentSpaceTiny*2
return options
}
@@ -573,7 +573,7 @@ extension GameInfoView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameSavePurchaseGuideView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameSavePurchaseGuideView.swift
index 795a12e3..93e74774 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameSavePurchaseGuideView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameSavePurchaseGuideView.swift
@@ -47,7 +47,7 @@ class GameSavePurchaseGuideView: UIView {
make.leading.top.bottom.equalToSuperview()
}
- let appNameImage = GradientImageView(image: R.image.app_title()?.scaled(toSize: CGSize(width: 138, height: 11.3)))
+ let appNameImage = UIImageView(image: UIImage(.dm, light: (R.image.app_title_light()?.scaled(toSize: CGSize(width: 138, height: 11.3)))!, dark: (R.image.app_title()?.scaled(toSize: CGSize(width: 138, height: 11.3)))!))
containerView.addSubview(appNameImage)
appNameImage.snp.makeConstraints { make in
make.leading.equalTo(becomeLabel.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)
@@ -77,7 +77,7 @@ class GameSavePurchaseGuideView: UIView {
make.top.equalTo(containerView.snp.bottom).offset(Constants.Size.ContentSpaceUltraTiny)
}
- let button = SymbolButton(image: nil, title: R.string.localizable.goToUpgrade(), titleFont: Constants.Font.caption(size: .l, weight: .semibold), titlePosition: .left, imageAndTitlePadding: 0)
+ let button = SymbolButton(image: nil, title: R.string.localizable.goToUpgrade(), titleFont: Constants.Font.caption(size: .l, weight: .semibold), titleColor: Constants.Color.LabelPrimary.forceStyle(.dark), titlePosition: .left, imageAndTitlePadding: 0)
button.enableRoundCorner = true
let buttonBackground = UIView(frame: CGRect(origin: .zero, size: CGSize(width: 100, height: 30)))
buttonBackground.addGradient(colors: Constants.Color.Gradient, direction: .leftToRight)
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/PSXSBICollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/PSXSBICollectionCell.swift
index 565492bb..c6faf422 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/PSXSBICollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/PSXSBICollectionCell.swift
@@ -22,7 +22,7 @@ class PSXSBICollectionCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
@@ -31,7 +31,7 @@ class PSXSBICollectionCell: UICollectionViewCell {
}
addSubview(addFileButton)
- addFileButton.backgroundColor = Constants.Color.BackgroundPrimary
+ addFileButton.backgroundColor = Constants.Color.Background
addFileButton.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.height.equalTo(Constants.Size.ItemHeightMin)
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/SaveItemCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/SaveItemCollectionViewCell.swift
index bd5cad72..da54c260 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/SaveItemCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/SaveItemCollectionViewCell.swift
@@ -52,7 +52,8 @@ class SaveItemCollectionViewCell: SwipeCollectionViewCell {
titleFont: Constants.Font.caption(size: .l, weight: .medium),
edgeInsets: UIEdgeInsets(top: 0, left: Constants.Size.ContentSpaceMin, bottom: 0, right: Constants.Size.ContentSpaceMin),
titlePosition: .left,
- imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny)
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: true)
view.layerCornerRadius = 15
return view
}()
@@ -68,6 +69,13 @@ class SaveItemCollectionViewCell: SwipeCollectionViewCell {
return view
}()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
+
override var isSelected: Bool {
willSet {
if newValue {
@@ -85,7 +93,7 @@ class SaveItemCollectionViewCell: SwipeCollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
- contentView.backgroundColor = Constants.Color.BackgroundPrimary
+ contentView.backgroundColor = Constants.Color.Background
contentView.addSubview(selectImageView)
selectImageView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/PSXSBIImportViewController.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/PSXSBIImportViewController.swift
index 87f34083..e903596d 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/PSXSBIImportViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/PSXSBIImportViewController.swift
@@ -17,7 +17,7 @@ class PSXSBIImportViewController: BaseViewController {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/ThreeDSAdvancedSettingViewController.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/ThreeDSAdvancedSettingViewController.swift
index 0d906b0c..5b1d1bcd 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/ThreeDSAdvancedSettingViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/ViewControllers/ThreeDSAdvancedSettingViewController.swift
@@ -65,7 +65,7 @@ class ThreeDSAdvancedSettingViewController: QuickTableViewController {
}()
private lazy var moreButton: SymbolButton = {
- let view = SymbolButton(symbol: .ellipsis)
+ let view = SymbolButton(symbol: .ellipsis, enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
self?.moreContextMenuButton.triggerTapGesture()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/ViewControllers/GamesViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Games/ViewControllers/GamesViewController.swift
index e6808880..d88317c1 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/ViewControllers/GamesViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/ViewControllers/GamesViewController.swift
@@ -20,7 +20,7 @@ class GamesViewController: BaseViewController {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.Background)
+ view.makeBlur()
return view
}()
@@ -275,7 +275,7 @@ class GamesViewController: BaseViewController {
} else {
//iPad布局
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
view.addSubview(gamesListView)
gamesListView.snp.makeConstraints { make in
@@ -341,8 +341,8 @@ class GamesViewController: BaseViewController {
make.top.trailing.bottom.equalToSuperview()
make.leading.equalTo(gamesListView.snp.trailing)
}
- controllersSettingView.backgroundColor = .black
- playHistoryView.backgroundColor = .black
+ controllersSettingView.backgroundColor = UIColor(.dm, light: .white, dark: .black)
+ playHistoryView.backgroundColor = UIColor(.dm, light: .white, dark: .black)
cornerMaskViewForiPad.isHidden = false
} else {
view.addSubview(controllersSettingView)
@@ -460,8 +460,8 @@ class GamesViewController: BaseViewController {
make.leading.equalTo(gamesListView.snp.trailing)
}
}
- controllersSettingView.backgroundColor = .black
- playHistoryView.backgroundColor = .black
+ controllersSettingView.backgroundColor = UIColor(.dm, light: .white, dark: .black)
+ playHistoryView.backgroundColor = UIColor(.dm, light: .white, dark: .black)
cornerMaskViewForiPad.isHidden = false
} else {
gamesNavigationView.controllerButton.isHidden = false
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCollectionViewCell.swift
index 179af3bd..5640ed6a 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCollectionViewCell.swift
@@ -38,6 +38,13 @@ class GameCollectionViewCell: UICollectionViewCell {
return view
}()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
+
private var selectedBackground: UIView = {
let view = UIView()
view.backgroundColor = Constants.Color.BackgroundSecondary
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
index 0316ab9b..deb15abb 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
@@ -16,7 +16,7 @@ class GameCoverView: UIView {
var imageView: UIImageView = {
let view = UIImageView()
view.contentMode = .scaleAspectFill
- view.backgroundColor = Constants.Color.BackgroundPrimary
+ view.backgroundColor = Constants.Color.Background
return view
}()
@@ -41,7 +41,7 @@ class GameCoverView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(imageView)
imageView.snp.makeConstraints { make in
make.edges.equalToSuperview()
@@ -112,7 +112,7 @@ class GameCoverView: UIView {
}
platformView.isHidden = true
barShadowView.isHidden = true
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
case .style2:
imageView.snp.remakeConstraints { make in
make.top.trailing.bottom.equalToSuperview()
@@ -127,7 +127,7 @@ class GameCoverView: UIView {
}
platformView.isHidden = false
barShadowView.isHidden = false
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
case .style3:
imageView.snp.remakeConstraints { make in
make.leading.top.trailing.equalToSuperview().inset(6)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
index cc386235..b4f2c3fe 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
@@ -1158,7 +1158,7 @@ extension GameListView: SectionIndexViewDataSource, SectionIndexViewDelegate {
item.title = "?"
}
item.titleColor = Constants.Color.LabelTertiary
- item.titleSelectedColor = Constants.Color.LabelPrimary
+ item.titleSelectedColor = Constants.Color.LabelPrimary.forceStyle(.dark)
item.selectedColor = Constants.Color.Main
item.titleFont = Constants.Font.caption(size: .s, weight: .bold)
return item
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
index 5a77e0b7..b70fe0b7 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
@@ -34,6 +34,8 @@ class GamesCollectionReusableView: UICollectionReusableView {
var didTapPlatform: (()->Void)? = nil
+ private var highlightString: String? = nil
+
override init(frame: CGRect) {
super.init(frame: frame)
if UIDevice.isPad {
@@ -91,6 +93,8 @@ class GamesCollectionReusableView: UICollectionReusableView {
}
titleLabel.attributedText = NSAttributedString(string: title, attributes: [.font: Constants.Font.title(), .foregroundColor: Constants.Color.LabelPrimary]).highlightString(highlightString)
}
+ skinButton.setTitleColor(Constants.Color.LabelSecondary, for: .normal)
+ self.highlightString = highlightString
if UIDevice.isPhone, UIDevice.isLandscape {
//隐藏模糊
if let blurView = subviews.first(where: { $0 is VisualEffectView }) as? VisualEffectView {
@@ -109,63 +113,65 @@ class GamesCollectionReusableView: UICollectionReusableView {
private static var brandImageCaches = [String: UIImage?]()
static func getBrandImage(gameType: GameType) -> UIImage? {
- let key = gameType.rawValue
+ let traitCollection = ApplicationSceneDelegate.applicationWindow?.traitCollection
+ let userInterfaceStyle = traitCollection?.userInterfaceStyle
+ let key = gameType.rawValue + (userInterfaceStyle == nil ? "" : "\(userInterfaceStyle!.rawValue)")
if let image = Self.brandImageCaches[key] {
return image
} else {
var image: UIImage? = nil
if gameType == ._3ds {
- image = R.image.sds_group_brand()
+ image = R.image.sds_group_brand(compatibleWith: traitCollection)
} else if gameType == .ds {
- image = R.image.ds_group_brand()
+ image = R.image.ds_group_brand(compatibleWith: traitCollection)
} else if gameType == .gba {
- image = R.image.gba_group_brand()
+ image = R.image.gba_group_brand(compatibleWith: traitCollection)
} else if gameType == .gbc {
- image = R.image.gbc_group_brand()
+ image = R.image.gbc_group_brand(compatibleWith: traitCollection)
} else if gameType == .gb {
- image = R.image.gb_group_brand()
+ image = R.image.gb_group_brand(compatibleWith: traitCollection)
} else if gameType == .nes {
- image = R.image.nes_group_brand()
+ image = R.image.nes_group_brand(compatibleWith: traitCollection)
} else if gameType == .snes {
- image = R.image.snes_group_brand()
+ image = R.image.snes_group_brand(compatibleWith: traitCollection)
} else if gameType == .psp {
- image = R.image.psp_group_brand()
+ image = R.image.psp_group_brand(compatibleWith: traitCollection)
} else if gameType == .md {
if Locale.prefersUS {
- image = R.image.md_group_brand_us()
+ image = R.image.md_group_brand_us(compatibleWith: traitCollection)
} else {
- image = R.image.md_group_brand()
+ image = R.image.md_group_brand(compatibleWith: traitCollection)
}
} else if gameType == .mcd {
if Locale.prefersUS {
- image = R.image.mcd_group_brand_us()
+ image = R.image.mcd_group_brand_us(compatibleWith: traitCollection)
} else {
- image = R.image.mcd_group_brand()
+ image = R.image.mcd_group_brand(compatibleWith: traitCollection)
}
} else if gameType == ._32x {
if Locale.prefersUS {
- image = R.image.s2x_group_brand_us()
+ image = R.image.s2x_group_brand_us(compatibleWith: traitCollection)
} else {
- image = R.image.s2x_group_brand()
+ image = R.image.s2x_group_brand(compatibleWith: traitCollection)
}
} else if gameType == .ss {
- image = R.image.ss_group_brand()
+ image = R.image.ss_group_brand(compatibleWith: traitCollection)
} else if gameType == .sg1000 {
- image = R.image.sg1000_group_brand()
+ image = R.image.sg1000_group_brand(compatibleWith: traitCollection)
} else if gameType == .gg {
- image = R.image.gg_group_brand()
+ image = R.image.gg_group_brand(compatibleWith: traitCollection)
} else if gameType == .ms {
- image = R.image.ms_group_brand()
+ image = R.image.ms_group_brand(compatibleWith: traitCollection)
} else if gameType == .n64 {
- image = R.image.n64_group_brand()
+ image = R.image.n64_group_brand(compatibleWith: traitCollection)
} else if gameType == .vb {
- image = R.image.vb_group_brand()
+ image = R.image.vb_group_brand(compatibleWith: traitCollection)
} else if gameType == .pm {
- image = R.image.pm_group_brand()
+ image = R.image.pm_group_brand(compatibleWith: traitCollection)
} else if gameType == .ps1 {
- image = R.image.ps1_group_brand()
+ image = R.image.ps1_group_brand(compatibleWith: traitCollection)
} else if gameType == .dc {
- image = R.image.dc_group_brand()
+ image = R.image.dc_group_brand(compatibleWith: traitCollection)
}
Self.brandImageCaches[key] = image
return image
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift
index f761fa3a..359cd264 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift
@@ -87,7 +87,8 @@ class GamesListBlankSlateView: BaseView {
welcomeLabelLeft.snp.makeConstraints { make in
make.leading.top.bottom.equalToSuperview()
}
- let appNameImage = UIImageView(image: R.image.app_title()?.scaled(toSize: CGSize(width: 138, height: 11.3)))
+
+ let appNameImage = UIImageView(image: UIImage(.dm, light: (R.image.app_title_light()?.scaled(toSize: CGSize(width: 138, height: 11.3)))!, dark: (R.image.app_title()?.scaled(toSize: CGSize(width: 138, height: 11.3)))!))
welcomeContainer.addSubview(appNameImage)
appNameImage.snp.makeConstraints { make in
make.leading.equalTo(welcomeLabelLeft.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)
@@ -106,7 +107,7 @@ class GamesListBlankSlateView: BaseView {
//加入社区
let channelLinkContainerView = UIView()
- channelLinkContainerView.backgroundColor = Constants.Color.BackgroundPrimary
+ channelLinkContainerView.backgroundColor = Constants.Color.Background
channelLinkContainerView.layerCornerRadius = 15
addSubview(channelLinkContainerView)
channelLinkContainerView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesNavigationView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesNavigationView.swift
index e4f95dfb..fd923e44 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesNavigationView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesNavigationView.swift
@@ -11,19 +11,19 @@ import UIKit
class GamesNavigationView: UIView {
private var appTitle: UIImageView = {
- let view = UIImageView(image: R.image.app_title())
+ let view = UIImageView(image: UIImage(.dm, light: R.image.app_title_light()!, dark: R.image.app_title()!))
return view
}()
var controllerButton: SymbolButton = {
- let view = SymbolButton(image: R.image.customArcadeStickConsoleFill()?.applySymbolConfig())
+ let view = SymbolButton(image: R.image.customArcadeStickConsoleFill()?.applySymbolConfig(), enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.BackgroundPrimary
return view
}()
var historyButton: SymbolButton = {
- let view = SymbolButton(image: R.image.customFlagPatternCheckered()?.applySymbolConfig())
+ let view = SymbolButton(image: R.image.customFlagPatternCheckered()?.applySymbolConfig(), enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.BackgroundPrimary
return view
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesToolView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesToolView.swift
index c343cf3e..ea23550d 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesToolView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesToolView.swift
@@ -291,6 +291,6 @@ class GamesToolIconView: UIView {
super.layoutSubviews()
layerCornerRadius = height/2
layer.borderWidth = 1
- layer.borderColor = UIColor.white.withAlphaComponent(0.05).cgColor
+ layer.borderColor = Constants.Color.Border.cgColor
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryBlankSlateView.swift b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryBlankSlateView.swift
index ddfdf97b..1c92736b 100644
--- a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryBlankSlateView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryBlankSlateView.swift
@@ -50,7 +50,7 @@ class PlayHistoryBlankSlateView: UIView {
//功能按钮
let gameCount = Database.realm.objects(Game.self).where({ !$0.isDeleted }).count
let actionButton = HowToButton(title: gameCount > 0 ? R.string.localizable.historyEmptyStartGame() : R.string.localizable.historyEmptyImportGame()) {}
- actionButton.label.textColor = Constants.Color.LabelPrimary
+ actionButton.label.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
actionButton.backgroundColor = Constants.Color.Main
containerView.addSubview(actionButton)
actionButton.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
index b584affb..f3280bfc 100644
--- a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
@@ -18,7 +18,8 @@ class PlayHistoryFavouriteCollectionCell: UICollectionViewCell {
titleAlignment: .left,
edgeInsets: UIEdgeInsets(top: 6, left: 12, bottom: 6, right: 12),
titlePosition: .right,
- imageAndTitlePadding: 4)
+ imageAndTitlePadding: 4,
+ enableGlass: true)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.Background
return view
@@ -51,7 +52,7 @@ class PlayHistoryFavouriteCollectionCell: UICollectionViewCell {
private let titleLabel: UILabel = {
let view = UILabel()
view.font = Constants.Font.body(size: .l)
- view.textColor = Constants.Color.LabelPrimary
+ view.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
view.numberOfLines = 2
view.layer.shadowColor = Constants.Color.Background.cgColor
view.layer.shadowOpacity = 0.5
@@ -60,6 +61,14 @@ class PlayHistoryFavouriteCollectionCell: UICollectionViewCell {
return view
}()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ titleLabel.layer.shadowColor = Constants.Color.Background.cgColor
+ iconViewContainerView.makeShadow(ofColor: Constants.Color.BackgroundPrimary, radius: 15)
+ }
+ }
+
private let subtitleIcon: UIImageView = {
let view = UIImageView()
view.image = .symbolImage(.starCircleFill).applySymbolConfig(color: .white.withAlphaComponent(0.5))
diff --git a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryView.swift b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryView.swift
index a2ab3b23..725f0172 100644
--- a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryView.swift
@@ -17,9 +17,9 @@ class PlayHistoryView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
if UIDevice.isPad {
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
} else {
- view.makeBlur(blurColor: .black)
+ view.makeBlur(blurColor: UIColor(.dm, light: .white, dark: .black))
}
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Home/ViewControllers/HomeViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Home/ViewControllers/HomeViewController.swift
index adab77f8..035509fc 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Home/ViewControllers/HomeViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Home/ViewControllers/HomeViewController.swift
@@ -49,7 +49,7 @@ class HomeViewController: BaseViewController {
private lazy var pageViewManager: PageViewManager = {
let style = PageStyle()
- style.contentViewBackgroundColor = UIDevice.isPad ? .black : Constants.Color.Background
+ style.contentViewBackgroundColor = UIDevice.isPad ? UIColor(.dm, light: .white, dark: .black) : Constants.Color.Background
let manager = PageViewManager(style: style, titles: HomeTabBar.BarSelection.allCases.map { String($0.rawValue) }, childViewControllers: childControllers)
manager.contentView.getContentEdgeInsets = {
if UIDevice.isPhone, UIDevice.isLandscape {
@@ -128,7 +128,7 @@ class HomeViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
self.setupViews()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Home/Views/HomeTabBar.swift b/ManicEmu/ManicEmu/Sources/Business/Home/Views/HomeTabBar.swift
index 559d87e2..e59577f7 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Home/Views/HomeTabBar.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Home/Views/HomeTabBar.swift
@@ -184,8 +184,13 @@ class HomeTabBar: UIView {
super.init(frame: frame)
self.backgroundColor = .clear
self.layer.cornerRadius = Constants.Size.HomeTabBarSize.height/2
- self.makeShadow()
- self.makeBlur(cornerRadius: Constants.Size.HomeTabBarSize.height/2)
+ if #available(iOS 26.0, *) {
+ self.makeGlass()
+ } else {
+ self.layer.borderWidth = 1
+ self.layer.borderColor = Constants.Color.Border.cgColor
+ self.makeBlur(cornerRadius: Constants.Size.HomeTabBarSize.height/2)
+ }
addSubviews([indicatorView, gamesBar, importBar, settingsBar])
updateViewsConstraints(isInit: true)
@@ -200,6 +205,16 @@ class HomeTabBar: UIView {
}
}
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ if #available(iOS 26.0, *) { } else {
+ self.layer.borderWidth = 1
+ self.layer.borderColor = Constants.Color.Border.cgColor
+ }
+ }
+ }
+
required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Models/ImportService.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Models/ImportService.swift
index d8d1a295..3d4fa72c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Models/ImportService.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Models/ImportService.swift
@@ -14,7 +14,7 @@ import IceCream
extension ImportService: CKRecordConvertible & CKRecordRecoverable { }
enum ImportServiceType: Int, PersistableEnum {
- case files, wifi, paste, googledrive, dropbox, onedrive, baiduyun, aliyun, samba, webdav
+ case files, wifi, paste, googledrive, dropbox, onedrive, baiduyun, aliyun, samba, webdav, multiDisc, romPatcher
}
class ImportService: Object, ObjectUpdatable {
@@ -98,6 +98,10 @@ class ImportService: Object, ObjectUpdatable {
"SMB"
case .webdav:
"WebDav"
+ case .multiDisc:
+ R.string.localizable.multiDiscBuilder()
+ case .romPatcher:
+ "RomPatcher"
}
}
@@ -123,9 +127,42 @@ class ImportService: Object, ObjectUpdatable {
R.image.import_smb()!
case .webdav:
R.image.import_webdav()!
+ case .multiDisc:
+ R.image.import_multi_disc_icon()!
+ case .romPatcher:
+ R.image.import_rom_patcher()!
}
}()
+ var iconCornerRadius: Double {
+ switch type {
+ case .files:
+ Constants.Size.CornerRadiusMin
+ case .wifi, .paste, .googledrive, .dropbox, .onedrive, .baiduyun, .aliyun, .multiDisc, .romPatcher:
+ Constants.Size.CornerRadiusTiny
+ case .samba, .webdav:
+ 0
+ }
+ }
+
+ var iconBackgroundColor: UIColor {
+ switch type {
+ case .files, .wifi, .paste, .googledrive, .dropbox, .onedrive, .baiduyun, .aliyun, .multiDisc, .romPatcher:
+ Constants.Color.BackgroundPrimary
+ case .samba, .webdav:
+ UIColor.clear
+ }
+ }
+
+ var iconBorderColor: UIColor {
+ switch type {
+ case .files, .wifi, .paste, .googledrive, .dropbox, .onedrive, .baiduyun, .aliyun, .multiDisc, .romPatcher:
+ Constants.Color.Border
+ case .samba, .webdav:
+ UIColor.clear
+ }
+ }
+
var cloudDriveProvider: CloudServiceProvider? {
guard let token = token else { return nil }
let provider: CloudServiceProvider?
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/CloudDriveBrowserViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/CloudDriveBrowserViewController.swift
index bdd21832..b789702b 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/CloudDriveBrowserViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/CloudDriveBrowserViewController.swift
@@ -32,7 +32,10 @@ class CloudDriveBrowserViewController: BaseViewController {
}
private var downloadManageButton: UIBarButtonItem = {
- let view = DownloadButton()
+ let view = DownloadButton(enableGlass: false)
+ if #available(iOS 26.0, *) {
+ view.backgroundColor = .clear
+ }
view.addTapGesture { gesture in
topViewController()?.present(DownloadViewController(), animated: true)
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/ImportViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/ImportViewController.swift
index 02710a8e..ec335d4b 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/ImportViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/ImportViewController.swift
@@ -59,7 +59,7 @@ class ImportViewController: BaseViewController {
make.edges.equalToSuperview()
}
} else {
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
importServiceListView.backgroundColor = Constants.Color.Background
importServiceListView.addServiceButton.isHidden = true
view.addSubview(importServiceListView)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/LanServiceEditViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/LanServiceEditViewController.swift
index 9daad3d3..b60ac4cf 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/LanServiceEditViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/LanServiceEditViewController.swift
@@ -44,7 +44,7 @@ class LanServiceEditViewController: BaseViewController {
}()
private lazy var confirmButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.landServiceEditConnect()) { [weak self] in
+ let view = HowToButton(title: R.string.localizable.landServiceEditConnect(), enableGlass: true) { [weak self] in
guard let self = self else { return }
//点击连接处理
self.collectionView.endEditing(true)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
index 402f7a1d..202f445f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
@@ -53,7 +53,7 @@ class MultiDiscBuilderViewController: BaseViewController {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
@@ -94,7 +94,7 @@ class MultiDiscBuilderViewController: BaseViewController {
}()
private lazy var moreButton: SymbolButton = {
- let view = SymbolButton(symbol: .ellipsis)
+ let view = SymbolButton(symbol: .ellipsis, enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
self?.moreContextMenuButton.triggerTapGesture()
@@ -103,7 +103,7 @@ class MultiDiscBuilderViewController: BaseViewController {
}()
private lazy var addFileButton: SymbolButton = {
- let view = SymbolButton(image: nil, title: R.string.localizable.multiDiscAddFile("ROM"), titleFont: Constants.Font.body(size: .l, weight: .medium), horizontalContian: true, titlePosition: .right)
+ let view = SymbolButton(image: nil, title: R.string.localizable.multiDiscAddFile("ROM"), titleFont: Constants.Font.body(size: .l, weight: .medium), titleColor: Constants.Color.LabelPrimary.forceStyle(.dark), horizontalContian: true, titlePosition: .right)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.Main
view.addTapGesture { [weak self] gesture in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceCollectionViewCell.swift
index 2866c531..71aaf730 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceCollectionViewCell.swift
@@ -10,8 +10,8 @@
import UIKit
class AddImportServiceCollectionViewCell: UICollectionViewCell {
- private var iconView: UIImageView = {
- let view = UIImageView()
+ private var iconView: ServiceIconView = {
+ let view = ServiceIconView(roundCorner: .allCorners)
return view
}()
@@ -24,7 +24,7 @@ class AddImportServiceCollectionViewCell: UICollectionViewCell {
var chevronIconView: UIImageView = {
let view = UIImageView()
- view.image = UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundTertiary)
+ view.image = UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundSecondary)
if Locale.isRTLLanguage {
view.transform = CGAffineTransform(scaleX: -1, y: 1)
}
@@ -62,7 +62,10 @@ class AddImportServiceCollectionViewCell: UICollectionViewCell {
}
func setData(service: ImportService) {
- iconView.image = service.iconImage
+ iconView.imageView.image = service.iconImage
+ iconView.backgroundColor = service.iconBackgroundColor
+ iconView.borderColor = service.iconBorderColor
+ iconView.radius = service.iconCornerRadius
titleLabel.text = service.title
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceView.swift
index 7117a376..b837516f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/AddImportServiceView.swift
@@ -15,7 +15,7 @@ class AddImportServiceView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: .black)
+ view.makeBlur(blurColor: UIColor(.dm, light: .white, dark: .black))
return view
}()
@@ -24,7 +24,7 @@ class AddImportServiceView: BaseView {
view.backgroundColor = .clear
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: AddImportServiceCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BlackHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: LowestHaderReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
view.delegate = self
@@ -184,7 +184,7 @@ extension AddImportServiceView: UICollectionViewDataSource {
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BlackHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: LowestHaderReusableView.self, for: indexPath)
header.titleLabel.font = Constants.Font.body(size: .l, weight: .semibold)
if indexPath.section == 0 {
header.titleLabel.text = R.string.localizable.importAddCloudServiceTitle()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/BrowserItemCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/BrowserItemCollectionViewCell.swift
index af58bdc7..829cad56 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/BrowserItemCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/BrowserItemCollectionViewCell.swift
@@ -91,8 +91,8 @@ class BrowserItemCollectionViewCell: UICollectionViewCell {
if isSelected {
checkboxImageView.image = UIImage(symbol: .checkmarkCircleFill,
size: Constants.Size.IconSizeTiny.height,
- colors: [Constants.Color.LabelPrimary, UIWindow.applicationWindow?.tintColor ?? Constants.Color.Main])
- selectedBackgroundView?.backgroundColor = Constants.Color.BackgroundSecondary
+ colors: [Constants.Color.LabelPrimary.forceStyle(.dark), UIWindow.applicationWindow?.tintColor ?? Constants.Color.Main])
+ selectedBackgroundView?.backgroundColor = Constants.Color.BackgroundPrimary
} else {
checkboxImageView.image = UIImage(symbol: .circle,
size: Constants.Size.IconSizeTiny.height,
@@ -109,8 +109,8 @@ class BrowserItemCollectionViewCell: UICollectionViewCell {
iconImageView.image = (isFolder ? R.image.file_browser_folder() : R.image.file_browser_document())
iconImageView.tintColor = nil
} else {
- titleLabel.textColor = Constants.Color.LabelTertiary
- detailLabel.textColor = Constants.Color.LabelQuaternary
+ titleLabel.textColor = Constants.Color.LabelSecondary
+ detailLabel.textColor = Constants.Color.LabelTertiary
iconImageView.image = (isFolder ? R.image.file_browser_folder() : R.image.file_browser_document())?.withRenderingMode(.alwaysTemplate)
iconImageView.tintColor = Constants.Color.LabelTertiary
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadButton.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadButton.swift
index 88d0e3d4..61ec1e44 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadButton.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadButton.swift
@@ -21,8 +21,8 @@ class DownloadButton: SymbolButton {
}
}
- init() {
- super.init(image: UIImage(symbol: .arrowDownToLine, font: Constants.Font.body(weight: .bold)))
+ init(enableGlass: Bool = true) {
+ super.init(image: UIImage(symbol: .arrowDownToLine, font: Constants.Font.body(weight: .bold)), enableGlass: enableGlass)
enableRoundCorner = true
detectDownloadStatus()
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadItemCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadItemCollectionViewCell.swift
index 04616098..eea5b123 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadItemCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadItemCollectionViewCell.swift
@@ -30,7 +30,7 @@ class DownloadItemCollectionViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = 1
- backgroundColor = Constants.Color.BackgroundTertiary
+ backgroundColor = Constants.Color.BackgroundSecondary
addSubview(colorView)
}
@@ -156,7 +156,13 @@ class DownloadItemCollectionViewCell: UICollectionViewCell {
}
}
}
- progressView.progress = task.progress.fractionCompleted
+ if progressView.width == 0 {
+ DispatchQueue.main.asyncAfter(delay: 0.35) {
+ self.progressView.progress = task.progress.fractionCompleted
+ }
+ } else {
+ progressView.progress = task.progress.fractionCompleted
+ }
removeButton.addTapGesture { [weak task] gesture in
guard let task else { return }
UIView.makeAlert(detail: R.string.localizable.removeDownloadTask(task.fileName), confirmTitle: R.string.localizable.confirmTitle(), confirmAction: {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadManageView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadManageView.swift
index cbae11dd..ffbf6798 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadManageView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/DownloadManageView.swift
@@ -70,7 +70,7 @@ class DownloadManageView: BaseView {
make.centerY.equalTo(icon)
}
- let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
closeButton.enableRoundCorner = true
topBlurView.addSubview(closeButton)
closeButton.addTapGesture { [weak self] gesture in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/GameSaveMatchGameView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/GameSaveMatchGameView.swift
index bc74c2fb..9336d049 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/GameSaveMatchGameView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/GameSaveMatchGameView.swift
@@ -51,7 +51,7 @@ class GameSaveMatchGameView: BaseView {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
@@ -171,7 +171,7 @@ class GameSaveMatchGameView: BaseView {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFileCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFileCollectionViewCell.swift
index a239d2fd..f69d247e 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFileCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFileCollectionViewCell.swift
@@ -10,8 +10,8 @@
import UIKit
class ImportFileCollectionViewCell: UICollectionViewCell {
- private var iconView: UIImageView = {
- let view = UIImageView()
+ private var iconView: ServiceIconView = {
+ let view = ServiceIconView(roundCorner: .allCorners)
return view
}()
@@ -89,7 +89,11 @@ class ImportFileCollectionViewCell: UICollectionViewCell {
//TODO: 需要处理图片的尺寸
func setData(service: ImportService) {
- iconView.image = service.iconImage
+ iconView.imageView.image = service.iconImage
+ iconView.backgroundColor = service.iconBackgroundColor
+ iconView.borderColor = service.iconBorderColor
+ iconView.radius = service.iconCornerRadius
+ titleLabel.text = service.title
var matt = NSMutableAttributedString(string: service.title, attributes: [.font: Constants.Font.title(size: .s, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
if let detail = service.detail {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListCollectionViewCell.swift
index d1afe31f..20fc084e 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListCollectionViewCell.swift
@@ -8,11 +8,10 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import UIKit
-import TKSwitcherCollection
class ImportServiceListCollectionViewCell: UICollectionViewCell {
- private var iconView: UIImageView = {
- let view = UIImageView()
+ private var iconView: ServiceIconView = {
+ let view = ServiceIconView(roundCorner: .allCorners)
return view
}()
@@ -22,12 +21,10 @@ class ImportServiceListCollectionViewCell: UICollectionViewCell {
return view
}()
- var switchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ var switchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
view.alpha = 0
return view
}()
@@ -63,14 +60,14 @@ class ImportServiceListCollectionViewCell: UICollectionViewCell {
switchButton.snp.makeConstraints { make in
make.centerY.equalTo(iconView)
make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMid)
- make.height.equalTo(28)
- make.width.equalTo(46)
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
}
-
- mainColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.MainColorChange, object: nil, queue: .main) { [weak self] notification in
- guard let self = self else { return }
- self.switchButton.onColor = Constants.Color.Main
- self.switchButton.reload()
+ if #available(iOS 26.0, *) {} else {
+ switchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
}
@@ -81,7 +78,11 @@ class ImportServiceListCollectionViewCell: UICollectionViewCell {
//TODO: 需要处理图片的尺寸
func setData(service: ImportService) {
- iconView.image = service.iconImage
+ iconView.imageView.image = service.iconImage
+ iconView.backgroundColor = service.iconBackgroundColor
+ iconView.borderColor = service.iconBorderColor
+ iconView.radius = service.iconCornerRadius
+ titleLabel.text = service.title
var matt = NSMutableAttributedString(string: service.title, attributes: [.font: Constants.Font.title(size: .s, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
if let detail = service.detail {
@@ -97,10 +98,10 @@ class ImportServiceListCollectionViewCell: UICollectionViewCell {
if service.type == .wifi {
switchButton.alpha = 1
- switchButton.setOn(WebServer.shard.isRunning, animate: false)
+ switchButton.setOn(WebServer.shard.isRunning, animated: false)
} else {
switchButton.alpha = 0
- switchButton.setOn(false, animate: false)
+ switchButton.setOn(false, animated: false)
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift
index 0ae01cc1..53192951 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift
@@ -14,12 +14,12 @@ class ImportServiceListView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.Background)
+ view.makeBlur()
return view
}()
var addServiceButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
return view
}()
@@ -31,22 +31,12 @@ class ImportServiceListView: BaseView {
//how to import
topViewController()?.present(WebViewController(url: Constants.URLs.GameImportGuide), animated: true)
}))
- actions.append(UIAction(title: R.string.localizable.multiDiscBuilder(), image: UIImage(symbol: .opticaldisc)) { [weak self] _ in
- guard let self = self else { return }
- //多碟助手
- topViewController()?.present(MultiDiscBuilderViewController(), animated: true)
- })
- actions.append(UIAction(title: "RomPatcher", image: UIImage(symbol: .memorychip)) { [weak self] _ in
- guard let self = self else { return }
- //RomPatcher
- topViewController()?.present(WebViewController(url: Constants.URLs.RomPatcher), animated: true)
- })
let view = ContextMenuButton(image: nil, menu: UIMenu(children: actions))
return view
}()
private lazy var moreButton: SymbolButton = {
- let view = SymbolButton(symbol: .ellipsis)
+ let view = SymbolButton(symbol: .ellipsis, enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
self?.moreContextMenuButton.triggerTapGesture()
@@ -62,6 +52,12 @@ class ImportServiceListView: BaseView {
return view
}()
+ private let backgroundGradientView: UIView = {
+ let view = UIView()
+ view.masksToBounds = true
+ return view
+ }()
+
lazy var collectionView: UICollectionView = {
let view = NoControllCollectionView(frame: .zero, collectionViewLayout: createLayout())
view.backgroundColor = .clear
@@ -84,13 +80,19 @@ class ImportServiceListView: BaseView {
private var serviceUpdateToken: NotificationToken? = nil
private var services: [ImportService] = {
var services: [ImportService] = []
- //默认添加wifi、粘贴板
+ //默认添加wifi、粘贴板、多碟助手、RomPatcher
services.append(ImportService.genService(type: .wifi, detail: WebServer.shard.isRunning ? R.string.localizable.importServiceListWiFiOnDetail(WebServer.shard.ipAddress) : R.string.localizable.importServiceListWiFiOffDetail()))
services.append(ImportService.genService(type: .paste, detail: R.string.localizable.importServiceListPasteDetail()))
+
+ services.append(ImportService.genService(type: .multiDisc))
+
+ services.append(ImportService.genService(type: .romPatcher))
return services
}()
+ private let gradientSize = CGSize(width: 495, height: 307)
+
override init(frame: CGRect) {
super.init(frame: frame)
//访问数据库
@@ -110,47 +112,16 @@ class ImportServiceListView: BaseView {
}
updateServices(objects: objects)
- //渐变背景
- let gradientSize = CGSize(width: 495, height: 307)
- let backgroundGradientView = UIView(frame: CGRect(origin: .zero, size: gradientSize))
- let ovalLayer = CAShapeLayer()
- ovalLayer.path = UIBezierPath(ovalIn: backgroundGradientView.frame).cgPath
- backgroundGradientView.layer.mask = ovalLayer
+ updateBackgroundGradientView()
- let colors = Constants.Color.Gradient.reversed()
- backgroundGradientView.addGradient(colors: Array(colors),
- locations: [0, 0.27, 0.62, 1],
- direction: UIView.GradientDirection(startPoint: CGPoint(x: 1, y: 0),
- endPoint: CGPoint(x: 0, y: 1)))
- let maskGradientView = UIView(frame: CGRect(origin: .zero, size: gradientSize))
- maskGradientView.addGradient(colors: [Constants.Color.Background.withAlphaComponent(0.95),
- Constants.Color.Background,
- Constants.Color.Background],
- locations: [0, 0.62, 1],
- direction: UIView.GradientDirection(startPoint: CGPoint(x: 0, y: 0),
- endPoint: CGPoint(x: 1, y: 1)))
-
- backgroundGradientView.addSubview(maskGradientView)
- maskGradientView.snp.makeConstraints { make in
- make.edges.equalToSuperview()
- }
- let maskView = UIView()
- maskView.masksToBounds = true
- maskView.addSubview(backgroundGradientView)
+ addSubview(backgroundGradientView)
backgroundGradientView.snp.makeConstraints { make in
- make.center.equalToSuperview()
- make.size.equalTo(gradientSize)
- }
- addSubview(maskView)
- maskView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalToSuperview().offset(Constants.Size.ContentInsetTop + Constants.Size.ItemHeightMid)
make.width.equalToSuperview()
make.height.equalTo(gradientSize.height)
}
-
-
addSubview(collectionView)
collectionView.snp.makeConstraints { make in
make.edges.equalToSuperview()
@@ -215,6 +186,13 @@ class ImportServiceListView: BaseView {
fatalError("init(coder:) has not been implemented")
}
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ updateBackgroundGradientView()
+ }
+ }
+
private func createLayout() -> UICollectionViewLayout {
let layout = UICollectionViewCompositionalLayout { sectionIndex, env in
let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(sectionIndex == 0 ? 1 : 0.5),
@@ -246,10 +224,40 @@ class ImportServiceListView: BaseView {
}
private func updateServices(objects: Results<ImportService>) {
- services.removeSubrange(2...)
+ services.removeSubrange(4...)
services.append(contentsOf: objects.map({ $0 }))
collectionView.reloadSections([1])
}
+
+ private func updateBackgroundGradientView() {
+ backgroundGradientView.subviews.forEach({ $0.removeFromSuperview() })
+ //渐变背景
+ let gradientView = UIView(frame: CGRect(origin: .zero, size: gradientSize))
+ let ovalLayer = CAShapeLayer()
+ ovalLayer.path = UIBezierPath(ovalIn: gradientView.frame).cgPath
+ gradientView.layer.mask = ovalLayer
+
+ gradientView.addGradient(colors: Constants.Color.Gradient,
+ direction: UIView.GradientDirection(startPoint: CGPoint(x: 0, y: 0.5),
+ endPoint: CGPoint(x: 1, y: 0.5)))
+ let maskGradientView = UIView(frame: CGRect(origin: .zero, size: gradientSize))
+ maskGradientView.addGradient(colors: [Constants.Color.Background.withAlphaComponent(0.92),
+ Constants.Color.Background,
+ Constants.Color.Background],
+ locations: [0, 0.62, 1],
+ direction: UIView.GradientDirection(startPoint: CGPoint(x: 0.5, y: 0),
+ endPoint: CGPoint(x: 0.5, y: 1)))
+
+ gradientView.addSubview(maskGradientView)
+ maskGradientView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ backgroundGradientView.addSubview(gradientView)
+ gradientView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ make.size.equalTo(gradientSize)
+ }
+ }
}
extension ImportServiceListView: UICollectionViewDataSource {
@@ -355,6 +363,12 @@ extension ImportServiceListView: UICollectionViewDelegate {
if let provider = service.lanDriveProvider {
topViewController()?.present(BaseNavigationController(rootViewController: CloudDriveBrowserViewController(provider: provider, directory: provider.rootItem, navigationTitle: service.title)), animated: true)
}
+ case .multiDisc:
+ //多碟助手
+ topViewController()?.present(MultiDiscBuilderViewController(), animated: true)
+ case .romPatcher:
+ //RomPatcher
+ topViewController()?.present(WebViewController(url: Constants.URLs.RomPatcher), animated: true)
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/LanServiceEditCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/LanServiceEditCollectionViewCell.swift
index 65526379..baa0e85c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/LanServiceEditCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/LanServiceEditCollectionViewCell.swift
@@ -49,7 +49,7 @@ class LanServiceEditCollectionViewCell: UICollectionViewCell {
}
let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
- textFieldContainer.backgroundColor = Constants.Color.Background
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
@@ -69,7 +69,7 @@ class LanServiceEditCollectionViewCell: UICollectionViewCell {
func setData(item: LanServiceEditViewController.EditItem) {
titleLabel.text = item.title
- editTextField.attributedPlaceholder = NSAttributedString(string: item.placeholderString, attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: Constants.Color.LabelSecondary])
+ editTextField.attributedPlaceholder = NSAttributedString(string: item.placeholderString, attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: Constants.Color.LabelTertiary])
editTextField.keyboardType = item.keyboardType
editTextField.returnKeyType = item.returnKeyType
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/MultiDiscItemCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/MultiDiscItemCollectionCell.swift
index 989781bb..38ebc617 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/MultiDiscItemCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/MultiDiscItemCollectionCell.swift
@@ -18,14 +18,14 @@ class MultiDiscItemCollectionCell: UICollectionViewCell {
let deleteIcon = SymbolButton(image: nil, title: R.string.localizable.removeTitle(), titleFont: Constants.Font.body(size: .m), titleColor: Constants.Color.Main, titleAlignment: .right, horizontalContian: true)
- private let sortIcon = SymbolButton(image: .init(symbol: .line3Horizontal, font: Constants.Font.title(size: .s), color: Constants.Color.BackgroundTertiary))
+ private let sortIcon = SymbolButton(image: .init(symbol: .line3Horizontal, font: Constants.Font.title(size: .s), color: Constants.Color.BackgroundSecondary))
private var itemViews: [BIOSCollectionViewCell.ItemView] = []
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
@@ -41,7 +41,7 @@ class MultiDiscItemCollectionCell: UICollectionViewCell {
}
addSubview(deleteIcon)
- deleteIcon.backgroundColor = Constants.Color.BackgroundPrimary
+ deleteIcon.backgroundColor = Constants.Color.Background
deleteIcon.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.height.equalTo(Constants.Size.ItemHeightMin)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
index 98ab863d..f0b1b637 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
@@ -359,7 +359,10 @@ class Game: Object, ObjectUpdatable {
}
var isPicodriveCore: Bool {
- if (gameType == .md || gameType == .mcd || gameType == ._32x || gameType == .sg1000 || gameType == .gg || gameType == .ms) && defaultCore == 1 {
+ if gameType == ._32x || gameType == .mcd {
+ return true
+ }
+ if (gameType == .md || gameType == .sg1000 || gameType == .gg || gameType == .ms) && defaultCore == 1 {
return true
}
return false
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosChallengeView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosChallengeView.swift
index 161dff71..39ac8280 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosChallengeView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosChallengeView.swift
@@ -15,7 +15,7 @@ class CheevosChallengeView: RoundAndBorderView {
init() {
super.init(roundCorner: .allCorners, radius: 16, borderColor: Constants.Color.Border, borderWidth: 1)
- makeBlur(blurRadius: 2.5, blurColor: Constants.Color.BackgroundPrimary, blurAlpha: 0.4)
+ makeBlur(blurRadius: 2.5, blurAlpha: 0.4)
enableInteractive = true
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift
index 76799c86..cf4aafc9 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift
@@ -189,7 +189,7 @@ class CheevosPopupView: UIView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift
index 8641fee7..a51f9436 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift
@@ -24,7 +24,7 @@ class CheevosProgressView: RoundAndBorderView {
init() {
super.init(roundCorner: .allCorners, radius: 16, borderColor: Constants.Color.Border, borderWidth: 1)
- makeBlur(blurRadius: 2.5, blurColor: Constants.Color.BackgroundPrimary, blurAlpha: 0.4)
+ makeBlur(blurRadius: 2.5, blurAlpha: 0.4)
enableInteractive = true
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
index ad58f61b..893d0097 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
@@ -26,7 +26,7 @@ class GameSettingView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -781,7 +781,7 @@ extension GameSettingView {
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
if !isEditingMode {
containerView.makeBlur()
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift
index 82bf71d0..d674fbc4 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift
@@ -66,7 +66,7 @@ class LeaderboardView: RoundAndBorderView {
init() {
super.init(roundCorner: .allCorners, radius: 12, borderColor: Constants.Color.Border, borderWidth: 1)
- makeBlur(blurRadius: 2.5, blurColor: Constants.Color.BackgroundPrimary, blurAlpha: 0.4)
+ makeBlur(blurRadius: 2.5, blurAlpha: 0.4)
enableInteractive = true
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/ThreeDSKeyboardView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/ThreeDSKeyboardView.swift
index 2c463d49..c06923ea 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/ThreeDSKeyboardView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/ThreeDSKeyboardView.swift
@@ -36,7 +36,7 @@ struct ThreeDSKeyboardView {
let textfiledWidth = UIDevice.isPhone ? 300 : 380
let containerView = RoundAndBorderView(roundCorner: .allCorners)
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
//标题
let titleLabel = UILabel()
@@ -58,8 +58,8 @@ struct ThreeDSKeyboardView {
}
//输入框
- let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: .white.withAlphaComponent(0.05), borderWidth: 1)
- textFieldContainer.backgroundColor = Constants.Color.Background
+ let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: Constants.Color.Border, borderWidth: 1)
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
containerView.addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMid)
@@ -84,7 +84,7 @@ struct ThreeDSKeyboardView {
textField.becomeFirstResponder()
let line = UIView()
- line.backgroundColor = Constants.Color.BackgroundSecondary
+ line.backgroundColor = Constants.Color.Border
containerView.addSubview(line)
line.snp.makeConstraints { make in
make.height.equalTo(1)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesCell.swift b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesCell.swift
index 035ede85..dcac6793 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesCell.swift
@@ -13,12 +13,12 @@ class FeaturesCell: UICollectionViewCell {
private var titleLabel: UILabel = {
let view = UILabel()
view.font = Constants.Font.title(size: .s, weight: .semibold)
- view.textColor = Constants.Color.LabelPrimary
+ view.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
return view
}()
var questionButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .questionmarkCircleFill, size: 12))
+ let view = SymbolButton(image: UIImage(symbol: .questionmarkCircleFill, size: 12, color: Constants.Color.LabelPrimary.forceStyle(.dark)))
view.delayInteractiveTouchEnd = true
view.backgroundColor = .clear
return view
@@ -40,7 +40,7 @@ class FeaturesCell: UICollectionViewCell {
let label = UILabel()
label.text = string
label.font = Constants.Font.caption(size: .l)
- label.textColor = Constants.Color.LabelPrimary
+ label.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
label.adjustsFontSizeToFitWidth = true
view.addSubview(label)
label.snp.makeConstraints { make in
@@ -92,7 +92,7 @@ class FeaturesCell: UICollectionViewCell {
make.height.equalTo(Constants.Size.IconSizeMin.height)
}
- let titleLeftView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold)))
+ let titleLeftView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)))
if Locale.isRTLLanguage {
titleLeftView.transform = CGAffineTransform(scaleX: -1, y: 1)
}
@@ -108,7 +108,7 @@ class FeaturesCell: UICollectionViewCell {
make.centerY.equalToSuperview()
}
- let titleRightView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold)))
+ let titleRightView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)))
titleRightView.semanticContentAttribute = .forceLeftToRight
if !Locale.isRTLLanguage {
titleRightView.transform = CGAffineTransform(scaleX: -1, y: 1)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesView.swift b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesView.swift
index b111e82a..f9f7da19 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/FeaturesView.swift
@@ -113,8 +113,8 @@ extension FeaturesView: JXBannerDataSource {
let pageControl = JXPageControlJump()
pageControl.contentMode = .center
pageControl.isAnimation = true
- pageControl.activeColor = Constants.Color.LabelPrimary
- pageControl.inactiveColor = Constants.Color.LabelPrimary.withAlphaComponent(0.15)
+ pageControl.activeColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ pageControl.inactiveColor = Constants.Color.LabelPrimary.forceStyle(.dark).withAlphaComponent(0.15)
pageControl.indicatorSize = .init(6)
pageControl.columnSpacing = Constants.Size.ContentSpaceUltraTiny
pageControl.contentAlignment = JXPageControlAlignment(.center, .bottom)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PriceItemCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PriceItemCollectionCell.swift
index c700918c..6e2eaca0 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PriceItemCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PriceItemCollectionCell.swift
@@ -28,7 +28,7 @@ class PriceItemCollectionCell: UICollectionViewCell {
private var promptLabel: UILabel = {
let view = UILabel()
view.textAlignment = .center
- view.textColor = Constants.Color.LabelPrimary
+ view.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
view.font = Constants.Font.caption(weight: .bold)
return view
}()
@@ -140,8 +140,8 @@ class PriceItemCollectionCell: UICollectionViewCell {
}
- roundAndBorderView.borderColor = isSelected ? Constants.Color.Main : Constants.Color.LabelSecondary
- roundAndBorderView.backgroundColor = isSelected ? Constants.Color.Main.withAlphaComponent(0.1) : Constants.Color.BackgroundSecondary
+ roundAndBorderView.borderColor = isSelected ? Constants.Color.Main : Constants.Color.Border
+ roundAndBorderView.backgroundColor = isSelected ? Constants.Color.Main.withAlphaComponent(0.1) : Constants.Color.BackgroundPrimary
}
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseButtonReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseButtonReusableView.swift
index 58a328c4..cb3509d8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseButtonReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseButtonReusableView.swift
@@ -140,11 +140,11 @@ class PurchaseButtonReusableView: UICollectionReusableView {
func setData(title: String, descripton: String, enable: Bool) {
descriptionLabel.text = descripton
- buttonContainer.backgroundColor = enable ? Constants.Color.Main : Constants.Color.Main.darken(by: 0.7)
+ buttonContainer.backgroundColor = enable ? Constants.Color.Main : Constants.Color.Main.darken(by: UIDevice.isDarkMode ? 0.7 : 0.35)
buttonContainer.isUserInteractionEnabled = enable
buttonContainer.enableInteractive = false
buttonLabel.text = title
- buttonLabel.textColor = enable ? Constants.Color.LabelPrimary : Constants.Color.LabelPrimary.darken(by: 0.7)
+ buttonLabel.textColor = enable ? Constants.Color.LabelPrimary.forceStyle(.dark) : Constants.Color.LabelPrimary.forceStyle(.dark).darken(by: UIDevice.isDarkMode ? 0.7 : 0.35)
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseView.swift b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseView.swift
index 71352a91..23232011 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Purchase/Views/PurchaseView.swift
@@ -14,7 +14,7 @@ class PurchaseView: BaseView {
private lazy var navigationView: UIView = {
let view = UIView()
- let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)), enableGlass: true)
closeButton.backgroundColor = .white.withAlphaComponent(0.1)
closeButton.enableRoundCorner = true
view.addSubview(closeButton)
@@ -32,7 +32,7 @@ class PurchaseView: BaseView {
restorePurchase.isUserInteractionEnabled = true
restorePurchase.enableInteractive = true
restorePurchase.font = Constants.Font.caption(size: .l, weight: .regular)
- restorePurchase.textColor = Constants.Color.LabelPrimary
+ restorePurchase.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
restorePurchase.text = R.string.localizable.restorePurchaseButton()
view.addSubview(restorePurchase)
restorePurchase.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift
index 7b00fe68..75ea0df1 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift
@@ -32,7 +32,7 @@ class RetroAchievementsDetailViewController: BaseViewController {
make.leading.trailing.equalToSuperview().inset(40)
}
- let shareButton = SymbolButton(image: UIImage(symbol: .squareAndArrowUp, font: Constants.Font.body(weight: .bold)))
+ let shareButton = SymbolButton(image: UIImage(symbol: .squareAndArrowUp, font: Constants.Font.body(weight: .bold)), enableGlass: true)
shareButton.enableRoundCorner = true
shareButton.addTapGesture { [weak self] gesture in
guard let self else { return }
@@ -73,7 +73,7 @@ class RetroAchievementsDetailViewController: BaseViewController {
}
}
- let detailView = RetroAchievementsDetailView(achievement: achievement, shaereMode: true) { }
+ let detailView = RetroAchievementsDetailView(achievement: achievement, shareMode: true) { }
shareImageView.addSubview(detailView)
detailView.snp.makeConstraints { make in
make.center.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsListViewController.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsListViewController.swift
index 53dc1697..55d0a02f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsListViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsListViewController.swift
@@ -13,6 +13,7 @@ class RetroAchievementsListViewController: BaseViewController {
private let backgroundImageView: UIImageView = {
let view = UIImageView(image: R.image.retro_bg())
+ view.contentMode = .scaleAspectFill
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsViewController.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsViewController.swift
index e6363788..462f1834 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsViewController.swift
@@ -10,6 +10,7 @@
class RetroAchievementsViewController: BaseViewController {
private let backgroundImageView: UIImageView = {
let view = UIImageView(image: R.image.retro_bg())
+ view.contentMode = .scaleAspectFill
return view
}()
@@ -25,7 +26,11 @@ class RetroAchievementsViewController: BaseViewController {
}
self.loginView.removeFromSuperview()
self.achievementsUser = AchievementsUser.getUser()
- self.view.insertSubview(self.profileView, belowSubview: self.closeButton)
+ if UIDevice.isPhone {
+ self.view.insertSubview(self.profileView, belowSubview: self.closeButton)
+ } else {
+ self.view.addSubview(self.profileView)
+ }
self.profileView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
@@ -77,6 +82,8 @@ class RetroAchievementsViewController: BaseViewController {
}
}
- addCloseButton()
+ if UIDevice.isPhone {
+ addCloseButton()
+ }
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift
index 9e23bc22..279fe208 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift
@@ -8,7 +8,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
class RetroAchievementsDetailView: BaseView {
- init(achievement: CheevosAchievement, shaereMode: Bool = false, didTapClose: @escaping (()->Void)) {
+ init(achievement: CheevosAchievement, shareMode: Bool = false, didTapClose: @escaping (()->Void)) {
super.init(frame: .zero)
let coverImageView = UIImageView()
@@ -53,7 +53,7 @@ class RetroAchievementsDetailView: BaseView {
let titleLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 0
- let matt = NSMutableAttributedString(string: achievement.title ?? "", attributes: [.font: Constants.Font.title(weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: achievement.title ?? "", attributes: [.font: Constants.Font.title(weight: .semibold), .foregroundColor: shareMode ? Constants.Color.LabelPrimary.forceStyle(.dark) : Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n\(achievement._description ?? "")", attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
@@ -93,7 +93,8 @@ class RetroAchievementsDetailView: BaseView {
}
}
- let seperator = SparkleSeperatorView(color: Constants.Color.BackgroundTertiary, lineColor: Constants.Color.BackgroundSecondary)
+ let seperatorColor = shareMode ? Constants.Color.Border.forceStyle(.dark) : Constants.Color.Border
+ let seperator = SparkleSeperatorView(color: seperatorColor, lineColor: seperatorColor)
addSubview(seperator)
seperator.snp.makeConstraints { make in
make.leading.trailing.equalToSuperview()
@@ -109,7 +110,7 @@ class RetroAchievementsDetailView: BaseView {
let view = UILabel()
view.textAlignment = .center
view.numberOfLines = 0
- let matt = NSMutableAttributedString(string: "\(achievement.points) points", attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: "\(achievement.points) points", attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: shareMode ? Constants.Color.LabelPrimary.forceStyle(.dark) : Constants.Color.LabelPrimary])
if achievement.unlocked, let unlockDate = achievement.unlockTime {
matt.append(NSAttributedString(string: "\n\(unlockDate.dateTimeString())", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
}
@@ -127,7 +128,7 @@ class RetroAchievementsDetailView: BaseView {
make.top.equalTo(seperator.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- if shaereMode {
+ if shareMode {
let brandImageView = UIImageView(image: R.image.app_title())
brandImageView.contentMode = .scaleAspectFit
addSubview(brandImageView)
@@ -142,7 +143,7 @@ class RetroAchievementsDetailView: BaseView {
make.bottom.equalToSuperview()
}
} else {
- let roundContainer = RoundAndBorderView(roundCorner: .allCorners, borderColor: UIColor.white.withAlphaComponent(0.1), borderWidth: 2)
+ let roundContainer = RoundAndBorderView(roundCorner: .allCorners, borderColor: Constants.Color.Border, borderWidth: 2)
roundContainer.addTapGesture { gesture in
didTapClose()
}
@@ -163,7 +164,7 @@ class RetroAchievementsDetailView: BaseView {
let okLabel = UILabel()
okLabel.text = R.string.localizable.gotIt()
okLabel.font = Constants.Font.title(size: .s, weight: .semibold)
- okLabel.textColor = .white
+ okLabel.textColor = Constants.Color.LabelPrimary
roundContainer.addSubview(okLabel)
okLabel.snp.makeConstraints { make in
make.center.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift
index 99d19f8c..ed6bb8ab 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift
@@ -8,7 +8,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import Kingfisher
import MarqueeLabel
-import TKSwitcherCollection
import BetterSegmentedControl
class RetroAchievementsListCell: UICollectionViewCell {
@@ -131,9 +130,9 @@ class RetroAchievementsListCell: UICollectionViewCell {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundPrimary),
+ .backgroundColor(Constants.Color.Background),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundTertiary),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
@@ -179,7 +178,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
layerCornerRadius = Constants.Size.CornerRadiusMax
addSubview(segmentView)
@@ -299,7 +298,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
let view = MarqueeLabel()
view.textAlignment = .left
view.font = Constants.Font.title(size: .l, weight: .semibold)
- view.textColor = .white
+ view.textColor = Constants.Color.LabelPrimary
return view
}()
@@ -317,30 +316,24 @@ class RetroAchievementsListCell: UICollectionViewCell {
return view
}()
- let enableSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ let enableSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
- let hardcoreSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ let hardcoreSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
- let alwaysShowProgressButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ let alwaysShowProgressButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -401,7 +394,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
}
let retroAchievementLabel = UILabel()
- retroAchievementLabel.attributedText = NSAttributedString(string: R.string.localizable.retroAchievements(), attributes: [.font: Constants.Font.title(size: .s, weight: .semibold), .foregroundColor: UIColor.white])
+ retroAchievementLabel.attributedText = NSAttributedString(string: R.string.localizable.retroAchievements(), attributes: [.font: Constants.Font.title(size: .s, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
addSubview(retroAchievementLabel)
retroAchievementLabel.snp.makeConstraints { make in
make.leading.equalTo(coverImageView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
@@ -453,14 +446,14 @@ class RetroAchievementsListCell: UICollectionViewCell {
let enableContainer = UIView()
enableContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- enableContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ enableContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(enableContainer)
enableContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax)
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(lastActivityIcon.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- let enableIcon = UIImageView(image: .symbolImage(.gamecontrollerFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let enableIcon = UIImageView(image: .symbolImage(.gamecontrollerFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
enableIcon.contentMode = .center
enableContainer.addSubview(enableIcon)
enableIcon.snp.makeConstraints { make in
@@ -471,7 +464,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
let enableLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 2
- let matt = NSMutableAttributedString(string: R.string.localizable.enableAchievements(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.enableAchievements(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
view.attributedText = matt.applying(attributes: [.paragraphStyle: style])
@@ -487,19 +480,26 @@ class RetroAchievementsListCell: UICollectionViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(enableLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ enableSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
let hardcoreContainer = UIView()
hardcoreContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- hardcoreContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ hardcoreContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(hardcoreContainer)
hardcoreContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax)
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(enableContainer.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
hardcoreIcon.contentMode = .center
hardcoreContainer.addSubview(hardcoreIcon)
hardcoreIcon.snp.makeConstraints { make in
@@ -510,7 +510,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
let hardcoreScoreLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 2
- let matt = NSMutableAttributedString(string: R.string.localizable.hardcoreMode(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.hardcoreMode(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n" + R.string.localizable.hardcoreDesc(), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
@@ -527,19 +527,26 @@ class RetroAchievementsListCell: UICollectionViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(hardcoreScoreLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ hardcoreSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
let alwaysShowProgressContainer = UIView()
alwaysShowProgressContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- alwaysShowProgressContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ alwaysShowProgressContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(alwaysShowProgressContainer)
alwaysShowProgressContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax)
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(hardcoreContainer.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- let alwaysShowProgressIcon = UIImageView(image: .symbolImage(.squareTextSquareFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let alwaysShowProgressIcon = UIImageView(image: .symbolImage(.squareTextSquareFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
alwaysShowProgressIcon.contentMode = .center
alwaysShowProgressContainer.addSubview(alwaysShowProgressIcon)
alwaysShowProgressIcon.snp.makeConstraints { make in
@@ -550,7 +557,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
let alwaysShowProgressLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 2
- let matt = NSMutableAttributedString(string: R.string.localizable.alwaysShowProgress(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.alwaysShowProgress(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n" + R.string.localizable.alwaysShowProgressDesc(), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
@@ -567,13 +574,20 @@ class RetroAchievementsListCell: UICollectionViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(alwaysShowProgressLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ alwaysShowProgressButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
let achievementInfoContainer = UIView()
achievementInfoContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- achievementInfoContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ achievementInfoContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(achievementInfoContainer)
achievementInfoContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax*2)
@@ -703,7 +717,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
achievementsCountLabel.attributedText = {
- let matt = NSMutableAttributedString(string: R.string.localizable.totalAchievements(achievementCount), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.totalAchievements(achievementCount), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n" + R.string.localizable.hardcore() + ": ", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
matt.append(NSAttributedString(string: "\(hardcoreUnlockCount) ", attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.Yellow]))
matt.append(NSAttributedString(string: R.string.localizable.softcore() + ": ", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
@@ -713,7 +727,7 @@ class RetroAchievementsListCell: UICollectionViewCell {
return matt.applying(attributes: [.paragraphStyle: style])
}()
pointLabel.attributedText = {
- let matt = NSMutableAttributedString(string: R.string.localizable.totalPoints(totalPoints), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.totalPoints(totalPoints), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n" + R.string.localizable.hardcore() + ": ", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
matt.append(NSAttributedString(string: "\(hardcorePoints) ", attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.Yellow]))
matt.append(NSAttributedString(string: R.string.localizable.softcore() + ": ", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
@@ -723,20 +737,20 @@ class RetroAchievementsListCell: UICollectionViewCell {
return matt.applying(attributes: [.paragraphStyle: style])
}()
- enableSwitchButton.setOn(game.enableAchievements, animate: false)
+ enableSwitchButton.setOn(game.enableAchievements, animated: false)
if retroGame.notSupportHardcore {
- hardcoreSwitchButton.customEnable = false
- hardcoreSwitchButton.setOn(false)
+ hardcoreSwitchButton.isEnabled = false
+ hardcoreSwitchButton.setOn(false, animated: false)
hardcoreSwitchButton.onDisableTap {
UIView.makeAlert(detail: R.string.localizable.notSupportHardcore(), cancelTitle: R.string.localizable.gotIt())
}
} else {
- hardcoreSwitchButton.customEnable = true
- hardcoreSwitchButton.setOn(game.enableHarcore, animate: false)
+ hardcoreSwitchButton.isEnabled = true
+ hardcoreSwitchButton.setOn(game.enableHarcore, animated: false)
hardcoreSwitchButton.onDisableTap {}
}
- alwaysShowProgressButton.setOn(game.getExtraBool(key: ExtraKey.alwaysShowProgress.rawValue) ?? false, animate: false)
+ alwaysShowProgressButton.setOn(game.getExtraBool(key: ExtraKey.alwaysShowProgress.rawValue) ?? false, animated: false)
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsLoginView.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsLoginView.swift
index df557835..6cfbda3c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsLoginView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsLoginView.swift
@@ -9,7 +9,7 @@
class RetroLoginFooterReusableView: UICollectionReusableView {
let button: SymbolButton = {
- let view = SymbolButton(image: nil, title: "", titleFont: Constants.Font.body(size: .l, weight: .medium), horizontalContian: true, titlePosition: .right)
+ let view = SymbolButton(image: nil, title: "", titleFont: Constants.Font.body(size: .l, weight: .medium), titleColor: Constants.Color.LabelPrimary.forceStyle(.dark), horizontalContian: true, titlePosition: .right)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.Red
return view
@@ -144,7 +144,7 @@ class RetroAchievementsLoginView: BaseView {
guard let button else { return }
if let username = self.username, !username.trimmed.isEmpty, let password = self.password, !password.isEmpty {
button.backgroundColor = Constants.Color.Main
- button.titleLabel.textColor = Constants.Color.LabelPrimary
+ button.titleLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
button.isUserInteractionEnabled = true
} else {
button.backgroundColor = Constants.Color.BackgroundSecondary
diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsProfileCell.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsProfileCell.swift
index ffa5264e..07f87017 100644
--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsProfileCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsProfileCell.swift
@@ -8,7 +8,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import Kingfisher
-import TKSwitcherCollection
import RealmSwift
class RetroAchievementsProfileCell: UICollectionViewCell {
@@ -89,7 +88,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
layerCornerRadius = Constants.Size.CornerRadiusMax
let hardcoreContainer = UIView()
@@ -99,7 +98,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalToSuperview()
}
- let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
hardcoreIcon.contentMode = .center
hardcoreContainer.addSubview(hardcoreIcon)
hardcoreIcon.snp.makeConstraints { make in
@@ -120,7 +119,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(hardcoreContainer.snp.bottom)
}
- let softcoreIcon = UIImageView(image: .symbolImage(.leafFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let softcoreIcon = UIImageView(image: .symbolImage(.leafFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
softcoreIcon.contentMode = .center
softcoreContainer.addSubview(softcoreIcon)
softcoreIcon.snp.makeConstraints { make in
@@ -141,7 +140,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(softcoreContainer.snp.bottom)
}
- let rankIcon = UIImageView(image: .symbolImage(.crownFill).applySymbolConfig(size: 18, color: UIColor.white))
+ let rankIcon = UIImageView(image: .symbolImage(.crownFill).applySymbolConfig(size: 18, color: Constants.Color.LabelPrimary))
rankContainer.addSubview(rankIcon)
rankIcon.snp.makeConstraints { make in
make.size.equalTo(24)
@@ -161,7 +160,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
}
func updateDatas(hardcoreScore: Int, softcoreScore: Int, rank: Int?) {
- let matt1 = NSMutableAttributedString(string: R.string.localizable.hardcoreTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt1 = NSMutableAttributedString(string: R.string.localizable.hardcoreTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt1.append(NSAttributedString(string: "\(hardcoreScore)", attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.Yellow]))
matt1.append(NSAttributedString(string: "\n" + R.string.localizable.hardcoreDesc(), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
let style = NSMutableParagraphStyle()
@@ -169,13 +168,13 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
hardcoreScoreLabel.attributedText = matt1.applying(attributes: [.paragraphStyle: style])
- let matt2 = NSMutableAttributedString(string: R.string.localizable.softcoreTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt2 = NSMutableAttributedString(string: R.string.localizable.softcoreTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt2.append(NSAttributedString(string: "\(softcoreScore)", attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.Yellow]))
matt2.append(NSAttributedString(string: "\n" + R.string.localizable.softcoreDesc(), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
softcoreScoreLabel.attributedText = matt2.applying(attributes: [.paragraphStyle: style])
- let matt3 = NSMutableAttributedString(string: R.string.localizable.rankTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt3 = NSMutableAttributedString(string: R.string.localizable.rankTitle(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
if let rank {
matt3.append(NSAttributedString(string: "\(rank)", attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.Yellow]))
} else {
@@ -195,7 +194,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
private let usernameLabel: UILabel = {
let view = UILabel()
view.font = Constants.Font.title(size: .l, weight: .semibold)
- view.textColor = .white
+ view.textColor = Constants.Color.LabelPrimary
return view
}()
@@ -228,7 +227,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
}()
private lazy var logoutButton: SymbolButton = {
- let view = SymbolButton(image: nil, title: R.string.localizable.achievementsLogoutTitle(), titleFont: Constants.Font.caption(size: .l), titleColor: Constants.Color.Red, titleAlignment: .right, edgeInsets: UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 14), horizontalContian: true, titlePosition: .right)
+ let view = SymbolButton(image: nil, title: R.string.localizable.achievementsLogoutTitle(), titleFont: Constants.Font.caption(size: .l), titleColor: Constants.Color.Red, titleAlignment: .right, edgeInsets: UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 14), horizontalContian: true, titlePosition: .right, enableGlass: true)
view.addTapGesture { [weak self] gesture in
guard let self else { return }
self.logoutSuccess?()
@@ -236,12 +235,10 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
return view
}()
- private lazy var enableSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private lazy var enableSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
view.onChange { [weak self] value in
guard let self else { return }
let realm = Database.realm
@@ -254,7 +251,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
game.enableAchievements = true
}
}
- self.hardcoreSwitchButton.customEnable = true
+ self.hardcoreSwitchButton.isEnabled = true
} else {
//关闭全局RetroAchievements
for game in games {
@@ -267,8 +264,8 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
}
//硬核模式也一并关闭
Settings.defalut.updateExtra(key: ExtraKey.globalHardcore.rawValue, value: false)
- self.hardcoreSwitchButton.customEnable = false
- self.hardcoreSwitchButton.setOn(false, animate: true)
+ self.hardcoreSwitchButton.isEnabled = false
+ self.hardcoreSwitchButton.setOn(false, animated: true)
}
}
view.onDisableTap {
@@ -277,12 +274,10 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
return view
}()
- private lazy var hardcoreSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private lazy var hardcoreSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
view.onChange { [weak self] value in
guard let self else { return }
let realm = Database.realm
@@ -386,14 +381,14 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
let enableContainer = UIView()
enableContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- enableContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ enableContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(enableContainer)
enableContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax)
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(memberSinceLabel.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- let enableIcon = UIImageView(image: .symbolImage(.gamecontrollerFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let enableIcon = UIImageView(image: .symbolImage(.gamecontrollerFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
enableIcon.contentMode = .center
enableContainer.addSubview(enableIcon)
enableIcon.snp.makeConstraints { make in
@@ -404,7 +399,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
let enableLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 2
- let matt = NSMutableAttributedString(string: R.string.localizable.enableGlobalAchievements(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.enableGlobalAchievements(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
view.attributedText = matt.applying(attributes: [.paragraphStyle: style])
@@ -420,19 +415,26 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(enableLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ enableSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
let hardcoreContainer = UIView()
hardcoreContainer.layerCornerRadius = Constants.Size.CornerRadiusMax
- hardcoreContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ hardcoreContainer.backgroundColor = Constants.Color.BackgroundPrimary
addSubview(hardcoreContainer)
hardcoreContainer.snp.makeConstraints { make in
make.height.equalTo(Constants.Size.ItemHeightMax)
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
make.top.equalTo(enableContainer.snp.bottom).offset(Constants.Size.ContentSpaceMax)
}
- let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: UIColor.white))
+ let hardcoreIcon = UIImageView(image: .symbolImage(.flameFill).applySymbolConfig(size: 19, color: Constants.Color.LabelPrimary))
hardcoreIcon.contentMode = .center
hardcoreContainer.addSubview(hardcoreIcon)
hardcoreIcon.snp.makeConstraints { make in
@@ -443,7 +445,7 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
let hardcoreScoreLabel: UILabel = {
let view = UILabel()
view.numberOfLines = 2
- let matt = NSMutableAttributedString(string: R.string.localizable.globalHardcoreMode(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: R.string.localizable.globalHardcoreMode(), attributes: [.font: Constants.Font.body(size: .l, weight: .semibold), .foregroundColor: Constants.Color.LabelPrimary])
matt.append(NSAttributedString(string: "\n" + R.string.localizable.hardcoreDesc(), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelSecondary]))
let style = NSMutableParagraphStyle()
style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2
@@ -460,7 +462,14 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
make.centerY.equalToSuperview()
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
make.leading.equalTo(hardcoreScoreLabel.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ hardcoreSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
addSubview(unlockedView)
@@ -510,13 +519,13 @@ class RetroAchievementsProfileCell: UICollectionViewCell {
unlockedView.countLabel.text = "\(profile.achievementCount)"
scoreView.updateDatas(hardcoreScore: profile.totalHardcorePoints, softcoreScore: profile.totalSoftcorePoints, rank: profile.totalRanked > 0 ? profile.totalRanked : nil)
let globalAchievements = Settings.defalut.getExtraBool(key: ExtraKey.globalAchievements.rawValue) ?? false
- enableSwitchButton.setOn(globalAchievements, animate: false)
+ enableSwitchButton.setOn(globalAchievements, animated: false)
if globalAchievements {
- hardcoreSwitchButton.setOn(Settings.defalut.getExtraBool(key: ExtraKey.globalHardcore.rawValue) ?? false, animate: false)
- hardcoreSwitchButton.customEnable = true
+ hardcoreSwitchButton.setOn(Settings.defalut.getExtraBool(key: ExtraKey.globalHardcore.rawValue) ?? false, animated: false)
+ hardcoreSwitchButton.isEnabled = true
} else {
- hardcoreSwitchButton.setOn(false, animate: false)
- hardcoreSwitchButton.customEnable = false
+ hardcoreSwitchButton.setOn(false, animated: false)
+ hardcoreSwitchButton.isEnabled = false
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
index a0997e51..baf6c974 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
@@ -10,7 +10,7 @@
struct SettingItem {
enum ItemType: String {
- case theme, quickGame, airPlay, iCloud, fullScreenWhenConnectController, FAQ, feedback, shareApp, qq, telegram, discord, clearCache, language, userAgreement, privacyPolicy, autoSaveState, bios, respectSilentMode, onlinePlay, about, retro, rumble
+ case theme, quickGame, airPlay, iCloud, fullScreenWhenConnectController, FAQ, feedback, shareApp, qq, telegram, discord, clearCache, language, userAgreement, privacyPolicy, autoSaveState, bios, respectSilentMode, onlinePlay, about, retro, rumble, appearance
}
var type: ItemType
@@ -27,7 +27,7 @@ struct SettingItem {
return Constants.Color.Green
case .airPlay, .FAQ, .about, .rumble:
return Constants.Color.Indigo
- case .iCloud, .userAgreement:
+ case .iCloud, .userAgreement, .appearance:
return Constants.Color.Blue
case .fullScreenWhenConnectController, .shareApp:
return Constants.Color.Orange
@@ -41,23 +41,23 @@ struct SettingItem {
var icon: UIImage {
switch type {
case .theme:
- UIImage(symbol: .paintpaletteFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .paintpaletteFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .quickGame:
- UIImage(symbol: .hareFill, font: Constants.Font.caption(size: .m, weight: .medium))
+ UIImage(symbol: .hareFill, font: Constants.Font.caption(size: .m, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .airPlay:
- UIImage(symbol: .airplayvideo, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .airplayvideo, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .iCloud:
if #available(iOS 17.0, *) {
- UIImage(symbol: .arrowTriangle2CirclepathIcloudFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .arrowTriangle2CirclepathIcloudFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
} else {
- UIImage(symbol: .cloudFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .cloudFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
}
case .FAQ:
- UIImage(symbol: .questionmarkAppFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .questionmarkAppFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .feedback:
- UIImage(symbol: .exclamationmarkBubbleFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .exclamationmarkBubbleFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .shareApp:
- UIImage(symbol: .arrowshapeTurnUpForwardFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .arrowshapeTurnUpForwardFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .qq:
R.image.settings_qq()!
case .telegram:
@@ -65,29 +65,35 @@ struct SettingItem {
case .discord:
R.image.settings_discord()!
case .clearCache:
- UIImage(symbol: .trashFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .trashFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .language:
- UIImage(symbol: .globeAmericasFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .globeAmericasFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .userAgreement:
- UIImage(symbol: .docTextFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .docTextFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .privacyPolicy:
- UIImage(symbol: .shieldLefthalfFilled, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .shieldLefthalfFilled, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .fullScreenWhenConnectController:
- R.image.customArrowDownLeftAndArrowUpRightRectangleFill()!.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium))
+ R.image.customArrowDownLeftAndArrowUpRightRectangleFill()!.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .autoSaveState:
- UIImage(symbol: .arrowDownDocFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .arrowDownDocFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .bios:
- UIImage(symbol: .cpuFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .cpuFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .respectSilentMode:
- UIImage(symbol: .bellFill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .bellFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .onlinePlay:
- UIImage(symbol: .person2Wave2Fill, font: Constants.Font.body(size: .s, weight: .medium))
+ UIImage(symbol: .person2Wave2Fill, font: Constants.Font.caption(size: .m, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .about:
- UIImage(symbol: .person3SequenceFill, font: Constants.Font.caption(size: .m, weight: .medium))
+ UIImage(symbol: .person3SequenceFill, font: Constants.Font.caption(size: .m, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
case .retro:
R.image.settings_retro()!
case .rumble:
- UIImage(symbol: .iphoneRadiowavesLeftAndRightCircleFill, font: Constants.Font.body(size: .l, weight: .medium))
+ if #available(iOS 16.1, *) {
+ UIImage(symbol: .iphoneGen1RadiowavesLeftAndRight, font: Constants.Font.caption(size: .m, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ } else {
+ UIImage(symbol: .iphoneRadiowavesLeftAndRightCircleFill, font: Constants.Font.body(size: .l, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ }
+ case .appearance:
+ R.image.customMoonphaseFirstQuarter()!.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
}
}
@@ -137,6 +143,8 @@ struct SettingItem {
"RetroAchievements"
case .rumble:
"Rumble"
+ case .appearance:
+ R.string.localizable.appearance()
}
}
@@ -157,6 +165,8 @@ struct SettingItem {
return R.string.localizable.respectSilentModeDesc()
} else if type == .rumble {
return R.string.localizable.rumbleDetail()
+ } else if type == .appearance {
+ return Settings.appearance.desc
}
return nil
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
index c8abe60e..e4485285 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
@@ -76,6 +76,29 @@ class Settings: Object, ObjectUpdatable {
///额外数据备用
@Persisted var extras: Data?
+ enum Appearance: Int {
+ case dark, light, auto
+ var desc: String {
+ switch self {
+ case .light:
+ R.string.localizable.appearanceLight()
+ case .dark:
+ R.string.localizable.appearanceDark()
+ case .auto:
+ R.string.localizable.appearanceAuto()
+ }
+ }
+ }
+ static var appearance: Appearance {
+ get {
+ return Appearance(rawValue: UserDefaults.standard.integer(forKey: Constants.DefaultKey.Appearance)) ?? .dark
+ }
+ set {
+ UserDefaults.standard.set(newValue.rawValue, forKey: Constants.DefaultKey.Appearance)
+ ThemeManager.shared.updateAppearance()
+ }
+ }
+
func getExtra(key: String) -> Any? {
if let extras {
return Self.getExtra(extras: extras, key: key)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/ViewControllers/SettingsViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/ViewControllers/SettingsViewController.swift
index c57f676a..95150f78 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/ViewControllers/SettingsViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/ViewControllers/SettingsViewController.swift
@@ -28,10 +28,12 @@ class SettingsViewController: BaseViewController {
private lazy var detailContentView: UIView = {
let view = UIView()
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
return view
}()
+ private var detailContentViewController: UIViewController? = nil
+
override func viewDidLoad() {
super.viewDidLoad()
@@ -42,10 +44,11 @@ class SettingsViewController: BaseViewController {
}
} else {
view.addSubview(settingsListView)
- view.backgroundColor = .black
+ view.backgroundColor = UIColor(.dm, light: .white, dark: .black)
settingsListView.backgroundColor = Constants.Color.Background
settingsListView.didTapDetail = { [weak self] vc in
guard let self = self else { return }
+ self.detailContentViewController = vc
self.detailContentView.subviews.forEach { $0.removeFromSuperview() }
self.detailContentView.addSubview(vc.view)
vc.view.snp.makeConstraints { make in
@@ -74,6 +77,7 @@ class SettingsViewController: BaseViewController {
}
let vc = ThemeViewController()
+ detailContentViewController = vc
detailContentView.addSubview(vc.view)
vc.view.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
index 3aa64bb0..a0fd6b3f 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
@@ -52,7 +52,7 @@ class BIOSCollectionViewCell: UICollectionViewCell {
init(enableButton: Bool = true, enableOptionButton: Bool = true) {
super.init(frame: .zero)
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
let titleContainer = UIView()
addSubview(titleContainer)
@@ -171,7 +171,7 @@ class BIOSCollectionViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
addSubviews(itemViews)
for (index, view) in itemViews.enumerated() {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
index 4af75df2..33716355 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
@@ -54,7 +54,7 @@ class BIOSSelectionView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
@@ -64,7 +64,7 @@ class BIOSSelectionView: BaseView {
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: BIOSCollectionViewCell.self)
view.register(cellWithClass: SettingDescriptionCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: PrimaryHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorHaderReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
view.delegate = self
@@ -73,7 +73,7 @@ class BIOSSelectionView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -122,7 +122,7 @@ class BIOSSelectionView: BaseView {
}
super.init(frame: .zero)
Log.debug("\(String(describing: Self.self)) init")
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(collectionView)
collectionView.snp.makeConstraints { make in
@@ -257,11 +257,11 @@ extension BIOSSelectionView: UICollectionViewDataSource {
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: PrimaryHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorHaderReusableView.self, for: indexPath)
let section = datas[indexPath.section]
- let matt = NSMutableAttributedString(string: section.title, attributes: [.font: Constants.Font.title(size: .s), .foregroundColor: Constants.Color.LabelPrimary])
+ let matt = NSMutableAttributedString(string: section.title, attributes: [.font: Constants.Font.body(size: .s, weight: .semibold), .foregroundColor: Constants.Color.LabelSecondary])
if section == .ps1 {
- matt.append(NSAttributedString(string: " (\(R.string.localizable.chooseOne()))", attributes: [.font: Constants.Font.body(size: .m), .foregroundColor: Constants.Color.LabelSecondary]))
+ matt.append(NSAttributedString(string: " (\(R.string.localizable.chooseOne()))", attributes: [.font: Constants.Font.caption(size: .m), .foregroundColor: Constants.Color.LabelTertiary]))
}
header.titleLabel.attributedText = matt
return header
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ColorPickerView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ColorPickerView.swift
index 460c8c9a..0812c494 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ColorPickerView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ColorPickerView.swift
@@ -23,18 +23,18 @@ class ColorPickerView: UIView {
return view
}()
private var addButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.title()))
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.title()), enableGlass: true)
+ view.backgroundColor = Constants.Color.BackgroundPrimary
view.enableRoundCorner = true
return view
}()
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -43,7 +43,7 @@ class ColorPickerView: UIView {
return view
}()
private lazy var saveButton: HowToButton = {
- let view = HowToButton(title: R.string.localizable.saveTitle()) { [weak self] in
+ let view = HowToButton(title: R.string.localizable.saveTitle(), enableGlass: true) { [weak self] in
guard let self = self else { return }
if var themeColor = self.themeColor {
//编辑
@@ -83,7 +83,7 @@ class ColorPickerView: UIView {
Log.debug("\(String(describing: Self.self)) init")
colorPicker.delegate = self
- colorPicker.borderColor = Constants.Color.BackgroundSecondary
+ colorPicker.borderColor = Constants.Color.BackgroundPrimary
addSubview(colorPicker)
colorPicker.snp.makeConstraints { make in
make.centerX.equalToSuperview()
@@ -91,8 +91,8 @@ class ColorPickerView: UIView {
make.size.equalTo(320)
}
- brightnessSlider.handle.borderColor = Constants.Color.BackgroundSecondary
- brightnessSlider.borderColor = Constants.Color.BackgroundSecondary
+ brightnessSlider.handle.borderColor = Constants.Color.BackgroundPrimary
+ brightnessSlider.borderColor = Constants.Color.BackgroundPrimary
brightnessSlider.trackColor = Constants.Color.Main
brightnessSlider.handle.borderWidth = 2.0
addSubview(brightnessSlider)
@@ -131,7 +131,7 @@ class ColorPickerView: UIView {
}
let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
- textFieldContainer.backgroundColor = Constants.Color.BackgroundSecondary
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
addSubview(textFieldContainer)
textFieldContainer.snp.makeConstraints { make in
make.centerY.equalTo(colorView)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/CoverStyleCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/CoverStyleCollectionViewCell.swift
index 9a146823..5a2f21b2 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/CoverStyleCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/CoverStyleCollectionViewCell.swift
@@ -8,7 +8,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import BetterSegmentedControl
-import TKSwitcherCollection
class CoverStyleCollectionViewCell: UICollectionViewCell {
@@ -23,9 +22,9 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundPrimary),
+ .backgroundColor(Constants.Color.Background),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundSecondary),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
@@ -58,7 +57,7 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
view.minimumValue = 0
view.maximumValue = 1
view.minimumTrackTintColor = Constants.Color.Main
- view.maximumTrackTintColor = Constants.Color.BackgroundTertiary
+ view.maximumTrackTintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -66,16 +65,14 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
let view = UIImageView()
view.contentMode = .center
view.layerCornerRadius = 6
- view.image = UIImage(symbol: .square, font: Constants.Font.body(size: .s, weight: .medium))
+ view.image = UIImage(symbol: .square, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
return view
}()
- private var forceSquareSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private var forceSquareSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -83,16 +80,14 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
let view = UIImageView()
view.contentMode = .center
view.layerCornerRadius = 6
- view.image = UIImage(symbol: .characterTextbox, font: Constants.Font.body(size: .s, weight: .medium))
+ view.image = UIImage(symbol: .characterTextbox, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
return view
}()
- private var hideGameTitleSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private var hideGameTitleSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -107,7 +102,7 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
let theme = Theme.defalut
let style = theme.coverStyle
@@ -173,7 +168,7 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
//开关
let forceSquareContainer = UIView()
- forceSquareContainer.backgroundColor = Constants.Color.BackgroundPrimary
+ forceSquareContainer.backgroundColor = Constants.Color.Background
forceSquareContainer.layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(forceSquareContainer)
forceSquareContainer.snp.makeConstraints { make in
@@ -212,11 +207,18 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
}
forceSquareContainer.addSubview(forceSquareSwitchButton)
- forceSquareSwitchButton.setOn(theme.forceSquare, animate: false)
+ forceSquareSwitchButton.setOn(theme.forceSquare, animated: false)
forceSquareSwitchButton.snp.makeConstraints { make in
make.centerY.equalTo(forceSquareIconView)
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMin)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ forceSquareSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
forceSquareSwitchButton.onChange { [weak self] value in
self?.updateCoverForceSquare(value)
@@ -224,7 +226,7 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
//隐藏游戏标题
let hideGameTitleContainer = UIView()
- hideGameTitleContainer.backgroundColor = Constants.Color.BackgroundPrimary
+ hideGameTitleContainer.backgroundColor = Constants.Color.Background
hideGameTitleContainer.layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(hideGameTitleContainer)
hideGameTitleContainer.snp.makeConstraints { make in
@@ -256,11 +258,18 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
}
hideGameTitleContainer.addSubview(hideGameTitleSwitchButton)
- hideGameTitleSwitchButton.setOn(theme.hideGameTitle, animate: false)
+ hideGameTitleSwitchButton.setOn(theme.hideGameTitle, animated: false)
hideGameTitleSwitchButton.snp.makeConstraints { make in
make.centerY.equalTo(hideGameTitleIconView)
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMin)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ hideGameTitleSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
hideGameTitleSwitchButton.onChange { [weak self] value in
self?.updateGameTitle(value)
@@ -270,10 +279,6 @@ class CoverStyleCollectionViewCell: UICollectionViewCell {
//通知更新主色
mainColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.MainColorChange, object: nil, queue: .main) { [weak self] notification in
guard let self = self else { return }
- self.forceSquareSwitchButton.onColor = Constants.Color.Main
- self.hideGameTitleSwitchButton.onColor = Constants.Color.Main
- self.forceSquareSwitchButton.reload()
- self.hideGameTitleSwitchButton.reload()
self.forceSquareIconView.backgroundColor = Constants.Color.Main
self.hideGameTitleIconView.backgroundColor = Constants.Color.Main
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DSOnlinePlaySettingCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DSOnlinePlaySettingCell.swift
index e78621c3..46fc2ece 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DSOnlinePlaySettingCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DSOnlinePlaySettingCell.swift
@@ -45,15 +45,22 @@ class DSOnlinePlaySettingCell: UICollectionViewCell {
view.image = UIImage(symbol: .checkmarkCircleFill,
size: Constants.Size.IconSizeMin.height,
weight: .bold,
- colors: [Constants.Color.LabelPrimary, Constants.Color.Main])
+ colors: [Constants.Color.LabelPrimary.forceStyle(.dark), Constants.Color.Main])
view.isHidden = true
return view
}()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
+
init() {
super.init(frame: .zero)
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
enableInteractive = true
delayInteractiveTouchEnd = true
@@ -98,7 +105,7 @@ class DSOnlinePlaySettingCell: UICollectionViewCell {
}
private lazy var resetButton: SymbolButton = {
- let view = SymbolButton(image: nil, title: R.string.localizable.dsWfcReset(), titleFont: Constants.Font.body(size: .l, weight: .medium), horizontalContian: true, titlePosition: .right)
+ let view = SymbolButton(image: nil, title: R.string.localizable.dsWfcReset(), titleFont: Constants.Font.body(size: .l, weight: .medium), titleColor: Constants.Color.LabelPrimary.forceStyle(.dark), horizontalContian: true, titlePosition: .right)
view.enableRoundCorner = true
view.backgroundColor = Constants.Color.Main
view.addTapGesture { [weak self] gesture in
@@ -117,7 +124,7 @@ class DSOnlinePlaySettingCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
addSubview(resetButton)
resetButton.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
index ab0999f4..a25716e5 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
@@ -23,7 +23,7 @@ class DesktopIconCollectionViewCell: UICollectionViewCell {
view.layer.shadowColor = Constants.Color.Shadow.cgColor
view.layer.shadowOpacity = 0.5
view.layer.shadowRadius = 2
- view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary, Constants.Color.Main])
+ view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary.forceStyle(.dark), Constants.Color.Main])
view.isHidden = true
return view
}()
@@ -55,12 +55,19 @@ class DesktopIconCollectionViewCell: UICollectionViewCell {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
+
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
}
private var scrollView: UIScrollView = {
let view = UIScrollView()
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
view.layerCornerRadius = Constants.Size.CornerRadiusMax
view.showsVerticalScrollIndicator = false
view.showsHorizontalScrollIndicator = false
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/GameListStyleCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/GameListStyleCollectionViewCell.swift
index 61e78add..86799b20 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/GameListStyleCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/GameListStyleCollectionViewCell.swift
@@ -8,7 +8,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import BetterSegmentedControl
-import TKSwitcherCollection
class GameListStyleCollectionViewCell: UICollectionViewCell {
@@ -19,9 +18,9 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundPrimary),
+ .backgroundColor(Constants.Color.Background),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundSecondary),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
@@ -47,9 +46,9 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundPrimary),
+ .backgroundColor(Constants.Color.Background),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundSecondary),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
@@ -70,16 +69,14 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
let view = UIImageView()
view.contentMode = .center
view.layerCornerRadius = 6
- view.image = UIImage(symbol: .calendarDayTimelineTrailing, font: Constants.Font.body(size: .s, weight: .medium))
+ view.image = UIImage(symbol: .calendarDayTimelineTrailing, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
return view
}()
- private var hideScrollIndicatorButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private var hideScrollIndicatorButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -87,16 +84,14 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
let view = UIImageView()
view.contentMode = .center
view.layerCornerRadius = 6
- view.image = UIImage(symbol: .listBullet, font: Constants.Font.body(size: .s, weight: .medium))
+ view.image = UIImage(symbol: .listBullet, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
return view
}()
- private var hideGroupTitleSwitchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ private var hideGroupTitleSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -118,6 +113,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
private lazy var gameSortTypeButton: SymbolButton = {
var title: String = (GameSortType(rawValue: Theme.defalut.getExtraInt(key: ExtraKey.gameSortType.rawValue) ?? 0) ?? .title).title
let view = SymbolButton(image: .symbolImage(.arrowUpArrowDown).applySymbolConfig(size: 13), title: title, titleFont: Constants.Font.body(), horizontalContian: true, titlePosition: .left)
+ view.backgroundColor = Constants.Color.BackgroundPrimary
view.layerCornerRadius = Constants.Size.CornerRadiusMin
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -144,6 +140,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
private lazy var gameSortOrderButton: SymbolButton = {
var title: String = (GameSortOrder(rawValue: Theme.defalut.getExtraInt(key: ExtraKey.gameSortOrder.rawValue) ?? 0) ?? .ascending).title
let view = SymbolButton(image: .symbolImage(.chevronUpChevronDown).applySymbolConfig(size: 13), title: title, titleFont: Constants.Font.body(), horizontalContian: true, titlePosition: .left)
+ view.backgroundColor = Constants.Color.BackgroundPrimary
view.layerCornerRadius = Constants.Size.CornerRadiusMin
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -163,7 +160,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMax
- backgroundColor = Constants.Color.BackgroundSecondary
+ backgroundColor = Constants.Color.BackgroundPrimary
let theme = Theme.defalut
//游戏行数
@@ -190,7 +187,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
//隐藏滚动条
let hideScrollIndicatorContainer = UIView()
- hideScrollIndicatorContainer.backgroundColor = Constants.Color.BackgroundPrimary
+ hideScrollIndicatorContainer.backgroundColor = Constants.Color.Background
hideScrollIndicatorContainer.layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(hideScrollIndicatorContainer)
hideScrollIndicatorContainer.snp.makeConstraints { make in
@@ -222,11 +219,18 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
}
hideScrollIndicatorContainer.addSubview(hideScrollIndicatorButton)
- hideScrollIndicatorButton.setOn(theme.hideIndicator, animate: false)
+ hideScrollIndicatorButton.setOn(theme.hideIndicator, animated: false)
hideScrollIndicatorButton.snp.makeConstraints { make in
make.centerY.equalTo(hideScrollIndicatorIconView)
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMin)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ hideScrollIndicatorButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
hideScrollIndicatorButton.onChange { value in
Theme.change { realm in
@@ -260,7 +264,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
//隐藏分组标题
let hideGroupTitleContainer = UIView()
- hideGroupTitleContainer.backgroundColor = Constants.Color.BackgroundPrimary
+ hideGroupTitleContainer.backgroundColor = Constants.Color.Background
hideGroupTitleContainer.layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(hideGroupTitleContainer)
hideGroupTitleContainer.snp.makeConstraints { make in
@@ -292,11 +296,18 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
}
hideGroupTitleContainer.addSubview(hideGroupTitleSwitchButton)
- hideGroupTitleSwitchButton.setOn(theme.hideGroupTitle, animate: false)
+ hideGroupTitleSwitchButton.setOn(theme.hideGroupTitle, animated: false)
hideGroupTitleSwitchButton.snp.makeConstraints { make in
make.centerY.equalTo(hideGroupTitleIconView)
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMin)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ hideGroupTitleSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
}
hideGroupTitleSwitchButton.onChange { value in
Theme.change { realm in
@@ -316,7 +327,7 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
}
let gameSortContainer = UIView()
- gameSortContainer.backgroundColor = Constants.Color.BackgroundPrimary
+ gameSortContainer.backgroundColor = Constants.Color.Background
gameSortContainer.layerCornerRadius = Constants.Size.CornerRadiusMid
addSubview(gameSortContainer)
gameSortContainer.snp.makeConstraints { make in
@@ -345,10 +356,6 @@ class GameListStyleCollectionViewCell: UICollectionViewCell {
mainColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.MainColorChange, object: nil, queue: .main) { [weak self] notification in
guard let self = self else { return }
- self.hideScrollIndicatorButton.onColor = Constants.Color.Main
- self.hideGroupTitleSwitchButton.onColor = Constants.Color.Main
- self.hideScrollIndicatorButton.reload()
- self.hideGroupTitleSwitchButton.reload()
self.hideScrollIndicatorIconView.backgroundColor = Constants.Color.Main
self.hideGroupTitleIconView.backgroundColor = Constants.Color.Main
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/MembershipInfoView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/MembershipInfoView.swift
index d31aca86..1dcdb99a 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/MembershipInfoView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/MembershipInfoView.swift
@@ -51,7 +51,7 @@ class MembershipInfoView: UIView {
make.trailing.lessThanOrEqualToSuperview().offset(-Constants.Size.ContentSpaceMid)
}
- let titleLeftView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold)))
+ let titleLeftView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)))
if Locale.isRTLLanguage {
titleLeftView.transform = CGAffineTransform(scaleX: -1, y: 1)
}
@@ -72,14 +72,14 @@ class MembershipInfoView: UIView {
}
titleLabel.text = text
titleLabel.font = Constants.Font.title(size: .s)
- titleLabel.textColor = Constants.Color.LabelPrimary
+ titleLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
titleContainer.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.leading.equalTo(titleLeftView.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)
make.centerY.equalToSuperview()
}
- let titleRightView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold)))
+ let titleRightView = UIImageView(image: R.image.customLaurelLeading()?.applySymbolConfig(font: UIFont.systemFont(ofSize: 16, weight: .bold), color: Constants.Color.LabelPrimary.forceStyle(.dark)))
if !Locale.isRTLLanguage {
titleRightView.transform = CGAffineTransform(scaleX: -1, y: 1)
}
@@ -99,7 +99,7 @@ class MembershipInfoView: UIView {
make.trailing.lessThanOrEqualToSuperview().offset(-Constants.Size.ContentSpaceMid)
}
let thankLabel = UILabel()
- thankLabel.textColor = Constants.Color.LabelPrimary
+ thankLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
thankLabel.font = Constants.Font.body(size: .s, weight: .medium)
thankLabel.text = R.string.localizable.thanksCommingDesc()
thankLabel.adjustsFontSizeToFitWidth = true
@@ -116,7 +116,7 @@ class MembershipInfoView: UIView {
}
let playLabel = UILabel()
- playLabel.textColor = Constants.Color.LabelPrimary
+ playLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
playLabel.font = Constants.Font.body(size: .s, weight: .medium)
playLabel.text = R.string.localizable.playGameDesc()
playLabel.adjustsFontSizeToFitWidth = true
@@ -129,7 +129,7 @@ class MembershipInfoView: UIView {
} else {
let becomeLabel = UILabel()
- becomeLabel.textColor = Constants.Color.LabelPrimary
+ becomeLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
becomeLabel.font = Constants.Font.title(size: .s)
becomeLabel.text = R.string.localizable.gameSaveGuideBecomTitle()
becomeLabel.adjustsFontSizeToFitWidth = true
@@ -147,7 +147,7 @@ class MembershipInfoView: UIView {
}
let memberLabel = UILabel()
- memberLabel.textColor = Constants.Color.LabelPrimary
+ memberLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
memberLabel.font = Constants.Font.title(size: .s)
memberLabel.text = R.string.localizable.gameSaveGuideMemberTitle()
memberLabel.adjustsFontSizeToFitWidth = true
@@ -159,7 +159,7 @@ class MembershipInfoView: UIView {
}
let detalLabel = UILabel()
- detalLabel.textColor = Constants.Color.LabelPrimary
+ detalLabel.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
detalLabel.font = Constants.Font.body(size: .s, weight: .medium)
detalLabel.text = R.string.localizable.settingsNonMemberDesc()
detalLabel.adjustsFontSizeToFitWidth = true
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/OnlinePlaySettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/OnlinePlaySettingView.swift
index bdeed856..88859d2c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/OnlinePlaySettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/OnlinePlaySettingView.swift
@@ -12,6 +12,44 @@ import ManicEmuCore
class OnlinePlaySettingView: BaseView {
+ class HaderReusableView: UICollectionReusableView {
+ var titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelSecondary
+ view.font = Constants.Font.body(size: .s, weight: .semibold)
+ return view
+ }()
+
+ var button: SymbolButton = {
+ let view = SymbolButton(image: R.image.customArrowTrianglehead2Clockwise()?.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .semibold), color: Constants.Color.LabelSecondary))
+ view.enableRoundCorner = true
+ view.backgroundColor = Constants.Color.Background
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ addSubviews([titleLabel, button])
+ makeBlur()
+
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ }
+
+ button.snp.makeConstraints { make in
+ make.centerY.equalTo(titleLabel)
+ make.leading.equalTo(titleLabel.snp.trailing)
+ make.size.equalTo(Constants.Size.ItemHeightTiny)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ }
+
private enum SectionIndex: Int, CaseIterable {
case desc, ds
var title: String {
@@ -36,7 +74,7 @@ class OnlinePlaySettingView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
@@ -46,7 +84,7 @@ class OnlinePlaySettingView: BaseView {
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: DSOnlinePlaySettingCell.self)
view.register(cellWithClass: SettingDescriptionCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: PrimaryButtonHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: HaderReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
view.delegate = self
@@ -55,7 +93,7 @@ class OnlinePlaySettingView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -79,7 +117,7 @@ class OnlinePlaySettingView: BaseView {
}
super.init(frame: .zero)
Log.debug("\(String(describing: Self.self)) init")
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(collectionView)
collectionView.snp.makeConstraints { make in
@@ -196,7 +234,7 @@ extension OnlinePlaySettingView: UICollectionViewDataSource {
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: PrimaryButtonHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: HaderReusableView.self, for: indexPath)
let section = datas[indexPath.section]
header.titleLabel.text = section.title
header.button.addTapGesture { [weak self] gesture in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/PlatformSortCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/PlatformSortCollectionViewCell.swift
index d258e245..cdc86eae 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/PlatformSortCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/PlatformSortCollectionViewCell.swift
@@ -15,14 +15,14 @@ class PlatformSortCollectionViewCell: UICollectionViewCell {
return label
}()
- private let icon = SymbolButton(image: .init(symbol: .line3Horizontal, font: Constants.Font.title(size: .s), color: Constants.Color.BackgroundTertiary))
+ private let icon = SymbolButton(image: .init(symbol: .line3Horizontal, font: Constants.Font.title(size: .s), color: Constants.Color.BackgroundSecondary))
override init(frame: CGRect) {
super.init(frame: frame)
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsItemCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsItemCollectionViewCell.swift
index 0fbe32d0..9069cae6 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsItemCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsItemCollectionViewCell.swift
@@ -6,7 +6,7 @@
// Copyright © 2025 Manic EMU. All rights reserved.
//
// SPDX-License-Identifier: AGPL-3.0-or-later
-import TKSwitcherCollection
+import BetterSegmentedControl
class SettingsItemCollectionViewCell: UICollectionViewCell {
private var iconView: UIImageView = {
@@ -23,19 +23,17 @@ class SettingsItemCollectionViewCell: UICollectionViewCell {
}()
var chevronIconView: UIImageView = {
- let view = UIImageView(image: UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundTertiary))
+ let view = UIImageView(image: UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundSecondary))
view.isHidden = true
view.contentMode = .center
return view
}()
- var switchButton: TKSimpleSwitch = {
- let view = TKSimpleSwitch()
+ var switchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
view.isHidden = true
- view.onColor = Constants.Color.Main
- view.offColor = Constants.Color.BackgroundTertiary
- view.lineColor = .clear
- view.lineSize = 0
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
return view
}()
@@ -47,6 +45,32 @@ class SettingsItemCollectionViewCell: UICollectionViewCell {
return view
}()
+ var didSegmentChange: ((_ index: Int)->Void)?
+ private lazy var segmentView: BetterSegmentedControl = {
+ let icons = [R.image.customMoonFill()!, R.image.customSunMaxFill()!, R.image.customMoonphaseFirstQuarter()!]
+ let segments = IconSegment.segments(withIcons: icons,
+ iconSize: .init(16),
+ normalIconTintColor: Constants.Color.LabelSecondary,
+ selectedIconTintColor: Constants.Color.LabelPrimary)
+ let options: [BetterSegmentedControl.Option] = [
+ .backgroundColor(Constants.Color.Background),
+ .indicatorViewInset(5),
+ .indicatorViewBackgroundColor(Constants.Color.AppearanceSegmentHighlight),
+ .cornerRadius(20)
+ ]
+ let view = BetterSegmentedControl(frame: .zero,
+ segments: segments,
+ options: options)
+
+ view.on(.valueChanged) { [weak self] sender, forEvent in
+ guard let self = self, let index = (sender as? BetterSegmentedControl)?.index else { return }
+ UIDevice.generateHaptic()
+ self.didSegmentChange?(index)
+ }
+ view.isHidden = true
+ return view
+ }()
+
private var mainColorChangeNotification: Any? = nil
deinit {
@@ -69,7 +93,11 @@ class SettingsItemCollectionViewCell: UICollectionViewCell {
titleLabel.snp.makeConstraints { make in
make.centerY.equalTo(iconView)
make.leading.equalTo(iconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
- make.trailing.equalToSuperview().offset(-46-Constants.Size.ContentSpaceMid-Constants.Size.ContentSpaceMin)
+ var offset = 46.0
+ if #available(iOS 26.0, *) {
+ offset = 63
+ }
+ make.trailing.equalToSuperview().offset(-offset-Constants.Size.ContentSpaceMid-Constants.Size.ContentSpaceMin)
}
addSubview(chevronIconView)
@@ -89,13 +117,22 @@ class SettingsItemCollectionViewCell: UICollectionViewCell {
switchButton.snp.makeConstraints { make in
make.centerY.equalTo(iconView)
make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
- make.size.equalTo(CGSize(width: 46, height: 28))
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
}
+ if #available(iOS 26.0, *) {} else {
+ switchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
+ }
+
- mainColorChangeNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.MainColorChange, object: nil, queue: .main) { [weak self] notification in
- guard let self = self else { return }
- self.switchButton.onColor = Constants.Color.Main
- self.switchButton.reload()
+ addSubview(segmentView)
+ segmentView.snp.makeConstraints { make in
+ make.centerY.equalTo(iconView)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
+ make.size.equalTo(CGSize(width: 105, height: 40))
}
}
@@ -124,23 +161,31 @@ class SettingsItemCollectionViewCell: UICollectionViewCell {
chevronIconView.isHidden = true
enableInteractive = false
delayInteractiveTouchEnd = false
+ case .appearance:
+ switchButton.isHidden = true
+ chevronIconView.isHidden = true
+ enableInteractive = false
+ delayInteractiveTouchEnd = false
+ segmentView.isHidden = false
+ segmentView.setIndex(Settings.appearance.rawValue, animated: false, shouldSendValueChangedEvent: false)
default:
switchButton.isHidden = true
chevronIconView.isHidden = false
enableInteractive = true
delayInteractiveTouchEnd = true
+ segmentView.isHidden = true
}
if let isOn = item.isOn {
if !PurchaseManager.isMember && (item.type == .airPlay || item.type == .iCloud) {
- switchButton.customEnable = false
- switchButton.setOn(false, animate: false)
+ switchButton.isEnabled = false
+ switchButton.setOn(false, animated: false)
} else {
- switchButton.customEnable = true
- switchButton.setOn(isOn, animate: false)
+ switchButton.isEnabled = true
+ switchButton.setOn(isOn, animated: false)
}
} else {
- switchButton.customEnable = false
- switchButton.setOn(false, animate: false)
+ switchButton.isEnabled = false
+ switchButton.setOn(false, animated: false)
}
switch item.type {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListFooterCollectionReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListFooterCollectionReusableView.swift
index 1e802ef2..70e042e8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListFooterCollectionReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListFooterCollectionReusableView.swift
@@ -34,7 +34,7 @@ class SettingsListFooterCollectionReusableView: UICollectionReusableView {
view.contentMode = .center
view.layerCornerRadius = 6
view.backgroundColor = Constants.Color.Red
- view.image = UIImage(symbol: .boltHeartFill, font: Constants.Font.body(size: .s, weight: .medium))
+ view.image = UIImage(symbol: .boltHeartFill, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
return view
}()
@@ -54,7 +54,7 @@ class SettingsListFooterCollectionReusableView: UICollectionReusableView {
}()
let donateChevronIconView: UIImageView = {
- let view = UIImageView(image: UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundTertiary))
+ let view = UIImageView(image: UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundSecondary))
view.contentMode = .center
return view
}()
@@ -196,7 +196,7 @@ class SettingsListFooterCollectionReusableView: UICollectionReusableView {
make.centerX.equalToSuperview()
}
- let starView = UIImageView(image: UIImage(symbol: .sparkle, color: Constants.Color.BackgroundPrimary))
+ let starView = UIImageView(image: UIImage(symbol: .sparkle, color: Constants.Color.BackgroundSecondary))
addSubview(starView)
starView.snp.makeConstraints { make in
make.top.equalTo(versionLabel.snp.bottom).offset(40)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
index d4771397..242b6b21 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
@@ -15,7 +15,7 @@ class SettingsListView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.Background)
+ view.makeBlur()
return view
}()
@@ -25,7 +25,7 @@ class SettingsListView: BaseView {
view.contentInsetAdjustmentBehavior = .never
view.register(cellWithClass: SettingsItemCollectionViewCell.self)
view.register(cellWithClass: MembershipCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorHaderReusableView.self)
view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withClass: SettingsListFooterCollectionReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
@@ -100,7 +100,8 @@ class SettingsListView: BaseView {
}
for section in SectionIndex.allCases {
if section == .general {
- datas[section] = [SettingItem(type: .theme),
+ datas[section] = [SettingItem(type: .appearance),
+ SettingItem(type: .theme),
SettingItem(type: .quickGame, isOn: Settings.defalut.quickGame),
SettingItem(type: .autoSaveState, isOn: Settings.defalut.autoSaveState)]
} else if section == .advance {
@@ -141,7 +142,7 @@ class SettingsListView: BaseView {
return datas
}()
- private let MembershipViewHeight = 130.0
+ private let MembershipViewHeight = 120.0
#if SIDE_LOAD
private static let FooterHeight = 538.0
@@ -333,7 +334,7 @@ extension SettingsListView: UICollectionViewDataSource {
let cell = collectionView.dequeueReusableCell(withClass: SettingsItemCollectionViewCell.self, for: indexPath)
let item = items[SectionIndex(rawValue: indexPath.section)!]![indexPath.row]
cell.setData(item: item)
- cell.switchButton.onChange(handler: nil)
+ cell.switchButton.onChange(handler: { _ in })
cell.switchButton.onDisableTap(handler: nil)
if item.type == .quickGame {
cell.switchButton.onChange { value in
@@ -359,7 +360,7 @@ extension SettingsListView: UICollectionViewDataSource {
UIView.makeAlert(title: R.string.localizable.iCloudTipsTitle(),
detail: R.string.localizable.iCloudTipsDetail(),
confirmTitle: R.string.localizable.iCloudConfirm(), cancelAction: { [weak cell] in
- cell?.switchButton.setOn(false)
+ cell?.switchButton.setOn(false, animated: true)
}, confirmAction: {
Settings.defalut.iCloudSyncEnable = value
if value, let iCloudServiceEnable = SyncManager.shared.iCloudServiceEnable, !iCloudServiceEnable {
@@ -400,6 +401,11 @@ extension SettingsListView: UICollectionViewDataSource {
//设置震动触感
Settings.defalut.updateExtra(key: ExtraKey.rumble.rawValue, value: value)
}
+ } else if item.type == .appearance {
+ cell.didSegmentChange = { [weak cell] index in
+ Settings.appearance = Settings.Appearance(rawValue: index) ?? .dark
+ cell?.setData(item: item)
+ }
} else {
cell.switchButton.onChange { value in }
}
@@ -409,10 +415,10 @@ extension SettingsListView: UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
if kind == UICollectionView.elementKindSectionHeader {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorHaderReusableView.self, for: indexPath)
header.titleLabel.text = SectionIndex(rawValue: indexPath.section)?.title
if UIDevice.isPad {
- header.makeBlur(blurColor: Constants.Color.Background)
+ header.makeBlur()
}
return header
} else {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsMembershipGiftView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsMembershipGiftView.swift
index 181c44fd..14cdf49d 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsMembershipGiftView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsMembershipGiftView.swift
@@ -11,7 +11,7 @@ class SettingsMembershipGiftView: UIView {
init(symbol: SFSymbol, title: String) {
super.init(frame: .zero)
- backgroundColor = Constants.Color.Background
+ backgroundColor = Constants.Color.Background.forceStyle(.dark)
let gift = GradientImageView(image: UIImage(symbol: symbol))
addSubview(gift)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeColorCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeColorCollectionViewCell.swift
index 59b2d657..8e2da1b8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeColorCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeColorCollectionViewCell.swift
@@ -21,39 +21,56 @@ class ThemeColorCollectionViewCell: UICollectionViewCell {
return view
}()
- var selectView: UIView = {
- let view = UIView(frame: CGRect(origin: .zero, size: .init(48)))
- let outerColor = UIColor.white
- let innerColor = Constants.Color.BackgroundSecondary
- let outerWidth = 2.0
- let innerWidth = 2.0
- let totalWidth = innerWidth + outerWidth
- let radius = min(view.bounds.width, view.bounds.height) / 2
+ class SelectView: UIView {
+ private let outerLayer = CAShapeLayer()
+ private let innerLayer = CAShapeLayer()
+ private let outerColor = UIColor(.dm, light: Constants.Color.LabelPrimary.forceStyle(.light), dark: .white)
+ private let innerColor = Constants.Color.BackgroundPrimary
- // Outer border layer
- let outerLayer = CAShapeLayer()
- outerLayer.path = UIBezierPath(ovalIn: view.bounds.insetBy(dx: outerWidth / 2, dy: outerWidth / 2)).cgPath
- outerLayer.strokeColor = outerColor.cgColor
- outerLayer.fillColor = UIColor.clear.cgColor
- outerLayer.lineWidth = totalWidth
- view.layer.addSublayer(outerLayer)
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+
+ let outerWidth = 2.0
+ let innerWidth = 2.0
+ let totalWidth = innerWidth + outerWidth
+ let radius = min(bounds.width, bounds.height) / 2
+
+ // Outer border layer
+ outerLayer.path = UIBezierPath(ovalIn: bounds.insetBy(dx: outerWidth / 2, dy: outerWidth / 2)).cgPath
+ outerLayer.strokeColor = outerColor.cgColor
+ outerLayer.fillColor = UIColor.clear.cgColor
+ outerLayer.lineWidth = totalWidth
+ layer.addSublayer(outerLayer)
+
+ // Inner border layer
+ let innerInset = outerWidth
+ innerLayer.path = UIBezierPath(ovalIn: bounds.insetBy(dx: innerInset + innerWidth / 2, dy: innerInset + innerWidth / 2)).cgPath
+ innerLayer.strokeColor = innerColor.cgColor
+ innerLayer.fillColor = UIColor.clear.cgColor
+ innerLayer.lineWidth = innerWidth
+ layer.addSublayer(innerLayer)
+
+ // Make the view itself circular
+ layer.cornerRadius = radius
+ clipsToBounds = true
+ backgroundColor = .clear
+ isHidden = true
+ }
- // Inner border layer
- let innerInset = outerWidth
- let innerLayer = CAShapeLayer()
- innerLayer.path = UIBezierPath(ovalIn: view.bounds.insetBy(dx: innerInset + innerWidth / 2, dy: innerInset + innerWidth / 2)).cgPath
- innerLayer.strokeColor = innerColor.cgColor
- innerLayer.fillColor = UIColor.clear.cgColor
- innerLayer.lineWidth = innerWidth
- view.layer.addSublayer(innerLayer)
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
- // Make the view itself circular
- view.layer.cornerRadius = radius
- view.clipsToBounds = true
- view.backgroundColor = .clear
- view.isHidden = true
- return view
- }()
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ outerLayer.strokeColor = outerColor.cgColor
+ innerLayer.strokeColor = innerColor.cgColor
+ }
+ }
+ }
+
+ var selectView: SelectView = SelectView(frame: CGRect(origin: .zero, size: .init(48)))
override init(frame: CGRect) {
super.init(frame: frame)
@@ -84,14 +101,14 @@ class ThemeColorCollectionViewCell: UICollectionViewCell {
private var roundContainerView: UIView = {
let view = UIView()
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
view.layerCornerRadius = Constants.Size.CornerRadiusMax
return view
}()
private var addButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.title()))
- view.backgroundColor = Constants.Color.BackgroundPrimary
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.title()), enableGlass: true)
+ view.backgroundColor = Constants.Color.Background
view.enableRoundCorner = true
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeSettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeSettingView.swift
index 9c158bf7..0ce2d7b1 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeSettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/ThemeSettingView.swift
@@ -32,7 +32,7 @@ class ThemeSettingView: BaseView {
private var topBlurView: UIView = {
let view = UIView()
- view.makeBlur(blurColor: Constants.Color.BackgroundPrimary)
+ view.makeBlur()
return view
}()
@@ -45,7 +45,7 @@ class ThemeSettingView: BaseView {
view.register(cellWithClass: CoverStyleCollectionViewCell.self)
view.register(cellWithClass: GameListStyleCollectionViewCell.self)
view.register(cellWithClass: PlatformSortCollectionViewCell.self)
- view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: PrimaryHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorHaderReusableView.self)
view.showsVerticalScrollIndicator = false
view.dataSource = self
view.delegate = self
@@ -57,7 +57,7 @@ class ThemeSettingView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -80,7 +80,7 @@ class ThemeSettingView: BaseView {
override init(frame: CGRect) {
super.init(frame: frame)
Log.debug("\(String(describing: Self.self)) init")
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(collectionView)
collectionView.snp.makeConstraints { make in
@@ -197,7 +197,7 @@ class ThemeSettingView: BaseView {
var backgroundView: UIView = {
let view = UIView()
view.layerCornerRadius = Constants.Size.CornerRadiusMax
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
return view
}()
@@ -262,7 +262,7 @@ extension ThemeSettingView: UICollectionViewDataSource {
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
- let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: PrimaryHaderReusableView.self, for: indexPath)
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorHaderReusableView.self, for: indexPath)
let section = SectionIndex(rawValue: indexPath.section)!
header.titleLabel.text = section.title
return header
diff --git a/ManicEmu/ManicEmu/Sources/Business/Skin/ViewControllers/FlexSkinSettingViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Skin/ViewControllers/FlexSkinSettingViewController.swift
index ebc06274..356a3aa6 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Skin/ViewControllers/FlexSkinSettingViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Skin/ViewControllers/FlexSkinSettingViewController.swift
@@ -65,7 +65,8 @@ class FlexSkinSettingViewController: BaseViewController {
title: R.string.localizable.controllerMappingReset(),
titleFont: Constants.Font.body(size: .m),
edgeInsets: UIEdgeInsets(top: 0, left: Constants.Size.ContentSpaceTiny, bottom: 0, right: Constants.Size.ContentSpaceTiny),
- titlePosition: .left)
+ titlePosition: .left,
+ enableGlass: true)
view.titleLabel.textAlignment = .center
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
diff --git a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/AddSkinCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/AddSkinCollectionViewCell.swift
index 2e6a77b9..a1726cd7 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/AddSkinCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/AddSkinCollectionViewCell.swift
@@ -30,7 +30,7 @@ class AddSkinCollectionViewCell: UICollectionViewCell {
enableInteractive = true
delayInteractiveTouchEnd = true
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = Constants.Color.BackgroundPrimary
+ backgroundColor = Constants.Color.Background
addSubview(iconView)
iconView.snp.makeConstraints { make in
make.center.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinCollectionViewCell.swift
index 7922d252..5ee4b6d8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinCollectionViewCell.swift
@@ -40,6 +40,7 @@ class SkinCollectionViewCell: UICollectionViewCell {
var controllerView: ControllerView = {
let view = ControllerView()
+ view.backgroundColor = .black
view.layerCornerRadius = Constants.Size.CornerRadiusMid
view.isUserInteractionEnabled = false
return view
@@ -52,7 +53,7 @@ class SkinCollectionViewCell: UICollectionViewCell {
view.layer.shadowColor = Constants.Color.Shadow.cgColor
view.layer.shadowOpacity = 0.5
view.layer.shadowRadius = 2
- view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary, Constants.Color.Main])
+ view.image = UIImage(symbol: .checkmarkCircleFill, weight: .bold, colors: [Constants.Color.LabelPrimary.forceStyle(.dark), Constants.Color.Main])
view.alpha = 0
return view
}()
@@ -68,7 +69,8 @@ class SkinCollectionViewCell: UICollectionViewCell {
title: R.string.localizable.skinPreviewTitle(),
titleFont: Constants.Font.body(),
edgeInsets: UIEdgeInsets(top: Constants.Size.ContentSpaceTiny, left: Constants.Size.ContentSpaceMin, bottom: Constants.Size.ContentSpaceTiny, right: Constants.Size.ContentSpaceMin),
- titlePosition: .right)
+ titlePosition: .right,
+ enableGlass: true)
view.enableRoundCorner = true
return view
}()
@@ -86,7 +88,7 @@ class SkinCollectionViewCell: UICollectionViewCell {
enableInteractive = true
delayInteractiveTouchEnd = true
layerCornerRadius = Constants.Size.CornerRadiusMid
- backgroundColor = .black
+ backgroundColor = Constants.Color.Background
addSubview(controllerView)
controllerView.snp.makeConstraints { make in
make.leading.trailing.bottom.equalToSuperview()
@@ -111,6 +113,13 @@ class SkinCollectionViewCell: UICollectionViewCell {
}
}
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ super.traitCollectionDidChange(previousTraitCollection)
+ if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+ selectImageView.layer.shadowColor = Constants.Color.Shadow.cgColor
+ }
+ }
+
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
index 32d487d6..9dbe5ed8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
@@ -107,7 +107,7 @@ class SkinSettingsView: BaseView {
}()
private lazy var moreButton: SymbolButton = {
- let view = SymbolButton(symbol: .ellipsis)
+ let view = SymbolButton(symbol: .ellipsis, enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
self?.moreContextMenuButton.triggerTapGesture()
@@ -116,7 +116,7 @@ class SkinSettingsView: BaseView {
}()
private lazy var closeButton: SymbolButton = {
- let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
view.enableRoundCorner = true
view.addTapGesture { [weak self] gesture in
guard let self = self else { return }
@@ -132,9 +132,9 @@ class SkinSettingsView: BaseView {
normalTextColor: Constants.Color.LabelSecondary,
selectedTextColor: Constants.Color.LabelPrimary)
let options: [BetterSegmentedControl.Option] = [
- .backgroundColor(Constants.Color.BackgroundSecondary),
+ .backgroundColor(Constants.Color.BackgroundPrimary),
.indicatorViewInset(5),
- .indicatorViewBackgroundColor(Constants.Color.BackgroundTertiary),
+ .indicatorViewBackgroundColor(Constants.Color.Background),
.cornerRadius(16)
]
let view = BetterSegmentedControl(frame: .zero,
@@ -334,7 +334,7 @@ class SkinSettingsView: BaseView {
var backgroundView: UIView = {
let view = UIView()
view.layerCornerRadius = Constants.Size.CornerRadiusMax
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
return view
}()
@@ -617,7 +617,7 @@ extension SkinSettingsView {
let view = UIView()
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/TKSwitchExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/TKSwitchExtensions.swift
deleted file mode 100644
index 8c61581a..00000000
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/TKSwitchExtensions.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// TKSwitchExtensions.swift
-// ManicEmu
-//
-// Created by Daiuno on 2025/3/13.
-// Copyright © 2025 Manic EMU. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import TKSwitcherCollection
-
-extension TKBaseSwitch {
- @discardableResult
- func onChange(handler: ((_ value: Bool) -> Void)? = nil) -> Self {
- self.valueChange = handler
- return self
- }
-
- func onDisableTap(handler: (()->Void)? = nil) {
- self.disableTap = handler
- }
-}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
index 821db0da..a19a9576 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
@@ -174,6 +174,10 @@ extension UIDevice {
static var deviceInfo: String {
return "Device:\(Device.version())\nVersion:\(UIDevice.current.systemVersion)"
}
+
+ static var isDarkMode: Bool {
+ ApplicationSceneDelegate.applicationWindow?.traitCollection.userInterfaceStyle == .dark
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIScrollViewExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIScrollViewExtensions.swift
new file mode 100644
index 00000000..36311e34
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIScrollViewExtensions.swift
@@ -0,0 +1,81 @@
+//
+// UIScrollViewExtensions.swift
+// ManicEmu
+//
+// Created on 2025-10-12.
+//
+
+import UIKit
+import ObjectiveC
+
+extension UIScrollView {
+
+ // MARK: - Swizzle Methods
+
+ /// 确保 swizzle 只执行一次
+ private static var hasSwizzled = false
+
+ /// 公共方法:调用此方法来激活 swizzle(需要在应用启动时调用)
+ @objc public static func disableEdgeEffect() {
+ guard !hasSwizzled else { return }
+ hasSwizzled = true
+
+ swizzleInitMethods()
+ }
+
+ /// 执行方法交换
+ private static func swizzleInitMethods() {
+ // Swizzle init(frame:)
+ let originalInitSelector = #selector(UIScrollView.init(frame:))
+ let swizzledInitSelector = #selector(UIScrollView.swizzled_init(frame:))
+
+ guard let originalMethod = class_getInstanceMethod(UIScrollView.self, originalInitSelector),
+ let swizzledMethod = class_getInstanceMethod(UIScrollView.self, swizzledInitSelector) else {
+ return
+ }
+
+ method_exchangeImplementations(originalMethod, swizzledMethod)
+
+ // Swizzle init(coder:)
+ let originalCoderSelector = #selector(UIScrollView.init(coder:))
+ let swizzledCoderSelector = #selector(UIScrollView.swizzled_init(coder:))
+
+ guard let originalCoderMethod = class_getInstanceMethod(UIScrollView.self, originalCoderSelector),
+ let swizzledCoderMethod = class_getInstanceMethod(UIScrollView.self, swizzledCoderSelector) else {
+ return
+ }
+
+ method_exchangeImplementations(originalCoderMethod, swizzledCoderMethod)
+ }
+
+ // MARK: - Swizzled Initializers
+
+ /// Swizzled init(frame:) 方法
+ @objc private dynamic func swizzled_init(frame: CGRect) -> UIScrollView {
+ // 调用原始方法(由于已经交换,这里实际调用的是原始的 init(frame:))
+ let scrollView = self.swizzled_init(frame: frame)
+ scrollView.hideEdgeEffects()
+ return scrollView
+ }
+
+ /// Swizzled init(coder:) 方法
+ @objc private dynamic func swizzled_init(coder: NSCoder) -> UIScrollView? {
+ // 调用原始方法(由于已经交换,这里实际调用的是原始的 init(coder:))
+ let scrollView = self.swizzled_init(coder: coder)
+ scrollView?.hideEdgeEffects()
+ return scrollView
+ }
+
+ // MARK: - Helper Methods
+
+ /// 隐藏边缘效果(iOS 26.0+)
+ private func hideEdgeEffects() {
+ if #available(iOS 26.0, *) {
+ self.topEdgeEffect.isHidden = true
+ self.leftEdgeEffect.isHidden = true
+ self.bottomEdgeEffect.isHidden = true
+ self.rightEdgeEffect.isHidden = true
+ }
+ }
+}
+
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
index 985740c8..88eb7ab7 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
@@ -16,7 +16,7 @@ import Schedule
extension UIView {
@discardableResult
- func makeBlur(blurRadius: CGFloat = 12.5, blurColor: UIColor = Constants.Color.BackgroundPrimary, blurAlpha: CGFloat = 0.9, cornerRadius: CGFloat? = nil) -> VisualEffectView {
+ func makeBlur(blurRadius: CGFloat = 12.5, blurColor: UIColor = Constants.Color.Background, blurAlpha: CGFloat = 0.9, cornerRadius: CGFloat? = nil) -> VisualEffectView {
if let blurView = subviews.first(where: { $0 is VisualEffectView }) as? VisualEffectView {
blurView.removeFromSuperview()
}
@@ -39,6 +39,41 @@ extension UIView {
self.addShadow(ofColor: ofColor, radius: radius)
}
+ /// 为视图添加 iOS 26 的 Liquid Glass 效果
+ /// - Parameters:
+ /// - useContainerEffect: 是否使用容器效果(UIGlassContainerEffect),默认为 false 使用普通玻璃效果(UIGlassEffect)
+ /// - Note: 此方法仅在 iOS 26.0 及以上版本可用
+ @available(iOS 26.0, *)
+ func makeGlass(useContainerEffect: Bool = false) {
+ // 移除已存在的 Liquid Glass 视图
+ subviews.filter { $0 is UIVisualEffectView && $0.accessibilityIdentifier == "LiquidGlassEffectView" }.forEach {
+ $0.removeFromSuperview()
+ }
+
+ // 创建 Glass Effect
+ let glassEffect: UIVisualEffect
+ if useContainerEffect {
+ glassEffect = UIGlassContainerEffect()
+ } else {
+ glassEffect = UIGlassEffect()
+ }
+
+ // 创建 UIVisualEffectView 并应用玻璃效果
+ let visualEffectView = UIVisualEffectView(effect: glassEffect)
+ visualEffectView.accessibilityIdentifier = "LiquidGlassEffectView"
+ visualEffectView.frame = bounds
+ visualEffectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+
+ // 继承当前视图的圆角设置
+ if layer.cornerRadius > 0 {
+ visualEffectView.layer.cornerRadius = layer.cornerRadius
+ visualEffectView.clipsToBounds = true
+ }
+
+ // 将 UIVisualEffectView 添加到当前视图的底层
+ insertSubview(visualEffectView, at: 0)
+ }
+
static func normalAnimate(enable: Bool = true, animations: @escaping ()->Void, completion: ((Bool)->Void)? = nil) {
if enable {
UIView.animate(withDuration: 0.35, animations: animations, completion: completion)
@@ -173,7 +208,7 @@ extension UIView {
mask.backgroundColor = .black.withAlphaComponent(0.2)
}
let pacman = UIView()
- let activity = NVActivityIndicatorView(frame: .zero, type: .pacman, color: .white, padding: nil)
+ let activity = NVActivityIndicatorView(frame: .zero, type: .pacman, color: Constants.Color.LabelPrimary, padding: nil)
pacman.addSubview(activity)
activity.snp.makeConstraints { make in
make.centerY.equalToSuperview()
@@ -272,7 +307,7 @@ extension UIView {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
make.top.equalTo(grabber.snp.bottom)
@@ -303,7 +338,7 @@ extension UIView {
}
let line = UIView()
- line.backgroundColor = Constants.Color.BackgroundSecondary
+ line.backgroundColor = Constants.Color.Border
containerView.addSubview(line)
line.snp.makeConstraints { make in
make.height.equalTo(1)
@@ -342,7 +377,7 @@ extension UIView {
}
} else {
let verticalLine = UIView()
- verticalLine.backgroundColor = Constants.Color.BackgroundSecondary
+ verticalLine.backgroundColor = Constants.Color.Border
buttonContainerView.addSubview(verticalLine)
verticalLine.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: 1, height: 26))
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/CoreSelectionView.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/CoreSelectionView.swift
index 1db8133f..f6e8e4ca 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/CoreSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/CoreSelectionView.swift
@@ -56,7 +56,7 @@ class CoreSelectionView: BaseView {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ImageFetcher.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ImageFetcher.swift
index 6ff18e74..dfee28e1 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ImageFetcher.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ImageFetcher.swift
@@ -29,7 +29,7 @@ struct ImageFetcher {
PermissionKit.requestCamera {
var config = CameraConfiguration()
config.editor = defaultEditorConfiguration()
- Photo.capture(config, type: .photo, sender: topViewController()) { result, _, _ in
+ let vc = Photo.capture(config, type: .photo, sender: topViewController()) { result, _, _ in
if case .image(let image) = result {
completion(image.scaled(toSize: preferenceSize))
} else {
@@ -37,6 +37,7 @@ struct ImageFetcher {
}
}
+ vc.sheetPresentationController?.preferredCornerRadius = Constants.Size.CornerRadiusMax
}
}
@@ -49,7 +50,7 @@ struct ImageFetcher {
config.selectOptions = [.livePhoto, .photo]
config.photoSelectionTapAction = .openEditor
config.editor = defaultEditorConfiguration()
- Photo.picker(config, sender: topViewController()) { result, _ in
+ let vc = Photo.picker(config, sender: topViewController()) { result, _ in
result.getImage(compressionScale: 1) { image in
if let image = image.first {
completion(image.scaled(toSize: preferenceSize))
@@ -59,6 +60,7 @@ struct ImageFetcher {
}
}
+ vc.sheetPresentationController?.preferredCornerRadius = Constants.Size.CornerRadiusMax
}
}
@@ -73,13 +75,14 @@ struct ImageFetcher {
}
static func edit(image: UIImage, preferenceSize: CGSize = .init(Constants.Size.GameCoverMaxSize), completion: @escaping (_ image: UIImage?)->Void) {
- Photo.edit(asset: .init(type: .image(image)), config: defaultEditorConfiguration(), finished: { asset, _ in
+ let vc = Photo.edit(asset: .init(type: .image(image)), config: defaultEditorConfiguration(), finished: { asset, _ in
if let newImage = asset.result?.image {
completion(newImage.scaled(toSize: preferenceSize))
} else {
completion(image.scaled(toSize: preferenceSize))
}
})
+ vc.sheetPresentationController?.preferredCornerRadius = Constants.Size.CornerRadiusMax
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
index 7dcc9cb1..d7027647 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
@@ -55,7 +55,7 @@ class PlatformSelectionView: BaseView {
}
let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
- containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ containerView.backgroundColor = Constants.Color.Background
containerView.makeBlur()
view.addSubview(containerView)
containerView.snp.makeConstraints { make in
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/SideMenuShowStyle.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/SideMenuShowStyle.swift
index 57b670cd..75087c34 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/SideMenuShowStyle.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/SideMenuShowStyle.swift
@@ -15,7 +15,7 @@ class SideMenuShowStyle: SideMenuPresentationStyle {
private class CoverView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
- self.backgroundColor = .black.withAlphaComponent(0.7)
+ self.backgroundColor = UIColor(.dm, light: .white.withAlphaComponent(0.35), dark: .black.withAlphaComponent(0.7))
}
required init?(coder: NSCoder) {
@@ -28,7 +28,7 @@ class SideMenuShowStyle: SideMenuPresentationStyle {
required init() {
super.init()
/// Background color behind the views and status bar color
- backgroundColor = .black
+ backgroundColor = UIColor(.dm, light: .white, dark: .black)
/// The starting alpha value of the menu before it appears
menuStartAlpha = 1
/// Whether or not the menu is on top. If false, the presenting view is on top. Shadows are applied to the view on top.
@@ -38,7 +38,7 @@ class SideMenuShowStyle: SideMenuPresentationStyle {
/// The amount the menu is scaled. Less than one shrinks the view, larger than one grows the view.
menuScaleFactor = 1
/// The color of the shadow applied to the top most view.
- onTopShadowColor = .black
+ onTopShadowColor = UIColor(.dm, light: .white, dark: .black)
/// The radius of the shadow applied to the top most view.
onTopShadowRadius = 5
/// The opacity of the shadow applied to the top most view.
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
index c95ed3f4..50e2532f 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
@@ -8,6 +8,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import RealmSwift
+import FluentDarkModeKit
class ThemeManager {
static let shared = ThemeManager()
@@ -41,6 +42,7 @@ class ThemeManager {
}
}
+ updateAppearance()
updateIcon()
updateThemeColor()
updateCoverStyle()
@@ -84,11 +86,16 @@ class ThemeManager {
let gradientColors = themeColor.colors.compactMap({ UIColor(hexString: $0) })
if Constants.Color.MainDynamicColor.hexString != mainColor.hexString {
Constants.Color.MainDynamicColor = mainColor
- ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .light
- DispatchQueue.main.asyncAfter(delay: 0.01) {
- ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .dark
- NotificationCenter.default.post(name: Constants.NotificationName.MainColorChange, object: nil)
+ //刷新整个系统的外观 会驱使traitCollectionDidChange方法进行调用
+ if let userInterfaceStyle = ApplicationSceneDelegate.applicationWindow?.traitCollection.userInterfaceStyle {
+ if userInterfaceStyle == .dark {
+ ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .light
+ } else {
+ ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .dark
+ }
}
+ self.updateAppearance()
+ NotificationCenter.default.post(name: Constants.NotificationName.MainColorChange, object: nil)
}
if Constants.Color.Gradient != gradientColors {
@@ -123,4 +130,15 @@ class ThemeManager {
NotificationCenter.default.post(name: Constants.NotificationName.GameListStyleChange, object: nil)
}
}
+
+ func updateAppearance() {
+ switch Settings.appearance {
+ case .auto:
+ ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .unspecified
+ case .light:
+ ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .light
+ case .dark:
+ ApplicationSceneDelegate.applicationWindow?.overrideUserInterfaceStyle = .dark
+ }
+ }
}
diff --git a/ManicEmu/Podfile b/ManicEmu/Podfile
index 7df624bd..ddb8c0b5 100644
--- a/ManicEmu/Podfile
+++ b/ManicEmu/Podfile
@@ -12,7 +12,6 @@ target 'ManicEmu' do
pod 'CloudServiceKit', :path => '../CloudServiceKit'
pod 'HXPhotoPicker/Lite', :path => '../HXPhotoPicker'
pod 'Closures', :path => '../Closures/Xcode/Closures'
- pod 'TKSwitcherCollection', :path => '../TKSwitcherCollection'
pod "GCDWebServer/WebUploader", :path => '../GCDWebServer'
pod 'ProHUD', :path => '../ProHUD'
pod 'BlankSlate', :path => '../BlankSlate'
diff --git a/ManicEmu/Podfile.lock b/ManicEmu/Podfile.lock
index 553f1b4a..308fbd36 100644
--- a/ManicEmu/Podfile.lock
+++ b/ManicEmu/Podfile.lock
@@ -179,7 +179,6 @@ PODS:
- SwifterSwift/WebKit (7.0.0)
- SwipeCellKit (2.7.1)
- Tiercel (3.2.5)
- - TKSwitcherCollection (1.4.3)
- UMAPM (2.0.4):
- UMCommon
- UMCommon (7.5.2):
@@ -229,7 +228,6 @@ DEPENDENCIES:
- SwifterSwift (~> 7.0)
- SwipeCellKit (from `../SwipeCellKit`)
- Tiercel (~> 3.0)
- - TKSwitcherCollection (from `../TKSwitcherCollection`)
- UMAPM (~> 2.0.3)
- UMCommon (~> 7.5.2)
- VisualEffectView (~> 5.0)
@@ -312,8 +310,6 @@ EXTERNAL SOURCES:
:path: "../ZipArchive"
SwipeCellKit:
:path: "../SwipeCellKit"
- TKSwitcherCollection:
- :path: "../TKSwitcherCollection"
ZIPFoundation:
:path: "../ZIPFoundation"
@@ -375,13 +371,12 @@ SPEC CHECKSUMS:
SwifterSwift: e9caf990fc72e835432280755d1f4c43f2a483d5
SwipeCellKit: 3972254a826da74609926daf59b08d6c72e619ea
Tiercel: c0a73f876a72800333b15f4e7e48791f4ad21e90
- TKSwitcherCollection: 6805f52958a8b661cd583a538345618a26ff9263
UMAPM: f038b65a3df4fe8e2df3245642d84cff7f5f63c8
UMCommon: 72513a01ebca2dead52f2112b4d7c6196dbbe412
UMDevice: dcdf7ec167387837559d149fbc7d793d984faf82
VisualEffectView: 173e1fabc2eb37af663547e14dc12efef7d2da8b
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
-PODFILE CHECKSUM: 53b3345edb2065a572663467eb2b7b20c00fec17
+PODFILE CHECKSUM: 1da151c3805063ec159935f9ae72ecbd9c867818
COCOAPODS: 1.16.2
diff --git a/QuickTableViewController/Source/QuickTableViewController.swift b/QuickTableViewController/Source/QuickTableViewController.swift
index 2502ee7a..a1e221e6 100644
--- a/QuickTableViewController/Source/QuickTableViewController.swift
+++ b/QuickTableViewController/Source/QuickTableViewController.swift
@@ -82,7 +82,7 @@ class QuickTableViewController: BaseViewController, UITableViewDataSource, UITab
make.top.bottom.equalToSuperview()
make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMin)
}
- tableView.backgroundColor = Constants.Color.BackgroundPrimary
+ tableView.backgroundColor = Constants.Color.Background
tableView.rowHeight = UITableView.automaticDimension
tableView.estimatedRowHeight = 44
tableView.dataSource = self
@@ -145,7 +145,7 @@ class QuickTableViewController: BaseViewController, UITableViewDataSource, UITab
(cell as? SwitchCell)?.delegate = self
#endif
row.customize?(cell, row)
- cell.backgroundColor = Constants.Color.BackgroundSecondary
+ cell.backgroundColor = Constants.Color.BackgroundPrimary
return cell
}
diff --git a/TKSwitcherCollection/.gitattributes b/TKSwitcherCollection/.gitattributes
deleted file mode 100644
index 19403015..00000000
--- a/TKSwitcherCollection/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-Example/** linguist-generated=true
-_Pods.xcodeproj/** linguist-generated=true
diff --git a/TKSwitcherCollection/.gitignore b/TKSwitcherCollection/.gitignore
deleted file mode 100644
index 14b65c30..00000000
--- a/TKSwitcherCollection/.gitignore
+++ /dev/null
@@ -1,63 +0,0 @@
-# Created by https://www.gitignore.io/api/swift
-
-### Swift ###
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.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
-.build/
-
-# CocoaPods - Refactored to standalone file
-
-# Carthage - Refactored to standalone file
-
-# 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
-fastlane/test_output
-
-
-# End of https://www.gitignore.io/api/swift
-.idea
diff --git a/TKSwitcherCollection/.swift-version b/TKSwitcherCollection/.swift-version
deleted file mode 100644
index 5186d070..00000000
--- a/TKSwitcherCollection/.swift-version
+++ /dev/null
@@ -1 +0,0 @@
-4.0
diff --git a/TKSwitcherCollection/.travis.yml b/TKSwitcherCollection/.travis.yml
deleted file mode 100644
index c4107d07..00000000
--- a/TKSwitcherCollection/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-osx_image: xcode7.3
-language: swift
-
-xcode_project: Example/Pods/Pods.xcodeproj
-xcode_scheme: TKSwitcherCollection
-xcode_sdk: iphonesimulator
\ No newline at end of file
diff --git a/TKSwitcherCollection/Example/Podfile b/TKSwitcherCollection/Example/Podfile
deleted file mode 100644
index 06ed77b3..00000000
--- a/TKSwitcherCollection/Example/Podfile
+++ /dev/null
@@ -1,11 +0,0 @@
-use_frameworks!
-
-target 'TKSwitcherCollection_Example' do
- pod 'TKSwitcherCollection', :path => '../'
-
- target 'TKSwitcherCollection_Tests' do
- inherit! :search_paths
-
-
- end
-end
diff --git a/TKSwitcherCollection/Example/Podfile.lock b/TKSwitcherCollection/Example/Podfile.lock
deleted file mode 100644
index f9478196..00000000
--- a/TKSwitcherCollection/Example/Podfile.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-PODS:
- - TKSwitcherCollection (1.4.3)
-
-DEPENDENCIES:
- - TKSwitcherCollection (from `../`)
-
-EXTERNAL SOURCES:
- TKSwitcherCollection:
- :path: "../"
-
-SPEC CHECKSUMS:
- TKSwitcherCollection: 6805f52958a8b661cd583a538345618a26ff9263
-
-PODFILE CHECKSUM: 22d4901429738fec3b90d800b97955912bfd129c
-
-COCOAPODS: 1.8.4
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.pbxproj b/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.pbxproj
deleted file mode 100644
index 7cca3edb..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,577 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- 08E0B33A0F9116383ECB1CCB /* Pods_TKSwitcherCollection_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD692ABE124D55B1F024D1 /* Pods_TKSwitcherCollection_Example.framework */; };
- 3991541740E46D955180CF58 /* Pods_TKSwitcherCollection_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DACE7DB18466F70685D065FF /* Pods_TKSwitcherCollection_Tests.framework */; };
- 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
- 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
- 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
- 607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
- 6A2AE842201C6F8800DA65BA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A2AE841201C6F8800DA65BA /* Assets.xcassets */; };
- 6A2AE845201C6F9300DA65BA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6A2AE843201C6F9300DA65BA /* LaunchScreen.storyboard */; };
- 6A2AE847201C786F00DA65BA /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 6A2AE846201C786F00DA65BA /* Images */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
- 607FACE61AFB9204008FA782 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 607FACC81AFB9204008FA782 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 607FACCF1AFB9204008FA782;
- remoteInfo = TKSwitcherCollection;
- };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
- 0D615B58C568C1D093B16C78 /* TKSwitcherCollection.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = TKSwitcherCollection.podspec; path = ../TKSwitcherCollection.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
- 25130DD39F719581D21DFDD9 /* Pods-TKSwitcherCollection_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TKSwitcherCollection_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TKSwitcherCollection_Tests/Pods-TKSwitcherCollection_Tests.debug.xcconfig"; sourceTree = "<group>"; };
- 3DAD692ABE124D55B1F024D1 /* Pods_TKSwitcherCollection_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TKSwitcherCollection_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 475CA416D223ACCDFA65D357 /* Pods-TKSwitcherCollection_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TKSwitcherCollection_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-TKSwitcherCollection_Example/Pods-TKSwitcherCollection_Example.release.xcconfig"; sourceTree = "<group>"; };
- 513DFC08F48498C5A8E71BE7 /* Pods-TKSwitcherCollection_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TKSwitcherCollection_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TKSwitcherCollection_Example/Pods-TKSwitcherCollection_Example.debug.xcconfig"; sourceTree = "<group>"; };
- 607FACD01AFB9204008FA782 /* TKSwitcherCollection_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TKSwitcherCollection_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
- 607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
- 607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
- 607FACE51AFB9204008FA782 /* TKSwitcherCollection_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TKSwitcherCollection_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
- 607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
- 6A2AE841201C6F8800DA65BA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
- 6A2AE844201C6F9300DA65BA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
- 6A2AE846201C786F00DA65BA /* Images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Images; path = ../Images; sourceTree = "<group>"; };
- 703780C31F547F2A5BAE8977 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
- DACE7DB18466F70685D065FF /* Pods_TKSwitcherCollection_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TKSwitcherCollection_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- F33702357CACCBC548A5938A /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
- FAAEE49C6B9BC937AA32C019 /* Pods-TKSwitcherCollection_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TKSwitcherCollection_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-TKSwitcherCollection_Tests/Pods-TKSwitcherCollection_Tests.release.xcconfig"; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 607FACCD1AFB9204008FA782 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 08E0B33A0F9116383ECB1CCB /* Pods_TKSwitcherCollection_Example.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- 607FACE21AFB9204008FA782 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3991541740E46D955180CF58 /* Pods_TKSwitcherCollection_Tests.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 11C9D5D9C400C23DBCE176C5 /* Pods */ = {
- isa = PBXGroup;
- children = (
- 513DFC08F48498C5A8E71BE7 /* Pods-TKSwitcherCollection_Example.debug.xcconfig */,
- 475CA416D223ACCDFA65D357 /* Pods-TKSwitcherCollection_Example.release.xcconfig */,
- 25130DD39F719581D21DFDD9 /* Pods-TKSwitcherCollection_Tests.debug.xcconfig */,
- FAAEE49C6B9BC937AA32C019 /* Pods-TKSwitcherCollection_Tests.release.xcconfig */,
- );
- name = Pods;
- sourceTree = "<group>";
- };
- 607FACC71AFB9204008FA782 = {
- isa = PBXGroup;
- children = (
- 607FACF51AFB993E008FA782 /* Podspec Metadata */,
- 607FACD21AFB9204008FA782 /* Example for TKSwitcherCollection */,
- 607FACE81AFB9204008FA782 /* Tests */,
- 607FACD11AFB9204008FA782 /* Products */,
- 11C9D5D9C400C23DBCE176C5 /* Pods */,
- FE34395743EC41F23977FF01 /* Frameworks */,
- );
- sourceTree = "<group>";
- };
- 607FACD11AFB9204008FA782 /* Products */ = {
- isa = PBXGroup;
- children = (
- 607FACD01AFB9204008FA782 /* TKSwitcherCollection_Example.app */,
- 607FACE51AFB9204008FA782 /* TKSwitcherCollection_Tests.xctest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 607FACD21AFB9204008FA782 /* Example for TKSwitcherCollection */ = {
- isa = PBXGroup;
- children = (
- 607FACD51AFB9204008FA782 /* AppDelegate.swift */,
- 607FACD71AFB9204008FA782 /* ViewController.swift */,
- 607FACD91AFB9204008FA782 /* Main.storyboard */,
- 6A2AE843201C6F9300DA65BA /* LaunchScreen.storyboard */,
- 6A2AE841201C6F8800DA65BA /* Assets.xcassets */,
- 607FACD31AFB9204008FA782 /* Supporting Files */,
- );
- name = "Example for TKSwitcherCollection";
- path = TKSwitcherCollection;
- sourceTree = "<group>";
- };
- 607FACD31AFB9204008FA782 /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- 607FACD41AFB9204008FA782 /* Info.plist */,
- );
- name = "Supporting Files";
- sourceTree = "<group>";
- };
- 607FACE81AFB9204008FA782 /* Tests */ = {
- isa = PBXGroup;
- children = (
- 607FACEB1AFB9204008FA782 /* Tests.swift */,
- 607FACE91AFB9204008FA782 /* Supporting Files */,
- );
- path = Tests;
- sourceTree = "<group>";
- };
- 607FACE91AFB9204008FA782 /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- 607FACEA1AFB9204008FA782 /* Info.plist */,
- );
- name = "Supporting Files";
- sourceTree = "<group>";
- };
- 607FACF51AFB993E008FA782 /* Podspec Metadata */ = {
- isa = PBXGroup;
- children = (
- 6A2AE846201C786F00DA65BA /* Images */,
- 0D615B58C568C1D093B16C78 /* TKSwitcherCollection.podspec */,
- 703780C31F547F2A5BAE8977 /* README.md */,
- F33702357CACCBC548A5938A /* LICENSE */,
- );
- name = "Podspec Metadata";
- sourceTree = "<group>";
- };
- FE34395743EC41F23977FF01 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 3DAD692ABE124D55B1F024D1 /* Pods_TKSwitcherCollection_Example.framework */,
- DACE7DB18466F70685D065FF /* Pods_TKSwitcherCollection_Tests.framework */,
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 607FACCF1AFB9204008FA782 /* TKSwitcherCollection_Example */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "TKSwitcherCollection_Example" */;
- buildPhases = (
- 684E56A4F3FE6D10C57DADB1 /* [CP] Check Pods Manifest.lock */,
- 607FACCC1AFB9204008FA782 /* Sources */,
- 607FACCD1AFB9204008FA782 /* Frameworks */,
- 607FACCE1AFB9204008FA782 /* Resources */,
- E7287D311281AC65022269E3 /* [CP] Embed Pods Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = TKSwitcherCollection_Example;
- productName = TKSwitcherCollection;
- productReference = 607FACD01AFB9204008FA782 /* TKSwitcherCollection_Example.app */;
- productType = "com.apple.product-type.application";
- };
- 607FACE41AFB9204008FA782 /* TKSwitcherCollection_Tests */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "TKSwitcherCollection_Tests" */;
- buildPhases = (
- 958D5D15974785C179E5D09E /* [CP] Check Pods Manifest.lock */,
- 607FACE11AFB9204008FA782 /* Sources */,
- 607FACE21AFB9204008FA782 /* Frameworks */,
- 607FACE31AFB9204008FA782 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 607FACE71AFB9204008FA782 /* PBXTargetDependency */,
- );
- name = TKSwitcherCollection_Tests;
- productName = Tests;
- productReference = 607FACE51AFB9204008FA782 /* TKSwitcherCollection_Tests.xctest */;
- productType = "com.apple.product-type.bundle.unit-test";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 607FACC81AFB9204008FA782 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 0830;
- ORGANIZATIONNAME = CocoaPods;
- TargetAttributes = {
- 607FACCF1AFB9204008FA782 = {
- CreatedOnToolsVersion = 6.3.1;
- DevelopmentTeam = 858CBVXSWP;
- LastSwiftMigration = 0900;
- };
- 607FACE41AFB9204008FA782 = {
- CreatedOnToolsVersion = 6.3.1;
- LastSwiftMigration = 0900;
- TestTargetID = 607FACCF1AFB9204008FA782;
- };
- };
- };
- buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "TKSwitcherCollection" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- Base,
- );
- mainGroup = 607FACC71AFB9204008FA782;
- productRefGroup = 607FACD11AFB9204008FA782 /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 607FACCF1AFB9204008FA782 /* TKSwitcherCollection_Example */,
- 607FACE41AFB9204008FA782 /* TKSwitcherCollection_Tests */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 607FACCE1AFB9204008FA782 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 6A2AE847201C786F00DA65BA /* Images in Resources */,
- 6A2AE845201C6F9300DA65BA /* LaunchScreen.storyboard in Resources */,
- 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
- 6A2AE842201C6F8800DA65BA /* Assets.xcassets in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- 607FACE31AFB9204008FA782 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
- 684E56A4F3FE6D10C57DADB1 /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-TKSwitcherCollection_Example-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
- 958D5D15974785C179E5D09E /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-TKSwitcherCollection_Tests-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
- E7287D311281AC65022269E3 /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-TKSwitcherCollection_Example/Pods-TKSwitcherCollection_Example-frameworks.sh",
- "${BUILT_PRODUCTS_DIR}/TKSwitcherCollection/TKSwitcherCollection.framework",
- );
- name = "[CP] Embed Pods Frameworks";
- outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TKSwitcherCollection.framework",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TKSwitcherCollection_Example/Pods-TKSwitcherCollection_Example-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 607FACCC1AFB9204008FA782 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
- 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- 607FACE11AFB9204008FA782 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 607FACEC1AFB9204008FA782 /* Tests.swift in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
- 607FACE71AFB9204008FA782 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 607FACCF1AFB9204008FA782 /* TKSwitcherCollection_Example */;
- targetProxy = 607FACE61AFB9204008FA782 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
- 607FACD91AFB9204008FA782 /* Main.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 607FACDA1AFB9204008FA782 /* Base */,
- );
- name = Main.storyboard;
- sourceTree = "<group>";
- };
- 6A2AE843201C6F9300DA65BA /* LaunchScreen.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 6A2AE844201C6F9300DA65BA /* Base */,
- );
- name = LaunchScreen.storyboard;
- sourceTree = "<group>";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- 607FACED1AFB9204008FA782 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- ENABLE_TESTABILITY = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.3;
- MTL_ENABLE_DEBUG_INFO = YES;
- ONLY_ACTIVE_ARCH = YES;
- SDKROOT = iphoneos;
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- };
- name = Debug;
- };
- 607FACEE1AFB9204008FA782 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- ENABLE_NS_ASSERTIONS = NO;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.3;
- MTL_ENABLE_DEBUG_INFO = NO;
- SDKROOT = iphoneos;
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- VALIDATE_PRODUCT = YES;
- };
- name = Release;
- };
- 607FACF01AFB9204008FA782 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 513DFC08F48498C5A8E71BE7 /* Pods-TKSwitcherCollection_Example.debug.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
- DEVELOPMENT_TEAM = 858CBVXSWP;
- INFOPLIST_FILE = TKSwitcherCollection/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- MODULE_NAME = ExampleApp;
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
- };
- name = Debug;
- };
- 607FACF11AFB9204008FA782 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 475CA416D223ACCDFA65D357 /* Pods-TKSwitcherCollection_Example.release.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
- DEVELOPMENT_TEAM = 858CBVXSWP;
- INFOPLIST_FILE = TKSwitcherCollection/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- MODULE_NAME = ExampleApp;
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
- };
- name = Release;
- };
- 607FACF31AFB9204008FA782 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 25130DD39F719581D21DFDD9 /* Pods-TKSwitcherCollection_Tests.debug.xcconfig */;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(SDKROOT)/Developer/Library/Frameworks",
- "$(inherited)",
- );
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- INFOPLIST_FILE = Tests/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
- };
- name = Debug;
- };
- 607FACF41AFB9204008FA782 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = FAAEE49C6B9BC937AA32C019 /* Pods-TKSwitcherCollection_Tests.release.xcconfig */;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(SDKROOT)/Developer/Library/Frameworks",
- "$(inherited)",
- );
- INFOPLIST_FILE = Tests/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "TKSwitcherCollection" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 607FACED1AFB9204008FA782 /* Debug */,
- 607FACEE1AFB9204008FA782 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "TKSwitcherCollection_Example" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 607FACF01AFB9204008FA782 /* Debug */,
- 607FACF11AFB9204008FA782 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "TKSwitcherCollection_Tests" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 607FACF31AFB9204008FA782 /* Debug */,
- 607FACF41AFB9204008FA782 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 607FACC81AFB9204008FA782 /* Project object */;
-}
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index c6c1ef91..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "self:TKSwitcherCollection.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/contents.xcworkspacedata b/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 632f6620..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "group:TKSwitcherCollection.xcodeproj">
- </FileRef>
- <FileRef
- location = "group:Pods/Pods.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d98100..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IDEDidComputeMac32BitWarning</key>
- <true/>
-</dict>
-</plist>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/AppDelegate.swift b/TKSwitcherCollection/Example/TKSwitcherCollection/AppDelegate.swift
deleted file mode 100644
index 6aff69cb..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/AppDelegate.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// AppDelegate.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-
- var window: UIWindow?
-
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
- // Override point for customization after application launch.
- return true
- }
-
- func applicationWillResignActive(_ application: UIApplication) {
- // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
- // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
- }
-
- func applicationDidEnterBackground(_ application: UIApplication) {
- // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
- // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
- }
-
- func applicationWillEnterForeground(_ application: UIApplication) {
- // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
- }
-
- func applicationDidBecomeActive(_ application: UIApplication) {
- // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
- }
-
- func applicationWillTerminate(_ application: UIApplication) {
- // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
- }
-
-}
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/AppIcon.appiconset/Contents.json b/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 19882d56..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "iphone",
- "size" : "20x20",
- "scale" : "2x"
- },
- {
- "idiom" : "iphone",
- "size" : "20x20",
- "scale" : "3x"
- },
- {
- "idiom" : "iphone",
- "size" : "29x29",
- "scale" : "2x"
- },
- {
- "idiom" : "iphone",
- "size" : "29x29",
- "scale" : "3x"
- },
- {
- "idiom" : "iphone",
- "size" : "40x40",
- "scale" : "2x"
- },
- {
- "idiom" : "iphone",
- "size" : "40x40",
- "scale" : "3x"
- },
- {
- "idiom" : "iphone",
- "size" : "60x60",
- "scale" : "2x"
- },
- {
- "idiom" : "iphone",
- "size" : "60x60",
- "scale" : "3x"
- },
- {
- "idiom" : "ios-marketing",
- "size" : "1024x1024",
- "scale" : "1x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/LaunchImage.launchimage/Contents.json b/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index e37b6494..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "minimum-system-version" : "7.0",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "minimum-system-version" : "7.0",
- "subtype" : "retina4",
- "scale" : "2x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/LaunchScreen.storyboard b/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index 21699db5..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
- <device id="retina4_7" orientation="portrait">
- <adaptation id="fullscreen"/>
- </device>
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
- <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
- <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="EHf-IW-A2E">
- <objects>
- <viewController id="01J-lp-oVM" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
- <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="by TBXark" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="15Y-le-7uu">
- <rect key="frame" x="16" y="638" width="343" height="21"/>
- <constraints>
- <constraint firstAttribute="height" constant="21" id="nCH-cy-1ue"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
- <nil key="highlightedColor"/>
- </label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKSwitchCollection" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PoD-14-nbS">
- <rect key="frame" x="16" y="313.5" width="343" height="40"/>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="f3k-2R-fie"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="31"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
- <nil key="highlightedColor"/>
- </label>
- </subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- <constraints>
- <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="15Y-le-7uu" secondAttribute="bottom" constant="8" id="02u-nz-aYx"/>
- <constraint firstItem="PoD-14-nbS" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" id="0aa-Nq-1gr"/>
- <constraint firstItem="PoD-14-nbS" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailingMargin" id="8lb-5Q-yuW"/>
- <constraint firstItem="PoD-14-nbS" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="IdF-P6-D6A"/>
- <constraint firstItem="PoD-14-nbS" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="T22-Xw-tRI"/>
- <constraint firstItem="15Y-le-7uu" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" id="YcG-1Q-YJD"/>
- <constraint firstItem="15Y-le-7uu" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailingMargin" id="arr-ax-Y1r"/>
- </constraints>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="53" y="375"/>
- </scene>
- </scenes>
-</document>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/Main.storyboard b/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/Main.storyboard
deleted file mode 100644
index 111fb294..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/Base.lproj/Main.storyboard
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
- <device id="retina5_9" orientation="portrait" appearance="light"/>
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
- <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="tne-QT-ifu">
- <objects>
- <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="TKSwitcherCollection_Example" customModuleProvider="target" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
- <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
- <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QLV-ox-kW6">
- <rect key="frame" x="0.0" y="44" width="375" height="734"/>
- <subviews>
- <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="6sC-I3-6ut">
- <rect key="frame" x="0.0" y="0.0" width="375" height="500"/>
- <subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Inv-Hq-sGq">
- <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKSimpleSwitch" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bnm-9T-lMc">
- <rect key="frame" x="7.9999999999999929" y="40" width="124.33333333333331" height="20"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hIm-lh-lix" customClass="TKSimpleSwitch" customModule="TKSwitcherCollection">
- <rect key="frame" x="277" y="30" width="90" height="40"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="width" constant="90" id="QK6-r2-9Ys"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="bottom" secondItem="Bnm-9T-lMc" secondAttribute="bottom" constant="40" id="9pc-Uk-2Pm"/>
- <constraint firstItem="hIm-lh-lix" firstAttribute="top" secondItem="Inv-Hq-sGq" secondAttribute="top" constant="30" id="Bda-VW-Esg"/>
- <constraint firstItem="Bnm-9T-lMc" firstAttribute="top" secondItem="Inv-Hq-sGq" secondAttribute="top" constant="40" id="QbX-cq-Ca4"/>
- <constraint firstItem="Bnm-9T-lMc" firstAttribute="leading" secondItem="Inv-Hq-sGq" secondAttribute="leading" constant="8" id="gDW-IC-WYw"/>
- <constraint firstAttribute="bottom" secondItem="hIm-lh-lix" secondAttribute="bottom" constant="30" id="gUU-dA-gbh"/>
- <constraint firstAttribute="trailing" secondItem="hIm-lh-lix" secondAttribute="trailing" constant="8" id="go6-Xd-qBP"/>
- </constraints>
- </view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DgJ-s9-xts">
- <rect key="frame" x="0.0" y="100" width="375" height="100"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKSimpleSwitch" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LeU-Rg-gJW">
- <rect key="frame" x="7.9999999999999929" y="40" width="124.33333333333331" height="20"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Rz-ym-yka" customClass="TKSimpleSwitch" customModule="TKSwitcherCollection">
- <rect key="frame" x="277" y="30" width="90" height="40"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="width" constant="90" id="3SK-WF-eCF"/>
- </constraints>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="boolean" keyPath="rotateWhenValueChange" value="YES"/>
- </userDefinedRuntimeAttributes>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="bottom" secondItem="8Rz-ym-yka" secondAttribute="bottom" constant="30" id="5s4-wg-IzD"/>
- <constraint firstItem="8Rz-ym-yka" firstAttribute="top" secondItem="DgJ-s9-xts" secondAttribute="top" constant="30" id="81P-8i-2bt"/>
- <constraint firstItem="LeU-Rg-gJW" firstAttribute="leading" secondItem="DgJ-s9-xts" secondAttribute="leading" constant="8" id="Pcc-za-WTv"/>
- <constraint firstAttribute="trailing" secondItem="8Rz-ym-yka" secondAttribute="trailing" constant="8" id="iNp-ZA-Koh"/>
- <constraint firstAttribute="bottom" secondItem="LeU-Rg-gJW" secondAttribute="bottom" constant="40" id="l7k-N6-WfQ"/>
- <constraint firstItem="LeU-Rg-gJW" firstAttribute="top" secondItem="DgJ-s9-xts" secondAttribute="top" constant="40" id="qNW-6g-BJx"/>
- </constraints>
- </view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xqz-jW-pI9">
- <rect key="frame" x="0.0" y="200" width="375" height="100"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKExchangeSwitch" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="If8-0A-TTz">
- <rect key="frame" x="8" y="40" width="147.33333333333334" height="20"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9fI-i4-W9Z" customClass="TKExchangeSwitch" customModule="TKSwitcherCollection">
- <rect key="frame" x="277" y="30" width="90" height="40"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="width" constant="90" id="6lR-qR-ucT"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstItem="9fI-i4-W9Z" firstAttribute="top" secondItem="xqz-jW-pI9" secondAttribute="top" constant="30" id="1Hl-qN-CVR"/>
- <constraint firstItem="If8-0A-TTz" firstAttribute="leading" secondItem="xqz-jW-pI9" secondAttribute="leading" constant="8" id="VJ5-Vl-2Ig"/>
- <constraint firstAttribute="bottom" secondItem="If8-0A-TTz" secondAttribute="bottom" constant="40" id="YOX-FM-iBm"/>
- <constraint firstItem="If8-0A-TTz" firstAttribute="top" secondItem="xqz-jW-pI9" secondAttribute="top" constant="40" id="hX6-Yq-ZuS"/>
- <constraint firstAttribute="bottom" secondItem="9fI-i4-W9Z" secondAttribute="bottom" constant="30" id="nPA-LQ-dQa"/>
- <constraint firstAttribute="trailing" secondItem="9fI-i4-W9Z" secondAttribute="trailing" constant="8" id="ngU-nt-icA"/>
- </constraints>
- </view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="stQ-co-hQh">
- <rect key="frame" x="0.0" y="300" width="375" height="100"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKSmileSwitch" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6mF-vi-DiW">
- <rect key="frame" x="7.9999999999999929" y="40" width="114.33333333333331" height="20"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="06v-5c-lum" customClass="TKSmileSwitch" customModule="TKSwitcherCollection">
- <rect key="frame" x="277" y="30" width="90" height="40"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="width" constant="90" id="eSW-01-JOv"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="trailing" secondItem="06v-5c-lum" secondAttribute="trailing" constant="8" id="jqh-ID-saB"/>
- <constraint firstAttribute="bottom" secondItem="6mF-vi-DiW" secondAttribute="bottom" constant="40" id="jwy-h1-5G2"/>
- <constraint firstAttribute="bottom" secondItem="06v-5c-lum" secondAttribute="bottom" constant="30" id="l7H-sI-atr"/>
- <constraint firstItem="6mF-vi-DiW" firstAttribute="leading" secondItem="stQ-co-hQh" secondAttribute="leading" constant="8" id="vSJ-Ph-400"/>
- <constraint firstItem="6mF-vi-DiW" firstAttribute="top" secondItem="stQ-co-hQh" secondAttribute="top" constant="40" id="xmU-IQ-m7Y"/>
- <constraint firstItem="06v-5c-lum" firstAttribute="top" secondItem="stQ-co-hQh" secondAttribute="top" constant="30" id="z3e-3i-g0O"/>
- </constraints>
- </view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WAs-nm-ZUe">
- <rect key="frame" x="0.0" y="400" width="375" height="100"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TKLiquidSwitch" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zVM-Bd-7eF">
- <rect key="frame" x="7.9999999999999929" y="40" width="119.33333333333331" height="20"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nwg-qk-0CC" customClass="TKLiquidSwitch" customModule="TKSwitcherCollection">
- <rect key="frame" x="277" y="30" width="90" height="40"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="width" constant="90" id="SU9-Oi-qDm"/>
- </constraints>
- </view>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <constraints>
- <constraint firstAttribute="bottom" secondItem="zVM-Bd-7eF" secondAttribute="bottom" constant="40" id="Cv4-NR-DSD"/>
- <constraint firstItem="Nwg-qk-0CC" firstAttribute="top" secondItem="WAs-nm-ZUe" secondAttribute="top" constant="30" id="Jty-Qh-xmD"/>
- <constraint firstItem="zVM-Bd-7eF" firstAttribute="top" secondItem="WAs-nm-ZUe" secondAttribute="top" constant="40" id="efN-pM-k7o"/>
- <constraint firstAttribute="trailing" secondItem="Nwg-qk-0CC" secondAttribute="trailing" constant="8" id="usV-BC-TGA"/>
- <constraint firstItem="zVM-Bd-7eF" firstAttribute="leading" secondItem="WAs-nm-ZUe" secondAttribute="leading" constant="8" id="xQL-Qv-W1z"/>
- <constraint firstAttribute="bottom" secondItem="Nwg-qk-0CC" secondAttribute="bottom" constant="30" id="xty-sr-BKn"/>
- </constraints>
- </view>
- </subviews>
- <constraints>
- <constraint firstAttribute="height" constant="500" id="F5E-7v-yYc"/>
- <constraint firstItem="xqz-jW-pI9" firstAttribute="centerY" secondItem="6sC-I3-6ut" secondAttribute="centerY" id="b0A-zY-ewa"/>
- <constraint firstItem="DgJ-s9-xts" firstAttribute="top" secondItem="6sC-I3-6ut" secondAttribute="top" constant="100" id="gFZ-2Y-Th4"/>
- <constraint firstItem="xqz-jW-pI9" firstAttribute="top" secondItem="6sC-I3-6ut" secondAttribute="top" constant="200" id="pPV-iv-aXp"/>
- <constraint firstItem="WAs-nm-ZUe" firstAttribute="top" secondItem="6sC-I3-6ut" secondAttribute="top" constant="400" id="x1k-pK-7M9"/>
- </constraints>
- </stackView>
- </subviews>
- <constraints>
- <constraint firstItem="6sC-I3-6ut" firstAttribute="top" secondItem="QLV-ox-kW6" secondAttribute="top" id="1VS-cs-HsW"/>
- <constraint firstAttribute="trailing" secondItem="6sC-I3-6ut" secondAttribute="trailing" id="5Re-T2-qty"/>
- <constraint firstItem="6sC-I3-6ut" firstAttribute="leading" secondItem="QLV-ox-kW6" secondAttribute="leading" id="fg6-a4-X2X"/>
- <constraint firstItem="6sC-I3-6ut" firstAttribute="centerX" secondItem="QLV-ox-kW6" secondAttribute="centerX" id="kMy-YA-Iz7"/>
- <constraint firstAttribute="bottom" secondItem="6sC-I3-6ut" secondAttribute="bottom" constant="234" id="tX3-o5-J4v"/>
- </constraints>
- </scrollView>
- </subviews>
- <color key="backgroundColor" red="0.89999997615814209" green="0.89999997615814209" blue="0.89999997615814209" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- <constraints>
- <constraint firstAttribute="trailing" secondItem="QLV-ox-kW6" secondAttribute="trailing" id="0th-SN-vdt"/>
- <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="QLV-ox-kW6" secondAttribute="bottom" id="Hro-hZ-Es1"/>
- <constraint firstItem="QLV-ox-kW6" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="ljf-06-1m8"/>
- <constraint firstItem="QLV-ox-kW6" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="tgf-jh-NFb"/>
- </constraints>
- </view>
- <connections>
- <outletCollection property="switchArray" destination="hIm-lh-lix" collectionClass="NSMutableArray" id="dXD-s0-nDW"/>
- <outletCollection property="switchArray" destination="8Rz-ym-yka" collectionClass="NSMutableArray" id="9wX-gY-JY9"/>
- <outletCollection property="switchArray" destination="9fI-i4-W9Z" collectionClass="NSMutableArray" id="mOC-AO-cj5"/>
- <outletCollection property="switchArray" destination="06v-5c-lum" collectionClass="NSMutableArray" id="Dpu-zx-LpX"/>
- <outletCollection property="switchArray" destination="Nwg-qk-0CC" collectionClass="NSMutableArray" id="n31-c7-DJc"/>
- </connections>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="273.1884057971015" y="235.71428571428569"/>
- </scene>
- </scenes>
-</document>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/Info.plist b/TKSwitcherCollection/Example/TKSwitcherCollection/Info.plist
deleted file mode 100644
index 237c0bbf..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/Info.plist
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>en</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>$(PRODUCT_NAME)</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.3.3</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIMainStoryboardFile</key>
- <string>Main</string>
- <key>UIRequiredDeviceCapabilities</key>
- <array>
- <string>armv7</string>
- </array>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
-</dict>
-</plist>
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/ViewController.swift b/TKSwitcherCollection/Example/TKSwitcherCollection/ViewController.swift
deleted file mode 100644
index 3aac6642..00000000
--- a/TKSwitcherCollection/Example/TKSwitcherCollection/ViewController.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// ViewController.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-import TKSwitcherCollection
-
-var count: Int = 0
-
-class ViewController: UIViewController {
-
- @IBOutlet var switchArray: [TKBaseSwitch]!
-
- override func viewDidLoad() {
- super.viewDidLoad()
- for switcher in switchArray {
- switcher.valueChange = { value in
- print("\(NSStringFromClass(switcher.classForCoder)) -> \(value)")
- }
- }
- }
-
- @objc func animateSwitch(_ timer: Timer) {
- let switcher = switchArray[count]
- switcher.setOn(switcher.isOn, animate: true)
- count += 1
- if count == (switchArray.count) {
- count = 0
- timer.invalidate()
- Timer.scheduledTimer(timeInterval: 0.5, target: self, selector: #selector(ViewController.animateSwitch(_:)), userInfo: nil, repeats: true)
- }
- }
-
- override func didReceiveMemoryWarning() {
- super.didReceiveMemoryWarning()
- }
-
-}
diff --git a/TKSwitcherCollection/Example/TKSwitcherCollection/gif.gif b/TKSwitcherCollection/Example/TKSwitcherCollection/gif.gif
deleted file mode 100644
index f1ba7caf..00000000
Binary files a/TKSwitcherCollection/Example/TKSwitcherCollection/gif.gif and /dev/null differ
diff --git a/TKSwitcherCollection/Example/Tests/Info.plist b/TKSwitcherCollection/Example/Tests/Info.plist
deleted file mode 100644
index ba72822e..00000000
--- a/TKSwitcherCollection/Example/Tests/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>en</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>$(PRODUCT_NAME)</string>
- <key>CFBundlePackageType</key>
- <string>BNDL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1</string>
-</dict>
-</plist>
diff --git a/TKSwitcherCollection/Example/Tests/Tests.swift b/TKSwitcherCollection/Example/Tests/Tests.swift
deleted file mode 100644
index c89234b9..00000000
--- a/TKSwitcherCollection/Example/Tests/Tests.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-import UIKit
-import XCTest
-import TKSwitcherCollection
-
-class Tests: XCTestCase {
-
- override func setUp() {
- super.setUp()
- // Put setup code here. This method is called before the invocation of each test method in the class.
- }
-
- override func tearDown() {
- // Put teardown code here. This method is called after the invocation of each test method in the class.
- super.tearDown()
- }
-
- func testExample() {
- // This is an example of a functional test case.
- XCTAssert(true, "Pass")
- }
-
- func testPerformanceExample() {
- // This is an example of a performance test case.
- self.measure {
- // Put the code you want to measure the time of here.
- }
- }
-
-}
diff --git a/TKSwitcherCollection/Images/exchange.gif b/TKSwitcherCollection/Images/exchange.gif
deleted file mode 100644
index 0d9827a7..00000000
Binary files a/TKSwitcherCollection/Images/exchange.gif and /dev/null differ
diff --git a/TKSwitcherCollection/Images/liquid.gif b/TKSwitcherCollection/Images/liquid.gif
deleted file mode 100644
index 7ddae55e..00000000
Binary files a/TKSwitcherCollection/Images/liquid.gif and /dev/null differ
diff --git a/TKSwitcherCollection/Images/simple.gif b/TKSwitcherCollection/Images/simple.gif
deleted file mode 100644
index ce38d435..00000000
Binary files a/TKSwitcherCollection/Images/simple.gif and /dev/null differ
diff --git a/TKSwitcherCollection/Images/simple2.gif b/TKSwitcherCollection/Images/simple2.gif
deleted file mode 100644
index 9433bddf..00000000
Binary files a/TKSwitcherCollection/Images/simple2.gif and /dev/null differ
diff --git a/TKSwitcherCollection/Images/smile.gif b/TKSwitcherCollection/Images/smile.gif
deleted file mode 100644
index ae3436b9..00000000
Binary files a/TKSwitcherCollection/Images/smile.gif and /dev/null differ
diff --git a/TKSwitcherCollection/LICENSE b/TKSwitcherCollection/LICENSE
deleted file mode 100644
index 0c280ca8..00000000
--- a/TKSwitcherCollection/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 TBXark
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/TKSwitcherCollection/README.md b/TKSwitcherCollection/README.md
deleted file mode 100644
index 901de0e1..00000000
--- a/TKSwitcherCollection/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# TKSwitcherCollection
-
-> An animate switch collection
-
-![Xcode 9.0+](https://img.shields.io/badge/Xcode-9.0%2B-blue.svg)
-![iOS 8.0+](https://img.shields.io/badge/iOS-8.0%2B-blue.svg)
-![Swift 4.0+](https://img.shields.io/badge/Swift-4.0%2B-orange.svg)
-[![Build Status](https://travis-ci.org/TBXark/TKSwitcherCollection.svg?branch=master)](https://travis-ci.org/TBXark/TKSwitcherCollection)
-[![CocoaPods](http://img.shields.io/cocoapods/v/TKSwitcherCollection.svg?style=flat)](http://cocoapods.org/?q=TKSwitcherCollection)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/TBXark/TKSwitcherCollection/master/LICENSE)
-
-## Requirements
-
-- iOS 8.0+
-- Xcode 9.0
-- Swift 4.0
-
-## Installation
-
-#### CocoaPods
-
-You can use [CocoaPods](http://cocoapods.org/) to install `TKSwitcherCollection` by adding it to your `Podfile`:
-
-```ruby
-platform :ios, '8.0'
-use_frameworks!
-pod 'TKSwitcherCollection'
-```
-
-To get the full benefits import `TKSwitcherCollection` wherever you import UIKit
-
-``` swift
-import UIKit
-import TKSwitcherCollection
-```
-
-#### Carthage
-
-Create a `Cartfile` that lists the framework and run `carthage update`. Follow
-the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to
-add `$(SRCROOT)/Carthage/Build/iOS/TKSwitcherCollection.framework` to an iOS project.
-
-```shell
-github "tbxark/TKSwitcherCollection"
-```
-
-#### Manually
-
-1. Download and drop ```TKSwitcherCollection``` in your project.
-2. Congratulations!
-
-## Usage example
-
-| Class | Example |
-|------------------|---------------------------------------------------------------|
-| TKSimpleSwitch | <img src="Images/simple.gif" style="height:200;width:auto"> |
-| TKSimpleSwitch | <img src="Images/simple2.gif" style="height:200;width:auto"> |
-| TKExchangeSwitch | <img src="Images/exchange.gif" style="height:200;width:auto"> |
-| TKSmileSwitch | <img src="Images/smile.gif" style="height:200;width:auto"> |
-| TKLiquidSwitch | <img src="Images/liquid.gif" style="height:200;width:auto"> |
-
-## Release History
-
-* 1.4.2
- add `IBDesignable`/`IBInspectable` support
-* 1.4.1
- bugs fixed
-* 1.4.0
- support swift 4.0
-* 1.3.1
- support swift 3.0
-* 1.0.3
- Complete basic functions, add Cocoapod and Carthage support
-
-## Contribute
-
-We would love for you to contribute to **TKSwitcherCollection**, check the ``LICENSE`` file for more info.
-
-## Meta
-
-TBXark – [@tbxark](https://twitter.com/tbxark) – [email protected]
-
-Distributed under the MIT license. See ``LICENSE`` for more information.
-
-[https://github.com/TBXark](https://github.com/TBXark)
-
-[swift-image]:https://img.shields.io/badge/swift-3.0-orange.svg
-
-[swift-url]: https://swift.org/
-
-[license-image]: https://img.shields.io/badge/License-MIT-blue.svg
-
-[license-url]: LICENSE
-
-[travis-image]: https://img.shields.io/travis/dbader/node-datadog-metrics/master.svg?style=flat-square
-
-[travis-url]: https://travis-ci.org/dbader/node-datadog-metrics
-
-[codebeat-image]: https://codebeat.co/badges/c19b47ea-2f9d-45df-8458-b2d952fe9dad
-
-[codebeat-url]: https://codebeat.co/projects/github-com-vsouza-awesomeios-com
diff --git a/TKSwitcherCollection/TKSwitcherCollection.podspec b/TKSwitcherCollection/TKSwitcherCollection.podspec
deleted file mode 100644
index aacd885d..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection.podspec
+++ /dev/null
@@ -1,12 +0,0 @@
-Pod::Spec.new do |s|
- s.name = "TKSwitcherCollection"
- s.version = "1.4.3"
- s.summary = "A animate switcher cllection in Swift."
- s.license = { :type => 'MIT License', :file => 'LICENSE' } # 协议
- s.homepage = "https://github.com/TBXark/TKSwitcherCollection"
- s.author = { "TBXark" => "[email protected]" }
- s.source = { :git => "https://github.com/TBXark/TKSwitcherCollection.git", :tag => s.version }
- s.platform = :ios, '8.0'
- s.source_files = 'TKSwitcherCollection/*.swift'
- s.requires_arc = true
-end
diff --git a/TKSwitcherCollection/TKSwitcherCollection/TKBaseSwitcher.swift b/TKSwitcherCollection/TKSwitcherCollection/TKBaseSwitcher.swift
deleted file mode 100644
index 49633d3e..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection/TKBaseSwitcher.swift
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// TKBaseSwitcher.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-public typealias TKSwitchValueChangeHook = (_ value: Bool) -> Void
-
-// 自定义 Switch 基类
-@IBDesignable
-open class TKBaseSwitch: UIControl {
- open var customEnable: Bool = true
-
- // MARK: - Property
- open var valueChange: TKSwitchValueChangeHook?
- open var disableTap: (()->Void)? = nil
- @IBInspectable open var animateDuration: Double = 0.4
- @IBInspectable open var isOn: Bool {
- set {
- on = newValue
- changeValueAnimate(isOn, duration: 0)
- }
- get {
- return on
- }
- }
-
- internal var on: Bool = false
- internal var sizeScale: CGFloat {
- return min(self.bounds.width, self.bounds.height) / 100.0
- }
-
- open override var frame: CGRect {
- didSet {
- guard frame.size != oldValue.size else {
- return
- }
- resetView()
- }
- }
-
- open override var bounds: CGRect {
- didSet {
- guard frame.size != oldValue.size else {
- return
- }
- resetView()
- }
- }
-
- // MARK: - Getter
-
- final public func setOn(_ on: Bool, animate: Bool = true) {
- guard on != isOn else {
- return
- }
- self.on.toggle()
- changeValueAnimate(isOn, duration: animate ? animateDuration : 0)
- }
-
- // MARK: - Init
- convenience public init() {
- self.init(frame: CGRect(x: 0, y: 0, width: 80, height: 40))
- }
-
- override public init(frame: CGRect) {
- super.init(frame: frame)
- setUpView()
- }
-
- required public init?(coder aDecoder: NSCoder) {
- super.init(coder: aDecoder)
- setUpView()
- }
-
- // MARK: - Internal
-
- internal func resetView() {
- gestureRecognizers?.forEach(self.removeGestureRecognizer)
- layer.sublayers?.forEach({ $0.removeFromSuperlayer() })
- setUpView()
- }
-
- internal func setUpView() {
- let tap = UITapGestureRecognizer(target: self, action: #selector(TKBaseSwitch.tapToggleValue))
- self.addGestureRecognizer(tap)
-
- for view in self.subviews {
- view.removeFromSuperview()
- }
- }
-
- @objc internal func tapToggleValue() {
- if customEnable {
- self.on.toggle()
- valueChange?(isOn)
- sendActions(for: UIControl.Event.valueChanged)
- changeValueAnimate(isOn, duration: animateDuration)
- } else {
- disableTap?()
- }
- }
-
- internal func changeValueAnimate(_ value: Bool, duration: Double) {
- }
-
-}
diff --git a/TKSwitcherCollection/TKSwitcherCollection/TKExchangeSwitch.swift b/TKSwitcherCollection/TKSwitcherCollection/TKExchangeSwitch.swift
deleted file mode 100644
index 0e72f6e6..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection/TKExchangeSwitch.swift
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// TKExchangeSwitch.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-// Design by Oleg Frolov
-//https://dribbble.com/shots/2238916-Switcher-VI
-
-@IBDesignable
-open class TKExchangeSwitch: TKBaseSwitch {
-
- // MARK: - Property
- open var isSmallStyle: Bool = false {
- didSet {
- resetView()
- }
- }
- open var switchControl: TKExchangeCircleView?
- open var backgroundLayer = CAShapeLayer()
-
- @IBInspectable open var lineColor = UIColor(white: 0.95, alpha: 1) {
- didSet {
- resetView()
- }
- }
-
- @IBInspectable open var onColor = UIColor(red: 0.34, green: 0.91, blue: 0.51, alpha: 1.00) {
- didSet {
- resetView()
- }
- }
-
- @IBInspectable open var offColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) {
- didSet {
- resetView()
- }
- }
-
- @IBInspectable open var lineSize: Double = 20 {
- didSet {
- resetView()
- }
- }
-
- // MARK: - Getter
- open var lineWidth: CGFloat {
- return CGFloat(lineSize) * sizeScale
- }
-
- open var onText: String = "" {
- didSet {
- resetView()
- }
- }
- open var onTextColor: UIColor = .clear {
- didSet {
- resetView()
- }
- }
- open var onTextFont: UIFont = UIFont.systemFont(ofSize: 12) {
- didSet {
- resetView()
- }
- }
- open var offText: String = "" {
- didSet {
- resetView()
- }
- }
- open var offTextColor: UIColor = .clear {
- didSet {
- resetView()
- }
- }
- open var offTextFont: UIFont = UIFont.systemFont(ofSize: 12) {
- didSet {
- resetView()
- }
- }
- private let onLabel = UILabel()
- private let offLabel = UILabel()
-
- // MARK: - Init
-
- // MARK: - Private Func
- override internal func setUpView() {
- super.setUpView()
-
- let radius = self.bounds.height / 2 - lineWidth
- let position = CGPoint(x: radius, y: radius + lineWidth)
-
- let backLayerPath = UIBezierPath()
- backLayerPath.move(to: CGPoint(x: lineWidth, y: 0))
- backLayerPath.addLine(to: CGPoint(x: bounds.width - 4 * lineWidth, y: 0))
-
- backgroundLayer.position = position
- backgroundLayer.fillColor = lineColor.cgColor
- backgroundLayer.strokeColor = lineColor.cgColor
- backgroundLayer.lineWidth = self.bounds.height
- backgroundLayer.lineCap = CAShapeLayerLineCap.round
- backgroundLayer.path = backLayerPath.cgPath
- layer.addSublayer(backgroundLayer)
-
- let switchRadius = bounds.height - lineWidth
- let width = (bounds.width - lineWidth)/2
- let switchControl = TKExchangeCircleView(frame: CGRect(x: lineWidth / 2, y: lineWidth / 2, width: width, height: switchRadius), isSmallStyle: isSmallStyle)
- switchControl.onLayer.fillColor = onColor.cgColor
- switchControl.offLayer.fillColor = offColor.cgColor
- addSubview(switchControl)
- self.switchControl = switchControl
-
- onLabel.center = CGPoint(x: self.bounds.width/4, y: self.bounds.height/2)
- onLabel.text = onText
- onLabel.textColor = onTextColor
- onLabel.font = onTextFont
- onLabel.sizeToFit()
- addSubview(onLabel)
-
- offLabel.center = CGPoint(x: self.bounds.width/4*3, y: self.bounds.height/2)
- offLabel.text = offText
- offLabel.textColor = offTextColor
- offLabel.font = offTextFont
- offLabel.sizeToFit()
- addSubview(offLabel)
- }
-
- // MARK: - Animate
- override func changeValueAnimate(_ value: Bool, duration: Double) {
- self.on = value
- let keyTimes = [0, 0.4, 0.6, 1]
- guard var frame = self.switchControl?.frame else {
- return
- }
- frame.origin.x = value ? lineWidth / 2 : ((self.bounds.width - lineWidth/2) / 2)
-
- let switchControlStrokeStartAnim = CAKeyframeAnimation(keyPath: "strokeStart")
- switchControlStrokeStartAnim.values = [0, 0.45, 0.45, 0]
- switchControlStrokeStartAnim.keyTimes = keyTimes as [NSNumber]?
- switchControlStrokeStartAnim.duration = duration
- switchControlStrokeStartAnim.isRemovedOnCompletion = true
-
- let switchControlStrokeEndAnim = CAKeyframeAnimation(keyPath: "strokeEnd")
- switchControlStrokeEndAnim.values = [1, 0.55, 0.55, 1]
- switchControlStrokeEndAnim.keyTimes = keyTimes as [NSNumber]?
- switchControlStrokeEndAnim.duration = duration
- switchControlStrokeEndAnim.isRemovedOnCompletion = true
-
- let switchControlChangeStateAnim: CAAnimationGroup = CAAnimationGroup()
- switchControlChangeStateAnim.animations = [switchControlStrokeStartAnim, switchControlStrokeEndAnim]
- switchControlChangeStateAnim.fillMode = CAMediaTimingFillMode.forwards
- switchControlChangeStateAnim.isRemovedOnCompletion = false
- switchControlChangeStateAnim.duration = duration
-
- backgroundLayer.add(switchControlChangeStateAnim, forKey: "SwitchBackground")
- switchControl?.exchangeAnimate(value, duration: duration)
-
- onLabel.alpha = 0
- offLabel.alpha = 0
- UIView.animate(withDuration: duration, animations: { () -> Void in
- self.switchControl?.frame = frame
- self.onLabel.alpha = 1
- self.offLabel.alpha = 1
- if value {
- self.onLabel.textColor = self.onTextColor
- self.onLabel.font = self.onTextFont
- self.offLabel.textColor = self.offTextColor
- self.offLabel.font = self.offTextFont
- } else {
- self.onLabel.textColor = self.offTextColor
- self.onLabel.font = self.offTextFont
- self.offLabel.textColor = self.onTextColor
- self.offLabel.font = self.onTextFont
- }
- })
- }
-}
-
-// MARK: - Deprecated
-extension TKExchangeSwitch {
- @available(*, deprecated, message: "color is deprecated. Use lineColor, onColor, offColor instead ")
- var color: (background: UIColor, on: UIColor, off: UIColor) {
- set {
- if newValue.background != lineColor {
- lineColor = newValue.background
- }
- if newValue.on != onColor {
- onColor = newValue.on
- }
- if newValue.on != offColor {
- offColor = newValue.off
- }
- }
- get {
- return (lineColor, onColor, offColor)
- }
- }
-}
-
-extension CGRect {
- init(center: CGPoint, size: CGSize) {
- let origin = CGPoint(x: center.x - size.width / 2.0, y: center.y - size.height / 2.0)
- self.init(origin: origin, size: size)
- }
-}
-
-open class TKExchangeCircleView: UIView {
-
- // MARK: - Property
- open var onLayer: CAShapeLayer = CAShapeLayer()
- open var offLayer: CAShapeLayer = CAShapeLayer()
- private var isSmallStyle: Bool
-
- // MARK: - Init
- init(frame: CGRect, isSmallStyle: Bool = false) {
- self.isSmallStyle = isSmallStyle
- super.init(frame: frame)
- setUpLayer()
- }
-
- required public init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
- // MARK: - Private Func
- fileprivate func setUpLayer() {
- let radius = min(self.bounds.width, self.bounds.height)
- let width = self.bounds.width
-
- let path: UIBezierPath
- if isSmallStyle {
- let newRadius = radius/2
- path = UIBezierPath(ovalIn: CGRect(x: width/2-newRadius/2, y: self.bounds.height/2-newRadius/2, width: newRadius, height: newRadius))
- } else {
- path = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: width, height: radius), cornerRadius: radius/2)
- }
-
- offLayer.frame = CGRect(x: 0, y: 0, width: width, height: radius)
- offLayer.path = path.cgPath
- offLayer.transform = CATransform3DMakeScale(0, 0, 1)
- self.layer.addSublayer(offLayer)
-
- onLayer.frame = CGRect(x: 0, y: 0, width: width, height: radius)
- onLayer.path = path.cgPath
- self.layer.addSublayer(onLayer)
- }
-
- func exchangeAnimate(_ value: Bool, duration: Double) {
-
- let fillMode = CAMediaTimingFillMode.forwards
-
- let hideValues = [NSValue(caTransform3D: CATransform3DMakeScale(0, 0, 1)),
- NSValue(caTransform3D: CATransform3DIdentity)]
-
- let showValues = [NSValue(caTransform3D: CATransform3DIdentity),
- NSValue(caTransform3D: CATransform3DMakeScale(0, 0, 1))]
-
- let showTimingFunction = CAMediaTimingFunction(controlPoints: 0, 0, 0, 1)
- let hideTimingFunction = CAMediaTimingFunction(controlPoints: 0, 0, 1, 1)
-
- let keyTimes = [0, 1]
-
- offLayer.zPosition = value ? 1 : 0
- onLayer.zPosition = value ? 0 : 1
-
- ////OffLayer animation
- let offLayerTransformAnim = CAKeyframeAnimation(keyPath: "transform")
- offLayerTransformAnim.values = value ? hideValues : showValues
- offLayerTransformAnim.keyTimes = keyTimes as [NSNumber]?
- offLayerTransformAnim.duration = duration
- offLayerTransformAnim.timingFunction = value ? hideTimingFunction : showTimingFunction
- offLayerTransformAnim.fillMode = fillMode
- offLayerTransformAnim.isRemovedOnCompletion = false
-
- ////OnLayer animation
- let onLayerTransformAnim = CAKeyframeAnimation(keyPath: "transform")
- onLayerTransformAnim.values = value ? showValues : hideValues
- onLayerTransformAnim.keyTimes = keyTimes as [NSNumber]?
- onLayerTransformAnim.duration = duration
- offLayerTransformAnim.timingFunction = value ? showTimingFunction : hideTimingFunction
- onLayerTransformAnim.fillMode = fillMode
- onLayerTransformAnim.isRemovedOnCompletion = false
-
- onLayer.add(onLayerTransformAnim, forKey: "OnAnimate")
- offLayer.add(offLayerTransformAnim, forKey: "OffAnimate")
- }
-
-}
diff --git a/TKSwitcherCollection/TKSwitcherCollection/TKLiquidSwitch.swift b/TKSwitcherCollection/TKSwitcherCollection/TKLiquidSwitch.swift
deleted file mode 100644
index 0b69ace7..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection/TKLiquidSwitch.swift
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// TKLiquidSwitch.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/26.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-// Design by Oleg Frolov
-//https://dribbble.com/shots/2028065-Switcher-lll
-
-@IBDesignable
-open class TKLiquidSwitch: TKBaseSwitch {
-
- private var bubbleLayer = CAShapeLayer()
- private var lineLayer = CAShapeLayer()
- @IBInspectable open var onColor = UIColor(red: 0.373, green: 0.843, blue: 0.596, alpha: 1) {
- didSet {
- resetView()
- }
- }
-
- @IBInspectable open var offColor = UIColor(red: 0.871, green: 0.871, blue: 0.871, alpha: 1) {
- didSet {
- resetView()
- }
- }
-
- override internal func setUpView() {
- super.setUpView()
-
- self.clipsToBounds = true
-
- lineLayer.path = UIBezierPath(roundedRect: CGRect(x: 0, y: (self.bounds.height - 20 * sizeScale) / 2, width: self.bounds.width, height: 20 * sizeScale), cornerRadius: 10 * sizeScale).cgPath
- lineLayer.fillColor = switchColor(true).cgColor
- self.layer.addSublayer(lineLayer)
-
- bubbleLayer.frame = self.bounds
- bubbleLayer.position = bubblePosition(true)
- bubbleLayer.path = bubbleShapePath
- bubbleLayer.fillColor = switchColor(true).cgColor
- self.layer.addSublayer(bubbleLayer)
-
- }
-
- override func changeValueAnimate(_ value: Bool, duration: Double) {
- let bubbleTransformAnim = CAKeyframeAnimation(keyPath: "transform")
- bubbleTransformAnim.values = [NSValue(caTransform3D: CATransform3DIdentity),
- NSValue(caTransform3D: CATransform3DMakeScale(1, 0.8, 1)),
- NSValue(caTransform3D: CATransform3DMakeScale(0.8, 1, 1)),
- NSValue(caTransform3D: CATransform3DIdentity)]
- bubbleTransformAnim.keyTimes = [NSNumber(value: 0), NSNumber(value: 1.0 / 3.0), NSNumber(value: 2.0 / 3.0), NSNumber(value: 1)]
- bubbleTransformAnim.duration = duration
-
- let bubblePositionAnim = CABasicAnimation(keyPath: "position")
- bubblePositionAnim.fromValue = NSValue(cgPoint: bubblePosition(!isOn))
- bubblePositionAnim.toValue = NSValue(cgPoint: bubblePosition(isOn))
- bubblePositionAnim.duration = duration
-
- let bubbleGroupAnim = CAAnimationGroup()
- bubbleGroupAnim.animations = [bubbleTransformAnim, bubblePositionAnim]
- bubbleGroupAnim.isRemovedOnCompletion = false
- bubbleGroupAnim.fillMode = CAMediaTimingFillMode.forwards
- bubbleGroupAnim.duration = duration
-
- bubbleLayer.add(bubbleGroupAnim, forKey: "Bubble")
-
- let color = switchColor(value).cgColor
- UIView.animate(withDuration: duration, animations: { () -> Void in
- self.lineLayer.fillColor = color
- self.bubbleLayer.fillColor = color
- })
-
- }
-}
-
-// Getter
-extension TKLiquidSwitch {
-
- var bubbleSize: CGSize {
- let lineH = 20 * sizeScale
- let w = lineH * 2 + bounds.height
- let h = bounds.height
- return CGSize(width: w, height: h)
- }
-
- var bubbleShapePath: CGPath {
- let bubblePath = UIBezierPath()
- let size = bubbleSize
- let sR = (size.width - size.height) / 4
- let lR = size.height / 2
-
- let l1 = CGPoint(x: sR, y: lR - sR)
- let l2 = CGPoint(x: sR, y: lR + sR)
-
- let c1 = CGPoint(x: sR * 2 + lR, y: 0)
- let c2 = CGPoint(x: sR * 2 + lR, y: lR * 2)
-
- let r1 = CGPoint(x: sR * 3 + lR * 2, y: lR - sR)
- let r2 = CGPoint(x: sR * 3 + lR * 2, y: lR + sR)
-
- let o1 = CGPoint(x: (lR + sR * 2) / 4, y: lR - sR)
- let o2 = CGPoint(x: (lR + sR * 2) / 4, y: lR + sR)
- let o3 = CGPoint(x: (lR * 2 + sR * 4) - (lR + sR * 2) / 4, y: lR - sR)
- let o4 = CGPoint(x: (lR * 2 + sR * 4) - (lR + sR * 2) / 4, y: lR + sR)
-
-// let cL = CGPoint(x: sR, y: lR)
- let cC = CGPoint(x: sR * 2 + lR, y: lR)
-// let cR = CGPoint(x: sR * 3 + lR * 2, y: lR)
-
- bubblePath.move(to: l1)
- bubblePath.addQuadCurve(to: c1, controlPoint: o1)
- bubblePath.addArc(withCenter: cC, radius: lR, startAngle: -CGFloat.pi / 2, endAngle: CGFloat.pi * 3 / 2, clockwise: true)
- bubblePath.addQuadCurve(to: r1, controlPoint: o3)
- bubblePath.addLine(to: r2)
-
- bubblePath.addQuadCurve(to: c2, controlPoint: o4)
- bubblePath.addQuadCurve(to: l2, controlPoint: o2)
- bubblePath.addLine(to: l1)
- bubblePath.close()
-
- return bubblePath.cgPath
- }
-
- func switchColor(_ isOn: Bool) -> UIColor {
- if isOn {
- return onColor
- } else {
- return offColor
- }
- }
-
- func bubblePosition(_ isOn: Bool) -> CGPoint {
- let h = self.bounds.height
- let w = self.bounds.width
- let bW = bubbleSize.width
-
- if isOn {
- return CGPoint(x: bW * 0.8, y: h / 2)
- } else {
- return CGPoint(x: w - bW * 0.2, y: h / 2)
- }
- }
-}
diff --git a/TKSwitcherCollection/TKSwitcherCollection/TKSimpleSwitch.swift b/TKSwitcherCollection/TKSwitcherCollection/TKSimpleSwitch.swift
deleted file mode 100644
index e0fb5f04..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection/TKSimpleSwitch.swift
+++ /dev/null
@@ -1,195 +0,0 @@
-//
-// TKSimpleSwitch.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-// Design by Oleg Frolov
-//https://dribbble.com/shots/1990516-Switcher
-//https://dribbble.com/shots/2165675-Switcher-V
-
-@available(*, deprecated, message: "TKSimpleSwitchConfig is deprecated. ")
-public struct TKSimpleSwitchConfig {
- public var onColor: UIColor
- public var offColor: UIColor
- public var lineColor: UIColor
- public var circleColor: UIColor
- public var lineSize: Double
-
- public init(onColor: UIColor = UIColor(red: 0.341, green: 0.914, blue: 0.506, alpha: 1),
- offColor: UIColor = UIColor(white: 0.9, alpha: 1),
- lineColor: UIColor = UIColor(white: 0.8, alpha: 1),
- circleColor: UIColor = UIColor.white,
- lineSize: Double = 10) {
- self.onColor = onColor
- self.offColor = offColor
- self.lineColor = lineColor
- self.circleColor = circleColor
- self.lineSize = lineSize
-
- }
-
-}
-
-@IBDesignable
-open class TKSimpleSwitch: TKBaseSwitch {
-
- private var switchControl = CAShapeLayer()
- private var backgroundLayer = CAShapeLayer()
-
- // 是否加旋转特效
- @IBInspectable open var rotateWhenValueChange: Bool = false
-
- @IBInspectable open var onColor: UIColor = UIColor(red: 0.341, green: 0.914, blue: 0.506, alpha: 1) {
- didSet {
- resetView()
- }
- }
- @IBInspectable open var offColor: UIColor = UIColor(white: 0.9, alpha: 1) {
- didSet {
- resetView()
- }
- }
- @IBInspectable open var lineColor: UIColor = UIColor(white: 0.8, alpha: 1) {
- didSet {
- resetView()
- }
- }
- @IBInspectable open var circleColor: UIColor = UIColor.white {
- didSet {
- resetView()
- }
- }
- @IBInspectable open var lineSize: Double = 10 {
- didSet {
- resetView()
- }
- }
-
- private var lineWidth: CGFloat {
- return CGFloat(lineSize) * sizeScale
- }
-
- // 初始化 View
- override internal func setUpView() {
- super.setUpView()
- self.backgroundColor = UIColor.clear
- let frame = CGRect(x: 0, y: 0, width: bounds.width, height: bounds.height)
- let radius = bounds.height / 2 - lineWidth
- let roundedRectPath = UIBezierPath(roundedRect: frame.insetBy(dx: lineWidth, dy: lineWidth), cornerRadius: radius)
- backgroundLayer.fillColor = stateToFillColor(false)
- backgroundLayer.strokeColor = lineColor.cgColor
- backgroundLayer.lineWidth = lineWidth
- backgroundLayer.path = roundedRectPath.cgPath
- layer.addSublayer(backgroundLayer)
-
- let innerLineWidth = bounds.height - lineWidth * 3 + 1
- let switchControlPath = UIBezierPath()
- switchControlPath.move(to: CGPoint(x: lineWidth, y: 0))
- switchControlPath.addLine(to: CGPoint(x: bounds.width - 2 * lineWidth - innerLineWidth + 1, y: 0))
- var point = backgroundLayer.position
- point.y += (radius + lineWidth)
- point.x += (radius)
- switchControl.position = point
- switchControl.path = switchControlPath.cgPath
- switchControl.lineCap = CAShapeLayerLineCap.round
- switchControl.fillColor = nil
- switchControl.strokeColor = circleColor.cgColor
- switchControl.lineWidth = innerLineWidth - 5
- switchControl.strokeEnd = 0.0001
- layer.addSublayer(switchControl)
-
- }
-
- public func reload() {
- changeValueAnimate(isOn, duration: 0)
- }
-
- // MARK: - Animate
- override func changeValueAnimate(_ value: Bool, duration: Double) {
-
- let times = [0, 0.49, 0.51, 1]
-
- // 线条运动动画
- let switchControlStrokeStartAnim = CAKeyframeAnimation(keyPath: "strokeStart")
- switchControlStrokeStartAnim.values = value ? [0, 0, 0, 1] : [1, 0, 0, 0]
- switchControlStrokeStartAnim.keyTimes = times as [NSNumber]?
- switchControlStrokeStartAnim.duration = duration
- switchControlStrokeStartAnim.isRemovedOnCompletion = true
-
- let switchControlStrokeEndAnim = CAKeyframeAnimation(keyPath: "strokeEnd")
- switchControlStrokeEndAnim.values = value ? [0, 1, 1, 1] : [1, 1, 1, 0]
- switchControlStrokeEndAnim.keyTimes = times as [NSNumber]?
- switchControlStrokeEndAnim.duration = duration
- switchControlStrokeEndAnim.isRemovedOnCompletion = true
-
- // 颜色动画
- let backgroundFillColorAnim = CAKeyframeAnimation(keyPath: "fillColor")
- backgroundFillColorAnim.values = [stateToFillColor(!value),
- stateToFillColor(!value),
- stateToFillColor(value),
- stateToFillColor(value)]
- backgroundFillColorAnim.keyTimes = [0, 0.5, 0.51, 1]
- backgroundFillColorAnim.duration = duration
- backgroundFillColorAnim.fillMode = CAMediaTimingFillMode.forwards
- backgroundFillColorAnim.isRemovedOnCompletion = false
-
- // 旋转动画
- if rotateWhenValueChange {
- UIView.animate(withDuration: duration, animations: { () -> Void in
- self.transform = self.transform.rotated(by: CGFloat.pi)
- })
- }
-
- // 动画组
- let switchControlChangeStateAnim: CAAnimationGroup = CAAnimationGroup()
- switchControlChangeStateAnim.animations = [switchControlStrokeStartAnim, switchControlStrokeEndAnim]
- switchControlChangeStateAnim.fillMode = CAMediaTimingFillMode.forwards
- switchControlChangeStateAnim.isRemovedOnCompletion = false
- switchControlChangeStateAnim.duration = duration
-
- let animateKey = value ? "value" : "TurnOff"
- switchControl.add(switchControlChangeStateAnim, forKey: animateKey)
- backgroundLayer.add(backgroundFillColorAnim, forKey: "Color")
- }
-
- private func stateToFillColor(_ isOn: Bool) -> CGColor {
- return isOn ? onColor.cgColor : offColor.cgColor
- }
-
-}
-
-// MARK: - Deprecated
-extension TKSimpleSwitch {
- @available(*, deprecated, message: "config is deprecated. Use onColor, offColor, lineColor, circleColor, lineSize instead ")
- open var config: TKSimpleSwitchConfig {
- set {
- if newValue.onColor != onColor {
- onColor = newValue.onColor
- }
- if newValue.offColor != offColor {
- offColor = newValue.offColor
- }
- if newValue.lineColor != lineColor {
- lineColor = newValue.lineColor
- }
- if newValue.circleColor != circleColor {
- lineColor = newValue.lineColor
- }
- if newValue.lineSize != lineSize {
- lineSize = newValue.lineSize
- }
- }
- get {
- return TKSimpleSwitchConfig(onColor: onColor,
- offColor: offColor,
- lineColor: lineColor,
- circleColor: circleColor,
- lineSize: lineSize)
- }
- }
-}
diff --git a/TKSwitcherCollection/TKSwitcherCollection/TKSmileSwitch.swift b/TKSwitcherCollection/TKSwitcherCollection/TKSmileSwitch.swift
deleted file mode 100644
index 76d721c5..00000000
--- a/TKSwitcherCollection/TKSwitcherCollection/TKSmileSwitch.swift
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// SmileSwitch.swift
-// SwitcherCollection
-//
-// Created by Tbxark on 15/10/25.
-// Copyright © 2015年 TBXark. All rights reserved.
-//
-
-import UIKit
-
-// Design by Oleg Frolov
-//https://dribbble.com/shots/2011284-Switcher-ll
-
-open class TKSmileSwitch: TKBaseSwitch {
-
- // MARK: - Property
- private var smileFace: TKSmileFaceView?
-
- // MARK: - Init
- override internal func setUpView() {
- super.setUpView()
- let frame = CGRect(x: 0, y: 0, width: self.bounds.height, height: self.bounds.height)
- smileFace = TKSmileFaceView(frame: frame)
- addSubview(smileFace!)
-
- }
-
- override open func draw(_ rect: CGRect) {
- let ctx = UIGraphicsGetCurrentContext()
- let lineWidth = 10 * sizeScale
- let path = UIBezierPath(roundedRect: rect.insetBy(dx: lineWidth, dy: lineWidth), cornerRadius: rect.width / 2)
- ctx?.setLineWidth(lineWidth * 2)
- ctx?.addPath(path.cgPath)
- UIColor(white: 0.9, alpha: 1).setStroke()
- ctx?.strokePath()
- }
-
- override func changeValueAnimate(_ value: Bool, duration: Double) {
- let x = value ? 0 : (bounds.width - bounds.height)
- let frame = CGRect(x: x, y: 0, width: bounds.height, height: bounds.height)
- self.smileFace!.faceType = value ? TKSmileFaceView.FaceType.happy : TKSmileFaceView.FaceType.sad
- self.smileFace?.rotation(animateDuration, count: 2, clockwise: !isOn)
- UIView.animate(withDuration: duration, animations: { () -> Void in
- self.smileFace?.frame = frame
- }, completion: { (complete) -> Void in
- if complete {
- self.smileFace?.eyeWinkAnimate(duration / 2)
- }
- })
-
- }
-}
-
-// 脸
-private class TKSmileFaceView: UIView {
-
- enum FaceType {
- case happy
- case sad
-
- func toColor() -> UIColor {
- switch self {
- case .happy:
- return UIColor(red: 0.388, green: 0.839, blue: 0.608, alpha: 1.000)
- case .sad:
- return UIColor(red: 0.843, green: 0.369, blue: 0.373, alpha: 1)
- }
- }
- }
-
- // MARK: - Property
- let rightEye: CAShapeLayer = CAShapeLayer()
- let leftEye: CAShapeLayer = CAShapeLayer()
- let mouth: CAShapeLayer = CAShapeLayer()
- let face: CAShapeLayer = CAShapeLayer()
-
- var faceType: FaceType = .happy {
- didSet {
- let position: CGFloat = isHappy ? 20 * sizeScale : 35 * sizeScale
- mouth.path = mouthPath.cgPath
- mouth.frame = CGRect(x: 0, y: position, width: 60 * sizeScale, height: 20 * sizeScale)
- face.fillColor = faceType.toColor().cgColor
- }
- }
-
- // MARK: - Getter
- var isHappy: Bool {
- return (faceType == .happy)
- }
-
- var sizeScale: CGFloat {
- return min(self.bounds.width, self.bounds.height) / 100.0
- }
-
- var mouthPath: UIBezierPath {
- get {
- let point: CGFloat = isHappy ? 70 * sizeScale : 10
- let path = UIBezierPath()
- path.move(to: CGPoint(x: 30 * sizeScale, y: 40 * sizeScale))
- path.addCurve(to: CGPoint(x: 70 * sizeScale, y: 40 * sizeScale), controlPoint1: CGPoint(x: 30 * sizeScale, y: 40 * sizeScale), controlPoint2: CGPoint(x: 50 * sizeScale, y: point))
- path.lineCapStyle = .round
- return path
- }
- }
-
- // MARK: - Init
- override init(frame: CGRect) {
- super.init(frame: frame)
- self.setupLayers()
- }
-
- required init?(coder aDecoder: NSCoder) {
- super.init(coder: aDecoder)
- self.setupLayers()
- }
-
- // MARK: - Private Func
- private func setupLayers() {
-
- let facePath = UIBezierPath(ovalIn: CGRect(x: 0, y: 0, width: 100 * sizeScale, height: 100 * sizeScale))
- let eyePath = UIBezierPath(ovalIn: CGRect(x: 0, y: 0, width: 20 * sizeScale, height: 20 * sizeScale))
-
- face.frame = CGRect(x: 0, y: 0, width: 100 * sizeScale, height: 100 * sizeScale)
- face.path = facePath.cgPath
- face.fillColor = faceType.toColor().cgColor
- layer.addSublayer(face)
-
- leftEye.frame = CGRect(x: 20 * sizeScale, y: 28 * sizeScale, width: 10 * sizeScale, height: 10 * sizeScale)
- leftEye.path = eyePath.cgPath
- leftEye.fillColor = UIColor.white.cgColor
- layer.addSublayer(leftEye)
-
- rightEye.frame = CGRect(x: 60 * sizeScale, y: 28 * sizeScale, width: 10 * sizeScale, height: 10 * sizeScale)
- rightEye.path = eyePath.cgPath
- rightEye.fillColor = UIColor.white.cgColor
- layer.addSublayer(rightEye)
-
- mouth.path = mouthPath.cgPath
- mouth.strokeColor = UIColor.white.cgColor
- mouth.fillColor = UIColor.clear.cgColor
- mouth.lineCap = CAShapeLayerLineCap.round
- mouth.lineWidth = 10 * sizeScale
- layer.addSublayer(mouth)
-
- faceType = .happy
-
- }
-
- // MARK: - Animate
- func eyeWinkAnimate(_ duration: Double) {
- let eyeLeftTransformAnim = CAKeyframeAnimation(keyPath: "transform")
- eyeLeftTransformAnim.values = [NSValue(caTransform3D: CATransform3DIdentity),
- NSValue(caTransform3D: CATransform3DMakeScale(1, 0.1, 1)),
- NSValue(caTransform3D: CATransform3DIdentity)
- ]
- eyeLeftTransformAnim.keyTimes = [0, 0.5, 1]
- eyeLeftTransformAnim.duration = duration
- leftEye.add(eyeLeftTransformAnim, forKey: "Wink")
- rightEye.add(eyeLeftTransformAnim, forKey: "Wink")
- }
-
- func rotation(_ duration: Double, count: Int, clockwise: Bool) {
- let rotationTransformAnim = CAKeyframeAnimation(keyPath: "transform.rotation.z")
- rotationTransformAnim.values = [0, 180 * CGFloat.pi / 180 * CGFloat(count) * (clockwise ? 1 : -1)]
- rotationTransformAnim.keyTimes = [0, 1]
- rotationTransformAnim.isRemovedOnCompletion = false
- rotationTransformAnim.duration = duration
- layer.add(rotationTransformAnim, forKey: "Rotation")
- }
-
-}
diff --git a/TKSwitcherCollection/_Pods.xcodeproj b/TKSwitcherCollection/_Pods.xcodeproj
deleted file mode 120000
index 3c5a8e71..00000000
--- a/TKSwitcherCollection/_Pods.xcodeproj
+++ /dev/null
@@ -1 +0,0 @@
-Example/Pods/Pods.xcodeproj
\ No newline at end of file