mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-23 05:13:04 +03:00
Fixed android white screen and crash issues
This commit is contained in:
parent
903a149d99
commit
f0b68f01db
@ -929,7 +929,7 @@
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios;
|
||||
PRODUCT_NAME = eSteem;
|
||||
PROVISIONING_PROFILE_SPECIFIER = dev09Dec;
|
||||
PROVISIONING_PROFILE_SPECIFIER = dev;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
};
|
||||
|
Binary file not shown.
@ -4,7 +4,5 @@
|
||||
<dict>
|
||||
<key>aps-environment</key>
|
||||
<string>development</string>
|
||||
<key>com.apple.developer.associated-domains</key>
|
||||
<array/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -67,7 +67,6 @@
|
||||
"react-native-navigation-bar-color": "^0.1.0",
|
||||
"react-native-reanimated": "^1.3.0",
|
||||
"react-native-render-html": "^4.1.2",
|
||||
"react-native-screens": "^2.0.0-alpha.16",
|
||||
"react-native-scrollable-tab-view": "esteemapp/react-native-scrollable-tab-view",
|
||||
"react-native-slider": "^0.11.0",
|
||||
"react-native-snap-carousel": "^3.8.0",
|
||||
|
@ -3,15 +3,12 @@ import 'react-native-gesture-handler';
|
||||
import { Provider, connect } from 'react-redux';
|
||||
import { PersistGate } from 'redux-persist/integration/react';
|
||||
import { IntlProvider } from 'react-intl';
|
||||
import { enableScreens } from 'react-native-screens';
|
||||
import { flattenMessages } from './utils/flattenMessages';
|
||||
import messages from './config/locales';
|
||||
|
||||
import Application from './screens/application';
|
||||
import { store, persistor } from './redux/store/store';
|
||||
|
||||
enableScreens();
|
||||
|
||||
const _renderApp = ({ locale }) => (
|
||||
<PersistGate loading={null} persistor={persistor}>
|
||||
<IntlProvider locale={locale} messages={flattenMessages(messages[locale])}>
|
||||
|
@ -1,78 +0,0 @@
|
||||
import React from 'react';
|
||||
import { createBottomTabNavigator } from 'react-navigation-tabs';
|
||||
|
||||
// Constants
|
||||
import ROUTES from '../constants/routeNames';
|
||||
import scalePx from '../utils/scalePx';
|
||||
|
||||
// Components
|
||||
import { Icon, IconContainer } from '../components/icon';
|
||||
import { Feed, Notification, Profile, Wallet } from '../screens';
|
||||
import { PostButton, BottomTabBar } from '../components';
|
||||
|
||||
const BaseNavigator = createBottomTabNavigator(
|
||||
{
|
||||
[ROUTES.TABBAR.FEED]: {
|
||||
screen: Feed,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon iconType="MaterialIcons" name="view-day" color={tintColor} size={scalePx(26)} />
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.NOTIFICATION]: {
|
||||
screen: Notification,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<IconContainer
|
||||
isBadge
|
||||
badgeType="notification"
|
||||
iconType="MaterialIcons"
|
||||
name="notifications"
|
||||
color={tintColor}
|
||||
size={scalePx(26)}
|
||||
/>
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.POST_BUTTON]: {
|
||||
screen: () => null,
|
||||
navigationOptions: {
|
||||
tabBarIcon: ({ tintColor }) => <PostButton />,
|
||||
},
|
||||
},
|
||||
[ROUTES.TABBAR.WALLET]: {
|
||||
screen: Wallet,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon
|
||||
iconType="MaterialIcons"
|
||||
name="account-balance-wallet"
|
||||
color={tintColor}
|
||||
size={scalePx(26)}
|
||||
/>
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.PROFILE]: {
|
||||
screen: Profile,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon iconType="MaterialIcons" name="person" color={tintColor} size={scalePx(26)} />
|
||||
),
|
||||
}),
|
||||
},
|
||||
},
|
||||
{
|
||||
tabBarComponent: props => <BottomTabBar {...props} />,
|
||||
tabBarOptions: {
|
||||
showLabel: false,
|
||||
activeTintColor: '#f6f6f6',
|
||||
inactiveTintColor: '#c1c5c7',
|
||||
style: {},
|
||||
tabStyle: {},
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
export { BaseNavigator };
|
@ -1 +0,0 @@
|
||||
export * from './baseNavigator';
|
@ -1,19 +1,28 @@
|
||||
import React from 'react';
|
||||
import { createSwitchNavigator } from 'react-navigation';
|
||||
import { createBottomTabNavigator } from 'react-navigation-tabs';
|
||||
import { createDrawerNavigator } from 'react-navigation-drawer';
|
||||
import { createStackNavigator } from 'react-navigation-stack';
|
||||
|
||||
import { BaseNavigator } from './baseNavigator';
|
||||
// Constants
|
||||
import ROUTES from '../constants/routeNames';
|
||||
import scalePx from '../utils/scalePx';
|
||||
|
||||
// Components
|
||||
import { Icon, IconContainer } from '../components/icon';
|
||||
import { PostButton, BottomTabBar, SideMenu } from '../components';
|
||||
|
||||
// Screens
|
||||
import {
|
||||
Bookmarks,
|
||||
Boost,
|
||||
Drafts,
|
||||
Editor,
|
||||
Feed,
|
||||
Follows,
|
||||
SpinGame,
|
||||
Login,
|
||||
PinCode,
|
||||
Notification,
|
||||
Post,
|
||||
Profile,
|
||||
ProfileEdit,
|
||||
@ -21,132 +30,102 @@ import {
|
||||
Redeem,
|
||||
SearchResult,
|
||||
Settings,
|
||||
SteemConnect,
|
||||
Transfer,
|
||||
Voters,
|
||||
Wallet,
|
||||
} from '../screens';
|
||||
|
||||
// Components
|
||||
import { SideMenu } from '../components';
|
||||
|
||||
const mainNavigation = createDrawerNavigator(
|
||||
const bottomTabNavigator = createBottomTabNavigator(
|
||||
{
|
||||
[ROUTES.SCREENS.FEED]: {
|
||||
screen: BaseNavigator,
|
||||
[ROUTES.TABBAR.FEED]: {
|
||||
screen: Feed,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon iconType="MaterialIcons" name="view-day" color={tintColor} size={scalePx(26)} />
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.NOTIFICATION]: {
|
||||
screen: Notification,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<IconContainer
|
||||
isBadge
|
||||
badgeType="notification"
|
||||
iconType="MaterialIcons"
|
||||
name="notifications"
|
||||
color={tintColor}
|
||||
size={scalePx(26)}
|
||||
/>
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.POST_BUTTON]: {
|
||||
screen: () => null,
|
||||
navigationOptions: {
|
||||
tabBarIcon: () => <PostButton />,
|
||||
},
|
||||
},
|
||||
[ROUTES.TABBAR.WALLET]: {
|
||||
screen: Wallet,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon
|
||||
iconType="MaterialIcons"
|
||||
name="account-balance-wallet"
|
||||
color={tintColor}
|
||||
size={scalePx(26)}
|
||||
/>
|
||||
),
|
||||
}),
|
||||
},
|
||||
[ROUTES.TABBAR.PROFILE]: {
|
||||
screen: Profile,
|
||||
navigationOptions: () => ({
|
||||
tabBarIcon: ({ tintColor }) => (
|
||||
<Icon iconType="MaterialIcons" name="person" color={tintColor} size={scalePx(26)} />
|
||||
),
|
||||
}),
|
||||
},
|
||||
},
|
||||
{
|
||||
contentComponent: SideMenu,
|
||||
tabBarComponent: props => <BottomTabBar {...props} />,
|
||||
tabBarOptions: {
|
||||
showLabel: false,
|
||||
activeTintColor: '#f6f6f6',
|
||||
inactiveTintColor: '#c1c5c7',
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
const mainNavigation = createDrawerNavigator(
|
||||
{ [ROUTES.SCREENS.FEED]: { screen: bottomTabNavigator } },
|
||||
{ contentComponent: SideMenu },
|
||||
);
|
||||
|
||||
const stackNavigator = createStackNavigator(
|
||||
{
|
||||
[ROUTES.DRAWER.MAIN]: {
|
||||
screen: mainNavigation,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.PROFILE]: {
|
||||
screen: Profile,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.PROFILE_EDIT]: {
|
||||
screen: ProfileEdit,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.POST]: {
|
||||
screen: Post,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.EDITOR]: {
|
||||
screen: Editor,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.VOTERS]: {
|
||||
screen: Voters,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.FOLLOWS]: {
|
||||
screen: Follows,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.SETTINGS]: {
|
||||
screen: Settings,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.DRAFTS]: {
|
||||
screen: Drafts,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.BOOKMARKS]: {
|
||||
screen: Bookmarks,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.SEARCH_RESULT]: {
|
||||
screen: SearchResult,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.TRANSFER]: {
|
||||
screen: Transfer,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.BOOST]: {
|
||||
screen: Boost,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.REDEEM]: {
|
||||
screen: Redeem,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.REBLOGS]: {
|
||||
screen: Reblogs,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
[ROUTES.SCREENS.SPIN_GAME]: {
|
||||
screen: SpinGame,
|
||||
navigationOptions: {
|
||||
header: () => null,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
headerMode: 'none',
|
||||
[ROUTES.DRAWER.MAIN]: { screen: mainNavigation },
|
||||
[ROUTES.SCREENS.PROFILE]: { screen: Profile },
|
||||
[ROUTES.SCREENS.PROFILE_EDIT]: { screen: ProfileEdit },
|
||||
[ROUTES.SCREENS.POST]: { screen: Post },
|
||||
[ROUTES.SCREENS.EDITOR]: { screen: Editor },
|
||||
[ROUTES.SCREENS.VOTERS]: { screen: Voters },
|
||||
[ROUTES.SCREENS.FOLLOWS]: { screen: Follows },
|
||||
[ROUTES.SCREENS.SETTINGS]: { screen: Settings },
|
||||
[ROUTES.SCREENS.DRAFTS]: { screen: Drafts },
|
||||
[ROUTES.SCREENS.BOOKMARKS]: { screen: Bookmarks },
|
||||
[ROUTES.SCREENS.SEARCH_RESULT]: { screen: SearchResult },
|
||||
[ROUTES.SCREENS.TRANSFER]: { screen: Transfer },
|
||||
[ROUTES.SCREENS.BOOST]: { screen: Boost },
|
||||
[ROUTES.SCREENS.REDEEM]: { screen: Redeem },
|
||||
[ROUTES.SCREENS.REBLOGS]: { screen: Reblogs },
|
||||
[ROUTES.SCREENS.SPIN_GAME]: { screen: SpinGame },
|
||||
},
|
||||
{ headerMode: 'none' },
|
||||
);
|
||||
|
||||
export default createSwitchNavigator({
|
||||
stackNavigator,
|
||||
[ROUTES.SCREENS.LOGIN]: { screen: Login },
|
||||
[ROUTES.SCREENS.PINCODE]: { screen: PinCode },
|
||||
[ROUTES.SCREENS.STEEM_CONNECT]: { screen: SteemConnect },
|
||||
});
|
||||
|
@ -7682,13 +7682,6 @@ react-native-safe-modules@^1.0.0:
|
||||
dependencies:
|
||||
debounce "^1.2.0"
|
||||
|
||||
react-native-screens@^2.0.0-alpha.16:
|
||||
version "2.0.0-alpha.16"
|
||||
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.16.tgz#4675c0e9b8cbd6b9321bfd3881b5939d61aba72b"
|
||||
integrity sha512-CGa0LT+AksCgttrVfM3cp8VWxUz6xcInj+qCUY1Nvd2HQh4gP3WQtH3SDWvMC3pFy3CbK0CbXZz7UcZsG3pzwQ==
|
||||
dependencies:
|
||||
debounce "^1.2.0"
|
||||
|
||||
react-native-scrollable-tab-view@esteemapp/react-native-scrollable-tab-view:
|
||||
version "0.10.0"
|
||||
resolved "https://codeload.github.com/esteemapp/react-native-scrollable-tab-view/tar.gz/a86ddabbda728b86eb16656b8e8e71655a38400e"
|
||||
|
Loading…
Reference in New Issue
Block a user