search

Glia-mh / glia-react-native

Hybrid mobile application for Glia
0 stars 0 forks source link

Merge Conflicts #10

Open AdityaAgg opened 7 years ago

AdityaAgg commented 7 years ago

Added Native Base Navigation - would be preferable to replace current navigation bar with native base navigation bar, so the experience is more seamless and feels more native rather than contrived in a JS framework like React Native.

AdityaAgg commented 7 years ago

Merge Conflicts also exist with the master branch regarding the formatting of about.js and login.js and survey_onboard.js. master will give more developed UI and UX, but need to ensure that pubnub branch functionality for these files still work and if it does not modify these files with correct variable names, etc. accordingly.

conversation.js merge conflicts are more about function as opposed to UI/UX so master can be overwritten.