From 01db63e2977ca23778ab2ca86a5981cc043afee6 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Tue, 17 Sep 2024 13:39:08 +0800 Subject: [PATCH] :bug: Fix compability on iOS 18 and macOS 15 --- ios/Podfile.lock | 32 +++++++++++++------------- ios/Runner.xcodeproj/project.pbxproj | 3 +++ lib/screens/auth/signin.dart | 7 ++++++ macos/Podfile.lock | 20 ++++++++-------- macos/Runner.xcodeproj/project.pbxproj | 3 +++ 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index af1f79a..0f696c3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -73,7 +73,7 @@ PODS: - Firebase/Performance (= 11.0.0) - firebase_core - Flutter - - FirebaseABTesting (11.1.0): + - FirebaseABTesting (11.2.0): - FirebaseCore (~> 11.0) - FirebaseAnalytics (11.0.0): - FirebaseAnalytics/AdIdSupport (= 11.0.0) @@ -97,9 +97,9 @@ PODS: - FirebaseCoreInternal (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.1.0): + - FirebaseCoreExtension (11.2.0): - FirebaseCore (~> 11.0) - - FirebaseCoreInternal (11.1.0): + - FirebaseCoreInternal (11.2.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - FirebaseCrashlytics (11.0.0): - FirebaseCore (~> 11.0) @@ -110,7 +110,7 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.1.0): + - FirebaseInstallations (11.2.0): - FirebaseCore (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) @@ -134,7 +134,7 @@ PODS: - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfig (11.1.0): + - FirebaseRemoteConfig (11.2.0): - FirebaseABTesting (~> 11.0) - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -142,8 +142,8 @@ PODS: - FirebaseSharedSwift (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.1.0) - - FirebaseSessions (11.1.0): + - FirebaseRemoteConfigInterop (11.2.0) + - FirebaseSessions (11.2.0): - FirebaseCore (~> 11.0) - FirebaseCoreExtension (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -152,7 +152,7 @@ PODS: - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (11.1.0) + - FirebaseSharedSwift (11.2.0) - Flutter (1.0.0) - flutter_background_service_ios (0.0.3): - Flutter @@ -450,19 +450,19 @@ SPEC CHECKSUMS: firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6 firebase_messaging: c40f84e7a98da956d5262fada373b5c458edcf13 firebase_performance: 8b7b9ca5adf3a9b3afa12b4eb96b9cabefc2c248 - FirebaseABTesting: c2e22c3aab99afa81d0561708b2c1c356c556976 + FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1 FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 - FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa - FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c + FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de + FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b - FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57 + FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 FirebasePerformance: efdc02bacb1b4710588c9f867011605c081cdf79 - FirebaseRemoteConfig: 05521e937b72e01847a7128da5a492327364c705 - FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87 - FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a - FirebaseSharedSwift: 260a35e08943ec810d820a70bc0359136351d0c5 + FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457 + FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db + FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6 + FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 80bce2c..f58899a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,6 +616,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; @@ -920,6 +921,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; @@ -947,6 +949,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; diff --git a/lib/screens/auth/signin.dart b/lib/screens/auth/signin.dart index 25c591c..e78bd68 100644 --- a/lib/screens/auth/signin.dart +++ b/lib/screens/auth/signin.dart @@ -7,6 +7,9 @@ import 'package:solian/exceptions/request.dart'; import 'package:solian/exts.dart'; import 'package:solian/models/auth.dart'; import 'package:solian/providers/auth.dart'; +import 'package:solian/providers/content/channel.dart'; +import 'package:solian/providers/content/realm.dart'; +import 'package:solian/providers/relation.dart'; import 'package:solian/providers/websocket.dart'; import 'package:solian/services.dart'; import 'package:solian/widgets/sized_container.dart'; @@ -164,6 +167,7 @@ class _SignInScreenState extends State { final result = AuthResult.fromJson(resp.body); _currentTicket = result.ticket; + _passwordController.clear(); // Finish sign in if possible if (result.isFinished) { @@ -173,6 +177,9 @@ class _SignInScreenState extends State { await auth.refreshAuthorizeStatus(); await auth.refreshUserProfile(); + Get.find().refreshAvailableChannel(); + Get.find().refreshAvailableRealms(); + Get.find().refreshRelativeList(); Get.find().registerPushNotifications(); autoConfigureBackgroundNotificationService(); autoStartBackgroundNotificationService(); diff --git a/macos/Podfile.lock b/macos/Podfile.lock index ce01c68..3183c7f 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -60,9 +60,9 @@ PODS: - FirebaseCoreInternal (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.1.0): + - FirebaseCoreExtension (11.2.0): - FirebaseCore (~> 11.0) - - FirebaseCoreInternal (11.1.0): + - FirebaseCoreInternal (11.2.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - FirebaseCrashlytics (11.0.0): - FirebaseCore (~> 11.0) @@ -73,7 +73,7 @@ PODS: - GoogleUtilities/Environment (~> 8.0) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.1.0): + - FirebaseInstallations (11.2.0): - FirebaseCore (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) @@ -87,8 +87,8 @@ PODS: - GoogleUtilities/Reachability (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - FirebaseRemoteConfigInterop (11.1.0) - - FirebaseSessions (11.1.0): + - FirebaseRemoteConfigInterop (11.2.0) + - FirebaseSessions (11.2.0): - FirebaseCore (~> 11.0) - FirebaseCoreExtension (~> 11.0) - FirebaseInstallations (~> 11.0) @@ -344,13 +344,13 @@ SPEC CHECKSUMS: firebase_messaging: ce70e6615f0cd906d80b7a651b960d76dad6de56 FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 - FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa - FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c + FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de + FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b - FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57 + FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 - FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87 - FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a + FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db + FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6 flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9 flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 7cc0873..9f71ffd 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -701,6 +701,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; @@ -843,6 +844,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; @@ -870,6 +872,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";