diff --git a/apps/mobile/App.js b/apps/mobile/App.js index d6a555c56..10e658367 100644 --- a/apps/mobile/App.js +++ b/apps/mobile/App.js @@ -27,7 +27,7 @@ import { export const DDS = new DeviceDetectionService(); export const db = new Storage(StorageInterface); -let timer = null; + let sideMenuRef; const App = () => { // Global State @@ -97,7 +97,7 @@ const App = () => { // Render if (!isIntialized) { - return ; + return <>; } console.log('rerendering plain'); return ( diff --git a/apps/mobile/ios/Fonts/Ionicons.ttf b/apps/mobile/ios/Fonts/Ionicons.ttf deleted file mode 100644 index 67bd84202..000000000 Binary files a/apps/mobile/ios/Fonts/Ionicons.ttf and /dev/null differ diff --git a/apps/mobile/ios/Notes.xcodeproj/project.pbxproj b/apps/mobile/ios/Notes.xcodeproj/project.pbxproj index 8f9266854..1f0142217 100644 --- a/apps/mobile/ios/Notes.xcodeproj/project.pbxproj +++ b/apps/mobile/ios/Notes.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 655394CA23888EBE008A1476 /* Quicksand-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 655394C223888EBE008A1476 /* Quicksand-Regular.ttf */; }; 655394CB23888EBE008A1476 /* Quicksand-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 655394C323888EBE008A1476 /* Quicksand-SemiBold.ttf */; }; 655394CC23888EBE008A1476 /* Quicksand-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 655394C423888EBE008A1476 /* Quicksand-Light.ttf */; }; - 655E77352380917B0049D452 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 655E772F2380917B0049D452 /* Ionicons.ttf */; }; 656C396C23A41CA20060E3AB /* NotoSerif-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 656C396923A41CA20060E3AB /* NotoSerif-Bold.ttf */; }; 656C396D23A41CA20060E3AB /* NotoSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 656C396A23A41CA20060E3AB /* NotoSans-Regular.ttf */; }; 656C396E23A41CA20060E3AB /* NotoSerif-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 656C396B23A41CA20060E3AB /* NotoSerif-Regular.ttf */; }; @@ -88,7 +87,6 @@ 655394C223888EBE008A1476 /* Quicksand-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Quicksand-Regular.ttf"; sourceTree = ""; }; 655394C323888EBE008A1476 /* Quicksand-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Quicksand-SemiBold.ttf"; sourceTree = ""; }; 655394C423888EBE008A1476 /* Quicksand-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Quicksand-Light.ttf"; sourceTree = ""; }; - 655E772F2380917B0049D452 /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = ""; }; 656C396923A41CA20060E3AB /* NotoSerif-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSerif-Bold.ttf"; sourceTree = ""; }; 656C396A23A41CA20060E3AB /* NotoSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSans-Regular.ttf"; sourceTree = ""; }; 656C396B23A41CA20060E3AB /* NotoSerif-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSerif-Regular.ttf"; sourceTree = ""; }; @@ -225,14 +223,6 @@ path = fonts; sourceTree = ""; }; - 655E772D2380917B0049D452 /* Fonts */ = { - isa = PBXGroup; - children = ( - 655E772F2380917B0049D452 /* Ionicons.ttf */, - ); - path = Fonts; - sourceTree = ""; - }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( @@ -244,7 +234,6 @@ isa = PBXGroup; children = ( 655394BB23888EBE008A1476 /* web */, - 655E772D2380917B0049D452 /* Fonts */, 13B07FAE1A68108700A75B9A /* Notes */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* NotesTests */, @@ -415,7 +404,6 @@ 655394C723888EBE008A1476 /* fonts.css in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 655394C623888EBE008A1476 /* texteditor.html in Resources */, - 655E77352380917B0049D452 /* Ionicons.ttf in Resources */, 655394CB23888EBE008A1476 /* Quicksand-SemiBold.ttf in Resources */, 655394CC23888EBE008A1476 /* Quicksand-Light.ttf in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, @@ -510,6 +498,7 @@ "${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", @@ -528,6 +517,7 @@ "${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", diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock index cdb455b10..ecb2f97aa 100644 --- a/apps/mobile/ios/Podfile.lock +++ b/apps/mobile/ios/Podfile.lock @@ -1,14 +1,14 @@ PODS: - boost-for-react-native (1.63.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.61.4) - - FBReactNativeSpec (0.61.4): + - FBLazyVector (0.61.5) + - FBReactNativeSpec (0.61.5): - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.4) - - RCTTypeSafety (= 0.61.4) - - React-Core (= 0.61.4) - - React-jsi (= 0.61.4) - - ReactCommon/turbomodule/core (= 0.61.4) + - RCTRequired (= 0.61.5) + - RCTTypeSafety (= 0.61.5) + - React-Core (= 0.61.5) + - React-jsi (= 0.61.5) + - ReactCommon/turbomodule/core (= 0.61.5) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -19,212 +19,214 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - RCTRequired (0.61.4) - - RCTTypeSafety (0.61.4): - - FBLazyVector (= 0.61.4) + - MMKV (1.0.23) + - RCTRequired (0.61.5) + - RCTTypeSafety (0.61.5): + - FBLazyVector (= 0.61.5) - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.4) - - React-Core (= 0.61.4) - - React (0.61.4): - - React-Core (= 0.61.4) - - React-Core/DevSupport (= 0.61.4) - - React-Core/RCTWebSocket (= 0.61.4) - - React-RCTActionSheet (= 0.61.4) - - React-RCTAnimation (= 0.61.4) - - React-RCTBlob (= 0.61.4) - - React-RCTImage (= 0.61.4) - - React-RCTLinking (= 0.61.4) - - React-RCTNetwork (= 0.61.4) - - React-RCTSettings (= 0.61.4) - - React-RCTText (= 0.61.4) - - React-RCTVibration (= 0.61.4) - - React-Core (0.61.4): + - RCTRequired (= 0.61.5) + - React-Core (= 0.61.5) + - React (0.61.5): + - React-Core (= 0.61.5) + - React-Core/DevSupport (= 0.61.5) + - React-Core/RCTWebSocket (= 0.61.5) + - React-RCTActionSheet (= 0.61.5) + - React-RCTAnimation (= 0.61.5) + - React-RCTBlob (= 0.61.5) + - React-RCTImage (= 0.61.5) + - React-RCTLinking (= 0.61.5) + - React-RCTNetwork (= 0.61.5) + - React-RCTSettings (= 0.61.5) + - React-RCTText (= 0.61.5) + - React-RCTVibration (= 0.61.5) + - React-Core (0.61.5): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.4) - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-Core/Default (= 0.61.5) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/CoreModulesHeaders (0.61.4): + - React-Core/CoreModulesHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/Default (0.61.4): + - React-Core/Default (0.61.5): - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/DevSupport (0.61.4): + - React-Core/DevSupport (0.61.5): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.4) - - React-Core/RCTWebSocket (= 0.61.4) - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) - - React-jsinspector (= 0.61.4) + - React-Core/Default (= 0.61.5) + - React-Core/RCTWebSocket (= 0.61.5) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) + - React-jsinspector (= 0.61.5) - Yoga - - React-Core/RCTActionSheetHeaders (0.61.4): + - React-Core/RCTActionSheetHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTAnimationHeaders (0.61.4): + - React-Core/RCTAnimationHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTBlobHeaders (0.61.4): + - React-Core/RCTBlobHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTImageHeaders (0.61.4): + - React-Core/RCTImageHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTLinkingHeaders (0.61.4): + - React-Core/RCTLinkingHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTNetworkHeaders (0.61.4): + - React-Core/RCTNetworkHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTSettingsHeaders (0.61.4): + - React-Core/RCTSettingsHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTTextHeaders (0.61.4): + - React-Core/RCTTextHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTVibrationHeaders (0.61.4): + - React-Core/RCTVibrationHeaders (0.61.5): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-Core/RCTWebSocket (0.61.4): + - React-Core/RCTWebSocket (0.61.5): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.4) - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsiexecutor (= 0.61.4) + - React-Core/Default (= 0.61.5) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsiexecutor (= 0.61.5) - Yoga - - React-CoreModules (0.61.4): - - FBReactNativeSpec (= 0.61.4) + - React-CoreModules (0.61.5): + - FBReactNativeSpec (= 0.61.5) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.61.4) - - React-Core/CoreModulesHeaders (= 0.61.4) - - React-RCTImage (= 0.61.4) - - ReactCommon/turbomodule/core (= 0.61.4) - - React-cxxreact (0.61.4): + - RCTTypeSafety (= 0.61.5) + - React-Core/CoreModulesHeaders (= 0.61.5) + - React-RCTImage (= 0.61.5) + - ReactCommon/turbomodule/core (= 0.61.5) + - React-cxxreact (0.61.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.61.4) - - React-jsi (0.61.4): + - React-jsinspector (= 0.61.5) + - React-jsi (0.61.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.61.4) - - React-jsi/Default (0.61.4): + - React-jsi/Default (= 0.61.5) + - React-jsi/Default (0.61.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.61.4): + - React-jsiexecutor (0.61.5): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - React-jsinspector (0.61.4) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - React-jsinspector (0.61.5) - react-native-aes (1.3.6): - React + - react-native-fast-storage (0.1.4): + - MMKV (= 1.0.23) + - React - react-native-webview (7.5.1): - React - - React-RCTActionSheet (0.61.4): - - React-Core/RCTActionSheetHeaders (= 0.61.4) - - React-RCTAnimation (0.61.4): - - React-Core/RCTAnimationHeaders (= 0.61.4) - - React-RCTBlob (0.61.4): - - React-Core/RCTBlobHeaders (= 0.61.4) - - React-Core/RCTWebSocket (= 0.61.4) - - React-jsi (= 0.61.4) - - React-RCTNetwork (= 0.61.4) - - React-RCTImage (0.61.4): - - React-Core/RCTImageHeaders (= 0.61.4) - - React-RCTNetwork (= 0.61.4) - - React-RCTLinking (0.61.4): - - React-Core/RCTLinkingHeaders (= 0.61.4) - - React-RCTNetwork (0.61.4): - - React-Core/RCTNetworkHeaders (= 0.61.4) - - React-RCTSettings (0.61.4): - - React-Core/RCTSettingsHeaders (= 0.61.4) - - React-RCTText (0.61.4): - - React-Core/RCTTextHeaders (= 0.61.4) - - React-RCTVibration (0.61.4): - - React-Core/RCTVibrationHeaders (= 0.61.4) - - ReactCommon/jscallinvoker (0.61.4): + - React-RCTActionSheet (0.61.5): + - React-Core/RCTActionSheetHeaders (= 0.61.5) + - React-RCTAnimation (0.61.5): + - React-Core/RCTAnimationHeaders (= 0.61.5) + - React-RCTBlob (0.61.5): + - React-Core/RCTBlobHeaders (= 0.61.5) + - React-Core/RCTWebSocket (= 0.61.5) + - React-jsi (= 0.61.5) + - React-RCTNetwork (= 0.61.5) + - React-RCTImage (0.61.5): + - React-Core/RCTImageHeaders (= 0.61.5) + - React-RCTNetwork (= 0.61.5) + - React-RCTLinking (0.61.5): + - React-Core/RCTLinkingHeaders (= 0.61.5) + - React-RCTNetwork (0.61.5): + - React-Core/RCTNetworkHeaders (= 0.61.5) + - React-RCTSettings (0.61.5): + - React-Core/RCTSettingsHeaders (= 0.61.5) + - React-RCTText (0.61.5): + - React-Core/RCTTextHeaders (= 0.61.5) + - React-RCTVibration (0.61.5): + - React-Core/RCTVibrationHeaders (= 0.61.5) + - ReactCommon/jscallinvoker (0.61.5): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.4) - - ReactCommon/turbomodule/core (0.61.4): + - React-cxxreact (= 0.61.5) + - ReactCommon/turbomodule/core (0.61.5): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 0.61.4) - - React-cxxreact (= 0.61.4) - - React-jsi (= 0.61.4) - - ReactCommon/jscallinvoker (= 0.61.4) + - React-Core (= 0.61.5) + - React-cxxreact (= 0.61.5) + - React-jsi (= 0.61.5) + - ReactCommon/jscallinvoker (= 0.61.5) - rn-fetch-blob (0.11.2): - React-Core - - RNCAsyncStorage (1.6.3): - - React - RNGestureHandler (1.5.0): - React - RNReanimated (1.4.0): @@ -253,6 +255,7 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - react-native-aes (from `../node_modules/react-native-aes-crypto`) + - react-native-fast-storage (from `../node_modules/react-native-fast-storage`) - react-native-webview (from `../node_modules/react-native-webview`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) @@ -266,7 +269,6 @@ DEPENDENCIES: - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - rn-fetch-blob (from `../node_modules/rn-fetch-blob`) - - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) @@ -276,6 +278,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native + - MMKV EXTERNAL SOURCES: DoubleConversion: @@ -308,6 +311,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" react-native-aes: :path: "../node_modules/react-native-aes-crypto" + react-native-fast-storage: + :path: "../node_modules/react-native-fast-storage" react-native-webview: :path: "../node_modules/react-native-webview" React-RCTActionSheet: @@ -332,8 +337,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon" rn-fetch-blob: :path: "../node_modules/rn-fetch-blob" - RNCAsyncStorage: - :path: "../node_modules/@react-native-community/async-storage" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" RNReanimated: @@ -348,38 +351,39 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: feb35a6b7f7b50f367be07f34012f34a79282fa3 - FBReactNativeSpec: 51477b84b1bf7ab6f9ef307c24e3dd675391be44 + FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f + FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: f3b3fb6f4723e8e52facb229d0c75fdc76773849 - RCTTypeSafety: 2ec60de6abb1db050b56ecc4b60188026078fd10 - React: 10e0130b57e55a7cd8c3dee37c1261102ce295f4 - React-Core: 636212410772d05f3a1eb79d965df2962ca1c70b - React-CoreModules: 6f70d5e41919289c582f88c9ad9923fe5c87400a - React-cxxreact: ddecbe9157ec1743f52ea17bf8d95debc0d6e846 - React-jsi: ca921f4041505f9d5197139b2d09eeb020bb12e8 - React-jsiexecutor: 8dfb73b987afa9324e4009bdce62a18ce23d983c - React-jsinspector: d15478d0a8ada19864aa4d1cc1c697b41b3fa92f + MMKV: 031ae51aedc0af1b250922f7ed8a6b6ee2f94c4c + RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 + RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 + React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 + React-Core: 688b451f7d616cc1134ac95295b593d1b5158a04 + React-CoreModules: d04f8494c1a328b69ec11db9d1137d667f916dcb + React-cxxreact: d0f7bcafa196ae410e5300736b424455e7fb7ba7 + React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7 + React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386 + React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0 react-native-aes: 22ea989d641f53ea7722fe6b146349ed66e6455d + react-native-fast-storage: bc274e68f7d87ffe777a1d20479544b7cd429b1d react-native-webview: 2aadbfef6b9eaa9e89b306ae3e31e6e870a6306d - React-RCTActionSheet: 7369b7c85f99b6299491333affd9f01f5a130c22 - React-RCTAnimation: d07be15b2bd1d06d89417eb0343f98ffd2b099a7 - React-RCTBlob: 8e0b23d95c9baa98f6b0e127e07666aaafd96c34 - React-RCTImage: 443050d14a66e8c2332e9c055f45689d23e15cc7 - React-RCTLinking: ce9a90ba155aec41be49e75ec721bbae2d48a47e - React-RCTNetwork: 41fe54bacc67dd00e6e4c4d30dd98a13e4beabc8 - React-RCTSettings: 45e3e0a6470310b2dab2ccc6d1d73121ba3ea936 - React-RCTText: 21934e0a51d522abcd0a275407e80af45d6fd9ec - React-RCTVibration: 0f76400ee3cec6edb9c125da49fed279340d145a - ReactCommon: a6a294e7028ed67b926d29551aa9394fd989c24c + React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 + React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 + React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 + React-RCTImage: 6b8e8df449eb7c814c99a92d6b52de6fe39dea4e + React-RCTLinking: 121bb231c7503cf9094f4d8461b96a130fabf4a5 + React-RCTNetwork: fb353640aafcee84ca8b78957297bd395f065c9a + React-RCTSettings: 8db258ea2a5efee381fcf7a6d5044e2f8b68b640 + React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe + React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad + ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc - RNCAsyncStorage: 3c304d1adfaea02ec732ac218801cb13897aa8c0 RNGestureHandler: a4ddde1ffc6e590c8127b8b7eabfdade45475c74 RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c RNScreens: f28b48b8345f2f5f39ed6195518291515032a788 RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4 - Yoga: ba3d99dbee6c15ea6bbe3783d1f0cb1ffb79af0f + Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b PODFILE CHECKSUM: 7cd3068f3c42e6d85b0135aaebe910c2bb876b5d diff --git a/apps/mobile/src/common/common.js b/apps/mobile/src/common/common.js index e82e6f3be..96c4b9ae4 100755 --- a/apps/mobile/src/common/common.js +++ b/apps/mobile/src/common/common.js @@ -1,6 +1,6 @@ import {DeviceEventEmitter, StatusBar, PixelRatio} from 'react-native'; -import AsyncStorage from '@react-native-community/async-storage'; +import FastStorage from 'react-native-fast-storage'; //COLOR SCHEME export const ACCENT = { color: '#0560FF', @@ -91,18 +91,18 @@ export function setColorScheme(colors = COLOR_SCHEME, accent = ACCENT) { } export async function getColorScheme() { - let accentColor = await AsyncStorage.getItem('accentColor'); - let t = await AsyncStorage.getItem('theme'); + let accentColor = await FastStorage.getItem('accentColor'); + let t = await FastStorage.getItem('theme'); if (typeof accentColor !== 'string') { - AsyncStorage.setItem('accentColor', '#0560FF'); + FastStorage.setItem('accentColor', '#0560FF'); setAccentColor('#0560FF'); } else { setAccentColor(accentColor); } if (typeof t !== 'string') { - AsyncStorage.setItem('theme', JSON.stringify({night: false})); + FastStorage.setItem('theme', JSON.stringify({night: false})); setColorScheme(COLOR_SCHEME_LIGHT); } else { let themeToSet = JSON.parse(t); diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js index 4ab2d763f..72f927d22 100644 --- a/apps/mobile/src/components/ActionSheetComponent/index.js +++ b/apps/mobile/src/components/ActionSheetComponent/index.js @@ -20,8 +20,7 @@ import Icon from 'react-native-vector-icons/Feather'; import NavigationService from '../../services/NavigationService'; import {db} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import AsyncStorage from '@react-native-community/async-storage'; - +import FastStorage from 'react-native-fast-storage'; const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; @@ -228,10 +227,10 @@ export const ActionSheetComponent = ({ icon: 'moon', func: () => { if (!colors.night) { - AsyncStorage.setItem('theme', JSON.stringify({night: true})); + FastStorage.setItem('theme', JSON.stringify({night: true})); changeColorScheme(COLOR_SCHEME_DARK); } else { - AsyncStorage.setItem('theme', JSON.stringify({night: false})); + FastStorage.setItem('theme', JSON.stringify({night: false})); changeColorScheme(COLOR_SCHEME_LIGHT); } }, diff --git a/apps/mobile/src/components/EditorMenu/index.js b/apps/mobile/src/components/EditorMenu/index.js index c9e810a25..fbeed5a17 100644 --- a/apps/mobile/src/components/EditorMenu/index.js +++ b/apps/mobile/src/components/EditorMenu/index.js @@ -20,7 +20,8 @@ import { } from '../../common/common'; import Icon from 'react-native-vector-icons/Feather'; import {h} from '../../utils/utils'; -import AsyncStorage from '@react-native-community/async-storage'; +import FastStorage from 'react-native-fast-storage'; + import {AnimatedSafeAreaView} from '../../views/Home'; import {TextInput} from 'react-native-gesture-handler'; import {useAppContext} from '../../provider/useAppContext'; @@ -276,13 +277,13 @@ export const EditorMenu = ({ icon: 'moon', func: () => { if (!colors.night) { - AsyncStorage.setItem( + FastStorage.setItem( 'theme', JSON.stringify(COLOR_SCHEME_DARK), ); changeColorScheme(COLOR_SCHEME_DARK); } else { - AsyncStorage.setItem( + FastStorage.setItem( 'theme', JSON.stringify(COLOR_SCHEME_LIGHT), ); diff --git a/apps/mobile/src/components/Menu/index.js b/apps/mobile/src/components/Menu/index.js index 6ce27ea89..8f7a6725a 100644 --- a/apps/mobile/src/components/Menu/index.js +++ b/apps/mobile/src/components/Menu/index.js @@ -18,10 +18,9 @@ import { } from '../../common/common'; import Icon from 'react-native-vector-icons/Feather'; import {h} from '../../utils/utils'; -import AsyncStorage from '@react-native-community/async-storage'; import {AnimatedSafeAreaView} from '../../views/Home'; import {useAppContext} from '../../provider/useAppContext'; - +import FastStorage from 'react-native-fast-storage'; export const Menu = ({close = () => {}, hide, update = () => {}}) => { const {colors, changeColorScheme} = useAppContext(); @@ -61,10 +60,10 @@ export const Menu = ({close = () => {}, hide, update = () => {}}) => { icon: 'moon', func: () => { if (!colors.night) { - AsyncStorage.setItem('theme', JSON.stringify({night: true})); + FastStorage.setItem('theme', JSON.stringify({night: true})); changeColorScheme(COLOR_SCHEME_DARK); } else { - AsyncStorage.setItem('theme', JSON.stringify({night: false})); + FastStorage.setItem('theme', JSON.stringify({night: false})); changeColorScheme(COLOR_SCHEME_LIGHT); } diff --git a/apps/mobile/src/utils/storage.js b/apps/mobile/src/utils/storage.js index 0c485b887..6c8808bcb 100644 --- a/apps/mobile/src/utils/storage.js +++ b/apps/mobile/src/utils/storage.js @@ -1,21 +1,21 @@ -import AsyncStorage from '@react-native-community/async-storage'; +import FastStorage from 'react-native-fast-storage'; import {NativeModules, Platform} from 'react-native'; var Aes = NativeModules.Aes; async function read(key) { - return await AsyncStorage.getItem(key); + return await FastStorage.getItem(key); } async function write(key, data) { - return await AsyncStorage.setItem(key, data); + return await FastStorage.setItem(key, data); } function remove(key) { - AsyncStorage.removeItem(key); + FastStorage.removeItem(key); } function clear() { - AsyncStorage.clear(); + FastStorage.clearStore(); } function encrypt(password, data) { diff --git a/apps/mobile/src/views/Editor/index.js b/apps/mobile/src/views/Editor/index.js index 6999fac69..7444d2d27 100755 --- a/apps/mobile/src/views/Editor/index.js +++ b/apps/mobile/src/views/Editor/index.js @@ -41,7 +41,7 @@ let note = {}; const Editor = ({navigation}) => { // Global State - const {colors} = useAppContext(); + const {colors, updateDB} = useAppContext(); // Local State @@ -93,7 +93,7 @@ const Editor = ({navigation}) => { }, dateCreated: timestamp, }); - + updateDB(); if (lockNote && noteProps.locked) { db.lockNote(timestamp, 'password'); } @@ -296,6 +296,7 @@ const Editor = ({navigation}) => { useEffect(() => { let handleBack = BackHandler.addEventListener('hardwareBackPress', () => { + updateDB(); setDialog(true); return true; }); diff --git a/apps/mobile/src/views/Settings/index.js b/apps/mobile/src/views/Settings/index.js index 6edcce33c..181907ff0 100644 --- a/apps/mobile/src/views/Settings/index.js +++ b/apps/mobile/src/views/Settings/index.js @@ -18,11 +18,10 @@ import { import Icon from 'react-native-vector-icons/Feather'; import {Header} from '../../components/header'; import {FlatList} from 'react-native-gesture-handler'; -import AsyncStorage from '@react-native-community/async-storage'; import {useAppContext} from '../../provider/useAppContext'; import {useIsFocused} from 'react-navigation-hooks'; import Container from '../../components/Container'; - +import FastStorage from 'react-native-fast-storage'; export const Settings = ({navigation}) => { const {colors, changeAccentColor, changeColorScheme} = useAppContext(); //const [colors, setColors] = useState(COLOR_SCHEME_LIGHT); @@ -81,7 +80,7 @@ export const Settings = ({navigation}) => { onPress={() => { changeAccentColor(item); - AsyncStorage.setItem('accentColor', item); + FastStorage.setItem('accentColor', item); }} style={{ flexDirection: 'row', @@ -109,13 +108,13 @@ export const Settings = ({navigation}) => { { if (!colors.night) { - AsyncStorage.setItem( + FastStorage.setItem( 'theme', JSON.stringify({night: true}), ); changeColorScheme(COLOR_SCHEME_DARK); } else { - AsyncStorage.setItem( + FastStorage.setItem( 'theme', JSON.stringify({night: false}), );