From 20ecfb069d282db8433a3802ba73dce49df0e5c8 Mon Sep 17 00:00:00 2001 From: kishan06 Date: Mon, 22 Apr 2024 12:09:56 +0530 Subject: [PATCH] minor bug fix --- .DS_Store | Bin 10244 -> 10244 bytes .dart_tool/package_config.json | 146 ++++----- .dart_tool/package_config_subset | 300 +++++++++--------- gsf/assets/image/menuicon/mysubscription.png | Bin 0 -> 1881 bytes gsf/ios/Podfile.lock | 67 ++++ gsf/ios/Runner.xcodeproj/project.pbxproj | 91 +++--- .../xcshareddata/swiftpm/Package.resolved | 15 + gsf/ios/Runner/Info.plist | 2 +- gsf/lib/views/pages/sidebar.dart | 21 +- .../pages/subscription/my_subscription.dart | 9 +- pubspec.lock | 12 +- 11 files changed, 358 insertions(+), 305 deletions(-) create mode 100644 gsf/assets/image/menuicon/mysubscription.png create mode 100644 gsf/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.DS_Store b/.DS_Store index 029412fe6574c03a4fa10b27da7d723cc8cdb9d6..c0847213e796fa6c3e5171a496e67bdad1daed15 100644 GIT binary patch delta 391 zcmZn(XbG6$&uF$WU^hRb*<=R+iODJg$5mJu^cd0^G8sxdbMljua`KZH7#IW?7?{$5 z^t}IIz_9tbfCwv-ko4rgqT)jF0{q1p`Q@I;`FR0Fsb!g|<&$N_cF9L%0tJFIt5T!W zi!xJ!3lftv^U{^=KLCvZ0?x_o;u_%=5Kc&5eqJi4vO@rbtL)$nVK8toXfrr61T(}i z6f!h0OlMfku$AE;!#Re>3||@kGx9QuF)A@?GwLv!GMY0wFgh{@F-9{cFeYxU6HnyW V%&zc@W%ErDCC0()(8+b;aR9?FWIO-> delta 364 zcmZn(XbG6$&uF?aU^hRb>0}21iODJg$2SWL3a~0kNy)?u2qz^bXQvnCm*%B7=jY@X zIpvh5Mr0=E=LKh0rB3z}+a(k)z+aq^U+xJM3n)r0%S-jL7Tym!HXf7A%mfup^sq}!y1Mi3`ZGmF}z{;#>m1b#;C-o z&1k}C%V^K&!RW~t#hA>P!I-&unRp_{#0HJc>@~0drDELIAGL9O(c600d`2O+f$vv5yP zttm5;it2OAOPfw?YA8*_oUBPn*rHe=8=KzY+ivBQe4xxcrUJkf>(@5DAy>R>;wQ?C zs;E}X#=cyTE80H{Dn8YU$v*Ne9fp`MtWUk6jAYHJzL;~)d_#Ho>eCoZ!a3);1Zxsl1|@bP#W?LE$RHD_?)a=D&hB zkQjc`k-#k zLO|HZ^YPF8>4J3lLYc9?ngcslfw#Za5Mf_-O-dj>4YCiKcE1sxdpqm#7|y{qfqSUsQi_KL zt?6Od&ssSD^Ts*Z!y`9Xl8Y1DMPt)V%%3)-1mt$#f+|L^{noFtPn9O>G=sN7&s|#I zwWPWUmEhaY#G;zO2{+y`X9sfc>^;>_D6<*uX5$T;7s-KXk+~hJW>hZt} zbFmH_zd-%73Txp#!+rnb5f|p*Be`_|+ZdZVEA0CX8`fLr-2Oe)suFgK*1pi&Mj8ov zNs2^T9Yg3)c%0YU-v{hjJQA+^hZON6Nh{i)#wH#Nx~jx&7)ew^`kYffH^be;t_EQr z(S&%PcuM(%H54B6EXJgwG8@9?YM-*No@6T9^YzFYz@s_4S^(#zdp5r4wl+Q8IBd2~ zyIT}2v9h+Gk|GFK|L0OI)>6eF9?`89CkuI8wULVdQ>qx76L}=+XWwo?g!=goZpH=Wet#d$1-wLY3hCIIB>Lszvz0%~4(X)<^DLD%3)hkUCR> z@Wh|moIm1g3HHH|5^!6UggD+jQJNuaC^Lxf&$kb%@v{iG>$~j}O-Uo6C+dr;1w?X!=1e&0XjsX^m(05SkQ( z57AIT?DJx|^h~;V+=WV1B&w84AGDCR2UM2Ay%+QY0yo0f3a7-!fgx8QYQt#(Tl%SU zs(scoL606OZDPpHh6NP_yMt`igOE3#FMY90JLF~|-)g8JaFyrPR?a9=TD+jGAn2z- zdSLgyBrQ#Zx5rQ+yr3^2Gp^!>a|H_&_N7ze1$_p&*ngs#bgW=c5Z{Tz&`cbkLwR;N zwj*3iGjY72oI@`of=(W&Ap*CKzw^d+Qx&NVL1Q^|SZ!Y#?B3%_Wi%{eM@pr15Q3fw z#;XtCZP>y7^Azz>vcFMt>n9>8(^3JDzUS+|m^Lm;CP7ffkTOW$k(hJnf@&pE(3TXz z{h)XX2Vdk>1%=C*OQdtqm6DpEa6Xf_UFwhy`_Dg7b5u@gLE(z`0^{brxVUF)d1(E3 z0*~M6%|}_gtyu-G#zVlJ5zA1 z=t?_R?jn2b4>x_R5g)qi7k}11@sdx@ksqcIu?UFozslUMCB?k`ayp5^7T*i?;F*P0 zVis13Sy&|!g>7hN7zx6*G&7utu*Cz5zZ>92 10.17.0) - Firebase/CoreOnly (10.17.0): - FirebaseCore (= 10.17.0) - Firebase/Crashlytics (10.17.0): - Firebase/CoreOnly - FirebaseCrashlytics (~> 10.17.0) + - firebase_analytics (10.7.0): + - Firebase/Analytics (= 10.17.0) + - firebase_core + - Flutter - firebase_core (2.22.0): - Firebase/CoreOnly (= 10.17.0) - Flutter @@ -23,6 +32,24 @@ PODS: - Firebase/Crashlytics (= 10.17.0) - firebase_core - Flutter + - FirebaseAnalytics (10.17.0): + - FirebaseAnalytics/AdIdSupport (= 10.17.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (10.17.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.17.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) - FirebaseCore (10.17.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) @@ -74,15 +101,47 @@ PODS: - FMDB/standard (2.7.5) - geolocator_apple (1.2.0): - Flutter + - GoogleAppMeasurement (10.17.0): + - GoogleAppMeasurement/AdIdSupport (= 10.17.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (10.17.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (10.17.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) - GoogleDataTransport (9.2.5): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/AppDelegateSwizzler (7.12.0): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network - GoogleUtilities/Environment (7.12.0): - PromisesObjC (< 3.0, >= 1.2) - GoogleUtilities/Logger (7.12.0): - GoogleUtilities/Environment + - GoogleUtilities/MethodSwizzler (7.12.0): + - GoogleUtilities/Logger + - GoogleUtilities/Network (7.12.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability - "GoogleUtilities/NSData+zlib (7.12.0)" + - GoogleUtilities/Reachability (7.12.0): + - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (7.12.0): - GoogleUtilities/Logger - health (1.0.4): @@ -162,6 +221,7 @@ DEPENDENCIES: - bluetooth_enable_fork (from `.symlinks/plugins/bluetooth_enable_fork/ios`) - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) + - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) - Flutter (from `Flutter`) @@ -202,6 +262,7 @@ SPEC REPOS: trunk: - BranchSDK - Firebase + - FirebaseAnalytics - FirebaseCore - FirebaseCoreExtension - FirebaseCoreInternal @@ -209,6 +270,7 @@ SPEC REPOS: - FirebaseInstallations - FirebaseSessions - FMDB + - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities - nanopb @@ -230,6 +292,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/connectivity_plus/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" + firebase_analytics: + :path: ".symlinks/plugins/firebase_analytics/ios" firebase_core: :path: ".symlinks/plugins/firebase_core/ios" firebase_crashlytics: @@ -305,8 +369,10 @@ SPEC CHECKSUMS: connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed Firebase: f4ac0b02927af9253ae094d23deecf0890da7374 + firebase_analytics: d6f520c1030d2c1215851f6e332d39a489a30bd2 firebase_core: efc9455611b8769fa90fbdae5da182600bd6901c firebase_crashlytics: 6a564f58db90be49c49d9ac100bc5cc3fcbf8267 + FirebaseAnalytics: b9284f9fff10157a843e0422e908711f7bf3b9f2 FirebaseCore: 534544dd98cabcf4bf8598d88ec683b02319a528 FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80 FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a @@ -323,6 +389,7 @@ SPEC CHECKSUMS: fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 + GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7 GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 health: 5a380c0f6c4f619535845992993964293962e99e diff --git a/gsf/ios/Runner.xcodeproj/project.pbxproj b/gsf/ios/Runner.xcodeproj/project.pbxproj index 1792bca..a187d26 100644 --- a/gsf/ios/Runner.xcodeproj/project.pbxproj +++ b/gsf/ios/Runner.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 1AF7D2922B8C725000853315 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AF7D2912B8C725000853315 /* GoogleService-Info.plist */; }; 227E28212AA8694400B81730 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 227E28202AA8694400B81730 /* NotificationService.swift */; }; 227E28252AA8694400B81730 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 227E281E2AA8694400B81730 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 2CDFEB5386549600F95A3C4B /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 529068A52A8E5706004ABCB1 /* BranchSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 529068A42A8E5706004ABCB1 /* BranchSDK */; }; 529068A72A8E5864004ABCB1 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068A62A8E5864004ABCB1 /* CoreServices.framework */; }; @@ -24,11 +23,12 @@ 529068B72A8E58B7004ABCB1 /* LinkPresentation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068B62A8E58B7004ABCB1 /* LinkPresentation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 529068B82A8F4849004ABCB1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068AC2A8E588C004ABCB1 /* WebKit.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 77FD1CDB4AA27371318067AA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - EAC2B08A5EF3DB337047B851 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - F28142B6420A67828003E26E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */; }; + B6DC1A5EE20154177CFADB9F /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */; }; + EAC2B08A5EF3DB337047B851 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -63,10 +63,10 @@ 227E281E2AA8694400B81730 /* OneSignalNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OneSignalNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 227E28202AA8694400B81730 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; 227E28222AA8694400B81730 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 34CF38A11769EB9BFC905652 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = ""; }; - 50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = ""; }; + 3C249F76873F87E2E555AA12 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = ""; }; 5209C85A2A8E3F4800868C46 /* OneSignal.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OneSignal.xcframework; path = Pods/OneSignalXCFramework/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework; sourceTree = ""; }; 529068A62A8E5864004ABCB1 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 529068A82A8E5873004ABCB1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; @@ -78,13 +78,12 @@ 529068B42A8E58AF004ABCB1 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 529068B62A8E58B7004ABCB1 /* LinkPresentation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LinkPresentation.framework; path = System/Library/Frameworks/LinkPresentation.framework; sourceTree = SDKROOT; }; 52C0E9972BCD0407007842BA /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = ""; }; - 559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 73E7677E7BC1C1EB29CDF77C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; sourceTree = ""; }; + 5F0437EAF2EA7FDF256B814F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -92,7 +91,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C3E19A11A483AD6983EC6356 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 9CFBA2BC099C711405BF79AE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -100,7 +100,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2CDFEB5386549600F95A3C4B /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */, + B6DC1A5EE20154177CFADB9F /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -118,8 +118,8 @@ 529068A72A8E5864004ABCB1 /* CoreServices.framework in Frameworks */, 529068A52A8E5706004ABCB1 /* BranchSDK in Frameworks */, 529068B82A8F4849004ABCB1 /* WebKit.framework in Frameworks */, - EAC2B08A5EF3DB337047B851 /* BuildFile in Frameworks */, - F28142B6420A67828003E26E /* Pods_Runner.framework in Frameworks */, + EAC2B08A5EF3DB337047B851 /* (null) in Frameworks */, + 77FD1CDB4AA27371318067AA /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -129,12 +129,12 @@ 17AC36FD4407D91AC2261E86 /* Pods */ = { isa = PBXGroup; children = ( - 40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */, - 50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */, - 8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */, - C3E19A11A483AD6983EC6356 /* Pods-Runner.debug.xcconfig */, - 34CF38A11769EB9BFC905652 /* Pods-Runner.release.xcconfig */, - 73E7677E7BC1C1EB29CDF77C /* Pods-Runner.profile.xcconfig */, + 6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */, + 3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */, + 5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */, + 5F0437EAF2EA7FDF256B814F /* Pods-Runner.debug.xcconfig */, + 3C249F76873F87E2E555AA12 /* Pods-Runner.release.xcconfig */, + 9CFBA2BC099C711405BF79AE /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -211,8 +211,8 @@ 529068A82A8E5873004ABCB1 /* SystemConfiguration.framework */, 529068A62A8E5864004ABCB1 /* CoreServices.framework */, 5209C85A2A8E3F4800868C46 /* OneSignal.xcframework */, - 635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */, - 559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */, + 31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */, + D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -224,7 +224,7 @@ isa = PBXNativeTarget; buildConfigurationList = 227E28262AA8694400B81730 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */; buildPhases = ( - 13EB04CF12534CDD59BBA288 /* [CP] Check Pods Manifest.lock */, + 94BDEDCAAC45ADE45D2B5275 /* [CP] Check Pods Manifest.lock */, 227E281A2AA8694400B81730 /* Sources */, 227E281B2AA8694400B81730 /* Frameworks */, 227E281C2AA8694400B81730 /* Resources */, @@ -242,15 +242,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - AD0A238C35E5294F8BAB6312 /* [CP] Check Pods Manifest.lock */, + A3BDE51BAD87866279EDCE9A /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 226DE2242AA76AB30069AF32 /* Embed Foundation Extensions */, - C9D58640702688400651DCCA /* [CP] Embed Pods Frameworks */, - 0566BE68C33393A00546891A /* FlutterFire: "flutterfire upload-crashlytics-symbols" */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + C0FE94159ACCD81B29D045F6 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -330,25 +329,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0566BE68C33393A00546891A /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( ); - name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\""; - outputFileListPaths = ( - ); + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; - 13EB04CF12534CDD59BBA288 /* [CP] Check Pods Manifest.lock */ = { + 94BDEDCAAC45ADE45D2B5275 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -370,21 +366,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -400,7 +381,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; - AD0A238C35E5294F8BAB6312 /* [CP] Check Pods Manifest.lock */ = { + A3BDE51BAD87866279EDCE9A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -422,7 +403,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C9D58640702688400651DCCA /* [CP] Embed Pods Frameworks */ = { + C0FE94159ACCD81B29D045F6 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -491,7 +472,7 @@ /* Begin XCBuildConfiguration section */ 227E28272AA8694400B81730 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */; + baseConfigurationReference = 6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -528,7 +509,7 @@ }; 227E28282AA8694400B81730 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */; + baseConfigurationReference = 3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; @@ -562,7 +543,7 @@ }; 227E28292AA8694400B81730 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */; + baseConfigurationReference = 5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; diff --git a/gsf/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/gsf/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..5bf1daa --- /dev/null +++ b/gsf/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "da338c7d827a9f8b10177e484783685675c8dff84a9dc59a904db0c53122e9f5", + "pins" : [ + { + "identity" : "ios-branch-sdk-spm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/BranchMetrics/ios-branch-sdk-spm", + "state" : { + "revision" : "7fbe3085821c8e60241a2037098c6eed76fd2798", + "version" : "2.2.0" + } + } + ], + "version" : 3 +} diff --git a/gsf/ios/Runner/Info.plist b/gsf/ios/Runner/Info.plist index f4358f4..9693dd1 100644 --- a/gsf/ios/Runner/Info.plist +++ b/gsf/ios/Runner/Info.plist @@ -23,7 +23,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.1 + 1.4.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/gsf/lib/views/pages/sidebar.dart b/gsf/lib/views/pages/sidebar.dart index 2e6f6c9..17a7154 100644 --- a/gsf/lib/views/pages/sidebar.dart +++ b/gsf/lib/views/pages/sidebar.dart @@ -175,7 +175,7 @@ class _AppDrawerState extends State { // 2; // if (homePageController.bottomNavIndex.value == // 1) { - // homePageController.updateBottomNavIndex(0); + // homePageController.updateBottomNavIndex(0); // homePageController.updateBottomNavIndex(1); // Get.back(); // } else { @@ -287,7 +287,7 @@ class _AppDrawerState extends State { Get.to( () => const MySubscription(), ); - }, false), + }, false, isSubscription: true), // const SizedBox(height: 15), // menuWidget('phone', 'Test', () { Get.back(); @@ -376,7 +376,8 @@ class _AppDrawerState extends State { } menuWidget(String svgIcon, String title, VoidCallback ontap, - bool swapBitesWithProfile) { + bool swapBitesWithProfile, + {bool? isSubscription}) { // final brightness = Get.theme.brightness; TextStyle textstyle = TextStyle( fontSize: 16, @@ -403,10 +404,16 @@ class _AppDrawerState extends State { width: 24, height: 24, ) - : SvgPicture.asset( - 'assets/image/sidebarIcons/${!globalContoller.darkMode.value ? svgIcon + '_black' : svgIcon}.svg', - width: 18, - ), + : isSubscription ?? false + ? Image.asset( + "assets/image/menuicon/mysubscription.png", + width: 24, + height: 24, + ) + : SvgPicture.asset( + 'assets/image/sidebarIcons/${!globalContoller.darkMode.value ? svgIcon + '_black' : svgIcon}.svg', + width: 18, + ), const SizedBox(width: 10), Text( title, diff --git a/gsf/lib/views/pages/subscription/my_subscription.dart b/gsf/lib/views/pages/subscription/my_subscription.dart index dc1e4b0..b04cdeb 100644 --- a/gsf/lib/views/pages/subscription/my_subscription.dart +++ b/gsf/lib/views/pages/subscription/my_subscription.dart @@ -95,9 +95,9 @@ class _MySubscriptionState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - 'Current active plan:-', + 'Current Active Plan:', style: TextStyle( - fontSize: 22, + fontSize: 16, color: !globalController.darkMode.value ? ColorConstants.kBlack : ColorConstants.kWhite, @@ -107,13 +107,14 @@ class _MySubscriptionState extends State { Text( subscriptionObj!.result!.utmSource ?? '', style: TextStyle( - fontSize: 22, + fontSize: 16, color: !globalController.darkMode.value ? ColorConstants.kBlack : ColorConstants.kWhite, fontFamily: 'SFPRO', ), ), + // rowTile( // text: // 'Unlimited access to live virtual fitness classes led by certified trainers.'), @@ -188,7 +189,7 @@ class _MySubscriptionState extends State { 'Next renewal date : $formattedEndDate', style: TextStyle( - fontSize: 14, + fontSize: 16, height: 2.2, color: !globalController.darkMode.value ? ColorConstants.kBlack diff --git a/pubspec.lock b/pubspec.lock index b3f5bee..ca2d65d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -263,10 +263,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.17.0" io: dependency: transitive description: @@ -496,14 +496,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.16" - timeago: - dependency: "direct main" - description: - name: timeago - sha256: d3204eb4c788214883380253da7f23485320a58c11d145babc82ad16bf4e7764 - url: "https://pub.dev" - source: hosted - version: "3.6.1" timing: dependency: transitive description: