From 200a03e4b5cd722d04b3ebb72fefb482113ac2c9 Mon Sep 17 00:00:00 2001 From: noumantahir Date: Thu, 4 Jan 2024 14:13:11 +0500 Subject: [PATCH 1/3] rever reanimated merge --- ios/Ecency.xcodeproj/project.pbxproj | 228 +++++++++--------- ios/Podfile.lock | 20 +- package.json | 6 +- patches/react-native+0.70.7.patch | 13 - .../markdownEditor/children/editorToolbar.tsx | 129 +++++----- src/components/progressiveImage/index.js | 67 +++++ .../toggleSwitch/view/toggleSwitchStyles.js | 23 -- .../toggleSwitch/view/toggleSwitchView.js | 134 ++++++++++ .../toggleSwitch/view/toggleSwitchView.tsx | 74 ------ .../children/uploadsGalleryContent.tsx | 21 +- yarn.lock | 44 ++-- 11 files changed, 437 insertions(+), 322 deletions(-) create mode 100644 src/components/progressiveImage/index.js create mode 100644 src/components/toggleSwitch/view/toggleSwitchView.js delete mode 100644 src/components/toggleSwitch/view/toggleSwitchView.tsx diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index bc4ce4a5f5..4235d0532e 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* EcencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* EcencyTests.m */; }; 021526F0AF8A45FCB60C9C56 /* Roboto-medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7900A87FFF214846B5FE0430 /* Roboto-medium.ttf */; }; + 04D1BA15BBCF7F2B9E3612BF /* libPods-Ecency-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FDDF70C668E24276B7F7D91 /* libPods-Ecency-EcencyTests.a */; }; 0516470B24D2C513005DE9C5 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0516470A24D2C513005DE9C5 /* ShareViewController.swift */; }; 0516470E24D2C513005DE9C5 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0516470C24D2C513005DE9C5 /* MainInterface.storyboard */; }; 0516471224D2C513005DE9C5 /* eshare.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0516470824D2C513005DE9C5 /* eshare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -28,6 +29,8 @@ 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DCD954D1E0B4F2C00145EB5 /* EcencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* EcencyTests.m */; }; 2E340255E74B48D8AF5B650C /* Sansation_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5ADE4B4B75DF437495E202D4 /* Sansation_Regular.ttf */; }; + 31856ADD6C0311522CA1DFA7 /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA5F73032F66B1EBAA61B851 /* libPods-Ecency.a */; }; + 3ABD43432246ECAC42DCEE31 /* libPods-ImageNotifi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C027160DB8491D45BFEA8 /* libPods-ImageNotifi.a */; }; 58F9BCC624793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; }; 58F9BCC724793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; }; 58F9BCC824793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; }; @@ -35,9 +38,6 @@ 89D99F65314A416290F8D921 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 64F2A611E6EF486C8D3FB82C /* Roboto.ttf */; }; 92082305364D41A4A673F950 /* RobotoMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5795D1B1C55E46FF96CC4AED /* RobotoMono-Regular.ttf */; }; A57EE8B63D4948F0A05218E3 /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65F56948860941D6BA55779F /* rubicon-icon-font.ttf */; }; - C5CD49D46F1B75DEB7A7D979 /* libPods-ImageNotifi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4484DD48A60746354AF16DFC /* libPods-ImageNotifi.a */; }; - DB5B24B5E945145AFBAEC65C /* libPods-Ecency-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 54F2A8BF9BF82EB2EF644B72 /* libPods-Ecency-EcencyTests.a */; }; - F3823F094DF1C33F5247C5E4 /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED1760CCC1ACAD181CF8701B /* libPods-Ecency.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -117,6 +117,8 @@ 06844A5429119F05002FCC34 /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = Ecency/BootSplash.storyboard; sourceTree = ""; }; 06F72CA2290B2159003392F3 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Ecency/AppDelegate.mm; sourceTree = ""; }; 06F72CA5290B2D7F003392F3 /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = ""; }; + 0AA04D912D96044AECF20A65 /* Pods-Ecency.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.debug.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.debug.xcconfig"; sourceTree = ""; }; + 0FDDF70C668E24276B7F7D91 /* libPods-Ecency-EcencyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency-EcencyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 112758B0BBF9458381CE41FD /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; 11CAB2F9B4B7425ABCAB4007 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Ecency/AppDelegate.h; sourceTree = ""; }; @@ -124,15 +126,17 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Ecency/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Ecency/main.m; sourceTree = ""; }; 1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + 1DFEA0938900B7C7E419498A /* Pods-Ecency-EcencyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.release.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.release.xcconfig"; sourceTree = ""; }; 22F5F05A06E142C2B41A4D38 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; 263FA8C0EF21473FAAAD3EDD /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* Ecency-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ecency-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* Ecency-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Ecency-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 34E88D888DD444F8B285363C /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + 404E707BFB0A754BDB18D41C /* Pods-Ecency-EcencyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.debug.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.debug.xcconfig"; sourceTree = ""; }; 420ABF9795564845A0963C27 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; - 4484DD48A60746354AF16DFC /* libPods-ImageNotifi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ImageNotifi.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4CA976A51F8781F23710B585 /* Pods-ImageNotifi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.release.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.release.xcconfig"; sourceTree = ""; }; 4EB466C53BAE4EDC904357B3 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; - 54F2A8BF9BF82EB2EF644B72 /* libPods-Ecency-EcencyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency-EcencyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 573C027160DB8491D45BFEA8 /* libPods-ImageNotifi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ImageNotifi.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 5795D1B1C55E46FF96CC4AED /* RobotoMono-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-Regular.ttf"; path = "../src/assets/fonts/RobotoMono-Regular.ttf"; sourceTree = ""; }; 58190B3B23294814000EA0E1 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 58190B3D23294823000EA0E1 /* Ecency.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Ecency.entitlements; path = Ecency/Ecency.entitlements; sourceTree = ""; }; @@ -146,24 +150,20 @@ 64F2A611E6EF486C8D3FB82C /* Roboto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Roboto.ttf; path = ../src/assets/fonts/Roboto.ttf; sourceTree = ""; }; 65F56948860941D6BA55779F /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "rubicon-icon-font.ttf"; path = "../src/assets/fonts/rubicon-icon-font.ttf"; sourceTree = ""; }; 6D935B44FB5A4CF3BF4D01DF /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; - 71637988A8C0116FCD68A50C /* Pods-Ecency-EcencyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.release.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.release.xcconfig"; sourceTree = ""; }; 7900A87FFF214846B5FE0430 /* Roboto-medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-medium.ttf"; path = "../src/assets/fonts/Roboto-medium.ttf"; sourceTree = ""; }; - 7C697DCF6F04795709967001 /* Pods-ImageNotifi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.debug.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.debug.xcconfig"; sourceTree = ""; }; - 7CA590193DB67DAF1ACA6014 /* Pods-Ecency-EcencyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.debug.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.debug.xcconfig"; sourceTree = ""; }; + 83345398C95A01BA9C82A26A /* Pods-Ecency.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.release.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.release.xcconfig"; sourceTree = ""; }; 93B182C6FFA44610AB188D7C /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; 9464AFB033664B4F8E9F0BED /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; 98D3D7C3AF354BF0987A2BFA /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; }; 9BC08A790166415B9BB3F5CF /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; A239FC84622A4A9CA7950ED9 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - BAA535169905BC192570B8E8 /* Pods-ImageNotifi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.release.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.release.xcconfig"; sourceTree = ""; }; BB1093ACCD904E2883413214 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; - ED1760CCC1ACAD181CF8701B /* libPods-Ecency.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + E71848FA34FB051BB9C34796 /* Pods-ImageNotifi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.debug.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; F1D77AE9F7B24CF19834052B /* Sansation_Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Sansation_Bold.ttf; path = ../src/assets/fonts/Sansation_Bold.ttf; sourceTree = ""; }; - F70C473E4325DFCBF55BC1D1 /* Pods-Ecency.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.debug.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.debug.xcconfig"; sourceTree = ""; }; - FC495F97649F7DCCD265703A /* Pods-Ecency.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.release.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.release.xcconfig"; sourceTree = ""; }; + FA5F73032F66B1EBAA61B851 /* libPods-Ecency.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -171,7 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DB5B24B5E945145AFBAEC65C /* libPods-Ecency-EcencyTests.a in Frameworks */, + 04D1BA15BBCF7F2B9E3612BF /* libPods-Ecency-EcencyTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -186,7 +186,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C5CD49D46F1B75DEB7A7D979 /* libPods-ImageNotifi.a in Frameworks */, + 3ABD43432246ECAC42DCEE31 /* libPods-ImageNotifi.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -196,7 +196,7 @@ files = ( 05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */, 065B9DDE2930E42A004310E4 /* hermes.xcframework in Frameworks */, - F3823F094DF1C33F5247C5E4 /* libPods-Ecency.a in Frameworks */, + 31856ADD6C0311522CA1DFA7 /* libPods-Ecency.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -280,12 +280,12 @@ 258E34A3BDFFFBF80D598187 /* Pods */ = { isa = PBXGroup; children = ( - F70C473E4325DFCBF55BC1D1 /* Pods-Ecency.debug.xcconfig */, - FC495F97649F7DCCD265703A /* Pods-Ecency.release.xcconfig */, - 7CA590193DB67DAF1ACA6014 /* Pods-Ecency-EcencyTests.debug.xcconfig */, - 71637988A8C0116FCD68A50C /* Pods-Ecency-EcencyTests.release.xcconfig */, - 7C697DCF6F04795709967001 /* Pods-ImageNotifi.debug.xcconfig */, - BAA535169905BC192570B8E8 /* Pods-ImageNotifi.release.xcconfig */, + 0AA04D912D96044AECF20A65 /* Pods-Ecency.debug.xcconfig */, + 83345398C95A01BA9C82A26A /* Pods-Ecency.release.xcconfig */, + 404E707BFB0A754BDB18D41C /* Pods-Ecency-EcencyTests.debug.xcconfig */, + 1DFEA0938900B7C7E419498A /* Pods-Ecency-EcencyTests.release.xcconfig */, + E71848FA34FB051BB9C34796 /* Pods-ImageNotifi.debug.xcconfig */, + 4CA976A51F8781F23710B585 /* Pods-ImageNotifi.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -299,9 +299,9 @@ 58190B3B23294814000EA0E1 /* StoreKit.framework */, ED297162215061F000B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */, - ED1760CCC1ACAD181CF8701B /* libPods-Ecency.a */, - 54F2A8BF9BF82EB2EF644B72 /* libPods-Ecency-EcencyTests.a */, - 4484DD48A60746354AF16DFC /* libPods-ImageNotifi.a */, + FA5F73032F66B1EBAA61B851 /* libPods-Ecency.a */, + 0FDDF70C668E24276B7F7D91 /* libPods-Ecency-EcencyTests.a */, + 573C027160DB8491D45BFEA8 /* libPods-ImageNotifi.a */, ); name = Frameworks; sourceTree = ""; @@ -400,12 +400,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "EcencyTests" */; buildPhases = ( - 246CACE3AFA4F5D163C20B46 /* [CP] Check Pods Manifest.lock */, + C54D84D662D6C182DE045D38 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 43C487FE305A92E80E54E7E3 /* [CP] Embed Pods Frameworks */, - 5DA65CD8FFDA43C8F44CD0BB /* [CP] Copy Pods Resources */, + 5F1FB1470958FA150303E0F1 /* [CP] Embed Pods Frameworks */, + CAF063D667FC5B3B68512988 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -437,7 +437,7 @@ isa = PBXNativeTarget; buildConfigurationList = 057A51A92AD4962400E9A768 /* Build configuration list for PBXNativeTarget "ImageNotifi" */; buildPhases = ( - C1CDFA1BB1A4DEA496951D1F /* [CP] Check Pods Manifest.lock */, + 1A5C8F8F41BED1BE8F97C47C /* [CP] Check Pods Manifest.lock */, 057A519C2AD4962300E9A768 /* Sources */, 057A519D2AD4962300E9A768 /* Frameworks */, 057A519E2AD4962300E9A768 /* Resources */, @@ -455,7 +455,7 @@ isa = PBXNativeTarget; buildConfigurationList = 05B6C4B424C306CE00B7FA60 /* Build configuration list for PBXNativeTarget "Ecency" */; buildPhases = ( - F09C461DA2AAFAC159B5A3B2 /* [CP] Check Pods Manifest.lock */, + A2B10E2CCC0492CF4778DDED /* [CP] Check Pods Manifest.lock */, 05B6C48E24C306CE00B7FA60 /* Start Packager */, 05B6C48F24C306CE00B7FA60 /* Sources */, 05B6C49324C306CE00B7FA60 /* Frameworks */, @@ -464,9 +464,9 @@ 58C9F50524CE017800A026DD /* Embed App Extensions */, 05BAAAEE25BF43F80072EA01 /* ShellScript */, 3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */, - A67ABA0F3492E858DBFEC682 /* [CP] Embed Pods Frameworks */, - 9A1E927B4FFB0FF63ED43910 /* [CP] Copy Pods Resources */, - FCB8462601C23AADF25E446C /* [CP-User] [RNFB] Core Configuration */, + C44924AC2FA92201E7EB2539 /* [CP] Embed Pods Frameworks */, + 7EEC7F0DE47D7C7CE8A3F289 /* [CP] Copy Pods Resources */, + DA796ED766580399CD1F9EFE /* [CP-User] [RNFB] Core Configuration */, ); buildRules = ( ); @@ -717,7 +717,7 @@ shellPath = /bin/sh; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n"; }; - 246CACE3AFA4F5D163C20B46 /* [CP] Check Pods Manifest.lock */ = { + 1A5C8F8F41BED1BE8F97C47C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -732,7 +732,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Ecency-EcencyTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-ImageNotifi-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -753,7 +753,21 @@ shellPath = /bin/sh; shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh"; }; - 43C487FE305A92E80E54E7E3 /* [CP] Embed Pods Frameworks */ = { + 57F4EECD4004FE3420E6DF92 /* Bundle React Native Code And Images */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Bundle React Native Code And Images"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; + }; + 5F1FB1470958FA150303E0F1 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -777,27 +791,13 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 57F4EECD4004FE3420E6DF92 /* Bundle React Native Code And Images */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Bundle React Native Code And Images"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; - }; - 5DA65CD8FFDA43C8F44CD0BB /* [CP] Copy Pods Resources */ = { + 7EEC7F0DE47D7C7CE8A3F289 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh", + "${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", @@ -842,64 +842,32 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 9A1E927B4FFB0FF63ED43910 /* [CP] Copy Pods Resources */ = { + A2B10E2CCC0492CF4778DDED /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", + "$(DERIVED_FILE_DIR)/Pods-Ecency-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh\"\n"; + 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; }; - A67ABA0F3492E858DBFEC682 /* [CP] Embed Pods Frameworks */ = { + C44924AC2FA92201E7EB2539 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -923,7 +891,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C1CDFA1BB1A4DEA496951D1F /* [CP] Check Pods Manifest.lock */ = { + C54D84D662D6C182DE045D38 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -938,36 +906,68 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ImageNotifi-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Ecency-EcencyTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F09C461DA2AAFAC159B5A3B2 /* [CP] Check Pods Manifest.lock */ = { + CAF063D667FC5B3B68512988 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", + "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); + name = "[CP] Copy Pods Resources"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Ecency-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - FCB8462601C23AADF25E446C /* [CP-User] [RNFB] Core Configuration */ = { + DA796ED766580399CD1F9EFE /* [CP-User] [RNFB] Core Configuration */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1087,7 +1087,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7CA590193DB67DAF1ACA6014 /* Pods-Ecency-EcencyTests.debug.xcconfig */; + baseConfigurationReference = 404E707BFB0A754BDB18D41C /* Pods-Ecency-EcencyTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1124,7 +1124,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 71637988A8C0116FCD68A50C /* Pods-Ecency-EcencyTests.release.xcconfig */; + baseConfigurationReference = 1DFEA0938900B7C7E419498A /* Pods-Ecency-EcencyTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1236,7 +1236,7 @@ }; 057A51AA2AD4962400E9A768 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7C697DCF6F04795709967001 /* Pods-ImageNotifi.debug.xcconfig */; + baseConfigurationReference = E71848FA34FB051BB9C34796 /* Pods-ImageNotifi.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1279,7 +1279,7 @@ }; 057A51AB2AD4962400E9A768 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BAA535169905BC192570B8E8 /* Pods-ImageNotifi.release.xcconfig */; + baseConfigurationReference = 4CA976A51F8781F23710B585 /* Pods-ImageNotifi.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1322,7 +1322,7 @@ }; 05B6C4B524C306CE00B7FA60 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F70C473E4325DFCBF55BC1D1 /* Pods-Ecency.debug.xcconfig */; + baseConfigurationReference = 0AA04D912D96044AECF20A65 /* Pods-Ecency.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -1407,7 +1407,7 @@ }; 05B6C4B624C306CE00B7FA60 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC495F97649F7DCCD265703A /* Pods-Ecency.release.xcconfig */; + baseConfigurationReference = 83345398C95A01BA9C82A26A /* Pods-Ecency.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c3edea8fdb..c27df41ed4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -483,8 +483,12 @@ PODS: - React-Core - react-native-restart (0.0.24): - React-Core - - react-native-safe-area-context (4.8.1): + - react-native-safe-area-context (4.5.0): + - RCT-Folly + - RCTRequired + - RCTTypeSafety - React-Core + - ReactCommon/turbomodule/core - react-native-udp (4.1.7): - CocoaAsyncSocket - React-Core @@ -619,12 +623,11 @@ PODS: - React - RNPermissions (3.7.3): - React-Core - - RNReanimated (3.6.1): + - RNReanimated (2.14.4): - DoubleConversion - FBLazyVector - FBReactNativeSpec - glog - - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety @@ -634,7 +637,6 @@ PODS: - React-Core/RCTWebSocket - React-CoreModules - React-cxxreact - - React-hermes - React-jsi - React-jsiexecutor - React-jsinspector @@ -648,7 +650,7 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.29.0): + - RNScreens (3.14.0): - React-Core - React-RCTImage - RNSVG (12.5.1): @@ -1055,7 +1057,7 @@ SPEC CHECKSUMS: React: ec6efc54c0fbb7c2e7147624c78065be80753082 React-bridging: 7dd96a58f896a1a7422a491d17ec644e87277953 React-callinvoker: f348d204f7bbe6020d4fd0dd57303f5b48a28003 - React-Codegen: 4d4cbbc69c4c934243dd61147f65b987259a1358 + React-Codegen: 73350192a09163a640c23baf795464474be0d793 React-Core: c57b11fd672421049038ef36881372da2605a0cd React-CoreModules: 2d91acffc3924adac6b508e3fc44121aa719ec40 React-cxxreact: ee2ab13a1db086dc152421aa42dc94cc68f412a1 @@ -1080,7 +1082,7 @@ SPEC CHECKSUMS: react-native-receive-sharing-intent: 62ab28c50e6ae56d32b9e841d7452091312a0bc7 react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-restart: 45c8dca02491980f2958595333cbccd6877cb57e - react-native-safe-area-context: cd1169d797a2ef722a00bfc5af10748d5b6c94f9 + react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc react-native-udp: df79c3cb72c4e71240cd3ce4687bfb8a137140d5 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 @@ -1115,8 +1117,8 @@ SPEC CHECKSUMS: RNNotifee: 053c0ace9c73634709a0214fd9c436a5777a562f RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027 RNPermissions: 314155ed6ce65237e7bd9fb6239219cce83228d3 - RNReanimated: c5a0074efffd21f4af324e86b19468758fe39fa2 - RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa + RNReanimated: 6668b0587bebd4b15dd849b99e5a9c70fc12ed95 + RNScreens: 4830eb40e0793b38849965cd27f4f3a7d7bc65c1 RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105 RNTusClient: b90393226531c118c4716a2b71128e3b9d9c77ee RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d diff --git a/package.json b/package.json index 3704b37b6d..d6998cc0bf 100644 --- a/package.json +++ b/package.json @@ -144,12 +144,12 @@ "react-native-qrcode-scanner": "^1.5.5", "react-native-qrcode-svg": "^6.0.3", "react-native-randombytes": "^3.6.1", - "react-native-reanimated": "^3.6.1", + "react-native-reanimated": "^2.12.0", "react-native-receive-sharing-intent": "^2.0.0", "react-native-render-html": "^6.0.5", "react-native-restart": "^0.0.24", - "react-native-safe-area-context": "^4.8.1", - "react-native-screens": "^3.29.0", + "react-native-safe-area-context": "^4.4.1", + "react-native-screens": "3.14.0", "react-native-scrollable-tab-view": "ecency/react-native-scrollable-tab-view", "react-native-slider": "^0.11.0", "react-native-snap-carousel": "^3.8.0", diff --git a/patches/react-native+0.70.7.patch b/patches/react-native+0.70.7.patch index 22c2faec89..873ff83759 100644 --- a/patches/react-native+0.70.7.patch +++ b/patches/react-native+0.70.7.patch @@ -70,19 +70,6 @@ index 0000000..361f5fb +++ b/node_modules/react-native/scripts/.packager.env @@ -0,0 +1 @@ +export RCT_METRO_PORT=8081 -diff --git a/node_modules/react-native/scripts/cocoapods/codegen_utils.rb b/node_modules/react-native/scripts/cocoapods/codegen_utils.rb -index 406e993..2c64fa5 100644 ---- a/node_modules/react-native/scripts/cocoapods/codegen_utils.rb -+++ b/node_modules/react-native/scripts/cocoapods/codegen_utils.rb -@@ -84,7 +84,7 @@ class CodegenUtils - 'source' => { :git => '' }, - 'header_mappings_dir' => './', - 'platforms' => { -- 'ios' => '11.0', -+ 'ios' => '12.0', - }, - 'source_files' => "**/*.{h,mm,cpp}", - 'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" => diff --git a/node_modules/react-native/sdks/hermes/hermes-engine.podspec b/node_modules/react-native/sdks/hermes/hermes-engine.podspec new file mode 100644 index 0000000..8d331e0 diff --git a/src/components/markdownEditor/children/editorToolbar.tsx b/src/components/markdownEditor/children/editorToolbar.tsx index 366c3d6cf0..6aee6efbd7 100644 --- a/src/components/markdownEditor/children/editorToolbar.tsx +++ b/src/components/markdownEditor/children/editorToolbar.tsx @@ -1,25 +1,17 @@ -import React, { useEffect, useRef, useState } from 'react'; import { Keyboard, View, ViewStyle } from 'react-native'; +import React, { useEffect, useMemo, useRef, useState } from 'react'; import { FlatList, - Gesture, - GestureDetector, - GestureStateChangeEvent, + HandlerStateChangeEvent, + PanGestureHandler, PanGestureHandlerEventPayload, } from 'react-native-gesture-handler'; import { getBottomSpace } from 'react-native-iphone-x-helper'; -import Animated, { - Easing, - clamp, - runOnJS, - useAnimatedStyle, - useSharedValue, - withTiming, -} from 'react-native-reanimated'; +import Animated, { EasingNode, Extrapolate } from 'react-native-reanimated'; import { IconButton, UploadsGalleryModal } from '../..'; +import styles from '../styles/editorToolbarStyles'; import { useAppSelector } from '../../../hooks'; import { MediaInsertData, Modes } from '../../uploadsGalleryModal/container/uploadsGalleryModal'; -import styles from '../styles/editorToolbarStyles'; import Formats from './formats/formats'; type Props = { @@ -51,10 +43,10 @@ export const EditorToolbar = ({ }: Props) => { const currentAccount = useAppSelector((state) => state.account.currentAccount); const uploadsGalleryModalRef = useRef(null); + const translateY = useRef(new Animated.Value(200)); + const shouldHideExtension = useRef(false); const extensionHeight = useRef(0); - const translateY = useSharedValue(200); - const [isExtensionVisible, setIsExtensionVisible] = useState(false); const [isKeyboardVisible, setKeyboardVisible] = useState(false); @@ -111,69 +103,92 @@ export const EditorToolbar = ({ _showUploadsExtension(Modes.MODE_VIDEO); }; - const _onPanEnd = (e: GestureStateChangeEvent) => { - console.log('finalize', e.velocityY, e.translationY); - const _shouldHide = e.velocityY > 300 || e.translationY > extensionHeight.current / 2; - if (_shouldHide) { - _hideExtension(); - } else { - _revealExtension(); - } - }; + // handles extension closing + const _onGestureEvent = Animated.event( + [ + { + nativeEvent: { + translationY: translateY.current, + }, + }, + ], + { + useNativeDriver: false, + }, + ); - const _gestureHandler = Gesture.Pan() - .onChange((e) => { - translateY.value = e.translationY; - }) - .onFinalize((e) => { - runOnJS(_onPanEnd)(e); - }); + const consY = useMemo( + () => + translateY.current.interpolate({ + inputRange: [0, 500], + outputRange: [0, 500], + extrapolate: Extrapolate.CLAMP, + }), + [translateY.current], + ); - const _animatedStyle = useAnimatedStyle(() => { - // Clamp the interpolated value to a specific range - return { - transform: [{ translateY: clamp(translateY.value, 0, 500) }], - }; - }); + const _animatedStyle = { + transform: [ + { + translateY: consY, + }, + ], + }; + + const _onPanHandlerStateChange = (e: HandlerStateChangeEvent) => { + console.log( + 'handler state change', + e.nativeEvent.velocityY, + e.nativeEvent.velocityY > 300, + e.nativeEvent.translationY, + ); + shouldHideExtension.current = + e.nativeEvent.velocityY > 300 || e.nativeEvent.translationY > extensionHeight.current / 2; + }; const _revealExtension = () => { if (!isExtensionVisible) { - translateY.value = 200; + translateY.current.setValue(200); } setIsExtensionVisible(true); - translateY.value = withTiming(0, { + Animated.timing(translateY.current, { duration: 200, - easing: Easing.inOut(Easing.ease), - }); + toValue: 0, + easing: EasingNode.inOut(EasingNode.ease), + }).start(); }; const _hideExtension = () => { - const _onComplete = () => { + Animated.timing(translateY.current, { + toValue: extensionHeight.current, + duration: 200, + easing: EasingNode.inOut(EasingNode.ease), + }).start(() => { + shouldHideExtension.current = false; setIsExtensionVisible(false); if (uploadsGalleryModalRef.current) { uploadsGalleryModalRef.current.toggleModal(false); } - }; + }); + }; - translateY.value = withTiming( - extensionHeight.current, - { - duration: 200, - easing: Easing.inOut(Easing.ease), - }, - (success) => { - if (success) { - runOnJS(_onComplete)(); - } - }, - ); + const _onPanEnded = () => { + if (shouldHideExtension.current) { + _hideExtension(); + } else { + _revealExtension(); + } }; const _renderExtension = () => { return ( - + { @@ -197,7 +212,7 @@ export const EditorToolbar = ({ /> - + ); }; diff --git a/src/components/progressiveImage/index.js b/src/components/progressiveImage/index.js new file mode 100644 index 0000000000..2a485b83e6 --- /dev/null +++ b/src/components/progressiveImage/index.js @@ -0,0 +1,67 @@ +import React, { useState } from 'react'; +import { View, StyleSheet } from 'react-native'; +import FastImage from 'react-native-fast-image'; +import Animated, { EasingNode } from 'react-native-reanimated'; + +const styles = StyleSheet.create({ + imageOverlay: { + position: 'absolute', + left: 0, + right: 0, + bottom: 0, + top: 0, + borderRadius: 8, + }, + container: { + backgroundColor: '#f6f6f6', + borderRadius: 8, + }, +}); + +const AnimatedFastImage = Animated.createAnimatedComponent(FastImage); + +const ProgressiveImage = ({ thumbnailSource, source, style, ...props }) => { + // const [calcImgHeight, setCalcImgHeight] = useState(300); + const thumbnailAnimated = new Animated.Value(0); + const imageAnimated = new Animated.Value(0); + + const handleThumbnailLoad = (e) => { + /* if (e) { + setCalcImgHeight(Math.floor((e.nativeEvent.height / e.nativeEvent.width) * dim.width)); + console.log(e.nativeEvent.width, e.nativeEvent.height); + } */ + Animated.timing(thumbnailAnimated, { + toValue: 1, + easing: EasingNode.inOut(EasingNode.ease), + }).start(); + }; + + const onImageLoad = () => { + Animated.timing(imageAnimated, { + toValue: 1, + easing: EasingNode.inOut(EasingNode.ease), + }).start(); + }; + + return ( + + + + + ); +}; + +export default ProgressiveImage; diff --git a/src/components/toggleSwitch/view/toggleSwitchStyles.js b/src/components/toggleSwitch/view/toggleSwitchStyles.js index f8b2f6ba80..bcce3f575b 100644 --- a/src/components/toggleSwitch/view/toggleSwitchStyles.js +++ b/src/components/toggleSwitch/view/toggleSwitchStyles.js @@ -5,27 +5,4 @@ export default EStyleSheet.create({ flexDirection: 'row', alignItems: 'center', }, - switch: { - justifyContent: 'center', - width: 68, - borderRadius: 20, - height: 35, - padding: 12, - }, - circle: { - alignItems: 'center', - justifyContent: 'center', - paddingHorizontal: 10, - position: 'absolute', - backgroundColor: 'white', - width: 28, - marginLeft: 4, - height: 28, - borderRadius: 28 / 2, - shadowOpacity: 0.2, - shadowOffset: { - height: 1.5, - }, - elevation: 3, - }, }); diff --git a/src/components/toggleSwitch/view/toggleSwitchView.js b/src/components/toggleSwitch/view/toggleSwitchView.js new file mode 100644 index 0000000000..8a8faf5610 --- /dev/null +++ b/src/components/toggleSwitch/view/toggleSwitchView.js @@ -0,0 +1,134 @@ +import React, { PureComponent } from 'react'; +import { View, TouchableOpacity, NativeModules } from 'react-native'; +import Animated, { EasingNode } from 'react-native-reanimated'; + +// Constants + +// Components + +// Styles +import styles from './toggleSwitchStyles'; + +class ToggleSwitchView extends PureComponent { + /* Props + * ------------------------------------------------ + * @prop { type } name - Description.... + */ + offsetX = new Animated.Value(0); + + constructor(props) { + super(props); + this.state = { + width: 68, + padding: 12, + circleWidth: 28, + circleHeight: 28, + translateX: 36, + isOn: props.isOn, + }; + } + + // Component Life Cycles + + componentDidMount() { + this.setState({ duration: 300 }); + } + + // Component Functions + _createCircleStyle = () => { + const { circleWidth, circleHeight } = this.state; + + return { + alignItems: 'center', + justifyContent: 'center', + paddingHorizontal: 10, + position: 'absolute', + backgroundColor: 'white', + transform: [{ translateX: this.offsetX }], + width: circleWidth, + marginLeft: 4, + height: circleHeight, + borderRadius: circleWidth / 2, + shadowOpacity: 0.2, + shadowOffset: { + height: 1.5, + }, + elevation: 3, + }; + }; + + _createSwitchStyle = () => { + const { onColor, offColor } = this.props; + const { padding, width, isOn } = this.state; + + return { + justifyContent: 'center', + width, + borderRadius: 20, + height: 35, + padding, + backgroundColor: isOn ? onColor || '#357ce6' : offColor || '#f5f5f5', + }; + }; + + _onToggle = () => { + const { onToggle, latchBack } = this.props; + const { isOn } = this.state; + this.setState({ isOn: !isOn }); + + // For debounce + setTimeout(() => { + if (onToggle) { + onToggle(!isOn); + } + // this.setState({isOn}) + }, 300); + + if (latchBack) { + setTimeout(() => { + this.setState({ isOn }); + }, 500); + } + }; + + _triggerAnimation = () => { + const { width, translateX, isOn, duration } = this.state; + const toValue = isOn ? width - (NativeModules.I18nManager.isRTL ? 100 : translateX) : 0; // in rtl layout, set the translate value to 100 + + Animated.timing(this.offsetX, { + toValue, + duration, + easing: EasingNode.inOut(EasingNode.ease), + }).start(); + }; + + UNSAFE_componentWillReceiveProps(nextProps) { + if (nextProps.isOn !== this.props.isOn) { + this.setState({ isOn: nextProps.isOn }); + } + } + + UNSAFE_componentWillMount() { + this.setState({ duration: 0 }); + } + + render() { + this._triggerAnimation(); + + return ( + + { + this._onToggle(); + }} + > + + + + ); + } +} + +export default ToggleSwitchView; diff --git a/src/components/toggleSwitch/view/toggleSwitchView.tsx b/src/components/toggleSwitch/view/toggleSwitchView.tsx deleted file mode 100644 index cb41ac81fd..0000000000 --- a/src/components/toggleSwitch/view/toggleSwitchView.tsx +++ /dev/null @@ -1,74 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { View, TouchableOpacity, NativeModules } from 'react-native'; -import Animated, { useSharedValue, withTiming } from 'react-native-reanimated'; - -// Styles -import EStyleSheet from 'react-native-extended-stylesheet'; -import styles from './toggleSwitchStyles'; - -interface Props { - onColor: string; - offColor: string; - isOn: boolean; - latchBack: boolean; - onToggle: (value: boolean) => void; -} - -const ToggleSwitchView = ({ onColor, offColor, latchBack, onToggle, ...props }: Props) => { - const [isOn, setIsOn] = useState(props.isOn); - - const offsetX = useSharedValue(0); - - useEffect(() => { - const _width = 68; - const _translateX = 36; - const _toValue = isOn ? _width - (NativeModules.I18nManager.isRTL ? 100 : _translateX) : 0; // in rtl layout, set the translate value to 100 - offsetX.value = withTiming(_toValue); - }, [isOn]); - - useEffect(() => { - if (props.isOn !== isOn) { - setIsOn(props.isOn); - } - }, [props.isOn]); - - const _onToggle = () => { - setIsOn(!isOn); - - // For debounce - setTimeout(() => { - if (onToggle) { - onToggle(!isOn); - } - // this.setState({isOn}) - }, 300); - - if (latchBack) { - setTimeout(() => { - setIsOn(isOn); - }, 500); - } - }; - - const _switchStyle = { - ...styles.switch, - backgroundColor: isOn - ? onColor || EStyleSheet.value('$primaryBlue') - : offColor || EStyleSheet.value('$primaryGray'), - }; - - const _circleStyle = { - ...styles.circle, - transform: [{ translateX: offsetX }], - }; - - return ( - - - - - - ); -}; - -export default ToggleSwitchView; diff --git a/src/components/uploadsGalleryModal/children/uploadsGalleryContent.tsx b/src/components/uploadsGalleryModal/children/uploadsGalleryContent.tsx index 7f7e9d3d84..2a9d6890c7 100644 --- a/src/components/uploadsGalleryModal/children/uploadsGalleryContent.tsx +++ b/src/components/uploadsGalleryModal/children/uploadsGalleryContent.tsx @@ -1,15 +1,13 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import { useIntl } from 'react-intl'; import { ActivityIndicator, Alert, Keyboard, Text, TouchableOpacity, View } from 'react-native'; import EStyleSheet from 'react-native-extended-stylesheet'; import { FlatList } from 'react-native-gesture-handler'; import Animated, { default as AnimatedView, - Easing, + EasingNode, SlideInRight, SlideOutRight, - useSharedValue, - withTiming, } from 'react-native-reanimated'; import { useDispatch } from 'react-redux'; import { Icon, IconButton } from '../..'; @@ -59,7 +57,7 @@ const UploadsGalleryContent = ({ const [isDeleteMode, setIsDeleteMode] = useState(false); const [isExpandedMode, setIsExpandedMode] = useState(false); - const animatedHeight = useSharedValue(COMPACT_HEIGHT); + const animatedHeightRef = useRef(new Animated.Value(COMPACT_HEIGHT)); const isDeleting = mode === Modes.MODE_IMAGE @@ -302,12 +300,13 @@ const UploadsGalleryContent = ({ color={EStyleSheet.value('$primaryBlack')} size={32} onPress={() => { - const _toValue = isExpandedMode ? COMPACT_HEIGHT : EXPANDED_HEIGHT; - animatedHeight.value = withTiming(_toValue, { - easing: Easing.inOut(Easing.cubic), + Animated.timing(animatedHeightRef.current, { + toValue: isExpandedMode ? COMPACT_HEIGHT : EXPANDED_HEIGHT, + duration: 300, + easing: EasingNode.inOut(EasingNode.cubic), + }).start(() => { + setIsExpandedMode(!isExpandedMode); }); - - setIsExpandedMode(!isExpandedMode); }} /> ); @@ -352,7 +351,7 @@ const UploadsGalleryContent = ({ }; return ( - + Date: Thu, 4 Jan 2024 14:14:23 +0500 Subject: [PATCH 2/3] using fixed backdrop with animation for now --- src/components/quickReplyModal/quickReplyModalView.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/quickReplyModal/quickReplyModalView.tsx b/src/components/quickReplyModal/quickReplyModalView.tsx index 62aad850e1..a9d207612b 100644 --- a/src/components/quickReplyModal/quickReplyModalView.tsx +++ b/src/components/quickReplyModal/quickReplyModalView.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useState } from 'react'; import ActionSheet from 'react-native-actions-sheet'; -import Animated, { FadeIn, FadeOut } from 'react-native-reanimated'; +import { View } from 'react-native'; import { QuickReplyModalContent } from './quickReplyModalContent'; import { useAppDispatch, useAppSelector } from '../../hooks'; import { hideReplyModal } from '../../redux/actions/uiAction'; @@ -50,9 +50,7 @@ const QuickReplyModal = () => { onClose={_onClose} /> - {backdropVisible && ( - - )} + {backdropVisible && } ); }; From d988036586e408db859bfc4f9c73eae35e208d49 Mon Sep 17 00:00:00 2001 From: noumantahir Date: Tue, 16 Jan 2024 16:43:40 +0500 Subject: [PATCH 3/3] project files update --- ios/Ecency.xcodeproj/project.pbxproj | 39 +++++++++++++++++++++------- ios/Podfile.lock | 2 +- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 8516388042..63e0257132 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 58F9BCC724793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; }; 58F9BCC824793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; }; 7C8D083700274C80BADEB3D6 /* Sansation_Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1D77AE9F7B24CF19834052B /* Sansation_Bold.ttf */; }; - 7F4B937591C4B6E56EB991C4 /* libPods-ImageNotifi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A196C466DE2A7EDB0F359F82 /* libPods-ImageNotifi.a */; }; 89D99F65314A416290F8D921 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 64F2A611E6EF486C8D3FB82C /* Roboto.ttf */; }; 92082305364D41A4A673F950 /* RobotoMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5795D1B1C55E46FF96CC4AED /* RobotoMono-Regular.ttf */; }; A57EE8B63D4948F0A05218E3 /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65F56948860941D6BA55779F /* rubicon-icon-font.ttf */; }; @@ -155,12 +154,9 @@ 83345398C95A01BA9C82A26A /* Pods-Ecency.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.release.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.release.xcconfig"; sourceTree = ""; }; 93B182C6FFA44610AB188D7C /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; 9464AFB033664B4F8E9F0BED /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; - 96E7FF80CADE8D5E6A44B1D7 /* libPods-Ecency-EcencyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency-EcencyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; 98D3D7C3AF354BF0987A2BFA /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; }; 9BC08A790166415B9BB3F5CF /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; - 9D3C26873EDE75EAB53BFB25 /* Pods-ImageNotifi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.release.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.release.xcconfig"; sourceTree = ""; }; - A196C466DE2A7EDB0F359F82 /* libPods-ImageNotifi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ImageNotifi.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A239FC84622A4A9CA7950ED9 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; BB1093ACCD904E2883413214 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; E71848FA34FB051BB9C34796 /* Pods-ImageNotifi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageNotifi.debug.xcconfig"; path = "Target Support Files/Pods-ImageNotifi/Pods-ImageNotifi.debug.xcconfig"; sourceTree = ""; }; @@ -404,7 +400,8 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "EcencyTests" */; buildPhases = ( - C54D84D662D6C182DE045D38 /* [CP] Check Pods Manifest.lock */, + 1BD01E9BED2645C1EAC86AF2 /* [CP] Check Pods Manifest.lock */, + C54D84D662D6C182DE045D38 /* Bundle React Native Code And Images */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, @@ -743,6 +740,28 @@ 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; }; + 1BD01E9BED2645C1EAC86AF2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Ecency-EcencyTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -777,7 +796,7 @@ files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", @@ -792,7 +811,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 7EEC7F0DE47D7C7CE8A3F289 /* [CP] Copy Pods Resources */ = { @@ -877,7 +896,7 @@ files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", @@ -892,10 +911,10 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C54D84D662D6C182DE045D38 /* [CP] Check Pods Manifest.lock */ = { + C54D84D662D6C182DE045D38 /* Bundle React Native Code And Images */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 388e9b9def..22ee1cd4a8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1132,6 +1132,6 @@ SPEC CHECKSUMS: Yoga: 92d086bb705a41cc588599b51db726ba7b1d341c YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 4a3bfe1f812d246ed7f7f03683c96b793859bec0 +PODFILE CHECKSUM: 12de1cef1f783b307ec212531b3c99dae87c022f COCOAPODS: 1.14.3