Skip to content
This repository has been archived by the owner on Jan 16, 2024. It is now read-only.

Commit

Permalink
fixed react-navigation installation
Browse files Browse the repository at this point in the history
  • Loading branch information
norbertschuler committed Dec 3, 2019
1 parent bfff72c commit c0937fa
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 2 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.facebook.react:react-native:+" // From node_modules
implementation 'com.facebook.fresco:animated-gif:1.10.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
if (useIntlJsc) {
implementation 'org.webkit:android-jsc-intl:+'
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/components/App/TreeCounter.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class App extends Component {
const backgroundColor = 'white';
return (
<SafeAreaView
forceInset={{ top: 'never' }}
forceInset={{ top: 'never', bottom: 'always' }}
style={{ flex: 1, backgroundColor: backgroundColor }}
>
<AppDrawerNavigatorContainer />
Expand Down
1 change: 1 addition & 0 deletions app/components/App/index.native.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { Provider } from 'react-redux';
import 'react-native-gesture-handler';

import TreeCounter from './TreeCounter';
import configureStore from '../../stores/TreecounterStore';
Expand Down
6 changes: 1 addition & 5 deletions app/components/Navigators/AppDrawerNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,9 @@ export const getAppNavigator = function(isLoggedIn, userProfile) {
[getLocalRoute('app_faq')]: FAQContainer,
['pickup_profile_modal']: ProfilePickerModal,
[getLocalRoute('app_treecounter')]: PublicTreeCounterContainer,

['about_us']: { screen: AboutUsContainer },
['contribution_details']: { screen: UserContributionDetails },

['license_info_list']: { screen: LicenseInfoList },

[getLocalRoute('app_imprint')]: {
screen: ImprintContainer
},
Expand Down Expand Up @@ -169,7 +166,7 @@ export const getAppNavigator = function(isLoggedIn, userProfile) {
},
{
headerMode: 'none',
navigationOptions: (/*{ navigation }*/) => {
defaultNavigationOptions: (/*{ navigation }*/) => {
return {
header: null
};
Expand Down Expand Up @@ -299,7 +296,6 @@ export const getAppNavigator = function(isLoggedIn, userProfile) {
[getLocalRoute('app_donateTrees')]: {
screen: SelectPlantProjectContainer
},

[getLocalRoute('app_giftTrees')]: {
screen: GiftTrees
}
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"react-native-document-picker": "^3.2.4",
"react-native-extended-stylesheet": "^0.12.0",
"react-native-fs": "2.14.1",
"react-native-gesture-handler": "^1.5.1",
"react-native-gesture-handler": "^1.5.2",
"react-native-htmlview": "^0.15.0",
"react-native-i18n": "^2.0.15",
"react-native-image-carousel": "^0.4.6",
Expand All @@ -83,6 +83,7 @@
"react-native-raw-bottom-sheet": "^2.0.6",
"react-native-reanimated": "^1.4.0",
"react-native-root-toast": "^3.2.0",
"react-native-screens": "^1.0.0-alpha.23",
"react-native-simple-radio-button": "^2.7.4",
"react-native-slick": "^1.0.2",
"react-native-svg": "^9.13.3",
Expand All @@ -91,7 +92,7 @@
"react-native-vector-icons": "6.6.0",
"react-native-webview": "^7.5.2",
"react-native-youtube": "^2.0.0",
"react-navigation": "^4.0.10 ",
"react-navigation": "^4.0.10",
"react-navigation-drawer": "^2.3.3",
"react-navigation-redux-helpers": "^1.1.2",
"react-navigation-stack": "^1.10.3",
Expand Down

0 comments on commit c0937fa

Please sign in to comment.