Skip to content

Createbottomtabnavigator() moved to 'react navigation tabs' #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Createbottomtabnavigator() moved to 'react navigation tabs' #127

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c402174
Upgraded Library versions
AbhiKul10 Apr 6, 2021
ff60371
installing react-navigation-stack library
AbhiKul10 Apr 9, 2021
04c5656
Update build.gradle
AbhiKul10 Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import React, { Component } from "react";
import { AppRegistry, Dimensions, ActivityIndicator, AsyncStorage, View, StyleSheet, StatusBar } from "react-native";
import { createStackNavigator, createSwitchNavigator, createBottomTabNavigator, createAppContainer } from "react-navigation";


import { createSwitchNavigator, createAppContainer } from "react-navigation";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"
import { createStackNavigator } from 'react-navigation-stack';
import Ionicons from "react-native-vector-icons/FontAwesome";



//Components
import HomeScreen from "./app/screens/HomeScreen/homeScreen";
import MapScreen from "./app/screens/MapScreen/mapScreen";
Expand Down Expand Up @@ -115,4 +121,4 @@ const AuthStack = createStackNavigator(

const AppContainer = createAppContainer(AuthStack);
export default AppContainer;

6 changes: 3 additions & 3 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 28
buildToolsVersion "27.0.3"
buildToolsVersion "29.0.2"
Copy link
Collaborator

@shehand shehand May 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these commits are not related to this PR. Remove them from this PR or create a single PR containing the changes.

Copy link
Contributor Author

@AbhiKul10 AbhiKul10 Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻


defaultConfig {
applicationId "com.go_social"
Expand All @@ -105,15 +105,15 @@ android {
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "arm64-v8a", "x86"
}
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include "armeabi-v7a", "x86"
include "armeabi-v7a", "arm64-v8a", "x86"
}
}
buildTypes {
Expand Down
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Apr 06 13:26:18 IST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
# distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
13 changes: 11 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,30 @@
"test": "jest --detectOpenHandles -u"
},
"dependencies": {
"@react-native-async-storage/async-storage": "^1.15.1",
"@react-native-community/async-storage": "^1.12.1",
"@react-navigation/bottom-tabs": "^5.11.9",
"email-validator": "^2.0.4",
"es6-symbol": "^3.1.3",
"firebase": "^7.2.2",
"react": "16.12.0",
"react-native": "^0.58.6",
"react-native-elements": "^1.1.0",
"react-native-fbsdk": "1.0.0-rc.3",
"react-native-gesture-handler": "^1.0.12",
"react-native-gesture-handler": "^1.10.3",
"react-native-google-places-autocomplete": "^1.3.9",
"react-native-image-crop-picker": "^0.28.0",
"react-native-image-picker": "^2.0.0",
"react-native-maps": "^0.26.1",
"react-native-maps-directions": "^1.6.0",
"react-native-micro-animated-button": "0.0.28",
"react-native-reanimated": "^2.1.0",
"react-native-safe-area-context": "^3.2.0",
"react-native-screens": "^3.0.0",
"react-native-vector-icons": "^6.1.0",
"react-navigation": "^4.0.6"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4",
"string.fromcodepoint": "^1.0.0"
},
"devDependencies": {
"babel-jest": "25.1.0",
Expand Down