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
adjust the RetroAchievements Progress and Leaderboard
Daiuno3947a0b26f6a
diff --git a/Cores/Libretro/ui/drivers/CheevosBridge.m b/Cores/Libretro/ui/drivers/CheevosBridge.mindex e40608cd..12f0a995 100644--- a/Cores/Libretro/ui/drivers/CheevosBridge.m+++ b/Cores/Libretro/ui/drivers/CheevosBridge.m@@ -53,9 +53,6 @@@implementation CheevosLeaderboard@end-@implementation CheevosProgress-@end-@implementation CheevosBridge#pragma mark - HTTP Server Call Implementationdiff --git a/Cores/Libretro/ui/drivers/LibretroCore.m b/Cores/Libretro/ui/drivers/LibretroCore.mindex b9eefcef..a056644e 100644--- a/Cores/Libretro/ui/drivers/LibretroCore.m+++ b/Cores/Libretro/ui/drivers/LibretroCore.m@@ -250,43 +250,48 @@ NSString * const RetroAchievementsNotification = @"RetroAchievementsNotification[[self getRetroArch] setReloadDelay:delay];}++ (CheevosAchievement *)convertAchievement:(rc_client_achievement_t *)a {+ if ([[NSString stringWithUTF8String:a->badge_name] isEqualToString:@"00000"]) {+ return nil;+ }+ CheevosAchievement* obj = [CheevosAchievement new];+ obj.title = a->title ? [NSString stringWithUTF8String:a->title] : nil;+ obj._description = a->description ? [NSString stringWithUTF8String:a->description] : nil;+ obj.badgeName = [NSString stringWithUTF8String:a->badge_name];+ obj.measuredProgress = [NSString stringWithUTF8String:a->measured_progress];+ obj.measuredPercent = (CGFloat)a->measured_percent;+ obj._id = (NSInteger)a->id;+ obj.points = (NSInteger)a->points;+ obj.unlockTime = (a->unlock_time ? [NSDate dateWithTimeIntervalSince1970:a->unlock_time] : nil);+ obj.state = (NSInteger)a->state;+ obj.category = (NSInteger)a->state;+ obj.bucket = (NSInteger)a->bucket;+ obj.unlocked = (a->unlocked != 0);+ obj.rarity = (CGFloat)a->rarity;+ obj.rarityHardcore = (CGFloat)a->rarity_hardcore;+ obj.type = (NSInteger)a->type;+ char url1[256];+ if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url1, sizeof(url1)) == RC_OK) {+ obj.unlockedBadgeUrl = [NSString stringWithCString:url1 encoding:NSUTF8StringEncoding];+ }+ char url2[256];+ if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url2, sizeof(url2)) == RC_OK) {+ obj.activeBadgeUrl = [NSString stringWithCString:url2 encoding:NSUTF8StringEncoding];+ }+ return obj;+}+static void cheevosDidTrigger(uint32_t type, void* object1, void* object2) {if (type == RC_CLIENT_EVENT_ACHIEVEMENT_TRIGGERED) {//获得成就if (object1) {rc_client_achievement_t *a = (rc_client_achievement_t *)object1;- if ([[NSString stringWithUTF8String:a->badge_name] isEqualToString:@"00000"]) {+ CheevosAchievement *achievement = [LibretroCore convertAchievement:a];+ if (!achievement) {return;}- CheevosAchievement* obj = [CheevosAchievement new];- obj.title = a->title ? [NSString stringWithUTF8String:a->title] : nil;- obj._description = a->description ? [NSString stringWithUTF8String:a->description] : nil;- obj.badgeName = [NSString stringWithUTF8String:a->badge_name];- obj.measuredProgress = [NSString stringWithUTF8String:a->measured_progress];- obj.measuredPercent = (CGFloat)a->measured_percent;- obj._id = (NSInteger)a->id;- obj.points = (NSInteger)a->points;- obj.unlockTime = (a->unlock_time ? [NSDate dateWithTimeIntervalSince1970:a->unlock_time] : nil);- obj.state = (NSInteger)a->state;- obj.category = (NSInteger)a->state;- obj.bucket = (NSInteger)a->bucket;- obj.unlocked = (a->unlocked != 0);- obj.rarity = (CGFloat)a->rarity;- obj.rarityHardcore = (CGFloat)a->rarity_hardcore;- obj.type = (NSInteger)a->type;---- char url1[256];- if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url1, sizeof(url1)) == RC_OK) {- obj.unlockedBadgeUrl = [NSString stringWithCString:url1 encoding:NSUTF8StringEncoding];- }- char url2[256];- if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url2, sizeof(url2)) == RC_OK) {- obj.activeBadgeUrl = [NSString stringWithCString:url2 encoding:NSUTF8StringEncoding];- }dispatch_async(dispatch_get_main_queue(), ^{- [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:obj];+ [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:achievement];});}@@ -396,22 +401,17 @@ static void cheevosDidTrigger(uint32_t type, void* object1, void* object2) {//进度展示if (object1) {rc_client_achievement_t *a = (rc_client_achievement_t *)object1;- if ([[NSString stringWithUTF8String:a->badge_name] isEqualToString:@"00000"]) {++ CheevosAchievement *achievement = [LibretroCore convertAchievement:a];+ if (!achievement) {return;}- CheevosProgress* obj = [CheevosProgress new];- obj.show = YES;- obj.title = a->title ? [NSString stringWithUTF8String:a->title] : nil;- obj.points = (NSInteger)a->points;- obj.measuredProgress = [NSString stringWithUTF8String:a->measured_progress];- obj.measuredPercent = (CGFloat)a->measured_percent;- obj._id = (NSInteger)a->id;- char url1[256];- if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url1, sizeof(url1)) == RC_OK) {- obj.unlockedBadgeUrl = [NSString stringWithCString:url1 encoding:NSUTF8StringEncoding];- }++ achievement.isProgressAchievement = YES;+ achievement.show = YES;+dispatch_async(dispatch_get_main_queue(), ^{- [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:obj];+ [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:achievement];});}@@ -419,14 +419,16 @@ static void cheevosDidTrigger(uint32_t type, void* object1, void* object2) {//进度隐藏if (object1) {rc_client_achievement_t *a = (rc_client_achievement_t *)object1;- if ([[NSString stringWithUTF8String:a->badge_name] isEqualToString:@"00000"]) {+ CheevosAchievement *achievement = [LibretroCore convertAchievement:a];+ if (!achievement) {return;}- CheevosProgress* obj = [CheevosProgress new];- obj.show = NO;- obj._id = (NSInteger)a->id;++ achievement.isProgressAchievement = YES;+ achievement.show = NO;+dispatch_async(dispatch_get_main_queue(), ^{- [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:obj];+ [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:achievement];});}@@ -434,22 +436,17 @@ static void cheevosDidTrigger(uint32_t type, void* object1, void* object2) {//进度更新if (object1) {rc_client_achievement_t *a = (rc_client_achievement_t *)object1;- if ([[NSString stringWithUTF8String:a->badge_name] isEqualToString:@"00000"]) {++ CheevosAchievement *achievement = [LibretroCore convertAchievement:a];+ if (!achievement) {return;}- CheevosProgress* obj = [CheevosProgress new];- obj.show = YES;- obj.title = a->title ? [NSString stringWithUTF8String:a->title] : nil;- obj.points = (NSInteger)a->points;- obj.measuredProgress = [NSString stringWithUTF8String:a->measured_progress];- obj.measuredPercent = (CGFloat)a->measured_percent;- obj._id = (NSInteger)a->id;- char url1[256];- if (rc_client_achievement_get_image_url(a, RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED, url1, sizeof(url1)) == RC_OK) {- obj.unlockedBadgeUrl = [NSString stringWithCString:url1 encoding:NSUTF8StringEncoding];- }++ achievement.isProgressAchievement = YES;+ achievement.show = YES;+dispatch_async(dispatch_get_main_queue(), ^{- [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:obj];+ [[NSNotificationCenter defaultCenter] postNotificationName:RetroAchievementsNotification object:achievement];});}}diff --git a/Cores/Libretro/ui/drivers/cocoa/CheevosBridge.h b/Cores/Libretro/ui/drivers/cocoa/CheevosBridge.hindex 1fe5efc9..8ff21576 100644--- a/Cores/Libretro/ui/drivers/cocoa/CheevosBridge.h+++ b/Cores/Libretro/ui/drivers/cocoa/CheevosBridge.h@@ -6,6 +6,7 @@// Copyright © 2025 Manic EMU. All rights reserved.//#import <Foundation/Foundation.h>+#import <UIKit/UIKit.h>@interface CheevosUser : NSObject@@ -43,6 +44,9 @@@property (nonatomic, assign) BOOL isMissable;@property (nonatomic, assign) BOOL isProgression;+@property (nonatomic, assign) BOOL isProgressAchievement;+@property (nonatomic, assign) BOOL show;+@end@interface CheevosGame : NSObject@@ -87,22 +91,12 @@@end@interface CheevosLeaderboard : NSObject+@property (nonatomic, copy) NSString *_Nullable badgeUrl;+@property (nonatomic, strong) UIImage *_Nullable image;@property (nonatomic, copy) NSString *_Nullable title;@property (nonatomic, copy) NSString *_Nullable _description;@end-@interface CheevosProgress : NSObject--@property (nonatomic, assign) BOOL show;-@property (nonatomic, assign) NSInteger points;-@property (nonatomic, copy) NSString *_Nullable title;-@property (nonatomic, copy) NSString *_Nullable measuredProgress;-@property (nonatomic, assign) CGFloat measuredPercent;-@property (nonatomic, assign) NSInteger _id;-@property (nonatomic, copy) NSString *_Nullable unlockedBadgeUrl;--@end-///登录结果typedef NS_ENUM(NSUInteger, LoginResult) {///成功diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxprojindex 965c3e92..c49a489b 100644--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj@@ -706,6 +706,7 @@57DF849C2D630E5800AA0AAB /* CGSizeExtenstions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DF849B2D630E5100AA0AAB /* CGSizeExtenstions.swift */; };57DF84BF2D637A1A00AA0AAB /* DominantColors in Frameworks */ = {isa = PBXBuildFile; productRef = 57DF84BE2D637A1A00AA0AAB /* DominantColors */; };57DF84E92D64249D00AA0AAB /* ShareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DF84E82D64249D00AA0AAB /* ShareManager.swift */; };+ 57DFBE8C2E71BC7A008C2161 /* CheevosPopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DFBE8B2E71BC4C008C2161 /* CheevosPopupView.swift */; };57E0C19E2D562F8600962555 /* GamesToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E0C19D2D562F8600962555 /* GamesToolView.swift */; };57E0C1A72D56580F00962555 /* UITextFieldExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E0C1A62D56580400962555 /* UITextFieldExtensions.swift */; };57E0CC532D8EACC70027FB8C /* ResourcesKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E0CC522D8EACBF0027FB8C /* ResourcesKit.swift */; };@@ -1707,6 +1708,7 @@57DF84792D62E97A00AA0AAB /* NSAttributedStringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAttributedStringExtensions.swift; sourceTree = "<group>"; };57DF849B2D630E5100AA0AAB /* CGSizeExtenstions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGSizeExtenstions.swift; sourceTree = "<group>"; };57DF84E82D64249D00AA0AAB /* ShareManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareManager.swift; sourceTree = "<group>"; };+ 57DFBE8B2E71BC4C008C2161 /* CheevosPopupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheevosPopupView.swift; sourceTree = "<group>"; };57E0363F2DBBE17100B222E1 /* Config-DebugSimulator.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Config-DebugSimulator.xcconfig"; sourceTree = "<group>"; };57E0C19D2D562F8600962555 /* GamesToolView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GamesToolView.swift; sourceTree = "<group>"; };57E0C1A62D56580400962555 /* UITextFieldExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextFieldExtensions.swift; sourceTree = "<group>"; };@@ -3685,6 +3687,7 @@57B6EC612D77F224002E619C /* Views */ = {isa = PBXGroup;children = (+ 57DFBE8B2E71BC4C008C2161 /* CheevosPopupView.swift */,57D029182E6C9C4000BF1F9D /* CheevosProgressView.swift */,5771C2092E6569B60062EDE0 /* LeaderboardView.swift */,5720CACB2DB5558B0090C0F6 /* ThreeDSKeyboardView.swift */,@@ -4961,6 +4964,7 @@57EC6A6D2D7FC1E4002920F0 /* GameSettingSortCollectionReusableView.swift in Sources */,5770068B2D438F7400762E8F /* PlayHistoryView.swift in Sources */,57F1A9342D7D6D7D00D0CC93 /* ExternalSceneDelegate.swift in Sources */,+ 57DFBE8C2E71BC7A008C2161 /* CheevosPopupView.swift in Sources */,5706236C2D7BDFE1004F09E7 /* CIFilterExtensions.swift in Sources */,57B6ED1E2D7ADED5002E619C /* CRTFilter.swift in Sources */,57AD35EA2D7DEB9D0092FD03 /* WebViewController.swift in Sources */,@@ -5554,6 +5558,12 @@DEVELOPMENT_TEAM = UU52N52JLD;ENABLE_DEBUG_DYLIB = NO;ENABLE_USER_SCRIPT_SANDBOXING = NO;+ FRAMEWORK_SEARCH_PATHS = (+ "$(inherited)",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "\"${PODS_ROOT}/Realm/core\"",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ );GCC_C_LANGUAGE_STANDARD = gnu17;GCC_PREPROCESSOR_DEFINITIONS = ("$(inherited)",@@ -5571,6 +5581,93 @@"@executable_path/Frameworks/MoltenVK.framework",);MARKETING_VERSION = 1.0.0;+ OTHER_CFLAGS = (+ "$(inherited)",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl/BetterSegmentedControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate/BlankSlate.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Closures/Closures.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit/CloudServiceKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout/CollectionViewPagingLayout.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView/DNSPageView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Device/Device.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fireworks/Fireworks.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit/FluentDarkModeKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fuse/Fuse.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker/HXPhotoPicker.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Haptica/Haptica.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore/IQKeyboardCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification/IQKeyboardNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager/IQKeyboardReturnManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar/IQKeyboardToolbar.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager/IQKeyboardToolbarManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification/IQTextInputViewNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextView/IQTextView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IceCream/IceCream.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXBanner/JXBanner.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl/JXPageControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore/ManicEmuCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel/MarqueeLabel.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift/OAuthSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Permission/Permission.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ProHUD/ProHUD.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols/SFSafeSymbols.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Schedule/Schedule.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SideMenu/SideMenu.modulemap\"",+ "-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\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync/iCloudSync.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Private/Realm/Realm.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/GCDWebServer/GCDWebServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SQLCipher/SQLCipher.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SSZipArchive/SSZipArchive.modulemap\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/Realm\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/MelonDSDeltaCore\"",+ "-iframework",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "-iframework",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ "-iframework",+ "\"${PODS_ROOT}/Realm/core\"",+ "-DSTATIC_LIBRARY",+ "$(inherited)",+ "-DSQLITE_HAS_CODEC",+ "-DSQLITE_TEMP_STORE=2",+ "-DSQLITE_SOUNDEX",+ "-DSQLITE_THREADSAFE",+ "-DSQLITE_ENABLE_RTREE",+ "-DSQLITE_ENABLE_STAT3",+ "-DSQLITE_ENABLE_STAT4",+ "-DSQLITE_ENABLE_COLUMN_METADATA",+ "-DSQLITE_ENABLE_MEMORY_MANAGEMENT",+ "-DSQLITE_ENABLE_LOAD_EXTENSION",+ "-DSQLITE_ENABLE_FTS4",+ "-DSQLITE_ENABLE_FTS4_UNICODE61",+ "-DSQLITE_ENABLE_FTS3_PARENTHESIS",+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY",+ "-DSQLITE_ENABLE_JSON1",+ "-DSQLITE_ENABLE_FTS5",+ "-DSQLCIPHER_CRYPTO_CC",+ "-DHAVE_USLEEP=1",+ "-DSQLITE_MAX_VARIABLE_NUMBER=99999",+ "-DSQLITE_EXTRA_INIT=sqlcipher_extra_init",+ "-DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown",+ );OTHER_LDFLAGS = ("$(inherited)","-ObjC",@@ -5655,10 +5752,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-weak_framework","\"AuthenticationServices\"",@@ -5671,6 +5764,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}/MelonDSDeltaCore\" \"-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_SWIFT_FLAGS = "$(inherited)";PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";@@ -5931,10 +6025,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-weak_framework","\"AuthenticationServices\"",@@ -6367,6 +6457,12 @@DEVELOPMENT_TEAM = UU52N52JLD;ENABLE_DEBUG_DYLIB = NO;ENABLE_USER_SCRIPT_SANDBOXING = NO;+ FRAMEWORK_SEARCH_PATHS = (+ "$(inherited)",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "\"${PODS_ROOT}/Realm/core\"",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ );GCC_C_LANGUAGE_STANDARD = gnu17;GCC_PREPROCESSOR_DEFINITIONS = ("$(inherited)",@@ -6384,6 +6480,96 @@"@executable_path/Frameworks/MoltenVK.framework",);MARKETING_VERSION = 1.0.0;+ OTHER_CFLAGS = (+ "$(inherited)",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl/BetterSegmentedControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate/BlankSlate.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Closures/Closures.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit/CloudServiceKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout/CollectionViewPagingLayout.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView/DNSPageView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Device/Device.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fireworks/Fireworks.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit/FluentDarkModeKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fuse/Fuse.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker/HXPhotoPicker.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Haptica/Haptica.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore/IQKeyboardCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification/IQKeyboardNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager/IQKeyboardReturnManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar/IQKeyboardToolbar.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager/IQKeyboardToolbarManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification/IQTextInputViewNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextView/IQTextView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IceCream/IceCream.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXBanner/JXBanner.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl/JXPageControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/LookinServer/LookinServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore/ManicEmuCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel/MarqueeLabel.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift/OAuthSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Permission/Permission.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ProHUD/ProHUD.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols/SFSafeSymbols.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Schedule/Schedule.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches/ShowTouches.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SideMenu/SideMenu.modulemap\"",+ "-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\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync/iCloudSync.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Private/Realm/Realm.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FLEX/FLEX.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/GCDWebServer/GCDWebServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SQLCipher/SQLCipher.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SSZipArchive/SSZipArchive.modulemap\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/Realm\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/MelonDSDeltaCore\"",+ "-iframework",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "-iframework",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ "-iframework",+ "\"${PODS_ROOT}/Realm/core\"",+ "-DSTATIC_LIBRARY",+ "$(inherited)",+ "-DSQLITE_HAS_CODEC",+ "-DSQLITE_TEMP_STORE=2",+ "-DSQLITE_SOUNDEX",+ "-DSQLITE_THREADSAFE",+ "-DSQLITE_ENABLE_RTREE",+ "-DSQLITE_ENABLE_STAT3",+ "-DSQLITE_ENABLE_STAT4",+ "-DSQLITE_ENABLE_COLUMN_METADATA",+ "-DSQLITE_ENABLE_MEMORY_MANAGEMENT",+ "-DSQLITE_ENABLE_LOAD_EXTENSION",+ "-DSQLITE_ENABLE_FTS4",+ "-DSQLITE_ENABLE_FTS4_UNICODE61",+ "-DSQLITE_ENABLE_FTS3_PARENTHESIS",+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY",+ "-DSQLITE_ENABLE_JSON1",+ "-DSQLITE_ENABLE_FTS5",+ "-DSQLCIPHER_CRYPTO_CC",+ "-DHAVE_USLEEP=1",+ "-DSQLITE_MAX_VARIABLE_NUMBER=99999",+ "-DSQLITE_EXTRA_INIT=sqlcipher_extra_init",+ "-DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown",+ );OTHER_LDFLAGS = ("$(inherited)","-ObjC",@@ -6477,10 +6663,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-framework","\"WebKit\"",@@ -6495,6 +6677,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}/MelonDSDeltaCore\" \"-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_SWIFT_FLAGS = "$(inherited)";PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";@@ -6656,6 +6839,12 @@DEVELOPMENT_TEAM = UU52N52JLD;ENABLE_DEBUG_DYLIB = NO;ENABLE_USER_SCRIPT_SANDBOXING = NO;+ FRAMEWORK_SEARCH_PATHS = (+ "$(inherited)",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "\"${PODS_ROOT}/Realm/core\"",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ );GCC_C_LANGUAGE_STANDARD = gnu17;GCC_PREPROCESSOR_DEFINITIONS = ("$(inherited)",@@ -6673,6 +6862,96 @@"@executable_path/Frameworks/MoltenVK.framework",);MARKETING_VERSION = 1.0.0;+ OTHER_CFLAGS = (+ "$(inherited)",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl/BetterSegmentedControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate/BlankSlate.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Closures/Closures.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit/CloudServiceKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout/CollectionViewPagingLayout.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView/DNSPageView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Device/Device.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fireworks/Fireworks.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit/FluentDarkModeKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fuse/Fuse.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker/HXPhotoPicker.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Haptica/Haptica.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore/IQKeyboardCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification/IQKeyboardNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager/IQKeyboardReturnManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar/IQKeyboardToolbar.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager/IQKeyboardToolbarManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification/IQTextInputViewNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextView/IQTextView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IceCream/IceCream.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXBanner/JXBanner.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl/JXPageControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/LookinServer/LookinServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore/ManicEmuCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel/MarqueeLabel.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift/OAuthSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Permission/Permission.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ProHUD/ProHUD.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols/SFSafeSymbols.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Schedule/Schedule.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches/ShowTouches.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SideMenu/SideMenu.modulemap\"",+ "-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\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync/iCloudSync.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Private/Realm/Realm.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FLEX/FLEX.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/GCDWebServer/GCDWebServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SQLCipher/SQLCipher.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SSZipArchive/SSZipArchive.modulemap\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/Realm\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/MelonDSDeltaCore\"",+ "-iframework",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "-iframework",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ "-iframework",+ "\"${PODS_ROOT}/Realm/core\"",+ "-DSTATIC_LIBRARY",+ "$(inherited)",+ "-DSQLITE_HAS_CODEC",+ "-DSQLITE_TEMP_STORE=2",+ "-DSQLITE_SOUNDEX",+ "-DSQLITE_THREADSAFE",+ "-DSQLITE_ENABLE_RTREE",+ "-DSQLITE_ENABLE_STAT3",+ "-DSQLITE_ENABLE_STAT4",+ "-DSQLITE_ENABLE_COLUMN_METADATA",+ "-DSQLITE_ENABLE_MEMORY_MANAGEMENT",+ "-DSQLITE_ENABLE_LOAD_EXTENSION",+ "-DSQLITE_ENABLE_FTS4",+ "-DSQLITE_ENABLE_FTS4_UNICODE61",+ "-DSQLITE_ENABLE_FTS3_PARENTHESIS",+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY",+ "-DSQLITE_ENABLE_JSON1",+ "-DSQLITE_ENABLE_FTS5",+ "-DSQLCIPHER_CRYPTO_CC",+ "-DHAVE_USLEEP=1",+ "-DSQLITE_MAX_VARIABLE_NUMBER=99999",+ "-DSQLITE_EXTRA_INIT=sqlcipher_extra_init",+ "-DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown",+ );OTHER_LDFLAGS = ("$(inherited)","-ObjC",@@ -6767,10 +7046,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-framework","\"WebKit\"",@@ -6785,6 +7060,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}/MelonDSDeltaCore\" \"-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_SWIFT_FLAGS = "$(inherited)";PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";@@ -7010,6 +7286,12 @@DEVELOPMENT_TEAM = UU52N52JLD;ENABLE_DEBUG_DYLIB = NO;ENABLE_USER_SCRIPT_SANDBOXING = NO;+ FRAMEWORK_SEARCH_PATHS = (+ "$(inherited)",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "\"${PODS_ROOT}/Realm/core\"",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ );GCC_C_LANGUAGE_STANDARD = gnu17;GCC_PREPROCESSOR_DEFINITIONS = ("$(inherited)",@@ -7027,6 +7309,96 @@"@executable_path/Frameworks/MoltenVK.framework",);MARKETING_VERSION = 1.0.0;+ OTHER_CFLAGS = (+ "$(inherited)",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl/BetterSegmentedControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate/BlankSlate.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Closures/Closures.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit/CloudServiceKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout/CollectionViewPagingLayout.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView/DNSPageView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Device/Device.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fireworks/Fireworks.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit/FluentDarkModeKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fuse/Fuse.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker/HXPhotoPicker.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Haptica/Haptica.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore/IQKeyboardCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification/IQKeyboardNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager/IQKeyboardReturnManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar/IQKeyboardToolbar.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager/IQKeyboardToolbarManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification/IQTextInputViewNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextView/IQTextView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IceCream/IceCream.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXBanner/JXBanner.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl/JXPageControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/LookinServer/LookinServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore/ManicEmuCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel/MarqueeLabel.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift/OAuthSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Permission/Permission.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ProHUD/ProHUD.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols/SFSafeSymbols.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Schedule/Schedule.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ShowTouches/ShowTouches.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SideMenu/SideMenu.modulemap\"",+ "-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\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync/iCloudSync.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Private/Realm/Realm.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FLEX/FLEX.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/GCDWebServer/GCDWebServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SQLCipher/SQLCipher.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SSZipArchive/SSZipArchive.modulemap\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/Realm\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/MelonDSDeltaCore\"",+ "-iframework",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "-iframework",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ "-iframework",+ "\"${PODS_ROOT}/Realm/core\"",+ "-DSTATIC_LIBRARY",+ "$(inherited)",+ "-DSQLITE_HAS_CODEC",+ "-DSQLITE_TEMP_STORE=2",+ "-DSQLITE_SOUNDEX",+ "-DSQLITE_THREADSAFE",+ "-DSQLITE_ENABLE_RTREE",+ "-DSQLITE_ENABLE_STAT3",+ "-DSQLITE_ENABLE_STAT4",+ "-DSQLITE_ENABLE_COLUMN_METADATA",+ "-DSQLITE_ENABLE_MEMORY_MANAGEMENT",+ "-DSQLITE_ENABLE_LOAD_EXTENSION",+ "-DSQLITE_ENABLE_FTS4",+ "-DSQLITE_ENABLE_FTS4_UNICODE61",+ "-DSQLITE_ENABLE_FTS3_PARENTHESIS",+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY",+ "-DSQLITE_ENABLE_JSON1",+ "-DSQLITE_ENABLE_FTS5",+ "-DSQLCIPHER_CRYPTO_CC",+ "-DHAVE_USLEEP=1",+ "-DSQLITE_MAX_VARIABLE_NUMBER=99999",+ "-DSQLITE_EXTRA_INIT=sqlcipher_extra_init",+ "-DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown",+ );OTHER_LDFLAGS = ("$(inherited)","-ObjC",@@ -7121,10 +7493,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-framework","\"WebKit\"",@@ -7139,6 +7507,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}/MelonDSDeltaCore\" \"-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_SWIFT_FLAGS = "$(inherited)";PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";@@ -7170,6 +7539,12 @@DEVELOPMENT_TEAM = UU52N52JLD;ENABLE_DEBUG_DYLIB = NO;ENABLE_USER_SCRIPT_SANDBOXING = NO;+ FRAMEWORK_SEARCH_PATHS = (+ "$(inherited)",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "\"${PODS_ROOT}/Realm/core\"",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ );GCC_C_LANGUAGE_STANDARD = gnu17;GCC_PREPROCESSOR_DEFINITIONS = ("$(inherited)",@@ -7187,6 +7562,93 @@"@executable_path/Frameworks/MoltenVK.framework",);MARKETING_VERSION = 1.0.0;+ OTHER_CFLAGS = (+ "$(inherited)",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BetterSegmentedControl/BetterSegmentedControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/BlankSlate/BlankSlate.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Closures/Closures.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CloudServiceKit/CloudServiceKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/CollectionViewPagingLayout/CollectionViewPagingLayout.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/DNSPageView/DNSPageView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Device/Device.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fireworks/Fireworks.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FluentDarkModeKit/FluentDarkModeKit.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Fuse/Fuse.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/HXPhotoPicker/HXPhotoPicker.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Haptica/Haptica.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardCore/IQKeyboardCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardNotification/IQKeyboardNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardReturnManager/IQKeyboardReturnManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbar/IQKeyboardToolbar.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardToolbarManager/IQKeyboardToolbarManager.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextInputViewNotification/IQTextInputViewNotification.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IQTextView/IQTextView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/IceCream/IceCream.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXBanner/JXBanner.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/JXPageControl/JXPageControl.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ManicEmuCore/ManicEmuCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MarqueeLabel/MarqueeLabel.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/OAuthSwift/OAuthSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Permission/Permission.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ProHUD/ProHUD.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SFSafeSymbols/SFSafeSymbols.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Schedule/Schedule.modulemap\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SideMenu/SideMenu.modulemap\"",+ "-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\"",+ "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/iCloudSync/iCloudSync.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Private/Realm/Realm.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/GCDWebServer/GCDWebServer.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SQLCipher/SQLCipher.modulemap\"",+ "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/SSZipArchive/SSZipArchive.modulemap\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/Realm\"",+ "-isystem",+ "\"${PODS_ROOT}/Headers/Public/MelonDSDeltaCore\"",+ "-iframework",+ "\"${PODS_ROOT}/../../ManicSupport/Frameworks\"",+ "-iframework",+ "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/ManicSupport\"",+ "-iframework",+ "\"${PODS_ROOT}/Realm/core\"",+ "-DSTATIC_LIBRARY",+ "$(inherited)",+ "-DSQLITE_HAS_CODEC",+ "-DSQLITE_TEMP_STORE=2",+ "-DSQLITE_SOUNDEX",+ "-DSQLITE_THREADSAFE",+ "-DSQLITE_ENABLE_RTREE",+ "-DSQLITE_ENABLE_STAT3",+ "-DSQLITE_ENABLE_STAT4",+ "-DSQLITE_ENABLE_COLUMN_METADATA",+ "-DSQLITE_ENABLE_MEMORY_MANAGEMENT",+ "-DSQLITE_ENABLE_LOAD_EXTENSION",+ "-DSQLITE_ENABLE_FTS4",+ "-DSQLITE_ENABLE_FTS4_UNICODE61",+ "-DSQLITE_ENABLE_FTS3_PARENTHESIS",+ "-DSQLITE_ENABLE_UNLOCK_NOTIFY",+ "-DSQLITE_ENABLE_JSON1",+ "-DSQLITE_ENABLE_FTS5",+ "-DSQLCIPHER_CRYPTO_CC",+ "-DHAVE_USLEEP=1",+ "-DSQLITE_MAX_VARIABLE_NUMBER=99999",+ "-DSQLITE_EXTRA_INIT=sqlcipher_extra_init",+ "-DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown",+ );OTHER_LDFLAGS = ("$(inherited)","-ObjC",@@ -7271,10 +7733,6 @@"-framework","\"UIKit\"","-framework",- "\"UMCommon\"",- "-framework",- "\"UMDevice\"",- "-framework","\"UniversalDetector\"","-weak_framework","\"AuthenticationServices\"",@@ -7287,6 +7745,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}/MelonDSDeltaCore\" \"-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_SWIFT_FLAGS = "$(inherited)";PRODUCT_BUNDLE_IDENTIFIER = "${APP_BUNDLE_IDENTIFIER}";"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${APP_BUNDLE_IDENTIFIER}";diff --git a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.stringsindex 5c389364..d3e8acd5 100644--- a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings@@ -641,3 +641,9 @@"AchievementsMissableAlert" = "لا يمكن الحصول على الإنجاز بعد مرحلة معينة في اللعبة ويتطلب لعبًا آخر إذا فاتك";"AchievementsProgressionAlert" = "الإنجاز مطلوب لإكمال اللعبة";"AchievementsWinAlert" = "الإنجاز يشير إلى إكمال اللعبة";++"AchievementsChallenge" = "بدء التحدي";+"AchievementsMastered" = "%@ تم إتقانه";+"AlwaysShowProgress" = "إظهار التقدم دائمًا";+"AlwaysShowProgressDesc" = "إبقاء تقدم الإنجازات مرئيًا على الشاشة.";+"Progress" = "التقدم";diff --git a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.stringsindex 82d78a29..c48c8093 100644--- a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings@@ -666,3 +666,9 @@ Prem el botó del control...";"AchievementsMissableAlert" = "El assoliment no podrà obtenir-se després d'un cert punt i requerirà una nova partida si es perd";"AchievementsProgressionAlert" = "L'assoliment és necessari per superar el joc";"AchievementsWinAlert" = "L'assoliment indica que el joc ha estat superat";++"AchievementsChallenge" = "Inicia Reptes";+"AchievementsMastered" = "%@ Dominat";+"AlwaysShowProgress" = "Mostra sempre el progrés";+"AlwaysShowProgressDesc" = "Mantingues el progrés dels assoliments visible a la pantalla.";+"Progress" = "Progrés";diff --git a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.stringsindex a23e6206..70e1217e 100644--- a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings@@ -662,3 +662,9 @@ Stiskněte tlačítko ovladače...";"AchievementsMissableAlert" = "Tohoto úspěchu nelze po určitém bodě dosáhnout a vyžaduje při zmeškání nové hraní";"AchievementsProgressionAlert" = "Tento úspěch je vyžadován k dokončení hry";"AchievementsWinAlert" = "Tento úspěch indikuje, že hra byla dokončena";++"AchievementsChallenge" = "Začít Výzvu";+"AchievementsMastered" = "%@ Zvládnuto";+"AlwaysShowProgress" = "Vždy Zobrazit Pokrok";+"AlwaysShowProgressDesc" = "Udržujte pokrok úspěchů viditelný na obrazovce.";+"Progress" = "Pokrok";diff --git a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.stringsindex a706b575..c6419106 100644--- a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings@@ -664,3 +664,9 @@ Tryk på controller-knappen...";"AchievementsMissableAlert" = "Præstationen kan ikke opnås efter et bestemt tidspunkt og kræver en ny gennemspilning hvis misset";"AchievementsProgressionAlert" = "Præstationen er påkrævet for at gennemføre spillet";"AchievementsWinAlert" = "Præstationen indikerer at spillet er gennemført";++"AchievementsChallenge" = "Start Udfordring";+"AchievementsMastered" = "%@ Mesteret";+"AlwaysShowProgress" = "Altid Vis Fremskridt";+"AlwaysShowProgressDesc" = "Hold præstationsfremskridt synligt på skærmen.";+"Progress" = "Fremskridt";diff --git a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.stringsindex 9c2448cd..63a53ad3 100644--- a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings@@ -668,3 +668,9 @@ Drücke die Controller-Taste...";"AchievementsMissableAlert" = "Dieser Erfolg kann nach einem bestimmten Punkt nicht mehr erzielt werden und erfordert bei Verpassen einen neuen Spielzug";"AchievementsProgressionAlert" = "Dieser Erfolg ist zum Abschluss des Spiels erforderlich";"AchievementsWinAlert" = "Dieser Erfolg zeigt an, dass das Spiel abgeschlossen wurde";++"AchievementsChallenge" = "Herausforderung Starten";+"AchievementsMastered" = "%@ Gemeistert";+"AlwaysShowProgress" = "Fortschritt Immer Anzeigen";+"AlwaysShowProgressDesc" = "Halte den Errungenschaftsfortschritt auf dem Bildschirm sichtbar.";+"Progress" = "Fortschritt";diff --git a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.stringsindex e3dce97b..a414fff1 100644--- a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings@@ -667,3 +667,9 @@"AchievementsMissableAlert" = "Το επίτευγμα δεν μπορεί να κερδηθεί μετά από ένα σημείο και απαιτεί νέο παιχνίδι αν χαθεί";"AchievementsProgressionAlert" = "Το επίτευγμα απαιτείται για την ολοκλήρωση του παιχνιδιού";"AchievementsWinAlert" = "Το επίτευγμα δηλώνει ότι το παιχνίδι έχει ολοκληρωθεί";++"AchievementsChallenge" = "Έναρξη Προκλήσης";+"AchievementsMastered" = "%@ Τελειοποιημένο";+"AlwaysShowProgress" = "Πάντα Εμφάνιση Προόδου";+"AlwaysShowProgressDesc" = "Διατήρηση προόδου επιτευγμάτων ορατής στην οθόνη.";+"Progress" = "Πρόοδος";diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.stringsindex 3a344bb7..7e2bd6ff 100644--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings@@ -677,3 +677,10 @@ Press the controller button to complete mapping...";"AchievementsMissableAlert" = "The achievement cannot be earned after some point in the playthrough and would require another playthrough if missed";"AchievementsProgressionAlert" = "The achievement is required to beat the game";"AchievementsWinAlert" = "The achievement indicates the game has been beaten";++"AchievementsChallenge" = "Start Challenge";+"AchievementsMastered" = "Mastered %@";+"AlwaysShowProgress" = "Always Show Progress";+"AlwaysShowProgressDesc" = "Keep achievement progress visible on screen.";+"Progress" = "Progress";+diff --git a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.stringsindex 0141f221..4842c70d 100644--- a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings@@ -666,3 +666,9 @@ Presiona el botón del control para continuar...";"AchievementsMissableAlert" = "El logro no se podrá obtener después de cierto punto y requerirá otra partida si se pierde";"AchievementsProgressionAlert" = "El logro es necesario para terminar el juego";"AchievementsWinAlert" = "El logro indica que el juego ha sido completado";++"AchievementsChallenge" = "Comenzar Desafío";+"AchievementsMastered" = "%@ Dominado";+"AlwaysShowProgress" = "Mostrar Progreso Siempre";+"AlwaysShowProgressDesc" = "Mantener el progreso de logros visible en pantalla.";+"Progress" = "Progreso";diff --git a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.stringsindex 61c6c3db..956b6879 100644--- a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings@@ -641,3 +641,9 @@ Presiona el botón del control para completar...";"AchievementsMissableAlert" = "El logro no podrá obtenerse después de cierto punto del juego y requerirá otra partida si se pierde";"AchievementsProgressionAlert" = "El logro es necesario para completar el juego";"AchievementsWinAlert" = "El logro indica que el juego ha sido completado";++"AchievementsChallenge" = "Iniciar Desafío";+"AchievementsMastered" = "%@ Dominado";+"AlwaysShowProgress" = "Mostrar Siempre Progreso";+"AlwaysShowProgressDesc" = "Mantener visible el progreso de logros en pantalla.";+"Progress" = "Progreso";diff --git a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.stringsindex d3130f54..a222ca54 100644--- a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings@@ -667,3 +667,9 @@ Paina ohjaimen nappia...";"AchievementsMissableAlert" = "Saavutusta ei voi ansaita tietyn kohdan jälkeen ja se vaatii uuden pelikerran jos menetetään";"AchievementsProgressionAlert" = "Saavutus vaaditaan pelin läpäisyyn";"AchievementsWinAlert" = "Saavutus ilmaisee että peli on läpäisty";++"AchievementsChallenge" = "Aloita Haaste";+"AchievementsMastered" = "%@ Hallitsematon";+"AlwaysShowProgress" = "Näytä Aina Edistyminen";+"AlwaysShowProgressDesc" = "Pidä saavutusten edistyminen näkyvillä näytöllä.";+"Progress" = "Edistyminen";diff --git a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.stringsindex b1cda722..82820d62 100644--- a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings@@ -668,3 +668,9 @@ Appuyez sur le bouton du contrôleur...";"AchievementsMissableAlert" = "Ce succès ne pourra être obtenu après un certain point et nécessitera une nouvelle partie si manqué";"AchievementsProgressionAlert" = "Ce succès est requis pour terminer le jeu";"AchievementsWinAlert" = "Ce succès indique que le jeu est terminé";++"AchievementsChallenge" = "Débuter le Défi";+"AchievementsMastered" = "%@ Maîtrisé";+"AlwaysShowProgress" = "Toujours Afficher Progression";+"AlwaysShowProgressDesc" = "Garder la progression des succès visible à l'écran.";+"Progress" = "Progression";diff --git a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.stringsindex ac141990..2e13e593 100644--- a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings@@ -668,3 +668,9 @@ Appuyez sur le bouton du contrôleur...";"AchievementsMissableAlert" = "Ce succès ne pourra plus être débloqué après un certain point et nécessitera une nouvelle partie si manqué";"AchievementsProgressionAlert" = "Ce succès est nécessaire pour finir le jeu";"AchievementsWinAlert" = "Ce succès indique que le jeu a été terminé";++"AchievementsChallenge" = "Lancer le Défi";+"AchievementsMastered" = "%@ Maîtrisé";+"AlwaysShowProgress" = "Toujours Afficher la Progression";+"AlwaysShowProgressDesc" = "Maintenir la progression des succès visible à l'écran.";+"Progress" = "Progression";diff --git a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.stringsindex 92e375ba..7d292739 100644--- a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings@@ -667,3 +667,9 @@"AchievementsMissableAlert" = "ההישג לא יוכל להתקבל לאחר נקודה מסוימת וידרוש משחק נוסף אם הוחמץ";"AchievementsProgressionAlert" = "ההישג נדרש כדי לסיים את המשחק";"AchievementsWinAlert" = "ההישג מעיד שהמשחק הושלם";++"AchievementsChallenge" = "התחל אתגר";+"AchievementsMastered" = "%@ רוּת";+"AlwaysShowProgress" = "הצג תמיד התקדמות";+"AlwaysShowProgressDesc" = "השאר את התקדмость ההישגים גלויה על המסך.";+"Progress" = "התקדמות";diff --git a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.stringsindex a6aecc25..f3d7e5d1 100644--- a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings@@ -668,3 +668,9 @@"AchievementsMissableAlert" = "यह उपलब्धि खेल के एक निश्चित बिंदु के बाद अर्जित नहीं की जा सकती और छूटने पर पुनः खेलने की आवश्यकता होगी";"AchievementsProgressionAlert" = "यह उपलब्धि खेल को पूरा करने के लिए आवश्यक है";"AchievementsWinAlert" = "यह उपलब्धि दर्शाती है कि खेल पूरा हो चुका है";++"AchievementsChallenge" = "चुनौती शुरू करें";+"AchievementsMastered" = "%@ में निपुण";+"AlwaysShowProgress" = "हमेशा प्रगति दिखाएं";+"AlwaysShowProgressDesc" = "स्क्रीन पर उपलब्धि प्रगति दिखाई रखें।";+"Progress" = "प्रगति";diff --git a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.stringsindex 478d9679..f34b6358 100644--- a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings@@ -664,3 +664,9 @@ Ako naiđete na nestabilnost u 3DS-u, pogledajte «Često Postavljana Pitanja»"AchievementsMissableAlert" = "Postignuće se ne može zaraditi nakon određene točke i zahtijeva novu igru ako se propusti";"AchievementsProgressionAlert" = "Postignuće je potrebno za dovršetak igre";"AchievementsWinAlert" = "Postignuće označava da je igra dovršena";++"AchievementsChallenge" = "Započni Izazov";+"AchievementsMastered" = "%@ Savladano";+"AlwaysShowProgress" = "Uvijek Prikaži Napredak";+"AlwaysShowProgressDesc" = "Održavaj napredak postignuća vidljivim na zaslonu.";+"Progress" = "Napredak";diff --git a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.stringsindex ffed8268..03465333 100644--- a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings@@ -666,3 +666,9 @@ Nyomja meg a kontroller gombját...";"AchievementsMissableAlert" = "A teljesítmény egy pont után nem szerezhető meg és új játékot igényel ha kimarad";"AchievementsProgressionAlert" = "A teljesítmény szükséges a játék befejezéséhez";"AchievementsWinAlert" = "A teljesítmény jelzi, hogy a játék befejeződött";++"AchievementsChallenge" = "Kihívás Indítása";+"AchievementsMastered" = "%@ Elsajátítva";+"AlwaysShowProgress" = "Folyamatosan Mutasd az Előrehaladást";+"AlwaysShowProgressDesc" = "Tartsd az achievementek előrehaladását láthatóvá a képernyőn.";+"Progress" = "Előrehaladás";diff --git a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.stringsindex acfe2538..efec5be4 100644--- a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings@@ -659,3 +659,9 @@ Tekan tombol kontroler...";"AchievementsMissableAlert" = "Pencapaian ini tidak dapat diperoleh setelah titik tertentu dan memerlukan permainan ulang jika terlewat";"AchievementsProgressionAlert" = "Pencapaian ini diperlukan untuk menyelesaikan game";"AchievementsWinAlert" = "Pencapaian ini menandakan game telah diselesaikan";++"AchievementsChallenge" = "Mulai Tantangan";+"AchievementsMastered" = "%@ Dikuasai";+"AlwaysShowProgress" = "Selalu Tampilkan Progress";+"AlwaysShowProgressDesc" = "Pertahankan progres pencapaian tetap terlihat di layar.";+"Progress" = "Progress";diff --git a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.stringsindex e087613d..d6aecd6d 100644--- a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings@@ -670,3 +670,9 @@ Premi il pulsante del controller...";"AchievementsMissableAlert" = "L'obiettivo non potrà essere ottenuto dopo un certo punto e richiederà un nuovo gioco se perso";"AchievementsProgressionAlert" = "L'obiettivo è necessario per completare il gioco";"AchievementsWinAlert" = "L'obiettivo indica che il gioco è stato completato";++"AchievementsChallenge" = "Avvia Sfida";+"AchievementsMastered" = "%@ Mastered";+"AlwaysShowProgress" = "Mostra Sempre Progresso";+"AlwaysShowProgressDesc" = "Mantieni visibile a schermo il progresso dei trofei.";+"Progress" = "Progresso";diff --git a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.stringsindex a2e68df8..5d1f7bd1 100644--- a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings@@ -663,3 +663,9 @@"AchievementsMissableAlert" = "この実績はゲーム進行によっては獲得不能になり、見逃した場合は再プレイが必要です";"AchievementsProgressionAlert" = "この実績はゲームクリアに必須です";"AchievementsWinAlert" = "この実績はゲームクリアを意味します";++"AchievementsChallenge" = "チャレンジ開始";+"AchievementsMastered" = "%@ マスター";+"AlwaysShowProgress" = "進捗を常に表示";+"AlwaysShowProgressDesc" = "実績の進捗を画面上に常に表示します。";+"Progress" = "進捗";diff --git a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.stringsindex 15e173b9..fd53fba3 100644--- a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings@@ -670,3 +670,9 @@"AchievementsMissableAlert" = "이 도전 과제는 플레이 도중 특정 시점 이후에는 획득할 수 없으며, 놓칠 경우 다시 플레이해야 합니다";"AchievementsProgressionAlert" = "이 도전 과제는 게임 클리어에 필수적입니다";"AchievementsWinAlert" = "이 도전 과제는 게임 클리어를 의미합니다";++"AchievementsChallenge" = "도전 시작";+"AchievementsMastered" = "%@ 마스터";+"AlwaysShowProgress" = "진행률 항상 표시";+"AlwaysShowProgressDesc" = "업적 진행 상황을 화면에 계속 표시합니다.";+"Progress" = "진행률";diff --git a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.stringsindex edcd9424..1c5378ab 100644--- a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings@@ -640,3 +640,9 @@ Tekan butang pengawal...";"AchievementsMissableAlert" = "Pencapaian ini tidak boleh diperoleh selepas titik tertentu dan memerlukan permainan semula jika terlepas";"AchievementsProgressionAlert" = "Pencapaian ini diperlukan untuk menamatkan permainan";"AchievementsWinAlert" = "Pencapaian ini menandakan permainan telah tamat";++"AchievementsChallenge" = "Mulai Cabaran";+"AchievementsMastered" = "%@ Dikuasai";+"AlwaysShowProgress" = "Sentiasa Tunjukkan Kemajuan";+"AlwaysShowProgressDesc" = "Kekalkan kemajuan pencapaian kelihatan di skrin.";+"Progress" = "Kemajuan";diff --git a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.stringsindex 00dfd2ec..0616d928 100644--- a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings@@ -658,3 +658,9 @@ Trykk på kontrollerknappen...";"AchievementsMissableAlert" = "Prestasjonen kan ikke oppnås etter et visst punkt og krever nytt spill hvis misset";"AchievementsProgressionAlert" = "Prestasjonen er nødvendig for å fullføre spillet";"AchievementsWinAlert" = "Prestasjonen indikerer at spillet er fullført";++"AchievementsChallenge" = "Start Utfordring";+"AchievementsMastered" = "%@ Mesteret";+"AlwaysShowProgress" = "Alltid Vis Fremdrift";+"AlwaysShowProgressDesc" = "Hold prestasjonsfremdrift synlig på skjermen.";+"Progress" = "Fremdrift";diff --git a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.stringsindex 7be87816..b2bffdac 100644--- a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings@@ -667,3 +667,9 @@ Druk op de controllerknop...";"AchievementsMissableAlert" = "De prestatie kan na een bepaald punt niet meer worden verdiend en vereist bij missen een nieuwe speelsessie";"AchievementsProgressionAlert" = "De prestatie is nodig om het spel uit te spelen";"AchievementsWinAlert" = "De prestatie geeft aan dat het spel is uitgespeeld";++"AchievementsChallenge" = "Start Uitdaging";+"AchievementsMastered" = "%@ Beheersd";+"AlwaysShowProgress" = "Voortgang Altijd Tonen";+"AlwaysShowProgressDesc" = "Houd prestatiewoortgang zichtbaar op scherm.";+"Progress" = "Voortgang";diff --git a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.stringsindex 9a409ab5..b33e5910 100644--- a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings@@ -641,3 +641,9 @@ Naciśnij przycisk kontrolera...";"AchievementsMissableAlert" = "Osiągnięcie nie będzie dostępne po określonym punkcie i wymagać będzie nowej rozgrywki jeśli przegapione";"AchievementsProgressionAlert" = "Osiągnięcie jest wymagane do ukończenia gry";"AchievementsWinAlert" = "Osiągnięcie wskazuje, że gra została ukończona";++"AchievementsChallenge" = "Rozpocznij Wyzwanie";+"AchievementsMastered" = "%@ Opanowane";+"AlwaysShowProgress" = "Zawsze Pokaż Postęp";+"AlwaysShowProgressDesc" = "Utzymuj postęp osiągnięć widoczny na ekranie.";+"Progress" = "Postęp";diff --git a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.stringsindex 673f72d2..e72500d7 100644--- a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings@@ -667,3 +667,9 @@ Pressione o botão do controle...";"AchievementsMissableAlert" = "A conquista não poderá ser obtida após certo ponto do jogo e exigirá nova jogada se perdida";"AchievementsProgressionAlert" = "A conquista é necessária para finalizar o jogo";"AchievementsWinAlert" = "A conquista indica que o jogo foi finalizado";++"AchievementsChallenge" = "Iniciar Desafio";+"AchievementsMastered" = "%@ Dominado";+"AlwaysShowProgress" = "Sempre Mostrar Progresso";+"AlwaysShowProgressDesc" = "Manter o progresso de conquistas visível na tela.";+"Progress" = "Progresso";diff --git a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.stringsindex 66357958..f913c913 100644--- a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings@@ -668,3 +668,9 @@ Pressione o botão do comando...";"AchievementsMissableAlert" = "O troféu não poderá ser obtido após determinado ponto e exigirá outra jogada se perdido";"AchievementsProgressionAlert" = "O troféu é necessário para completar o jogo";"AchievementsWinAlert" = "O troféu indica que o jogo foi concluído";++"AchievementsChallenge" = "Iniciar Desafio";+"AchievementsMastered" = "%@ Dominado";+"AlwaysShowProgress" = "Mostrar Sempre Progresso";+"AlwaysShowProgressDesc" = "Manter o progresso de conquistas visível no ecrã.";+"Progress" = "Progresso";diff --git a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.stringsindex ecdfccb2..7630d4ec 100644--- a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings@@ -666,3 +666,9 @@ Apasă butonul controlerului...";"AchievementsMissableAlert" = "Achievement-ul nu mai poate fi obținut după un anumit punct și necesită un nou joc dacă este ratat";"AchievementsProgressionAlert" = "Achievement-ul este necesar pentru a termina jocul";"AchievementsWinAlert" = "Achievement-ul indică faptul că jocul a fost terminat";++"AchievementsChallenge" = "Începe Provocarea";+"AchievementsMastered" = "%@ Stăpânit";+"AlwaysShowProgress" = "Afișează Mereu Progresul";+"AlwaysShowProgressDesc" = "Păstrează progresul realizărilor vizibil pe ecran.";+"Progress" = "Progres";diff --git a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.stringsindex 5c8f8a3f..2335152d 100644--- a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings@@ -662,3 +662,9 @@"AchievementsMissableAlert" = "Достижение нельзя получить после определенного момента прохождения и потребуется повторная игра при пропуске";"AchievementsProgressionAlert" = "Достижение необходимо для завершения игры";"AchievementsWinAlert" = "Достижение указывает на завершение игры";++"AchievementsChallenge" = "Начать Вызов";+"AchievementsMastered" = "%@ Освоено";+"AlwaysShowProgress" = "Всегда Показывать Прогресс";+"AlwaysShowProgressDesc" = "Держать прогресс достижений видимым на экране.";+"Progress" = "Прогресс";diff --git a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.stringsindex c157f0e7..043c0e6b 100644--- a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings@@ -666,3 +666,9 @@ Ak sa vyskytne nestabilita v 3DS, pozrite si «Časté otázky» alebo sa pripoj"AchievementsMissableAlert" = "Tento úspech nie je možné po určitom bode získat a pri zmeškaní si vyžaduje nové prehratie";"AchievementsProgressionAlert" = "Tento úspech je potrebný na dokončenie hry";"AchievementsWinAlert" = "Tento úspech signalizuje, že hra bola dokončená";++"AchievementsChallenge" = "Začať Výzvu";+"AchievementsMastered" = "%@ Zvládnuté";+"AlwaysShowProgress" = "Vždy Zobraziť Pokrok";+"AlwaysShowProgressDesc" = "Udržiavajte pokrok úspechov viditeľný na obrazovke.";+"Progress" = "Pokrok";diff --git a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.stringsindex 4f95a9d4..1aca19ce 100644--- a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings@@ -660,3 +660,9 @@ Tryck på kontrollknappen...";"AchievementsMissableAlert" = "Prestationen kan inte erhållas efter en viss punkt och kräver en ny spelomgång om missad";"AchievementsProgressionAlert" = "Prestationen krävs för att klara spelet";"AchievementsWinAlert" = "Prestationen indikerar att spelet har klarats";++"AchievementsChallenge" = "Starta Utmaning";+"AchievementsMastered" = "%@ Bemästrat";+"AlwaysShowProgress" = "Alltid Visa Framsteg";+"AlwaysShowProgressDesc" = "Håll prestationsframsteg synliga på skärmen.";+"Progress" = "Framsteg";diff --git a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.stringsindex dfa93b5b..49246946 100644--- a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings@@ -656,3 +656,9 @@"AchievementsMissableAlert" = "ความสำเร็จนี้ไม่สามารถได้รับหลังจากจุดหนึ่งในการเล่นและต้องเริ่มเล่นใหม่หากพลาด";"AchievementsProgressionAlert" = "ความสำเร็จนี้จำเป็นในการผ่านเกม";"AchievementsWinAlert" = "ความสำเร็จนี้แสดงว่าได้ผ่านเกมแล้ว";++"AchievementsChallenge" = "เริ่มการท้าทาย";+"AchievementsMastered" = "เชี่ยวชาญ %@";+"AlwaysShowProgress" = "แสดงความคืบหน้าตลอด";+"AlwaysShowProgressDesc" = "แสดงความคืบหน้าของความสำเร็จบนหน้าจออย่างต่อเนื่อง";+"Progress" = "ความคืบหน้า";diff --git a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.stringsindex 98112e0f..e4770096 100644--- a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings@@ -666,3 +666,9 @@ Kontrolcü düğmesine basın...";"AchievementsMissableAlert" = "Bu başarım oyun içinde belirli bir noktadan sonra kazanılamaz ve kaçırılırsa yeni bir oyun gerektirir";"AchievementsProgressionAlert" = "Bu başarım oyunu tamamlamak için gereklidir";"AchievementsWinAlert" = "Bu başarım oyunun tamamlandığını gösterir";++"AchievementsChallenge" = "Mücadeleyi Başlat";+"AchievementsMastered" = "%@ Uzmanlık";+"AlwaysShowProgress" = "İlerlemeyi Her Zaman Göster";+"AlwaysShowProgressDesc" = "Başarım ilerlemesini ekranda görünür tut.";+"Progress" = "İlerleme";diff --git a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.stringsindex 9beee9dd..a8a98653 100644--- a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings@@ -666,3 +666,9 @@"AchievementsMissableAlert" = "Досягнення не можна отримати після певної точки проходження і вимагатиме повторної гри при пропуску";"AchievementsProgressionAlert" = "Досягнення необхідне для завершення гри";"AchievementsWinAlert" = "Досягнення вказує на завершення гри";++"AchievementsChallenge" = "Почати Виклик";+"AchievementsMastered" = "%@ Опановано";+"AlwaysShowProgress" = "Завжди Показувати Прогрес";+"AlwaysShowProgressDesc" = "Тримати прогрес досягнень видимим на екрані.";+"Progress" = "Прогрес";diff --git a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.stringsindex 94f7200e..bb24c38b 100644--- a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings@@ -660,3 +660,9 @@ Nhấn nút điều khiển...";"AchievementsMissableAlert" = "Thành tích này sẽ không thể đạt được sau một điểm nhất định và yêu cầu chơi lại nếu bỏ lỡ";"AchievementsProgressionAlert" = "Thành tích này cần thiết để hoàn thành trò chơi";"AchievementsWinAlert" = "Thành tích này cho biết trò chơi đã được hoàn thành";++"AchievementsChallenge" = "Bắt Đầu Thử Thách";+"AchievementsMastered" = "Thành Thạo %@";+"AlwaysShowProgress" = "Luôn Hiển Thị Tiến Trình";+"AlwaysShowProgressDesc" = "Giữ tiến trình thành tựu hiển thị trên màn hình.";+"Progress" = "Tiến Trình";diff --git a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.stringsindex 9da6fd9f..7dfe427f 100644--- a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings@@ -672,3 +672,9 @@"AchievementsMissableAlert" = "此成就於遊戲流程中特定時點後將無法獲取,若錯過需重新開始遊戲";"AchievementsProgressionAlert" = "此成就為通關必要條件";"AchievementsWinAlert" = "此成就表示遊戲已通關";++"AchievementsChallenge" = "開始挑戰";+"AchievementsMastered" = "精通 %@";+"AlwaysShowProgress" = "常顯示進度";+"AlwaysShowProgressDesc" = "持續於畫面上顯示成就進度。";+"Progress" = "進度";diff --git a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.stringsindex 4693ac71..0f39724c 100644--- a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings@@ -673,3 +673,9 @@"AchievementsMissableAlert" = "该成就在游戏流程中特定时点后将无法获取,若错过需重新开始游戏";"AchievementsProgressionAlert" = "该成就是通关的必要条件";"AchievementsWinAlert" = "该成就表示游戏已通关";++"AchievementsChallenge" = "开始挑战";+"AchievementsMastered" = "精通 %@";+"AlwaysShowProgress" = "始终显示进度";+"AlwaysShowProgressDesc" = "在屏幕上持续显示成就进度。";+"Progress" = "进度";diff --git a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.stringsindex df4659e1..289de538 100644--- a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings@@ -672,3 +672,9 @@"AchievementsMissableAlert" = "此成就於遊戲流程中特定時點後將無法取得,若錯過需重新開始遊戲";"AchievementsProgressionAlert" = "此成就為通關必要條件";"AchievementsWinAlert" = "此成就表示遊戲已通關";++"AchievementsChallenge" = "開始挑戰";+"AchievementsMastered" = "精通 %@";+"AlwaysShowProgress" = "始終顯示進度";+"AlwaysShowProgressDesc" = "持續在畫面上顯示成就進度。";+"Progress" = "進度";diff --git a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swiftindex 2d1bada4..1c797b0d 100644--- a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift+++ b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift@@ -53,7 +53,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {System.allCores.forEach { ManicEmu.register($0) }#if CRASH_COLLECT- //收集闪退日志+ //收集闪退日志 用于内测用户测试bug时使用let apmConfig = UMAPMConfig.default()apmConfig.crashAndBlockMonitorEnable = trueapmConfig.javaScriptBridgeEnable = false@@ -65,10 +65,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {apmConfig.pageMonitorEnable = falseapmConfig.logCollectEnable = falseUMCrashConfigure.setAPMConfig(apmConfig)-#endif- //友盟初始化 用于统计安装数量MobClick.setAutoPageEnabled(true)UMConfigure.initWithAppkey(Constants.Cipher.UMAppKey, channel: nil);+#endif//启动游戏手柄监听ExternalGameControllerUtils.shared.startDetecting()diff --git a/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift b/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swiftindex 3fa54199..fc3160d3 100644--- a/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift+++ b/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift@@ -31,7 +31,7 @@ class ApplicationSceneDelegate: UIResponder, UIWindowSceneDelegate {if Settings.defalut.iCloudSyncEnable {SyncManager.shared.startSync()}- self.showPrivacyRequestIfNeed()+if !isSuccess {UIView.makeAlert(title: R.string.localizable.fatalErrorTitle(), detail: R.string.localizable.fatalErrorDesc(), cancelTitle: R.string.localizable.confirmTitle())}@@ -126,23 +126,6 @@ class ApplicationSceneDelegate: UIResponder, UIWindowSceneDelegate {}}}-- private func showPrivacyRequestIfNeed() {- DispatchQueue.main.asyncAfter(delay: 1) {- if Locale.prefersCN && !UserDefaults.standard.bool(forKey: Constants.DefaultKey.HasShowPrivacyAlert) {- UIView.makeAlert(title: "隐私政策", detail: """-友盟SDK-SDK服务商:友盟同欣(北京)科技有限公司-使用目的:进行APP运营统计与分析-收集个人信息:设备信息(IMEI/MAC/Android ID/IDFA/OAID/OpenUDID/GUID/SIM卡IMSI/ICCID)、位置信息、网络信息-隐私权政策链接:https://www.umeng.com/page/policy-""", cancelTitle: "拒绝", confirmTitle: "同意", enableForceHide: false, hideAction: {- UserDefaults.standard.set(true, forKey: Constants.DefaultKey.HasShowPrivacyAlert)- })- }- }- }-}extension ApplicationSceneDelegate: UIDropInteractionDelegate {diff --git a/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h b/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.hindex 07dc730f..444d6acc 100644--- a/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h+++ b/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h@@ -12,10 +12,10 @@@import SnapKit;@import FluentDarkModeKit;@import SFSafeSymbols;-#import <UMCommon/UMCommon.h>#import <UniversalDetector/UniversalDetector.h>#import <Libretro/LibretroCore.h>#if CRASH_COLLECT+#import <UMCommon/UMCommon.h>#import <UMAPM/UMAPMConfig.h>#import <UMAPM/UMCrashConfigure.h>#endifdiff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swiftindex 993f00d0..a4075a9b 100644--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift@@ -466,7 +466,8 @@ struct Constants {static let TurnOffHardcore = NSNotification.Name(rawValue: "TurnOffHardcore")///游戏排序更新static let GameSortChange = NSNotification.Name(rawValue: "GameSortChange")-+ ///成就解锁进度常驻关闭+ static let TurnOffAlwaysShowProgress = NSNotification.Name(rawValue: "TurnOffAlwaysShowProgress")}struct URLs {diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swiftindex 1ad2bc7b..e16ab9c0 100644--- a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift@@ -21,4 +21,6 @@ enum ExtraKey: String {case rumblecase gameSortTypecase gameSortOrder+ case achievementsProgress+ case alwaysShowProgress}diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swiftindex 96d7e41f..42d8ca95 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift@@ -13,6 +13,7 @@ import IceCream#if !targetEnvironment(simulator)import ThreeDS#endif+import SmartCodableenum ThreeDSMode: Int, PersistableEnum {case compatibility, performance, quality@@ -416,4 +417,54 @@ class Game: Object, ObjectUpdatable {}return false}++ func getAchievementProgress(id: Int) -> AchievementProgress? {+ if let jsonString = getExtraString(key: ExtraKey.achievementsProgress.rawValue) {+ if let progresses = [AchievementProgress].deserialize(from: jsonString) {+ return progresses.first(where: { $0.id == id })+ }+ }+ return nil+ }++ func updateAchievementProgress(_ progress: AchievementProgress) {+ if let jsonString = getExtraString(key: ExtraKey.achievementsProgress.rawValue) {+ if var progresses = [AchievementProgress].deserialize(from: jsonString) {+ progresses.removeAll(where: { $0.id == progress.id })+ progresses.append(progress)+ if let jsonString = progresses.toJSONString() {+ updateExtra(key: ExtraKey.achievementsProgress.rawValue, value: jsonString)+ }+ }+ }+ }++ func removeAchievementProgress(id: Int) {+ if let jsonString = getExtraString(key: ExtraKey.achievementsProgress.rawValue) {+ if var progresses = [AchievementProgress].deserialize(from: jsonString) {+ var isRemoved = false+ progresses.removeAll(where: {+ if $0.id == id {+ isRemoved = true+ return true+ } else {+ return false+ }+ })+ if isRemoved, let jsonString = progresses.toJSONString() {+ updateExtra(key: ExtraKey.achievementsProgress.rawValue, value: jsonString)+ }+ }+ }+ }+}+++struct AchievementProgress: SmartCodable {+ var id: Int = 0+ var measuredProgress: String = ""+ var measuredPercent: CGFloat = 0+++}diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swiftindex 0184b5b5..5af9ef1d 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift@@ -47,6 +47,7 @@ class PlayViewController: GameViewController {private var achievementsNotification: Any? = nilprivate var quitGamingNotification: Any? = nilprivate var turnOffHardcoreNotification: Any? = nil+ private var turnOffAlwaysShowProgressNotification: Any? = nil//每分钟执行一次private lazy var repeatTimer: Schedule.Task = {@@ -94,7 +95,11 @@ class PlayViewController: GameViewController {//排行榜控件private var leaderboardView: LeaderboardView? = nil//进度控件- private var progressView: CheevosProgressView? = nil+ private var cheevosProgressView: CheevosProgressView? = nil+ //游戏过程中接收到的leaderboard+ private var leaderboards: [CheevosLeaderboard] = []+ //解锁进展中的成就+ private var progressAchievements: [CheevosAchievement] = []deinit {Log.debug("\(String(describing: Self.self)) deinit")@@ -152,6 +157,9 @@ class PlayViewController: GameViewController {if let turnOffHardcoreNotification {NotificationCenter.default.removeObserver(turnOffHardcoreNotification)}+ if let turnOffAlwaysShowProgressNotification {+ NotificationCenter.default.removeObserver(turnOffAlwaysShowProgressNotification)+ }if SyncManager.shared.hasDownloadTask {UIView.makeLoadingToast(message: R.string.localizable.loadingTitle())}@@ -403,29 +411,72 @@ class PlayViewController: GameViewController {}}- //获取成就+ //RetroAchievements通知achievementsNotification = NotificationCenter.default.addObserver(forName: Notification.Name(rawValue: "RetroAchievementsNotification"), object: nil, queue: .main, using: { [weak self] notification inguard let self else { return }if let achievement = notification.object as? CheevosAchievement {- //获得成就- self.showRetroAchievements(badgeUrl: achievement.unlockedBadgeUrl,- title: R.string.localizable.achievementUnlocked(),- message: achievement.title) { [weak self] in- guard let self else { return }- topViewController(appController: true)?.present(RetroAchievementsDetailViewController(achievement: achievement), animated: true)- self.pauseEmulation()+ if achievement.isProgressAchievement {+ //成就进度更新+ if let progressView = self.cheevosProgressView {+ if achievement.show {+ progressView.updateProgress(achievement)+ if let measuredProgress = achievement.measuredProgress {+ //缓存进度+ let achievementProgress = AchievementProgress(id: achievement._id, measuredProgress: measuredProgress, measuredPercent: achievement.measuredPercent)+ self.manicGame.updateAchievementProgress(achievementProgress)+ }+ //自动隐藏进度+ DispatchQueue.main.asyncAfter(delay: 4) { [weak self] in+ self?.hideAchievementProgressIfNeed()+ }++ //临时存储进度 用于popup展示+ if let cacheAchievement = self.progressAchievements.first(where: { $0._id == achievement._id }) {+ cacheAchievement.measuredProgress = achievement.measuredProgress+ cacheAchievement.measuredPercent = achievement.measuredPercent+ } else {+ self.progressAchievements.append(achievement)+ }+ } else {+ progressView.removeProgress(id: achievement._id)+ self.progressAchievements.removeAll(where: { $0._id == achievement._id })+ }+ }+ } else {+ //获得成就+ self.showRetroAchievements(badgeUrl: achievement.unlockedBadgeUrl,+ title: R.string.localizable.achievementUnlocked(),+ message: achievement.title) { [weak self] in+ guard let self else { return }+ //尝试读取缓存中的解锁进度+ if achievement.measuredProgress == nil,+ let achievementProgress = self.manicGame.getAchievementProgress(id: achievement._id) {+ achievement.measuredPercent = achievementProgress.measuredPercent+ achievement.measuredProgress = achievementProgress.measuredProgress+ }+ topViewController(appController: true)?.present(RetroAchievementsDetailViewController(achievement: achievement), animated: true)+ self.pauseEmulation()+ }+ UIDevice.generateAchievementHaptic()+ //删除缓存的解锁进度+ self.manicGame.removeAchievementProgress(id: achievement._id)}- UIDevice.generateAchievementHaptic()} else if let summary = notification.object as? CheevosSummary {- //启动成就+ //启动RetroAchievementsself.showRetroAchievements(badgeUrl: summary.badgeUrl,- title: R.string.localizable.achievementsGo() + " (\(self.isHardcoreMode ? R.string.localizable.hardcore() : R.string.localizable.softcore()))",- message: R.string.localizable.achievementsSummary(summary.unlockedAchievementsNum, summary.coreAchievementsNum),+ title: summary.title ?? R.string.localizable.achievementsGo() + " (\(self.isHardcoreMode ? R.string.localizable.hardcore() : R.string.localizable.softcore()))",+ message: R.string.localizable.achievementsSummary(summary.unlockedAchievementsNum, summary.coreAchievementsNum),hideIcon: true);} else if let _ = notification.object as? CheevosCompletion {//解锁完成- self.showRetroAchievements(title: R.string.localizable.achievementsCompleted());+ var message: String = ""+ if let user = AchievementsUser.getUser() {+ message = user.username + " | "+ }+ message = R.string.localizable.gameSortPlayTime() + Date.timeDuration(milliseconds: Int(self.manicGame.totalPlayDuration))+ self.showRetroAchievements(title: self.isHardcoreMode ? R.string.localizable.achievementsMastered(self.manicGame.aliasName ?? self.manicGame.name) : R.string.localizable.achievementsCompleted(),+ message: message);CheersView.makeNormalCheers()UIDevice.generateAchievementHaptic()@@ -443,17 +494,21 @@ class PlayViewController: GameViewController {if let title = leaderboard.title, let description = leaderboard._description {self.showRetroAchievements(title: R.string.localizable.leaderboardStart() + title, message: description, hideIcon: true);}-- } else if let cheevosProgress = notification.object as? CheevosProgress {- //排行榜追踪- if let progressView = self.progressView {- if cheevosProgress.show {- progressView.updateProgress(cheevosProgress)- } else {- progressView.removeProgress(id: cheevosProgress._id)- }+ if let coverUrl = manicGame.onlineCoverUrl, manicGame.gameCover == nil {+ leaderboard.badgeUrl = coverUrl+ } else if let data = manicGame.gameCover?.storedData() {+ leaderboard.image = UIImage.tryDataImageOrPlaceholder(tryData: data, preferenceSize: .init(40))}- } else if let message = notification.object as? String {+ self.leaderboards.append(leaderboard)++ } else if let cheevosChallenge = notification.object as? CheevosChallenge {+ //挑战提示+ self.showRetroAchievements(badgeUrl: cheevosChallenge.unlockedBadgeUrl,+ title: R.string.localizable.achievementsChallenge(),+ message: cheevosChallenge._description,+ hideIcon: true)++ } else if let message = notification.object as? String {UIView.makeToast(message: message)}})@@ -473,6 +528,12 @@ class PlayViewController: GameViewController {LibretroCore.sharedInstance().turnOffHardcode()})+ //关闭进度常驻+ turnOffAlwaysShowProgressNotification = NotificationCenter.default.addObserver(forName: Constants.NotificationName.TurnOffAlwaysShowProgress, object: nil, queue: .main, using: { [weak self] notification in+ guard let self else { return }+ self.hideAchievementProgressIfNeed()+ })+//更新最新游戏时间updateLatestPlayDate()@@ -2001,8 +2062,8 @@ extension PlayViewController {"cheevos_token": user.token,"cheevos_username": user.username])if enableAchievements {- updateLeaderboard()- updateProgress()+ setupLeaderboardView()+ setupAchievementProgressView()}} else {LibretroCore.sharedInstance().updateLibretroConfig("cheevos_enable", value: "false")@@ -2616,7 +2677,7 @@ extension PlayViewController {}let label = UILabel()- label.numberOfLines = 2+ label.numberOfLines = 0let matt = NSMutableAttributedString(string: title, attributes: [.font: Constants.Font.title(size: .s, weight: .regular), .foregroundColor: UIColor.white])if let message {matt.append(NSAttributedString(string: "\n\(message)", attributes: [.font: Constants.Font.body(size: .s), .foregroundColor: Constants.Color.LabelSecondary]))@@ -2662,30 +2723,47 @@ extension PlayViewController {}}- private func updateLeaderboard() {+ private func setupLeaderboardView() {if leaderboardView == nil {let leaderboardView = LeaderboardView()view.addSubview(leaderboardView)leaderboardView.snp.makeConstraints { make in- make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceHuge)- make.top.equalTo(view.safeAreaLayoutGuide.snp.top)- make.height.equalTo(32)+ make.leading.top.equalTo(self.gameView).inset(5)+ make.height.equalTo(24)}leaderboardView.isHidden = true+ leaderboardView.addTapGesture { [weak self] gesture in+ guard let self else { return }+ self.pauseEmulation()+ CheevosPopupView.show(leaderboards: leaderboards.reversed(),+ gameViewRect: self.gameView.frame,+ menuInsets: getMenuInset()) { [weak self] in+ self?.resumeEmulationAndHandleAudio()+ }+ }self.leaderboardView = leaderboardView}}- private func updateProgress() {- if progressView == nil {+ private func setupAchievementProgressView() {+ if cheevosProgressView == nil {let progressView = CheevosProgressView()view.addSubview(progressView)progressView.snp.makeConstraints { make in- make.leading.trailing.bottom.equalTo(self.gameView)+ make.trailing.bottom.equalTo(self.gameView).inset(5)make.height.equalTo(32)}progressView.isHidden = true- self.progressView = progressView+ progressView.addTapGesture { [weak self] gesture in+ guard let self else { return }+ self.pauseEmulation()+ CheevosPopupView.show(achievements: progressAchievements.reversed(),+ gameViewRect: self.gameView.frame,+ menuInsets: getMenuInset()) { [weak self] in+ self?.resumeEmulationAndHandleAudio()+ }+ }+ self.cheevosProgressView = progressView}}@@ -2706,6 +2784,14 @@ extension PlayViewController {}return menuInsets}++ private func hideAchievementProgressIfNeed() {+ if let cheevosProgressView, !cheevosProgressView.isHidden, !(self.manicGame.getExtraBool(key: ExtraKey.alwaysShowProgress.rawValue) ?? false) {+ UIView.springAnimate { [weak self] in+ self?.cheevosProgressView?.isHidden = true+ }+ }+ }}//MARK: GameViewControllerDelegate代理@@ -2723,7 +2809,7 @@ extension PlayViewController: GameViewControllerDelegate {if SheetProvider.find(identifier: Constants.Strings.PlayPurchaseAlertIdentifier).count > 0 {return false}- return (GameSettingView.isShow || GameInfoView.isShow || CheatCodeListView.isShow || SkinSettingsView.isShow || FilterSelectionView.isShow || ControllersSettingView.isShow || GameSettingView.isEditingShow || WebViewController.isShow || FlexSkinSettingViewController.isShow || RetroAchievementsListViewController.isShow) ? false : true+ return (GameSettingView.isShow || GameInfoView.isShow || CheatCodeListView.isShow || SkinSettingsView.isShow || FilterSelectionView.isShow || ControllersSettingView.isShow || GameSettingView.isEditingShow || WebViewController.isShow || FlexSkinSettingViewController.isShow || RetroAchievementsListViewController.isShow || CheevosPopupView.isShow) ? false : true}}diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swiftnew file mode 100644index 00000000..35ab1e09--- /dev/null+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosPopupView.swift@@ -0,0 +1,365 @@+//+// CheevosPopupView.swift+// ManicEmu+//+// Created by Daiuno on 2025/9/10.+// Copyright © 2025 Manic EMU. All rights reserved.+//++import ProHUD+import Kingfisher++class CheevosPopupAchievementCell: UICollectionViewCell {+ private let containerView: RoundAndBorderView = {+ let view = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: Constants.Color.Border, borderWidth: 1)+ view.backgroundColor = Constants.Color.BackgroundPrimary+ return view+ }()++ private let imageView: UIImageView = {+ let view = UIImageView()+ view.contentMode = .scaleAspectFill+ view.layerCornerRadius = 4+ return view+ }()++ private let titleLabel: UILabel = {+ let view = UILabel()+ view.numberOfLines = 2+ return view+ }()++ private let progressView = RetroAchievementsListCell.AchievementsProgressView()++ private let progressLabel: UILabel = {+ let view = UILabel()+ view.font = Constants.Font.caption(size: .m)+ view.textColor = Constants.Color.Yellow+ return view+ }()++ override init(frame: CGRect) {+ super.init(frame: frame)+ addSubview(containerView)+ containerView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }++ containerView.addSubview(imageView)+ imageView.snp.makeConstraints { make in+ make.size.equalTo(50)+ make.centerY.equalToSuperview()+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMid)+ }++ containerView.addSubview(titleLabel)+ titleLabel.snp.makeConstraints { make in+ make.top.equalTo(imageView)+ make.leading.equalTo(imageView.snp.trailing).offset(Constants.Size.ContentSpaceTiny)+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)+ }++ containerView.addSubview(progressView)+ progressView.snp.makeConstraints { make in+ make.leading.equalTo(titleLabel)+ make.height.equalTo(2)+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceTiny)+ }+++ addSubview(progressLabel)+ progressLabel.snp.makeConstraints { make in+ make.leading.equalTo(progressView.snp.trailing).offset(Constants.Size.ContentSpaceMin)+ make.centerY.equalTo(progressView)+ make.trailing.equalTo(titleLabel)+ }++ }++ required init?(coder: NSCoder) {+ fatalError("init(coder:) has not been implemented")+ }++ func setData(achievement: CheevosAchievement) {+ imageView.kf.setImage(with: URL(string: achievement.unlockedBadgeUrl), placeholder: UIImage.placeHolder(preferenceSize: .init(40)))++ let matt = NSMutableAttributedString(string: achievement.title ?? "", attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: Constants.Color.LabelPrimary])+ matt.append(NSAttributedString(string: "\n\(achievement._description ?? "")", attributes: [.font: Constants.Font.body(size: .s), .foregroundColor: Constants.Color.LabelSecondary]))+ let style = NSMutableParagraphStyle()+ style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2+ style.alignment = .left+ titleLabel.attributedText = matt.applying(attributes: [.paragraphStyle: style])++ progressView.progress = achievement.measuredPercent++ progressLabel.text = achievement.measuredProgress+ }+}++class CheevosPopupLeaderboardCell: UICollectionViewCell {+ private let containerView: RoundAndBorderView = {+ let view = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid, borderColor: Constants.Color.Border, borderWidth: 1)+ view.backgroundColor = Constants.Color.BackgroundPrimary+ return view+ }()++ private let imageView: UIImageView = {+ let view = UIImageView()+ view.contentMode = .scaleAspectFill+ view.layerCornerRadius = 4+ return view+ }()++ private let titleLabel: UILabel = {+ let view = UILabel()+ view.numberOfLines = 2+ return view+ }()++ override init(frame: CGRect) {+ super.init(frame: frame)+ addSubview(containerView)+ containerView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }++ containerView.addSubview(imageView)+ imageView.snp.makeConstraints { make in+ make.size.equalTo(40)+ make.centerY.equalToSuperview()+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMid)+ }++ containerView.addSubview(titleLabel)+ titleLabel.snp.makeConstraints { make in+ make.centerY.equalToSuperview()+ make.leading.equalTo(imageView.snp.trailing).offset(Constants.Size.ContentSpaceTiny)+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)+ }+ }++ required init?(coder: NSCoder) {+ fatalError("init(coder:) has not been implemented")+ }++ func setData(leaderboard: CheevosLeaderboard) {+ if let badgeUrl = leaderboard.badgeUrl {+ imageView.kf.setImage(with: URL(string: badgeUrl), placeholder: UIImage.placeHolder(preferenceSize: .init(40)))+ } else {+ imageView.image = leaderboard.image+ }++ let matt = NSMutableAttributedString(string: leaderboard.title ?? "", attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: UIColor.white])+ matt.append(NSAttributedString(string: "\n\(leaderboard._description ?? "")", attributes: [.font: Constants.Font.body(size: .s), .foregroundColor: Constants.Color.LabelSecondary]))+ let style = NSMutableParagraphStyle()+ style.lineSpacing = Constants.Size.ContentSpaceUltraTiny/2+ style.alignment = .left+ titleLabel.attributedText = matt.applying(attributes: [.paragraphStyle: style])+ }+}++class CheevosPopupView: UIView {+ /// 充当导航条+ private var navigationBlurView: UIView = {+ let view = UIView()+ view.makeBlur()+ return view+ }()++ private lazy var closeButton: SymbolButton = {+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))+ view.enableRoundCorner = true+ view.addTapGesture { [weak self] gesture in+ guard let self = self else { return }+ self.didTapClose?()+ }+ return view+ }()++ private lazy var collectionView: UICollectionView = {+ let view = UICollectionView(frame: .zero, collectionViewLayout: createLayout())+ view.backgroundColor = .clear+ view.contentInsetAdjustmentBehavior = .never+ view.register(cellWithClass: CheevosPopupLeaderboardCell.self)+ view.register(cellWithClass: CheevosPopupAchievementCell.self)+ view.showsVerticalScrollIndicator = false+ view.dataSource = self+ view.delegate = self+ view.allowsSelection = true+ view.allowsMultipleSelection = false+ view.contentInset = UIEdgeInsets(top: Constants.Size.ItemHeightMid + Constants.Size.ContentSpaceMax, left: 0, bottom: Constants.Size.ContentInsetBottom, right: 0)+ return view+ }()++ private var leaderBoards: [CheevosLeaderboard] = []++ private var achievements: [CheevosAchievement] = []++ private let isLeaderBoard: Bool++ ///点击关闭按钮回调+ var didTapClose: (()->Void)? = nil++ deinit {+ Log.debug("\(String(describing: Self.self)) deinit")+ }++ init(leaderBoards: [CheevosLeaderboard]? = nil, achievements: [CheevosAchievement]? = nil) {+ self.isLeaderBoard = leaderBoards != nil+ super.init(frame: .zero)+ Log.debug("\(String(describing: Self.self)) init")++ if let _ = leaderBoards, let _ = achievements {+ return+ }++ if isLeaderBoard {+ self.leaderBoards = leaderBoards ?? []+ } else {+ self.achievements = achievements ?? []+ }++ addSubview(collectionView)+ collectionView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }++ addSubview(navigationBlurView)+ navigationBlurView.snp.makeConstraints { make in+ make.leading.top.trailing.equalToSuperview()+ make.height.equalTo(Constants.Size.ItemHeightMid)+ }++ let headerLabel = UILabel()+ headerLabel.font = Constants.Font.title(size: .s, weight: .bold)+ headerLabel.textColor = Constants.Color.LabelPrimary+ headerLabel.text = isLeaderBoard ? R.string.localizable.leaderboard() : R.string.localizable.progress()+ navigationBlurView.addSubview(headerLabel)+ headerLabel.snp.makeConstraints { make in+ make.centerY.equalToSuperview()+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)+ }++ navigationBlurView.addSubview(closeButton)+ closeButton.snp.makeConstraints { make in+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)+ make.centerY.equalToSuperview()+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)+ }+ }++ required init?(coder: NSCoder) {+ fatalError("init(coder:) has not been implemented")+ }++ private func createLayout() -> UICollectionViewLayout {+ let layout = UICollectionViewCompositionalLayout { [weak self] sectionIndex, env in+ guard let self else { return nil }++ let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .fractionalHeight(1)))+ let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .absolute(self.isLeaderBoard ? 64 : Constants.Size.ItemHeightHuge)), subitem: item, count: Int(1))+++ group.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: Constants.Size.ContentSpaceMid, bottom: 0, trailing: Constants.Size.ContentSpaceMid)+ group.interItemSpacing = NSCollectionLayoutSpacing.fixed(Constants.Size.ContentSpaceMid)++ let section = NSCollectionLayoutSection(group: group)+ section.interGroupSpacing = Constants.Size.ContentSpaceMid++ section.contentInsets = NSDirectionalEdgeInsets(top: Constants.Size.ContentSpaceMid, leading: Constants.Size.ContentSpaceMid, bottom: Constants.Size.ContentSpaceMid, trailing: Constants.Size.ContentSpaceMid)++ return section+ }+ return layout+ }+}++extension CheevosPopupView: UICollectionViewDataSource {+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {+ isLeaderBoard ? leaderBoards.count : achievements.count+ }++ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {+ if isLeaderBoard {+ let cell = collectionView.dequeueReusableCell(withClass: CheevosPopupLeaderboardCell.self, for: indexPath)+ cell.setData(leaderboard: leaderBoards[indexPath.row])+ return cell+ } else {+ let cell = collectionView.dequeueReusableCell(withClass: CheevosPopupAchievementCell.self, for: indexPath)+ cell.setData(achievement: achievements[indexPath.row])+ return cell+ }+ }+}++extension CheevosPopupView: UICollectionViewDelegate {++}++extension CheevosPopupView {+ static var isShow: Bool {+ Sheet.find(identifier: String(describing: CheevosPopupView.self)).count > 0 ? true : false+ }++ static func show(leaderboards: [CheevosLeaderboard]? = nil,+ achievements: [CheevosAchievement]? = nil,+ gameViewRect: CGRect,+ menuInsets: UIEdgeInsets?,+ hideCompletion: (()->Void)? = nil) {+ Sheet.lazyPush(identifier: String(describing: CheevosPopupView.self)) { sheet in+ sheet.configGamePlayingStyle(isForGameMenu: true, gameViewRect: gameViewRect, menuInsets: menuInsets, hideCompletion: hideCompletion)++ let view = UIView()++ let grabber = UIImageView(image: R.image.grabber_icon())+ grabber.isUserInteractionEnabled = true+ grabber.contentMode = .center+ view.addSubview(grabber)+ let grabberHeight = Constants.Size.ContentSpaceTiny*3+ grabber.snp.makeConstraints { make in+ make.leading.top.trailing.equalToSuperview()+ make.height.equalTo(grabberHeight)+ }++ let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])+ containerView.makeBlur()+ view.addSubview(containerView)+ containerView.snp.makeConstraints { make in+ make.top.equalTo(grabber.snp.bottom)+ make.leading.bottom.trailing.equalToSuperview()+ if let maxHeight = sheet.config.cardMaxHeight {+ make.height.equalTo(maxHeight - grabberHeight)+ }+ }+ view.addPanGesture { [weak view, weak sheet] gesture in+ guard let view = view, let sheet = sheet else { return }+ let point = gesture.translation(in: gesture.view)+ view.transform = .init(translationX: 0, y: point.y <= 0 ? 0 : point.y)+ if gesture.state == .recognized {+ let v = gesture.velocity(in: gesture.view)+ if (view.y > view.height*2/3 && v.y > 0) || v.y > 1200 {+ // 达到移除的速度+ sheet.pop()+ }+ UIView.animate(withDuration: 0.8, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.5, options: [.allowUserInteraction, .curveEaseOut], animations: {+ view.transform = .identity+ })+ }+ }++ let listView = CheevosPopupView(leaderBoards: leaderboards, achievements: achievements)+ listView.didTapClose = { [weak sheet] in+ sheet?.pop()+ hideCompletion?()+ }+ containerView.addSubview(listView)+ listView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }++ sheet.set(customView: view).snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }+ }+ }+}diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swiftindex 0269f8c8..a4490cd5 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/CheevosProgressView.swift@@ -9,180 +9,109 @@import UIKit-class CheevosProgressDetailView: UIView {- let coverImageView: UIImageView = {- let view = UIImageView()- view.contentMode = .scaleAspectFill- view.layerCornerRadius = 4- return view- }()+class CheevosProgressView: RoundAndBorderView {- let titleLabel: UILabel = {- let view = UILabel()- view.font = Constants.Font.caption(size: .l)- view.textColor = Constants.Color.LabelPrimary- return view- }()+ private var progressViewDict: [Int: (imageView: UIImageView, measuredString: String?)] = [:]+ private let containerView = UIView()- private let progressLabel: UILabel = {+ private let titleLabel: UILabel = {let view = UILabel()- view.font = Constants.Font.caption(size: .s)- view.textColor = Constants.Color.Yellow- return view- }()-- let progressView: RetroAchievementsListCell.AchievementsProgressView = {- let view = RetroAchievementsListCell.AchievementsProgressView()+ view.font = UIFont.monospacedSystemFont(ofSize: 12, weight: .regular)+ view.textColor = .white+ view.minimumScaleFactor = 0.5return view}()- override init(frame: CGRect) {- super.init(frame: frame)-- alpha = 0.75+ init() {+ super.init(roundCorner: .allCorners, radius: 16, borderColor: Constants.Color.Border, borderWidth: 1)+ makeBlur(blurRadius: 2.5, blurColor: .white, blurAlpha: 0.4)- addSubview(coverImageView)- coverImageView.snp.makeConstraints { make in- make.width.equalTo(28)- make.top.bottom.leading.equalToSuperview().inset(2)- }+ enableInteractive = true- addSubview(titleLabel)- titleLabel.setContentHuggingPriority(.required, for: .horizontal)- titleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)- titleLabel.snp.makeConstraints { make in- make.leading.equalTo(coverImageView.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)- make.top.equalToSuperview().offset(Constants.Size.ContentSpaceUltraTiny)- make.trailing.lessThanOrEqualToSuperview()+ addSubview(containerView)+ containerView.snp.makeConstraints { make in+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMin)+ make.top.bottom.equalToSuperview()}- addSubview(progressView)- progressView.snp.makeConstraints { make in- make.leading.equalTo(coverImageView.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)- make.height.equalTo(2)- make.bottom.equalToSuperview().offset(-Constants.Size.ContentSpaceTiny)+ let icon = UIImageView(image: .symbolImage(.playFill).applySymbolConfig(font: UIFont.systemFont(ofSize: 10, weight: .bold)))+ icon.contentMode = .scaleAspectFit+ addSubview(icon)+ icon.snp.makeConstraints { make in+ make.size.equalTo(12)+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMin)+ make.centerY.equalToSuperview()}- addSubview(progressLabel)- progressLabel.snp.makeConstraints { make in- make.leading.equalTo(progressView.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)- make.centerY.equalTo(progressView)- make.trailing.equalToSuperview()- }-- // 给最小宽度避免系统加 width == 0 的临时约束- self.snp.makeConstraints { make in- make.width.greaterThanOrEqualTo(60)+ addSubview(titleLabel)+ titleLabel.snp.makeConstraints { make in+ make.centerY.equalToSuperview()+ make.leading.equalTo(containerView.snp.trailing).offset(4)+ make.trailing.equalTo(icon.snp.leading).offset(-5)}}- func updateProgress(_ progress: CheevosProgress) {- coverImageView.kf.setImage(- with: URL(string: progress.unlockedBadgeUrl),- placeholder: UIImage.placeHolder(preferenceSize: .init(32))- )- titleLabel.text = (progress.title ?? "") + " (\(progress.points) points)"- progressView.progress = progress.measuredPercent- progressLabel.text = progress.measuredProgress ?? ""- }-- required init?(coder: NSCoder) {+ @MainActor required init?(coder: NSCoder) {fatalError("init(coder:) has not been implemented")}-}--// MARK: - Scroll Container-// MARK: - 容器-class CheevosProgressView: UIView {-- private let stackView = UIStackView()- private var progressViewDict: [Int: CheevosProgressDetailView] = [:]-- override init(frame: CGRect) {- super.init(frame: frame)- setupUI()- }- required init?(coder: NSCoder) {- super.init(coder: coder)- setupUI()- }-- private func setupUI() {- backgroundColor = Constants.Color.BackgroundPrimary.withAlphaComponent(0.4)+ func updateProgress(_ progress: CheevosAchievement) {+ if isHidden { isHidden = false }- stackView.axis = .horizontal- stackView.alignment = .fill- stackView.distribution = .fillEqually // 平分宽度- stackView.spacing = Constants.Size.ContentSpaceMin- addSubview(stackView)+ titleLabel.text = progress.measuredProgress- stackView.snp.makeConstraints { make in- make.edges.equalToSuperview()+ if let info = progressViewDict[progress._id] {+ updateLayout(view: info.imageView, remakeConstraints: false)+ } else {+ let view = UIImageView()+ view.layerCornerRadius = 4+ view.contentMode = .scaleAspectFill+ view.kf.setImage(with: URL(string: progress.unlockedBadgeUrl), placeholder: UIImage.placeHolder(preferenceSize: .init(32)))+ containerView.addSubview(view)+ updateLayout(view: view)+ progressViewDict[progress._id] = (view, progress.measuredProgress)}}- // MARK: - Public API-- func updateProgress(_ progress: CheevosProgress) {- if isHidden { isHidden = false }-- if let view = progressViewDict[progress._id] {- view.updateProgress(progress)+ private func updateLayout(view: UIImageView?, remakeConstraints: Bool = true, updateMeasuredString: Bool = false) {+ let hightLightView: UIImageView?+ if let view {+ hightLightView = view} else {- let view = CheevosProgressDetailView()- view.updateProgress(progress)- configureCompressionResistance(for: view)- stackView.addArrangedSubview(view)- progressViewDict[progress._id] = view+ let element = progressViewDict.randomElement()+ hightLightView = element?.value.imageView+ if updateMeasuredString {+ titleLabel.text = element?.value.measuredString+ }+ }+++ for (index, subView) in containerView.subviews.enumerated() {+ subView.alpha = (subView == hightLightView ? 1 : 0.5)+ subView.snp.remakeConstraints { make in+ make.top.bottom.equalToSuperview().inset(4)+ make.size.equalTo(24)+ if index == 0 {+ make.leading.equalToSuperview()+ } else {+ make.leading.equalTo(containerView.subviews[index-1].snp.trailing).offset(4)+ }+ if index == containerView.subviews.count - 1 {+ make.trailing.equalToSuperview()+ }+ }}- updateLayoutForSingleView()}func removeProgress(id: Int) {- if let view = progressViewDict[id] {- stackView.removeArrangedSubview(view)- view.removeFromSuperview()+ if let info = progressViewDict[id] {+ info.imageView.removeFromSuperview()progressViewDict.removeValue(forKey: id)+ updateLayout(view: nil, updateMeasuredString: info.imageView.alpha == 1 ? true : false)}if progressViewDict.isEmpty {isHidden = true}- updateLayoutForSingleView()}- // MARK: - Layout-- private func updateLayoutForSingleView() {- if stackView.arrangedSubviews.count == 1 {- stackView.distribution = .fill- stackView.alignment = .center- stackView.snp.remakeConstraints { make in- make.top.bottom.equalToSuperview()- make.centerX.equalToSuperview()- make.width.equalTo(285)- }- } else {- stackView.distribution = .fillEqually- stackView.alignment = .fill- stackView.snp.makeConstraints { make in- make.edges.equalToSuperview()- }- }- }-- private func configureCompressionResistance(for view: CheevosProgressDetailView) {- // coverImageView 保证最优先显示- view.coverImageView.setContentCompressionResistancePriority(.required, for: .horizontal)- view.coverImageView.setContentHuggingPriority(.required, for: .horizontal)-- // titleLabel 允许压缩,字体可缩小- view.titleLabel.adjustsFontSizeToFitWidth = true- view.titleLabel.minimumScaleFactor = 0.6- view.titleLabel.lineBreakMode = .byTruncatingTail- view.titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)-- // progressView 次要,可以被压缩- view.progressView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)- }}diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swiftindex d381ad26..1c0b070e 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/LeaderboardView.swift@@ -9,120 +9,133 @@import UIKit-class LeaderboardView: UIScrollView {+class LeaderboardDetailView: UIView {+ private let titleLabel: UILabel = {+ let view = UILabel()+ view.font = UIFont.monospacedSystemFont(ofSize: 12, weight: .regular)+ view.textColor = .white+ view.minimumScaleFactor = 0.5+ return view+ }()- private let stackView = UIStackView()- private var labelDict: [Int: UILabel] = [:]-- private var stackLeadingConstraint: Constraint?- private var stackTrailingConstraint: Constraint?- private var stackCenterXConstraint: Constraint?+ let seperator: UIView = {+ let view = UIView()+ view.backgroundColor = Constants.Color.Border+ return view+ }()override init(frame: CGRect) {super.init(frame: frame)- setupUI()++ let icon = UIImageView(image: R.image.customFlagPatternCheckered()?.applySymbolConfig(font: Constants.Font.caption(size: .s, weight: .bold)))+ addSubview(icon)+ icon.snp.makeConstraints { make in+ make.size.equalTo(12)+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceTiny)+ make.centerY.equalToSuperview()+ }++ addSubview(titleLabel)+ titleLabel.snp.makeConstraints { make in+ make.leading.equalToSuperview().offset(22)+ make.centerY.equalToSuperview()+ make.trailing.equalToSuperview().offset(-9)+ }++ addSubview(seperator)+ seperator.snp.makeConstraints { make in+ make.trailing.equalToSuperview()+ make.size.equalTo(CGSize(width: 1, height: 12))+ make.centerY.equalToSuperview()+ }++ }++ func updateTitle(string: String?) {+ titleLabel.text = string}required init?(coder: NSCoder) {- super.init(coder: coder)- setupUI()+ fatalError("init(coder:) has not been implemented")}+}++class LeaderboardView: RoundAndBorderView {+ private var itemsDict: [Int: LeaderboardDetailView] = [:]+ private let containerView = UIView()- private func setupUI() {- showsHorizontalScrollIndicator = false- showsVerticalScrollIndicator = false- alwaysBounceVertical = false- alwaysBounceHorizontal = false- bounces = false- isScrollEnabled = true+ init() {+ super.init(roundCorner: .allCorners, radius: 12, borderColor: Constants.Color.Border, borderWidth: 1)+ makeBlur(blurRadius: 2.5, blurColor: .white, blurAlpha: 0.4)- backgroundColor = Constants.Color.BackgroundPrimary.withAlphaComponent(0.4)- layerCornerRadius = Constants.Size.CornerRadiusMid+ enableInteractive = true- stackView.axis = .horizontal- stackView.alignment = .center- stackView.spacing = Constants.Size.ContentSpaceMin- addSubview(stackView)+ addSubview(containerView)+ containerView.snp.makeConstraints { make in+ make.leading.top.bottom.equalToSuperview()+ make.trailing.equalToSuperview().offset(-15)+ }- stackView.snp.makeConstraints { make in- make.top.bottom.equalToSuperview()- make.height.equalToSuperview() // 固定高度- stackLeadingConstraint = make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax).constraint- stackTrailingConstraint = make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax).constraint+ let icon = UIImageView(image: .symbolImage(.playFill).applySymbolConfig(font: UIFont.systemFont(ofSize: 8, weight: .bold)))+ icon.contentMode = .scaleAspectFit+ addSubview(icon)+ icon.snp.makeConstraints { make in+ make.size.equalTo(10)+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceTiny)+ make.centerY.equalToSuperview()}}- // MARK: - Public API+ @MainActor required init?(coder: NSCoder) {+ fatalError("init(coder:) has not been implemented")+ }func updateLeaderboard(id: Int, content: String) {if self.isHidden {self.isHidden = false}- let matt = NSMutableAttributedString(string: "\(R.string.localizable.leaderboard())-\(id)", attributes: [.font: Constants.Font.caption(size: .s), .foregroundColor: Constants.Color.LabelSecondary])- matt.append(NSAttributedString(string: "\n\(content)", attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelPrimary]))- if let label = labelDict[id] {- label.attributedText = matt+ if let item = itemsDict[id] {+ item.updateTitle(string: content)} else {- let label = UILabel()- label.numberOfLines = 2- label.attributedText = matt- label.setContentHuggingPriority(.required, for: .horizontal)- label.setContentCompressionResistancePriority(.required, for: .horizontal)-- stackView.addArrangedSubview(label)- labelDict[id] = label- }- setNeedsLayout()- layoutIfNeeded()- updateLayout()- }-- func removeLeaderboard(id: Int) {- if let label = labelDict[id] {- stackView.removeArrangedSubview(label)- label.removeFromSuperview()- labelDict.removeValue(forKey: id)- }- if labelDict.isEmpty {- self.isHidden = true+ let item = LeaderboardDetailView()+ item.updateTitle(string: content)+ containerView.addSubview(item)+ updateLayout()+ itemsDict[id] = item}- setNeedsLayout()- layoutIfNeeded()- updateLayout()}- // MARK: - Layout Update-private func updateLayout() {- // 计算 stackView 的总宽度- let totalWidth = stackView.arrangedSubviews.reduce(0) { $0 + $1.intrinsicContentSize.width } + CGFloat(max(0, stackView.arrangedSubviews.count - 1)) * stackView.spacing- let scrollWidth = bounds.width - Constants.Size.ContentSpaceMax*2-- if totalWidth <= scrollWidth {- // 居中显示,不可滚动- isScrollEnabled = false- stackLeadingConstraint?.deactivate()- stackTrailingConstraint?.deactivate()-- if stackCenterXConstraint == nil {- stackView.snp.makeConstraints { make in- stackCenterXConstraint = make.centerX.equalToSuperview().constraint+ for (index, subView) in containerView.subviews.enumerated() {+ if let view = subView as? LeaderboardDetailView {+ if index == containerView.subviews.count - 1 {+ view.seperator.isHidden = true+ } else {+ view.seperator.isHidden = false+ }+ }+ subView.snp.remakeConstraints { make in+ make.top.bottom.equalToSuperview()+ if index == 0 {+ make.leading.equalToSuperview()+ } else {+ make.leading.equalTo(containerView.subviews[index-1].snp.trailing)+ }+ if index == containerView.subviews.count - 1 {+ make.trailing.equalToSuperview()}}- stackCenterXConstraint?.activate()-- } else {- // 左对齐,可滚动- isScrollEnabled = true- stackCenterXConstraint?.deactivate()-- stackLeadingConstraint?.activate()- stackTrailingConstraint?.activate()}}- override func layoutSubviews() {- super.layoutSubviews()- updateLayout()+ func removeLeaderboard(id: Int) {+ if let item = itemsDict[id] {+ item.removeFromSuperview()+ itemsDict.removeValue(forKey: id)+ updateLayout()+ }+ if itemsDict.isEmpty {+ self.isHidden = true+ }}}diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swiftindex 5eccf4a7..0c467f92 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/ViewControllers/RetroAchievementsDetailViewController.swift@@ -8,19 +8,40 @@// SPDX-License-Identifier: AGPL-3.0-or-laterclass RetroAchievementsDetailViewController: BaseViewController {++ private let containerView = UIView()+init(achievement: CheevosAchievement) {super.init(fullScreen: true)view.backgroundColor = .clear- view.makeBlur()++ view.addSubview(containerView)+ containerView.makeBlur()+ containerView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }let detailView = RetroAchievementsDetailView(achievement: achievement) { [weak self] inself?.dismiss(animated: true)}- view.addSubview(detailView)+ containerView.addSubview(detailView)detailView.snp.makeConstraints { make inmake.center.equalToSuperview()make.leading.trailing.equalToSuperview().inset(40)}++ let shareButton = SymbolButton(image: UIImage(symbol: .squareAndArrowUp, font: Constants.Font.body(weight: .bold)))+ shareButton.enableRoundCorner = true+ shareButton.addTapGesture { [weak self] gesture in+ guard let self else { return }+ ShareManager.shareImage(image: self.containerView.asImage())+ }+ view.addSubview(shareButton)+ shareButton.snp.makeConstraints { make in+ make.size.equalTo(Constants.Size.IconSizeMid)+ make.top.equalTo(view.safeAreaLayoutGuide.snp.top).offset(Constants.Size.ContentSpaceMin)+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)+ }}@MainActor required init?(coder: NSCoder) {diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementListView.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementListView.swiftindex b95ab966..06d5e832 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementListView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementListView.swift@@ -97,7 +97,7 @@ class RetroAchievementListView: BaseView {let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1),heightDimension: .fractionalHeight(1)))//group布局- let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .absolute(978)), subitems: [item])+ let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .absolute(1058)), subitems: [item])group.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)//section布局let section = NSCollectionLayoutSection(group: group)@@ -180,6 +180,14 @@ extension RetroAchievementListView: UICollectionViewDataSource {}}}+ cell.alwaysShowProgressButton.onChange { [weak self] value in+ guard let self else { return }+ self.game.updateExtra(key: ExtraKey.alwaysShowProgress.rawValue, value: value)+ if !value {+ //关闭了进度常驻 则需要发送通知+ NotificationCenter.default.post(name: Constants.NotificationName.TurnOffAlwaysShowProgress, object: nil)+ }+ }return cell}}diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swiftindex f8cd54a2..3acaa355 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift@@ -10,6 +10,7 @@class RetroAchievementsDetailView: BaseView {init(achievement: CheevosAchievement, didTapClose: @escaping (()->Void)) {super.init(frame: .zero)+let coverImageView = UIImageView()coverImageView.contentMode = .scaleAspectFilladdSubview(coverImageView)diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swiftindex e6cc26a2..a32b928c 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift@@ -122,6 +122,8 @@ class RetroAchievementsListCell: UICollectionViewCell {private var isHardcoreList = true+ var didTapAchievement: ((CheevosAchievement)->Void)? = nil+private lazy var segmentView: BetterSegmentedControl = {let titles = [R.string.localizable.hardcore(), R.string.localizable.softcore()]let segments = LabelSegment.segments(withTitles: titles,@@ -233,7 +235,7 @@ class RetroAchievementsListCell: UICollectionViewCell {}func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {- topViewController()?.present(RetroAchievementsDetailViewController(achievement: datas[indexPath.row]), animated: true)+ didTapAchievement?(datas[indexPath.row])}}@@ -333,6 +335,15 @@ class RetroAchievementsListCell: UICollectionViewCell {return view}()+ let alwaysShowProgressButton: TKSimpleSwitch = {+ let view = TKSimpleSwitch()+ view.onColor = Constants.Color.Main+ view.offColor = Constants.Color.BackgroundTertiary+ view.lineColor = .clear+ view.lineSize = 0+ return view+ }()+private let achievementsCountLabel: UILabel = {let view = UILabel()view.numberOfLines = 0@@ -345,8 +356,19 @@ class RetroAchievementsListCell: UICollectionViewCell {return view}()- private let listView: AchievementsListView = {+ private lazy var listView: AchievementsListView = {let view = AchievementsListView()+ view.didTapAchievement = { [weak self] achievement in+ guard let self else { return }+ //尝试读取缓存中的解锁进度+ if achievement.measuredProgress == nil,+ let game = self.game,+ let achievementProgress = game.getAchievementProgress(id: achievement._id) {+ achievement.measuredPercent = achievementProgress.measuredPercent+ achievement.measuredProgress = achievementProgress.measuredProgress+ }+ topViewController()?.present(RetroAchievementsDetailViewController(achievement: achievement), animated: true)+ }return view}()@@ -366,6 +388,8 @@ class RetroAchievementsListCell: UICollectionViewCell {private var username: String? = nil+ private weak var game: Game? = nil+override init(frame: CGRect) {super.init(frame: frame)@@ -506,6 +530,46 @@ class RetroAchievementsListCell: UICollectionViewCell {make.size.equalTo(CGSize(width: 46, height: 28))}+ let alwaysShowProgressContainer = UIView()+ alwaysShowProgressContainer.layerCornerRadius = Constants.Size.CornerRadiusMax+ alwaysShowProgressContainer.backgroundColor = Constants.Color.BackgroundSecondary+ 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))+ alwaysShowProgressIcon.contentMode = .center+ alwaysShowProgressContainer.addSubview(alwaysShowProgressIcon)+ alwaysShowProgressIcon.snp.makeConstraints { make in+ make.size.equalTo(24)+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMid)+ make.centerY.equalToSuperview()+ }+ 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])+ 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+ view.attributedText = matt.applying(attributes: [.paragraphStyle: style])+ return view+ }()+ alwaysShowProgressContainer.addSubview(alwaysShowProgressLabel)+ alwaysShowProgressLabel.snp.makeConstraints { make in+ make.centerY.equalTo(alwaysShowProgressIcon)+ make.leading.equalTo(alwaysShowProgressIcon.snp.trailing).offset(Constants.Size.ContentSpaceTiny)+ }+ alwaysShowProgressContainer.addSubview(alwaysShowProgressButton)+ alwaysShowProgressButton.snp.makeConstraints { make in+ 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))+ }+let achievementInfoContainer = UIView()achievementInfoContainer.layerCornerRadius = Constants.Size.CornerRadiusMax@@ -514,7 +578,7 @@ class RetroAchievementsListCell: UICollectionViewCell {achievementInfoContainer.snp.makeConstraints { make inmake.height.equalTo(Constants.Size.ItemHeightMax*2)make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)- make.top.equalTo(hardcoreContainer.snp.bottom).offset(Constants.Size.ContentSpaceMax)+ make.top.equalTo(alwaysShowProgressContainer.snp.bottom).offset(Constants.Size.ContentSpaceMax)}let achievementCountIcon = SymbolButton(image: R.image.customTrophyFill()?.applySymbolConfig())achievementInfoContainer.addSubview(achievementCountIcon)@@ -583,6 +647,7 @@ class RetroAchievementsListCell: UICollectionViewCell {func setDatas(game: Game, retroGame: CheevosGame?) {guard let retroGame else { return }+ self.game = gamecoverImageView.kf.setImage(with: URL(string: retroGame.badgeUrl), placeholder: UIImage.placeHolder(preferenceSize: .init(80)))var achievementCount = 0@@ -672,5 +737,7 @@ class RetroAchievementsListCell: UICollectionViewCell {hardcoreSwitchButton.setOn(enableAchievements ? (game.getExtraBool(key: ExtraKey.achievementsHardcore.rawValue) ?? false) : false, animate: false)hardcoreSwitchButton.onDisableTap {}}++ alwaysShowProgressButton.setOn(game.getExtraBool(key: ExtraKey.alwaysShowProgress.rawValue) ?? false, animate: false)}}diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ShareManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ShareManager.swiftindex 905e762d..71d1b77f 100644--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ShareManager.swift+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ShareManager.swift@@ -206,7 +206,7 @@ extension ShareManager: UIDocumentInteractionControllerDelegate {}}- static func shareFile(fileUrl: URL) {+ static func shareFile(fileUrl: URL, uti: String = "public.data") {guard FileManager.default.fileExists(atPath: fileUrl.path) else {UIView.makeToast(message: R.string.localizable.shareFileFailedMissing())return@@ -215,12 +215,27 @@ extension ShareManager: UIDocumentInteractionControllerDelegate {ShareManager.shared.documentInteractionController = documentInteractionControllerdocumentInteractionController.delegate = ShareManager.shareddocumentInteractionController.url = fileUrl- documentInteractionController.uti = "public.data"+ documentInteractionController.uti = utiif let view = topViewController(appController: true)?.view {documentInteractionController.presentOptionsMenu(from: UIDevice.isPad ? .zero : view.frame, in: view, animated: true)}}+ static func shareImage(image: UIImage) {+ // 1. 保存图片到临时目录+ guard let data = image.pngData() else { return }+ let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent("shared.png")+ if FileManager.default.fileExists(atPath: tempURL.path) {+ try? FileManager.default.removeItem(at: tempURL)+ }+ do {+ try data.write(to: tempURL)+ } catch {+ return+ }+ shareFile(fileUrl: tempURL, uti: "public.png")+ }+private static func create3DSGameSave(urls: [String: URL]) -> URL? {var result = [URL]()for (name, url) in urls {diff --git a/ManicEmu/Podfile b/ManicEmu/Podfileindex ad2ee58a..0b01ff8c 100644--- a/ManicEmu/Podfile+++ b/ManicEmu/Podfile@@ -26,8 +26,8 @@ target 'ManicEmu' dopod 'MarqueeLabel', :path => '../MarqueeLabel'pod 'RealmSwift', '= 10.54.2'- pod 'UMCommon', '~> 7.5.2'- pod 'UMAPM', '~> 2.0.3', :configurations => ['SideloadDebug']+# pod 'UMCommon', '~> 7.5.2', :configurations => ['SideloadDebug']+# pod 'UMAPM', '~> 2.0.3', :configurations => ['SideloadDebug']pod 'Fireworks', :git => 'https://github.com/tomkowz/fireworks.git', :branch => 'master'pod 'SnapKit', '~> 5.0'pod 'SwifterSwift', '~> 7.0'diff --git a/ManicEmu/Podfile.lock b/ManicEmu/Podfile.lockindex a4659118..dbc90d93 100644--- a/ManicEmu/Podfile.lock+++ b/ManicEmu/Podfile.lock@@ -182,11 +182,6 @@ PODS:- SwipeCellKit (2.7.1)- Tiercel (3.2.5)- TKSwitcherCollection (1.4.3)- - UMAPM (2.0.4):- - UMCommon- - UMCommon (7.5.2):- - UMDevice- - UMDevice (3.4.0)- VisualEffectView (5.0.0)- ZIPFoundation (0.9.19)@@ -233,8 +228,6 @@ DEPENDENCIES:- SwipeCellKit (from `../SwipeCellKit`)- Tiercel (~> 3.0)- TKSwitcherCollection (from `../TKSwitcherCollection`)- - UMAPM (~> 2.0.3)- - UMCommon (~> 7.5.2)- VisualEffectView (~> 5.0)- ZIPFoundation (from `../ZIPFoundation`)@@ -271,9 +264,6 @@ SPEC REPOS:- SQLite.swift- SwifterSwift- Tiercel- - UMAPM- - UMCommon- - UMDevice- VisualEffectViewEXTERNAL SOURCES:@@ -382,12 +372,9 @@ SPEC CHECKSUMS:SwipeCellKit: 3972254a826da74609926daf59b08d6c72e619eaTiercel: c0a73f876a72800333b15f4e7e48791f4ad21e90TKSwitcherCollection: 6805f52958a8b661cd583a538345618a26ff9263- UMAPM: f038b65a3df4fe8e2df3245642d84cff7f5f63c8- UMCommon: 72513a01ebca2dead52f2112b4d7c6196dbbe412- UMDevice: dcdf7ec167387837559d149fbc7d793d984faf82VisualEffectView: 173e1fabc2eb37af663547e14dc12efef7d2da8bZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c-PODFILE CHECKSUM: 570e357ed3877f57dbb0dd44fdb25cdad74f5568+PODFILE CHECKSUM: 997e6e751c84fc3918e48fd409c14073df9457caCOCOAPODS: 1.16.2