From e2437172f9cfccb68f34e8f4413b138538394917 Mon Sep 17 00:00:00 2001 From: LezdCS Date: Sat, 25 May 2024 19:21:10 +0900 Subject: [PATCH 1/2] Clarify subscription features --- ios/Podfile.lock | 164 +++++++++--------- ios/Runner.xcodeproj/project.pbxproj | 18 ++ .../dialogs/in_app_purchase_dialog.dart | 32 +++- 3 files changed, 124 insertions(+), 90 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 275575aa..6d8e76d7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -6,38 +6,38 @@ PODS: - ReachabilitySwift - device_info_plus (0.0.1): - Flutter - - Firebase/Analytics (10.24.0): + - Firebase/Analytics (10.25.0): - Firebase/Core - - Firebase/Core (10.24.0): + - Firebase/Core (10.25.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.24.0) - - Firebase/CoreOnly (10.24.0): - - FirebaseCore (= 10.24.0) - - Firebase/Crashlytics (10.24.0): + - FirebaseAnalytics (~> 10.25.0) + - Firebase/CoreOnly (10.25.0): + - FirebaseCore (= 10.25.0) + - Firebase/Crashlytics (10.25.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 10.24.0) - - Firebase/RemoteConfig (10.24.0): + - FirebaseCrashlytics (~> 10.25.0) + - Firebase/RemoteConfig (10.25.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 10.24.0) - - firebase_analytics (10.10.2): - - Firebase/Analytics (= 10.24.0) + - FirebaseRemoteConfig (~> 10.25.0) + - firebase_analytics (10.10.6): + - Firebase/Analytics (= 10.25.0) - firebase_core - Flutter - - firebase_core (2.30.0): - - Firebase/CoreOnly (= 10.24.0) + - firebase_core (2.31.1): + - Firebase/CoreOnly (= 10.25.0) - Flutter - - firebase_crashlytics (3.5.2): - - Firebase/Crashlytics (= 10.24.0) + - firebase_crashlytics (3.5.6): + - Firebase/Crashlytics (= 10.25.0) - firebase_core - Flutter - - firebase_remote_config (4.4.2): - - Firebase/RemoteConfig (= 10.24.0) + - firebase_remote_config (4.4.6): + - Firebase/RemoteConfig (= 10.25.0) - firebase_core - Flutter - FirebaseABTesting (10.25.0): - FirebaseCore (~> 10.0) - - FirebaseAnalytics (10.24.0): - - FirebaseAnalytics/AdIdSupport (= 10.24.0) + - FirebaseAnalytics (10.25.0): + - FirebaseAnalytics/AdIdSupport (= 10.25.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) @@ -45,16 +45,16 @@ PODS: - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30911.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.24.0): + - FirebaseAnalytics/AdIdSupport (10.25.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.24.0) + - GoogleAppMeasurement (= 10.25.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30911.0, >= 2.30908.0) - - FirebaseCore (10.24.0): + - FirebaseCore (10.25.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) @@ -62,7 +62,7 @@ PODS: - FirebaseCore (~> 10.0) - FirebaseCoreInternal (10.25.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseCrashlytics (10.24.0): + - FirebaseCrashlytics (10.25.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) - FirebaseRemoteConfigInterop (~> 10.23) @@ -76,7 +76,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseRemoteConfig (10.24.0): + - FirebaseRemoteConfig (10.25.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -106,21 +106,21 @@ PODS: - Flutter - flutter_web_auth (0.5.0): - Flutter - - GoogleAppMeasurement (10.24.0): - - GoogleAppMeasurement/AdIdSupport (= 10.24.0) + - GoogleAppMeasurement (10.25.0): + - GoogleAppMeasurement/AdIdSupport (= 10.25.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30911.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.24.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.24.0) + - GoogleAppMeasurement/AdIdSupport (10.25.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.25.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30911.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.24.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.25.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) @@ -130,23 +130,16 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleMLKit/BarcodeScanning (4.0.0): + - GoogleMLKit/BarcodeScanning (6.0.0): - GoogleMLKit/MLKitCore - - MLKitBarcodeScanning (~> 3.0.0) - - GoogleMLKit/MLKitCore (4.0.0): - - MLKitCommon (~> 9.0.0) - - GoogleToolboxForMac/DebugUtils (2.3.2): - - GoogleToolboxForMac/Defines (= 2.3.2) - - GoogleToolboxForMac/Defines (2.3.2) - - GoogleToolboxForMac/Logger (2.3.2): - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSData+zlib (2.3.2)": - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)": - - GoogleToolboxForMac/DebugUtils (= 2.3.2) - - GoogleToolboxForMac/Defines (= 2.3.2) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)" - - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)" + - MLKitBarcodeScanning (~> 5.0.0) + - GoogleMLKit/MLKitCore (6.0.0): + - MLKitCommon (~> 11.0.0) + - GoogleToolboxForMac/Defines (4.2.1) + - GoogleToolboxForMac/Logger (4.2.1): + - GoogleToolboxForMac/Defines (= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (4.2.1)": + - GoogleToolboxForMac/Defines (= 4.2.1) - GoogleUtilities/AppDelegateSwizzler (7.13.3): - GoogleUtilities/Environment - GoogleUtilities/Logger @@ -177,31 +170,30 @@ PODS: - GoogleUtilities/Privacy - GoogleUtilitiesComponents (1.1.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (2.3.0) + - GTMSessionFetcher/Core (3.4.1) - in_app_purchase_storekit (0.0.1): - Flutter - FlutterMacOS - - MLImage (1.0.0-beta4) - - MLKitBarcodeScanning (3.0.0): - - MLKitCommon (~> 9.0) - - MLKitVision (~> 5.0) - - MLKitCommon (9.0.0): - - GoogleDataTransport (~> 9.0) - - GoogleToolboxForMac/Logger (~> 2.1) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - - GoogleUtilities/UserDefaults (~> 7.0) + - MLImage (1.0.0-beta5) + - MLKitBarcodeScanning (5.0.0): + - MLKitCommon (~> 11.0) + - MLKitVision (~> 7.0) + - MLKitCommon (11.0.0): + - GoogleDataTransport (< 10.0, >= 9.4.1) + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0) - GoogleUtilitiesComponents (~> 1.0) - - GTMSessionFetcher/Core (< 3.0, >= 1.1) - - MLKitVision (5.0.0): - - GoogleToolboxForMac/Logger (~> 2.1) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - GTMSessionFetcher/Core (< 3.0, >= 1.1) - - MLImage (= 1.0.0-beta4) - - MLKitCommon (~> 9.0) - - mobile_scanner (3.5.6): + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLKitVision (7.0.0): + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLImage (= 1.0.0-beta5) + - MLKitCommon (~> 11.0) + - mobile_scanner (5.1.1): - Flutter - - GoogleMLKit/BarcodeScanning (~> 4.0.0) + - GoogleMLKit/BarcodeScanning (~> 6.0.0) - move_to_background (0.0.1): - Flutter - nanopb (2.30910.0): @@ -217,7 +209,7 @@ PODS: - PromisesObjC (2.4.0) - PromisesSwift (2.4.0): - PromisesObjC (= 2.4.0) - - ReachabilitySwift (5.2.2) + - ReachabilitySwift (5.2.3) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -337,19 +329,19 @@ SPEC CHECKSUMS: audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d - Firebase: 91fefd38712feb9186ea8996af6cbdef41473442 - firebase_analytics: 57d684b05ce9767ebb2dc13166d38bb725a97c5d - firebase_core: 66b99b4fb4e5d7cc4e88d4c195fe986681f3466a - firebase_crashlytics: 7ccf6bc9a3310a5c53bca1150203f9b91b42732a - firebase_remote_config: 42902611d62a925c8c0e58a7cd5b453a3b3423e5 + Firebase: 0312a2352584f782ea56f66d91606891d4607f06 + firebase_analytics: 12eee4d99a168adaf820e54e65720aea450e97f3 + firebase_core: 22e117a2e0dec3cb318c8f53f2dd01c140375617 + firebase_crashlytics: bd50e4bbd2ac62cb6d5efd73449f414a2619e55b + firebase_remote_config: 347436da419c4b6d64995edc037e9ed56158354b FirebaseABTesting: e6e3c3e0e35813874f571d1b7bdae2aab319dd38 - FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13 - FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894 + FirebaseAnalytics: ec00fe8b93b41dc6fe4a28784b8e51da0647a248 + FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483 FirebaseCoreExtension: 8a47811d0b155501559ef05d089518152a0a1677 FirebaseCoreInternal: 910a81992c33715fec9263ca7381d59ab3a750b7 - FirebaseCrashlytics: af38ea4adfa606f6e63fcc22091b61e7938fcf66 + FirebaseCrashlytics: 4b96efb0ce73b38b2a85e8b8bd1bd8f63f09d015 FirebaseInstallations: 91950fe859846fff0fbd296180909dd273103b09 - FirebaseRemoteConfig: 95dddc50496b37eef199dadce850d5652b534b43 + FirebaseRemoteConfig: 9f3935cefecd85d5b312192117f444957de24a75 FirebaseRemoteConfigInterop: b25018791b204c0d78a90e394d6c62d9b1f22da8 FirebaseSessions: c0939656253a1fa0e94ecc266ccf770cc8b33732 FirebaseSharedSwift: 0274086954b1b2d5fd7e829eccc587044d72a4ba @@ -359,26 +351,26 @@ SPEC CHECKSUMS: flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d - GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491 + GoogleAppMeasurement: 9abf64b682732fed36da827aa2a68f0221fd2356 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a - GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e - GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 + GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065 + GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe - GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 + GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd in_app_purchase_storekit: 0e4b3c2e43ba1e1281f4f46dd71b0593ce529892 - MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b - MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505 - MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390 - MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49 - mobile_scanner: 38dcd8a49d7d485f632b7de65e4900010187aef2 + MLImage: 1824212150da33ef225fbd3dc49f184cf611046c + MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b + MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1 + MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1 + mobile_scanner: 8564358885a9253c43f822435b70f9345c87224f move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d nanopb: 438bc412db1928dac798aa6fd75726007be04262 - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 - ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149 + ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979 share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 23344dcf..8254c3a2 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -203,6 +203,7 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 5672603D844CC853B3E35101 /* [firebase_crashlytics] Crashlytics Upload Symbols */, 3D0753EF9287E80E627BD700 /* [CP] Embed Pods Frameworks */, + DDC91F41B021A2A0E9EFE5E0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -385,6 +386,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + DDC91F41B021A2A0E9EFE5E0 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/lib/src/presentation/widgets/settings/dialogs/in_app_purchase_dialog.dart b/lib/src/presentation/widgets/settings/dialogs/in_app_purchase_dialog.dart index e1198d89..bddbeec5 100644 --- a/lib/src/presentation/widgets/settings/dialogs/in_app_purchase_dialog.dart +++ b/lib/src/presentation/widgets/settings/dialogs/in_app_purchase_dialog.dart @@ -55,7 +55,33 @@ Widget inAppPurchaseDialog( ), ), child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ + const Text( + 'StreamElements', + style: + TextStyle(fontSize: 14, fontWeight: FontWeight.bold), + ), + Wrap( + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + const Icon( + Icons.check_circle_outline_rounded, + size: 18, + color: Colors.green, + ), + const SizedBox( + width: 4, + ), + Text( + 'Events list view', + style: TextStyle( + color: + Theme.of(context).textTheme.bodyLarge!.color, + fontSize: 13), + ) + ], + ), Wrap( crossAxisAlignment: WrapCrossAlignment.center, children: [ @@ -68,13 +94,12 @@ Widget inAppPurchaseDialog( width: 4, ), Text( - 'StreamElements events view', + 'Media request control (no audio)', style: TextStyle( color: Theme.of(context).textTheme.bodyLarge!.color, fontSize: 13), ) - // todo: preview button show feature screen ], ), Wrap( @@ -89,13 +114,12 @@ Widget inAppPurchaseDialog( width: 4, ), Text( - 'StreamElements media request control', + 'Overlays (audio on Android only)', style: TextStyle( color: Theme.of(context).textTheme.bodyLarge!.color, fontSize: 13), ) - // todo: preview button show feature screen ], ), ], From da06a0d4e7864f3b2024d51435c1e9a2eeb9ce65 Mon Sep 17 00:00:00 2001 From: LezdCS Date: Sat, 25 May 2024 19:22:12 +0900 Subject: [PATCH 2/2] Version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a3837a60..4ca74868 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.1.0+52 +version: 2.2.0+53 environment: sdk: '>=2.19.0-0 <4.0.0'