unicorn-demo-app 7.2.4 → 7.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unicorn-demo-app",
-  "version": "7.2.4",
+  "version": "7.3.0",
   "main": "src/index.js",
   "author": "Ethan Sharabi <ethan.shar@gmail.com>",
   "license": "MIT",
@@ -20,8 +20,8 @@
     "shell-utils": "^1.0.10"
   },
   "peerDependencies": {
-    "react": "^18.0.0",
-    "react-native": "^0.69.1",
+    "react": "^18.2.0",
+    "react-native": "^0.71.2",
     "react-native-ui-lib": "*",
     "semver": "^5.5.0"
   }

package/src/demoApp.js

@@ -1,8 +1,7 @@
-import AsyncStorage from '@react-native-community/async-storage';
 import {Navigation} from 'react-native-navigation';
 import {Constants, Colors, Typography} from 'react-native-ui-lib'; // eslint-disable-line
 import {registerScreens} from './screens';
-
+import Storage, {DEFAULT_SCREEN} from './storage';
 
 /** Examples - uncomment when needed */
 // Typography.loadTypographies({
@@ -115,12 +114,10 @@ function startApp(defaultScreen) {
   Navigation.setRoot(rootObject);
 }
 
-async function getDefaultScreenAndStartApp() {
-  try {
-    const defaultScreen = await AsyncStorage.getItem('uilib.defaultScreen');
-    startApp(defaultScreen);
-  } catch (error) {
-    console.warn(error);
+function getDefaultScreenAndStartApp() {
+  if (Storage.contains(DEFAULT_SCREEN)) {
+    startApp(Storage.getString(DEFAULT_SCREEN));
+  } else {
     startApp();
   }
 }

package/src/screens/MainScreen.js

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import React, {Component} from 'react';
-import AsyncStorage from '@react-native-community/async-storage';
 import PropTypes from 'prop-types';
 import {StyleSheet, FlatList, SectionList, ScrollView} from 'react-native';
 import {ViewPropTypes} from 'deprecated-react-native-prop-types';
@@ -21,6 +20,7 @@ import {
   Dividers
 } from 'react-native-ui-lib'; //eslint-disable-line
 import {navigationData} from './MenuStructure';
+import Storage, {DEFAULT_SCREEN} from '../storage';
 
 const settingsIcon = require('../assets/icons/settings.png');
 const chevronIcon = require('../assets/icons/chevronRight.png');
@@ -152,7 +152,7 @@ class MainScreen extends Component {
   };
 
   setDefaultScreen = ({customValue: item}) => {
-    AsyncStorage.setItem('uilib.defaultScreen', item.screen);
+    Storage.set(DEFAULT_SCREEN, item.screen);
     this.openScreen({customValue: item});
   };
 
@@ -269,7 +269,7 @@ class MainScreen extends Component {
   onCheckViewableItems = ({viewableItems}) => {
     const {chipsLabels, selectedSection} = this.state;
     if (!this.hasPressItem && this.hasUserScrolled) {
-      const title = viewableItems[0].section.title;
+      const title = viewableItems[0]?.section.title;
       const sectionIndex = _.findIndex(chipsLabels, c => {
         return c === title;
       });

package/src/screens/SettingsScreen.js

@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import React, {Component} from 'react';
-import AsyncStorage from '@react-native-community/async-storage';
 import {StyleSheet, I18nManager} from 'react-native';
 import {Colors, View, Text, Picker, Incubator, Switch} from 'react-native-ui-lib'; //eslint-disable-line
 import {navigationData} from './MenuStructure';
+import Storage, {DEFAULT_SCREEN, IS_RTL} from '../storage';
 
 const none = {label: '[None]', value: ''};
 
@@ -28,17 +28,17 @@ class SettingsScreen extends Component {
 
     this.state = {
       showRefreshMessage: false,
+      isRTL: false,
       screens
     };
   }
 
-  async UNSAFE_componentWillMount() {
+  UNSAFE_componentWillMount() {
     const {screens} = this.state;
-    const defaultScreenId = await AsyncStorage.getItem('uilib.defaultScreen');
+    const defaultScreenId = Storage.getString(DEFAULT_SCREEN);
     const defaultScreen = _.find(screens, {value: defaultScreenId});
 
-    const isRTLString = await AsyncStorage.getItem('uilib.isRTL');
-    const isRTL = isRTLString === 'true';
+    const isRTL = Storage.getBoolean(IS_RTL);
 
     this.setState({defaultScreen, isRTL});
   }
@@ -46,7 +46,7 @@ class SettingsScreen extends Component {
   onDirectionChange = () => {
     this.setState({isRTL: !this.state.isRTL}, () => {
       I18nManager.forceRTL(this.state.isRTL);
-      AsyncStorage.setItem('uilib.isRTL', `${this.state.isRTL}`);
+      Storage.set(IS_RTL, this.state.isRTL);
       setTimeout(() => {
         this.setState({showRefreshMessage: true});
       }, 1000);
@@ -55,7 +55,7 @@ class SettingsScreen extends Component {
 
   setDefaultScreen = screen => {
     this.setState({defaultScreen: screen});
-    AsyncStorage.setItem('uilib.defaultScreen', screen.value);
+    Storage.set(DEFAULT_SCREEN, screen);
     setTimeout(() => {
       this.setState({showRefreshMessage: true});
     }, 1000);