Commit 6e776b7e authored by Solveig Hergot Langås's avatar Solveig Hergot Langås
Browse files

Merge branch 'Tab' into 'master'

#10 Tab-bar ferdig

See merge request !1
parents daf3f383 41c373b2
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
import React , { Component } from 'react';
import { Text, View } from 'react-native';
import { createBottomTabNavigator } from 'react-navigation-tabs';
import { createAppContainer } from 'react-navigation';
import { Icon } from 'react-native-elements';
import HomePage from './pages/HomePage';
import ExplorePage from './pages/ExplorePage';
export default function App() {
return (
<View style={styles.container}>
<Text>Open up App.js to start working on your app</Text>
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
alignItems: 'center',
justifyContent: 'center',
const TabNavigator = createBottomTabNavigator(
{ Home: { screen: HomePage,
navigationOptions: {
tabBarIcon: <Icon name = "home" size = "40%" />,
}
},
});
Explore: { screen: ExplorePage,
navigationOptions: {
tabBarIcon: <Icon name = "search" size = "40%" />
} }
},
{tabBarOptions: {
activeBackgroundColor : '#3f51b5',
inactiveBackgroundColor : 'rgba(63, 81, 181, .5)',
showLabel : false,
}});
export default createAppContainer(TabNavigator);
\ No newline at end of file
......@@ -1031,6 +1031,27 @@
}
}
},
"@react-navigation/core": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-3.5.1.tgz",
"integrity": "sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==",
"requires": {
"hoist-non-react-statics": "^3.3.0",
"path-to-regexp": "^1.7.0",
"query-string": "^6.4.2",
"react-is": "^16.8.6"
}
},
"@react-navigation/native": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-3.6.2.tgz",
"integrity": "sha512-Cybeou6N82ZeRmgnGlu+wzlV3z5BZQR2dmYaNFV1TNLUGHqtvv8E7oNw9uYcz9Ox5LFbiX+FdNTn2d6ZPlK0kg==",
"requires": {
"hoist-non-react-statics": "^3.0.1",
"react-native-safe-area-view": "^0.14.1",
"react-native-screens": "^1.0.0 || ^1.0.0-alpha"
}
},
"@types/fbemitter": {
"version": "2.0.32",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/@types/fbemitter/-/fbemitter-2.0.32.tgz",
......@@ -1054,11 +1075,43 @@
"@types/lodash": "*"
}
},
"@types/prop-types": {
"version": "15.7.3",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
"integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
},
"@types/qs": {
"version": "6.5.3",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/@types/qs/-/qs-6.5.3.tgz",
"integrity": "sha1-HDtxsJHq6vWSRTgAa39wYDzmPTg="
},
"@types/react": {
"version": "16.9.11",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.11.tgz",
"integrity": "sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ==",
"requires": {
"@types/prop-types": "*",
"csstype": "^2.2.0"
}
},
"@types/react-native": {
"version": "0.60.22",
"resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.60.22.tgz",
"integrity": "sha512-LTXMKEyGA+x4kadmjujX6yAgpcaZutJ01lC7zLJWCULaZg7Qw5/3iOQpwIJRUcOc+a8A2RR7rSxplehVf9IuhA==",
"requires": {
"@types/prop-types": "*",
"@types/react": "*"
}
},
"@types/react-native-vector-icons": {
"version": "6.4.4",
"resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.4.tgz",
"integrity": "sha512-G1Iry/8i23IPjZzNjydMt/WcjV+T1Xu3cTXDwSsP9lpKu0bA0j+c7AACJ1aIka8HVnWXS41NoZnKkHImO0SMkw==",
"requires": {
"@types/react": "*",
"@types/react-native": "*"
}
},
"@types/uuid-js": {
"version": "0.7.2",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/@types/uuid-js/-/uuid-js-0.7.2.tgz",
......@@ -1949,6 +2002,15 @@
"object-visit": "^1.0.0"
}
},
"color": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
"integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
"requires": {
"color-convert": "^1.9.1",
"color-string": "^1.5.2"
}
},
"color-convert": {
"version": "1.9.3",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/color-convert/-/color-convert-1.9.3.tgz",
......@@ -1962,6 +2024,15 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"color-string": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
"integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
"requires": {
"color-name": "^1.0.0",
"simple-swizzle": "^0.2.2"
}
},
"color-support": {
"version": "1.1.3",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/color-support/-/color-support-1.1.3.tgz",
......@@ -2154,6 +2225,11 @@
}
}
},
"csstype": {
"version": "2.6.7",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.7.tgz",
"integrity": "sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ=="
},
"debounce": {
"version": "1.2.0",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/debounce/-/debounce-1.2.0.tgz",
......@@ -2185,6 +2261,11 @@
"is-obj": "^1.0.0"
}
},
"deepmerge": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
"integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
},
"define-properties": {
"version": "1.1.3",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/define-properties/-/define-properties-1.1.3.tgz",
......@@ -3434,6 +3515,14 @@
}
}
},
"hoist-non-react-statics": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
"integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
"requires": {
"react-is": "^16.7.0"
}
},
"hosted-git-info": {
"version": "2.8.5",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
......@@ -4776,6 +4865,11 @@
"mimic-fn": "^1.0.0"
}
},
"opencollective-postinstall": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
"integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="
},
"opn": {
"version": "3.0.3",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/opn/-/opn-3.0.3.tgz",
......@@ -4942,6 +5036,21 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw="
},
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
"requires": {
"isarray": "0.0.1"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
}
}
},
"path-type": {
"version": "2.0.0",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/path-type/-/path-type-2.0.0.tgz",
......@@ -5146,6 +5255,16 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/qs/-/qs-6.9.0.tgz",
"integrity": "sha1-0Sl+KgScUxGctJzKNmrbusyAtAk="
},
"query-string": {
"version": "6.8.3",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.3.tgz",
"integrity": "sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==",
"requires": {
"decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
}
},
"querystringify": {
"version": "2.1.1",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/querystringify/-/querystringify-2.1.1.tgz",
......@@ -5241,6 +5360,11 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/react-is/-/react-is-16.11.0.tgz",
"integrity": "sha1-uF3+zUitHORp/1WKiCyo6DE5KPo="
},
"react-lifecycles-compat": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-native": {
"version": "https://github.com/expo/react-native/archive/sdk-35.0.0.tar.gz",
"integrity": "sha512-KBH8PlT3K3yTYW/u2E1KKTAaVq2WjYAqZTOgXyosSLwg/TVpG6JbHyTG4a24f5tI2GEqarRLufsggF4CkB7KUw==",
......@@ -5361,6 +5485,85 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/react-native-branch/-/react-native-branch-3.0.1.tgz",
"integrity": "sha1-Wwe2HL0pAWjNPDZi4Bfr4PNW0so="
},
"react-native-elements": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-1.2.7.tgz",
"integrity": "sha512-0S+0R1cbItl15i64qrkWnyMztwpw60d0SUsZGVDKRAMf0Jvq9Clgyh/MzxJx2sr42mbedQP1sg5Et4fZM7Fp1w==",
"requires": {
"@types/react-native-vector-icons": "^6.4.4",
"color": "^3.1.0",
"deepmerge": "^3.1.0",
"hoist-non-react-statics": "^3.1.0",
"opencollective-postinstall": "^2.0.0",
"prop-types": "^15.7.2",
"react-native-ratings": "^6.3.0",
"react-native-status-bar-height": "^2.2.0"
}
},
"react-native-gesture-handler": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.3.0.tgz",
"integrity": "sha512-ASRFIXBuKRvqlmwkWJhV8yP2dTpvcqVrLNpd7FKVBFHYWr6SAxjGyO9Ik8w1lAxDhMlRP2IcJ9p9eq5X2WWeLQ==",
"requires": {
"hoist-non-react-statics": "^2.3.1",
"invariant": "^2.2.2",
"prop-types": "^15.5.10"
},
"dependencies": {
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
}
}
},
"react-native-ratings": {
"version": "6.5.0",
"resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-6.5.0.tgz",
"integrity": "sha512-YMcfQ7UQCmXGEc/WPlukHSHs5yvckTwjq5fTRk1FG8gaO7fZCNygEUGPuw4Dbvvp3IlsCUn0bOQd63RYsb7NDQ==",
"requires": {
"lodash": "^4.17.4",
"prop-types": "^15.5.10"
}
},
"react-native-reanimated": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.4.0.tgz",
"integrity": "sha512-tO7nSNNP+iRLVbkcSS5GXyDBb7tSI02+XuRL3/S39EAr35rnvUy2JfeLUQG+fWSObJjnMVhasUDEUwlENk8IXw=="
},
"react-native-safe-area-view": {
"version": "0.14.8",
"resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz",
"integrity": "sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==",
"requires": {
"hoist-non-react-statics": "^2.3.1"
},
"dependencies": {
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
}
}
},
"react-native-screens": {
"version": "1.0.0-alpha.23",
"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz",
"integrity": "sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==",
"requires": {
"debounce": "^1.2.0"
}
},
"react-native-status-bar-height": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-native-status-bar-height/-/react-native-status-bar-height-2.4.0.tgz",
"integrity": "sha512-pWvZFlyIHiuxLugLioq97vXiaGSovFXEyxt76wQtbq0gxv4dGXMPqYow46UmpwOgeJpBhqL1E0EKxnfJRrFz5w=="
},
"react-native-tab-view": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-2.10.0.tgz",
"integrity": "sha512-qgexVz5eO4yaFjdkmn/sURXgVvaBo6pZD/q1eoca96SbPVbaH3WzVhF3bRUfeTHwZkXwznFTpS3JURqIFU8vQA=="
},
"react-native-view-shot": {
"version": "2.6.0",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/react-native-view-shot/-/react-native-view-shot-2.6.0.tgz",
......@@ -5405,6 +5608,26 @@
}
}
},
"react-navigation": {
"version": "4.0.10",
"resolved": "https://registry.npmjs.org/react-navigation/-/react-navigation-4.0.10.tgz",
"integrity": "sha512-7PqvmsdQ7HIyxPUMYbd9Uq//VoMdniEOLAOSvIhb/ExtbAt/1INSjUF+RiMWOMCWLTCNvNPRvTz7xy7qwWureg==",
"requires": {
"@react-navigation/core": "^3.5.1",
"@react-navigation/native": "^3.6.2"
}
},
"react-navigation-tabs": {
"version": "2.5.6",
"resolved": "https://registry.npmjs.org/react-navigation-tabs/-/react-navigation-tabs-2.5.6.tgz",
"integrity": "sha512-4WivEAsChJ+MuJ6JHxhAUMekHnVIt/zc4y/07KChXD5NBkSE0sk4vmMRndZQ6AP3n/ZihACcfigBAsMoqt0JXA==",
"requires": {
"hoist-non-react-statics": "^3.3.0",
"react-lifecycles-compat": "^3.0.4",
"react-native-safe-area-view": "^0.14.6",
"react-native-tab-view": "^2.9.0"
}
},
"react-proxy": {
"version": "1.1.8",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/react-proxy/-/react-proxy-1.1.8.tgz",
......@@ -6093,6 +6316,21 @@
"plist": "^3.0.1"
}
},
"simple-swizzle": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
"integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
"requires": {
"is-arrayish": "^0.3.1"
},
"dependencies": {
"is-arrayish": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
}
}
},
"slash": {
"version": "2.0.0",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/slash/-/slash-2.0.0.tgz",
......@@ -6279,6 +6517,11 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
"integrity": "sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ="
},
"split-on-first": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
},
"split-string": {
"version": "3.1.0",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/split-string/-/split-string-3.1.0.tgz",
......@@ -6326,6 +6569,11 @@
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/stream-buffers/-/stream-buffers-2.2.0.tgz",
"integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
},
"strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
},
"string-width": {
"version": "2.1.1",
"resolved": "https://artifactory.palantir.build/artifactory/api/npm/all-npm/string-width/-/string-width-2.1.1.tgz",
......
import React, { Component } from 'react';
import { StyleSheet, Text, View } from 'react-native';
class ExplorePage extends Component {
render(){
return(
<View>
<Text> ExplorePage </Text>
</View>
)
}
}
export default ExplorePage;
\ No newline at end of file
import React, { Component } from 'react';
import { StyleSheet, Text, View } from 'react-native';
class HomePage extends Component{
render(){
return(
<Text> HomePage </Text>
)
}
}
export default HomePage;
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment