diff --git a/AUTHORS b/AUTHORS index 40aa2b227..8f3326e2c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,4 +5,5 @@ # Hope Tambala +Joseph McCombs diff --git a/App.js b/App.js index a2ac517b4..4e2cce553 100644 --- a/App.js +++ b/App.js @@ -1,18 +1,24 @@ // REACT import React from 'react'; -import { Provider } from 'react-redux'; +import { Provider as PaperProvider } from 'react-native-paper'; +import { Provider as StoreProvider } from 'react-redux'; import MainNavigation from './components/MainNavigation'; // REDUX import configureStore from './modules/state-management/configure-store'; +// STYLING +import theme from './modules/theme' + const store = configureStore(); const App = () => { return ( - - - + + + + + ); } diff --git a/README.md b/README.md index e90d2aa52..5882aaedd 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ Here are some quick npm commands to get started: - `npm lint-fix`: Run the ESLinter. +## Resources + +- [React Native Paper](https://callstack.github.io/react-native-paper/index.html) + + ## Standards [![js-standard-style](https://cdn.rawgit.com/standard/standard/master/badge.svg)](https://github.com/expo-community/standard-version-expo) diff --git a/app.json b/app.json index ae00967c0..a8cc97eb5 100644 --- a/app.json +++ b/app.json @@ -24,13 +24,15 @@ ], "ios": { "supportsTablet": true, - "buildNumber": "0.1.0" + "buildNumber": "0.1.0", + "bundleIdentifier": "com.puente.collect" }, "web": { "favicon": "./assets/images/favicon.png" }, "android": { - "versionCode": 370000100 + "versionCode": 370000100, + "package": "com.puente.collect" } } -} +} \ No newline at end of file diff --git a/components/TabBarIcon.js b/components/TabBarIcon/index.js similarity index 87% rename from components/TabBarIcon.js rename to components/TabBarIcon/index.js index 81d5378d9..10a8532ef 100644 --- a/components/TabBarIcon.js +++ b/components/TabBarIcon/index.js @@ -1,7 +1,7 @@ import { Ionicons } from '@expo/vector-icons'; import * as React from 'react'; -import Colors from '../constants/style/Colors'; +import Colors from '../../modules/theme/colors'; export default function TabBarIcon(props) { const { name, focused } = props; diff --git a/constants/style/Colors.js b/modules/theme/colors/index.js similarity index 100% rename from constants/style/Colors.js rename to modules/theme/colors/index.js diff --git a/modules/theme/index.js b/modules/theme/index.js new file mode 100644 index 000000000..baf21aade --- /dev/null +++ b/modules/theme/index.js @@ -0,0 +1,14 @@ +import { DefaultTheme } from 'react-native-paper'; + + +const theme = { + ...DefaultTheme, + colors: { + ...DefaultTheme.colors, + primary: 'tomato', + accent: 'yellow', + }, +}; + + +export default theme; \ No newline at end of file