ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-11-24 08:55:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2527 from ecency/nt/ios-fixes

Browse Source 
Nt/ios fixes
This commit is contained in:
Feruz M 2022-11-10 06:42:34 +05:30 committed by GitHub
commit e7bdd7f455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ios/Ecency.xcodeproj/project.pbxproj
View File

@ -18,9 +18,9 @@
05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58190B3B23294814000EA0E1 /* StoreKit.framework */; };
05B6C49724C306CE00B7FA60 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
05B6C4A724C306CE00B7FA60 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 588019232355C26B008397D1 /* AppCenter-Config.plist */; };
0604FF82291C1192008F323C /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06F72CA5290B2D7F003392F3 /* hermes.xcframework */; };
06844A5529119F05002FCC34 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 06844A5429119F05002FCC34 /* BootSplash.storyboard */; };
06F72CA3290B2159003392F3 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06F72CA2290B2159003392F3 /* AppDelegate.mm */; };
06F72CA6290B2D7F003392F3 /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06F72CA5290B2D7F003392F3 /* hermes.xcframework */; };
1CD0B89E258019B600A7D78E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */; };
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
@ -167,8 +167,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
06F72CA6290B2D7F003392F3 /* hermes.xcframework in Frameworks */,
05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */,
0604FF82291C1192008F323C /* hermes.xcframework in Frameworks */,
4C862CA54961F248740FD033 /* libPods-Ecency.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -362,6 +362,7 @@
00E356EB1AD99517003FC87E /* Frameworks */,
00E356EC1AD99517003FC87E /* Resources */,
6B252B733476BB711CE6A142 /* [CP] Copy Pods Resources */,
F3C6394C6EBC87626F25D7D5 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -404,6 +405,7 @@
3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */,
8CAC790A172583E183AC7A42 /* [CP] Copy Pods Resources */,
22F92F057F5D7E3DCA532FB8 /* [CP-User] [RNFB] Core Configuration */,
041F6EF745979D40AD8035BC /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -590,6 +592,24 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
041F6EF745979D40AD8035BC /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
05B6C48E24C306CE00B7FA60 /* Start Packager */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -833,6 +853,24 @@
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;
};
F3C6394C6EBC87626F25D7D5 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
FD10A7F122414F3F0027D42C /* Start Packager */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

2
ios/Podfile.lock
View File

@ -963,7 +963,7 @@ SPEC CHECKSUMS:
RNNotifee: dcb2593127f40945c4ee5fc09f61d71bbd00b9cf
RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
RNReanimated: 26c85a645e1b0e187d05918fbd5a33446406e7bf
RNReanimated: e985de53d37cc67ff4ea98d14615fec185510594
RNScreens: 4830eb40e0793b38849965cd27f4f3a7d7bc65c1
RNSVG: ecd661f380a07ba690c9c5929c475a44f432d674
RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d

10
src/screens/application/hook/useInitApplication.tsx
View File

@ -2,7 +2,7 @@ import { useEffect, useRef } from 'react';
import Orientation, { useDeviceOrientationChange } from 'react-native-orientation-locker';
import { isLandscape } from 'react-native-device-info';
import EStyleSheet from 'react-native-extended-stylesheet';
import { AppState, NativeEventSubscription, useColorScheme } from 'react-native';
import { Appearance, AppState, NativeEventSubscription, useColorScheme } from 'react-native';
import { useAppDispatch, useAppSelector } from '../../../hooks';
import { setDeviceOrientation, setLockedOrientation } from '../../../redux/actions/uiAction';
import { orientations } from '../../../redux/constants/orientationsConstants';
@ -52,7 +52,13 @@ export const useInitApplication = () => {
useEffect(() => {
if (THEME_OPTIONS[colorTheme].value === null) {
dispatch(setIsDarkTheme(systemColorScheme === 'dark'));
// workaround to avoid hook callback glitch on iOS causing momentary theme flash
setTimeout(() => {
const sysDarkTheme = Appearance.getColorScheme() === 'dark';
if (sysDarkTheme !== isDarkTheme) {
dispatch(setIsDarkTheme(sysDarkTheme));
}
}, 200);
}
}, [systemColorScheme]);