verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[NEW] Changed navigation library to react-navigation. (#41) 

* Changed navigation library to react-navigation.
Refactoring on sagas to remove navigation navigation flow do it in views.
Added new modal library.
Renamed view files to the same name of their classes.
Added support to redux-devtools using the chrome extension through Remote devtools menu.
Some components was refactored to reduce complexity and more legibility.

* Remove react-native-navigation from Android

* Adding servers to drawer menu, allowing server switch.

* Sidebar component

* opss :x fix add server

* opss :x fix add server

* Fixed add server navigation issues, fixed empty and slow Rooms List and Chat Messages

* Disable cleanup everytime

* some fixes

* some fixes

*  fix?

* .

* Fixed logo not displaying when app is loading or signing to server

* Fixed logo in loading and login

* Update LoginView.js

* Update PublicRoutes.js
This commit is contained in:
gilmarsquinelato 2017-09-21 14:08:00 -03:00 committed by Guilherme Gazzo
parent 332d7dab13
commit d55db0fca5
46 changed files with 983 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
__tests__/__snapshots__/Storyshots.test.js.snap
View File

@ -235,6 +235,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -338,6 +339,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -441,6 +443,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -565,6 +568,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -689,6 +693,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -813,6 +818,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },
@ -937,6 +943,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
"position": "absolute", "position": "absolute",
}, },
Object { Object {
"borderRadius": 20,
"height": 40, "height": 40,
"width": 40, "width": 40,
}, },

1
android/app/build.gradle
View File

@ -144,7 +144,6 @@ android {
} }
dependencies { dependencies {
compile project(':react-native-navigation')
compile project(':react-native-svg') compile project(':react-native-svg')
compile project(':react-native-image-picker') compile project(':react-native-image-picker')
compile project(':react-native-vector-icons') compile project(':react-native-vector-icons')

12
android/app/src/main/java/com/rocketchatrn/MainActivity.java
View File

@ -1,7 +1,15 @@
package com.rocketchatrn; package com.rocketchatrn;
import com.reactnativenavigation.controllers.SplashActivity; import com.facebook.react.ReactActivity;
public class MainActivity extends SplashActivity { public class MainActivity extends ReactActivity {
/**
* Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component.
*/
@Override
protected String getMainComponentName() {
return "RocketChatRN";
}
} }

38
android/app/src/main/java/com/rocketchatrn/MainApplication.java
View File

@ -3,7 +3,6 @@ package com.rocketchatrn;
import android.app.Application; import android.app.Application;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
// import com.reactnativenavigation.NavigationReactPackage;
import com.horcrux.svg.SvgPackage; import com.horcrux.svg.SvgPackage;
import com.imagepicker.ImagePickerPackage; import com.imagepicker.ImagePickerPackage;
import com.oblador.vectoricons.VectorIconsPackage; import com.oblador.vectoricons.VectorIconsPackage;
@ -14,31 +13,40 @@ import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage; import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage; import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.reactnativenavigation.NavigationApplication;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class MainApplication extends NavigationApplication { public class MainApplication extends Application implements ReactApplication {
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@Override @Override
public boolean isDebug() { public boolean getUseDeveloperSupport() {
// Make sure you are using BuildConfig from your own application
return BuildConfig.DEBUG; return BuildConfig.DEBUG;
} }
@Override
protected List<ReactPackage> getPackages() { protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList( return Arrays.<ReactPackage>asList(
new SvgPackage(), new MainReactPackage(),
new ImagePickerPackage(), new SvgPackage(),
new VectorIconsPackage(), new ImagePickerPackage(),
new RNFetchBlobPackage(), new VectorIconsPackage(),
new ZeroconfReactPackage(), new RNFetchBlobPackage(),
new RealmReactPackage() new ZeroconfReactPackage(),
new RealmReactPackage()
); );
} }
};
@Override @Override
public List<ReactPackage> createAdditionalReactPackages() { public ReactNativeHost getReactNativeHost() {
return getPackages(); return mReactNativeHost;
} }
@Override
public void onCreate() {
super.onCreate();
SoLoader.init(this, /* native exopackage */ false);
}
} }

2
android/settings.gradle
View File

@ -1,6 +1,4 @@
rootProject.name = 'RocketChatRN' rootProject.name = 'RocketChatRN'
include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
include ':react-native-svg' include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':react-native-image-picker' include ':react-native-image-picker'

3
app/containers/Avatar.js
View File

@ -36,7 +36,8 @@ class Avatar extends React.PureComponent {
const avatarStyle = { const avatarStyle = {
width: size, width: size,
height: size height: size,
borderRadius
}; };
const uri = avatar || `${ baseUrl }/avatar/${ text }`; const uri = avatar || `${ baseUrl }/avatar/${ text }`;

30
app/containers/Banner.js
View File

@ -30,9 +30,29 @@ export default class Banner extends React.PureComponent {
authenticating: PropTypes.bool, authenticating: PropTypes.bool,
offline: PropTypes.bool offline: PropTypes.bool
} }
componentWillMount() {
this.state = {
slow: false
};
this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
}
componentWillUnmount() {
clearTimeout(this.timer);
}
render() { render() {
const { connecting, authenticating, offline } = this.props; const { connecting, authenticating, offline } = this.props;
if (!this.state.slow) {
return null;
}
if (offline) {
return (
<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
</View>
);
}
if (connecting) { if (connecting) {
return ( return (
<View style={[styles.bannerContainer, { backgroundColor: '#0d0' }]}> <View style={[styles.bannerContainer, { backgroundColor: '#0d0' }]}>
@ -48,13 +68,7 @@ export default class Banner extends React.PureComponent {
</View> </View>
); );
} }
if (offline) {
return (
<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
</View>
);
}
return null; return null;
} }
} }

9
app/containers/Message.js
View File

@ -10,7 +10,8 @@ import User from './message/User';
const styles = StyleSheet.create({ const styles = StyleSheet.create({
content: { content: {
flexGrow: 1 flexGrow: 1,
flexShrink: 1
}, },
message: { message: {
padding: 12, padding: 12,
@ -29,7 +30,11 @@ export default class Message extends React.PureComponent {
} }
attachments() { attachments() {
return this.props.item.attachments.length ? <Card data={this.props.item.attachments[0]} /> : null; return this.props.item.attachments.length ? (
<Card
data={this.props.item.attachments[0]}
/>
) : null;
} }
render() { render() {

57
app/containers/Routes.js Normal file
View File

@ -0,0 +1,57 @@
import PropTypes from 'prop-types';
import React from 'react';
import { View, Image } from 'react-native';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import * as Animatable from 'react-native-animatable';
import { appInit } from '../actions';
import styles from '../views/Styles';
import AuthRoutes from './routes/AuthRoutes';
import PublicRoutes from './routes/PublicRoutes';
@connect(
state => ({
login: state.login,
app: state.app
}),
dispatch => bindActionCreators({
appInit
}, dispatch)
)
export default class Routes extends React.Component {
static propTypes = {
login: PropTypes.object.isRequired,
app: PropTypes.object.isRequired,
appInit: PropTypes.func.isRequired
}
componentWillMount() {
this.props.appInit();
}
render() {
const { login, app } = this.props;
if (app.starting) {
return (
<View style={styles.logoContainer}>
<Animatable.Text
animation='pulse'
easing='ease-out'
iterationCount='infinite'
style={{ textAlign: 'center' }}
>
<Image style={styles.logo} source={require('../images/logo.png')} />
</Animatable.Text>
</View>
);
}
if ((login.token && !login.failure) || app.ready) {
return (<AuthRoutes />);
}
return (<PublicRoutes />);
}
}

114
app/containers/Sidebar.js Normal file
View File

@ -0,0 +1,114 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { ScrollView, Text, View, StyleSheet, FlatList, TouchableHighlight } from 'react-native';
import { DrawerItems } from 'react-navigation';
import { connect } from 'react-redux';
import realm from '../lib/realm';
import { setServer } from '../actions/server';
const styles = StyleSheet.create({
scrollView: {
paddingTop: 20
},
imageContainer: {
width: '100%',
alignItems: 'center'
},
image: {
width: 200,
height: 200,
borderRadius: 100
},
serverTitle: {
fontSize: 16,
color: 'grey',
padding: 10,
width: '100%'
},
serverItem: {
backgroundColor: 'white',
padding: 10,
flex: 1
},
selectedServer: {
backgroundColor: '#eeeeee'
}
});
@connect(state => ({
server: state.server.server
}), dispatch => ({
selectServer: server => dispatch(setServer(server))
}))
export default class Sidebar extends Component {
static propTypes = {
server: PropTypes.string.isRequired,
selectServer: PropTypes.func.isRequired,
navigation: PropTypes.object.isRequired
}
componentWillMount() {
realm.addListener('change', this.updateState);
this.state = this.getState();
}
componentWillUnmount() {
realm.removeListener('change', this.updateState);
}
onItemPress = ({ route, focused }) => {
this.props.navigation.navigate('DrawerClose');
if (!focused) {
this.props.navigation.navigate(route.routeName, undefined);
}
}
onPressItem = (item) => {
this.props.selectServer(item.id);
this.props.navigation.navigate('DrawerClose');
}
getState = () => ({
servers: realm.objects('servers')
})
updateState = () => {
this.setState(this.getState());
}
renderItem = ({ item, separators }) => (
<TouchableHighlight
onShowUnderlay={separators.highlight}
onHideUnderlay={separators.unhighlight}
onPress={() => { this.onPressItem(item); }}
>
<View style={[styles.serverItem, (item.id === this.props.server ? styles.selectedServer : null)]}>
<Text>
{item.id}
</Text>
</View>
</TouchableHighlight>
);
render() {
return (
<ScrollView style={styles.scrollView}>
<View style={{ paddingBottom: 20 }}>
<DrawerItems
{...this.props}
onItemPress={this.onItemPress}
/>
<Text style={styles.serverTitle}>SERVERS</Text>
<FlatList
data={this.state.servers}
renderItem={this.renderItem}
keyExtractor={item => item.id}
/>
</View>
</ScrollView>
);
}
}

76
app/containers/message/Card.js
View File

@ -3,8 +3,7 @@ import React from 'react';
import Meteor from 'react-native-meteor'; import Meteor from 'react-native-meteor';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { CachedImage } from 'react-native-img-cache'; import { CachedImage } from 'react-native-img-cache';
import { Text, TouchableOpacity } from 'react-native'; import { Text, TouchableOpacity, View } from 'react-native';
import { Navigation } from 'react-native-navigation';
import { import {
Card, Card,
CardImage, CardImage,
@ -14,27 +13,13 @@ import {
} from 'react-native-card-view'; } from 'react-native-card-view';
import RocketChat from '../../lib/rocketchat'; import RocketChat from '../../lib/rocketchat';
const close = () => Navigation.dismissModal({ import PhotoModal from './PhotoModal';
animationType: 'slide-down'
});
const CustomButton = ({ text }) => (
<TouchableOpacity onPress={close}>
<Text style={{ color: 'blue' }}>{text}</Text>
</TouchableOpacity>
);
CustomButton.propTypes = {
text: PropTypes.string
};
Navigation.registerComponent('CustomButton', () => CustomButton);
@connect(state => ({ @connect(state => ({
base: state.settings.Site_Url, base: state.settings.Site_Url,
canShowList: state.login.token.length || state.login.user.token canShowList: state.login.token.length || state.login.user.token
})) }))
export default class Cards extends React.PureComponent { export default class Cards extends React.PureComponent {
static propTypes = { static propTypes = {
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
@ -44,7 +29,9 @@ export default class Cards extends React.PureComponent {
constructor() { constructor() {
super(); super();
const user = Meteor.user(); const user = Meteor.user();
this.state = {}; this.state = {
modalVisible: false
};
RocketChat.getUserToken().then((token) => { RocketChat.getUserToken().then((token) => {
this.setState({ img: `${ this.props.base }${ this.props.data.image_url }?rc_uid=${ user._id }&rc_token=${ token }` }); this.setState({ img: `${ this.props.base }${ this.props.data.image_url }?rc_uid=${ user._id }&rc_token=${ token }` });
}); });
@ -52,20 +39,28 @@ export default class Cards extends React.PureComponent {
getImage() { getImage() {
return ( return (
<TouchableOpacity onPress={() => this._onPressButton()}> <View>
<Card> <TouchableOpacity onPress={() => this._onPressButton()}>
<CardImage style={{ width: 256, height: 256 }}> <Card>
<CachedImage <CardImage style={{ width: 256, height: 256 }}>
style={{ width: 256, height: 256 }} <CachedImage
source={{ uri: encodeURI(this.state.img) }} style={{ width: 256, height: 256 }}
/> source={{ uri: encodeURI(this.state.img) }}
</CardImage> />
<CardContent> </CardImage>
<Text style={[{ fontSize: 12, alignSelf: 'center', fontStyle: 'italic' }]}>{this.props.data.title}</Text> <CardContent>
<Text style={{ alignSelf: 'center', fontWeight: 'bold' }}>{this.props.data.description}</Text> <Text style={[{ fontSize: 12, alignSelf: 'center', fontStyle: 'italic' }]}>{this.props.data.title}</Text>
</CardContent> <Text style={{ alignSelf: 'center', fontWeight: 'bold' }}>{this.props.data.description}</Text>
</Card> </CardContent>
</TouchableOpacity> </Card>
</TouchableOpacity>
<PhotoModal
title={this.props.data.title}
image={this.state.img}
isVisible={this.state.modalVisible}
onClose={() => this.setState({ modalVisible: false })}
/>
</View>
); );
} }
@ -76,21 +71,8 @@ export default class Cards extends React.PureComponent {
} }
_onPressButton() { _onPressButton() {
Navigation.showModal({ this.setState({
screen: 'Photo', modalVisible: true
title: this.props.data.title, // title of the screen as appears in the nav bar (optional)
passProps: { image: this.state.img },
// navigatorStyle: {}, // override the navigator style for the screen, see "Styling the navigator" below (optional)
navigatorButtons: {
leftButtons: [{
id: 'custom-button',
component: 'CustomButton',
passProps: {
text: 'close'
}
}]
}, // override the nav buttons for the screen, see "Adding buttons to the navigator" below (optional)
animationType: 'slide-up' // 'none' / 'slide-up' , appear animation for the modal (optional, default 'slide-up')
}); });
} }

60
app/containers/message/PhotoModal.js Normal file
View File

@ -0,0 +1,60 @@
import React from 'react';
import { ScrollView, View, Dimensions, Text } from 'react-native';
import { CachedImage } from 'react-native-img-cache';
import PropTypes from 'prop-types';
import Modal from 'react-native-modal';
const deviceWidth = Dimensions.get('window').width;
const styles = {
imageWrapper: {
alignItems: 'stretch'
},
image: {
width: deviceWidth,
height: deviceWidth
},
titleContainer: {
width: '100%',
alignItems: 'center',
marginBottom: 15
},
title: {
color: '#ffffff',
fontSize: 16,
fontWeight: '600'
}
};
export default class extends React.PureComponent {
static propTypes = {
title: PropTypes.string.isRequired,
image: PropTypes.string.isRequired,
isVisible: PropTypes.bool,
onClose: PropTypes.func.isRequired
}
render() {
const { image, isVisible, onClose, title } = this.props;
return (
<Modal
isVisible={isVisible}
onBackdropPress={onClose}
onBackButtonPress={onClose}
>
<View style={styles.titleContainer}>
<Text style={styles.title}>{title}</Text>
</View>
<View style={styles.imageWrapper}>
<ScrollView contentContainerStyle={styles.imageWrapper} maximumZoomScale={1.5}>
<CachedImage
style={styles.image}
source={{ uri: encodeURI(image) }}
mutable
resizeMode={'contain'}
/>
</ScrollView>
</View>
</Modal>
);
}
}

62
app/containers/routes/AuthRoutes.js Normal file
View File

@ -0,0 +1,62 @@
import React from 'react';
import { StackNavigator, DrawerNavigator } from 'react-navigation';
// import { Platform } from 'react-native';
import Sidebar from '../../containers/Sidebar';
import DrawerMenuButton from '../../presentation/DrawerMenuButton';
import RoomsListView from '../../views/RoomsListView';
import RoomView from '../../views/RoomView';
import CreateChannelView from '../../views/CreateChannelView';
const drawerPosition = 'left';
const drawerIconPosition = 'headerLeft';
const AuthRoutes = StackNavigator(
{
RoomsList: {
screen: RoomsListView,
navigationOptions({ navigation }) {
return {
title: 'Rooms',
[drawerIconPosition]: (<DrawerMenuButton navigation={navigation} />)
};
}
},
Room: {
screen: RoomView,
navigationOptions({ navigation }) {
return {
title: navigation.state.params.title || 'Room'
// [drawerIconPosition]: (<DrawerMenuButton navigation={navigation} />)÷
};
}
},
CreateChannel: {
screen: CreateChannelView,
navigationOptions: {
title: 'Create Channel'
}
}
},
{
}
);
const Routes = DrawerNavigator({
Home: {
screen: AuthRoutes,
navigationOptions({ navigation }) {
return {
title: 'Rooms',
[drawerIconPosition]: (<DrawerMenuButton navigation={navigation} />)
};
}
}
}, {
contentComponent: Sidebar,
drawerPosition
});
export default Routes;

46
app/containers/routes/PublicRoutes.js Normal file
View File

@ -0,0 +1,46 @@
import React from 'react';
import { TouchableOpacity } from 'react-native';
import { StackNavigator } from 'react-navigation';
import Icon from 'react-native-vector-icons/FontAwesome';
import ListServerView from '../../views/ListServerView';
import NewServerView from '../../views/NewServerView';
import LoginView from '../../views/LoginView';
const PublicRoutes = StackNavigator(
{
ListServer: {
screen: ListServerView,
navigationOptions({ navigation }) {
return {
title: 'Servers',
headerRight: (
<TouchableOpacity
onPress={() => navigation.navigate('AddServer')}
style={{ width: 50, alignItems: 'center' }}
>
<Icon name='plus' size={16} />
</TouchableOpacity>
)
};
}
},
AddServer: {
screen: NewServerView,
navigationOptions: {
title: 'New server'
}
},
Login: {
screen: LoginView,
navigationOptions: {
title: 'Login'
}
}
},
{
}
);
export default PublicRoutes;

77
app/images/logo.svg
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="435.721px" height="85.242px" viewBox="62.402 -18.766 435.721 85.242"
enable-background="new 62.402 -18.766 435.721 85.242" xml:space="preserve">
<g>
<path fill="#F4F4F4" d="M205.456,22.207c0,4.297-1.603,7.119-4.681,8.465l4.425,16.803c0.192,0.771-0.192,1.154-0.898,1.154h-6.67
c-0.641,0-0.961-0.32-1.09-0.898l-4.297-16.289h-4.425v16.162c0,0.642-0.384,1.025-1.026,1.025h-6.67
c-0.641,0-1.026-0.385-1.026-1.025V-1.651c0-0.641,0.385-1.026,1.026-1.026h16.097c6.028,0,9.235,3.207,9.235,9.235V22.207
L205.456,22.207z M194.169,22.976c1.667,0,2.565-0.898,2.565-2.565V8.354c0-1.667-0.898-2.564-2.565-2.564h-6.349v17.187
L194.169,22.976L194.169,22.976z"/>
<path fill="#F4F4F4" d="M210.583,6.558c0-6.028,3.206-9.235,9.235-9.235h7.183c6.028,0,9.235,3.207,9.235,9.235v32.836
c0,6.027-3.207,9.234-9.235,9.234h-7.183c-6.029,0-9.235-3.207-9.235-9.234V6.558z M225.397,40.355
c1.667,0,2.565-0.834,2.565-2.565V8.162c0-1.667-0.898-2.565-2.565-2.565h-3.719c-1.667,0-2.565,0.898-2.565,2.565v29.629
c0,1.73,0.898,2.564,2.565,2.564H225.397L225.397,40.355z"/>
<path fill="#F4F4F4" d="M268.362,13.484c0,0.642-0.385,1.026-1.025,1.026h-6.413c-0.706,0-1.026-0.384-1.026-1.026v-5.13
c0-1.667-0.897-2.564-2.564-2.564h-3.335c-1.731,0-2.565,0.897-2.565,2.564V37.6c0,1.731,0.897,2.563,2.565,2.563h3.335
c1.667,0,2.564-0.833,2.564-2.563v-5.132c0-0.642,0.32-1.026,1.026-1.026h6.413c0.643,0,1.025,0.384,1.025,1.026v6.927
c0,6.027-3.271,9.234-9.234,9.234h-7.183c-6.028,0-9.299-3.207-9.299-9.234V6.558c0-6.028,3.271-9.235,9.299-9.235h7.183
c5.964,0,9.234,3.207,9.234,9.235V13.484z"/>
<path fill="#F4F4F4" d="M295.422,48.629c-0.771,0-1.218-0.32-1.476-0.961l-8.079-19.048l-2.374,4.554v14.172
c0,0.834-0.448,1.283-1.282,1.283h-6.157c-0.834,0-1.283-0.449-1.283-1.283v-48.74c0-0.833,0.449-1.283,1.283-1.283h6.157
c0.833,0,1.282,0.449,1.282,1.283v19.881l9.876-20.202c0.321-0.641,0.771-0.962,1.476-0.962h6.733c0.962,0,1.347,0.642,0.897,1.539
l-10.901,22.382l11.606,25.91c0.449,0.834,0.064,1.475-0.961,1.475H295.422z"/>
<path fill="#F4F4F4" d="M333.45,4.763c0,0.641-0.257,1.09-1.026,1.09h-16.033v12.826h12.249c0.643,0,1.026,0.385,1.026,1.09v6.349
c0,0.706-0.385,1.091-1.026,1.091h-12.249v12.954h16.033c0.771,0,1.026,0.321,1.026,1.026v6.414c0,0.641-0.257,1.024-1.026,1.024
h-23.6c-0.578,0-0.963-0.385-0.963-1.024V-1.651c0-0.641,0.385-1.026,0.963-1.026h23.6c0.771,0,1.026,0.385,1.026,1.026V4.763z"/>
<path fill="#F4F4F4" d="M363.204-2.677c0.705,0,1.026,0.385,1.026,1.026v6.414c0,0.641-0.321,1.026-1.026,1.026h-7.439v41.814
c0,0.705-0.32,1.024-1.025,1.024h-6.67c-0.643,0-1.026-0.319-1.026-1.024V5.789h-7.438c-0.643,0-1.026-0.385-1.026-1.026v-6.414
c0-0.641,0.385-1.026,1.026-1.026H363.204z"/>
<path fill="#F4F4F4" d="M363.585,41.445c0-0.834,0.449-1.282,1.283-1.282h5.836c0.834,0,1.282,0.448,1.282,1.282v5.899
c0,0.835-0.448,1.283-1.282,1.283h-5.836c-0.834,0-1.283-0.448-1.283-1.283V41.445z"/>
<path fill="#F4F4F4" d="M404.114,13.484c0,0.642-0.386,1.026-1.026,1.026h-6.413c-0.705,0-1.025-0.384-1.025-1.026v-5.13
c0-1.667-0.897-2.564-2.564-2.564h-3.335c-1.732,0-2.565,0.897-2.565,2.564V37.6c0,1.731,0.897,2.563,2.565,2.563h3.335
c1.667,0,2.564-0.833,2.564-2.563v-5.132c0-0.642,0.32-1.026,1.025-1.026h6.413c0.643,0,1.026,0.384,1.026,1.026v6.927
c0,6.027-3.271,9.234-9.235,9.234h-7.183c-6.028,0-9.299-3.207-9.299-9.234V6.558c0-6.028,3.271-9.235,9.299-9.235h7.183
c5.965,0,9.235,3.207,9.235,9.235V13.484z"/>
<path fill="#F4F4F4" d="M427.455-1.651c0-0.641,0.384-1.026,1.025-1.026h6.605c0.77,0,1.089,0.385,1.089,1.026v49.254
c0,0.641-0.32,1.024-1.089,1.024h-6.605c-0.643,0-1.025-0.385-1.025-1.024V27.209h-8.209v20.395c0,0.642-0.385,1.025-1.026,1.025
h-6.604c-0.771,0-1.091-0.385-1.091-1.025V-1.651c0-0.641,0.32-1.026,1.091-1.026h6.604c0.643,0,1.026,0.385,1.026,1.026v20.394
h8.209V-1.651L427.455-1.651z"/>
<path fill="#F4F4F4" d="M465.419,48.629c-0.577,0-0.897-0.32-1.026-0.898l-1.795-9.362h-11.416l-1.73,9.362
c-0.129,0.578-0.449,0.898-1.026,0.898h-6.861c-0.705,0-1.026-0.385-0.835-1.09l10.646-49.318c0.129-0.641,0.513-0.898,1.09-0.898
h8.915c0.577,0,0.962,0.257,1.09,0.898l10.646,49.318c0.129,0.705-0.128,1.09-0.897,1.09H465.419z M456.889,8.546l-4.104,22.382
h8.209L456.889,8.546z"/>
<path fill="#F4F4F4" d="M497.097-2.677c0.705,0,1.026,0.385,1.026,1.026v6.414c0,0.641-0.321,1.026-1.026,1.026h-7.438v41.814
c0,0.705-0.321,1.024-1.026,1.024h-6.67c-0.641,0-1.025-0.319-1.025-1.024V5.789h-7.438c-0.642,0-1.025-0.385-1.025-1.026v-6.414
c0-0.641,0.385-1.026,1.025-1.026H497.097z"/>
</g>
<path fill="#C1272D" d="M162.586,23.788c0-5.031-1.505-9.854-4.474-14.339c-2.666-4.025-6.401-7.588-11.1-10.591
c-9.074-5.796-21-8.989-33.579-8.989c-4.202,0-8.344,0.355-12.361,1.059c-2.492-2.333-5.41-4.432-8.497-6.091
c-16.494-7.994-30.172-0.188-30.172-0.188S75.12-4.904,73.052,4.253c-5.689,5.644-8.773,12.45-8.773,19.535
c0,0.022,0.001,0.045,0.001,0.068c0,0.022-0.001,0.044-0.001,0.068c0,7.085,3.083,13.891,8.773,19.534
c2.068,9.158-10.649,19.605-10.649,19.605s13.678,7.805,30.172-0.188c3.087-1.659,6.004-3.759,8.497-6.091
c4.018,0.703,8.159,1.058,12.361,1.058c12.58,0,24.505-3.191,33.579-8.987c4.699-3.003,8.434-6.565,11.1-10.592
c2.969-4.484,4.474-9.309,4.474-14.338c0-0.023-0.001-0.045-0.001-0.068S162.586,23.81,162.586,23.788z"/>
<path fill="#FFFFFF" d="M113.433-3.018c23.293,0,42.177,12.062,42.177,26.941c0,14.878-18.884,26.941-42.177,26.941
c-5.187,0-10.154-0.6-14.743-1.693c-4.664,5.61-14.924,13.411-24.891,10.89c3.242-3.482,8.045-9.366,7.017-19.058
c-5.974-4.648-9.56-10.597-9.56-17.08C71.255,9.043,90.139-3.018,113.433-3.018"/>
<g>
<g>
<circle fill="#C1272D" cx="113.433" cy="24.79" r="5.603"/>
</g>
<g>
<circle fill="#C1272D" cx="132.913" cy="24.79" r="5.603"/>
</g>
<g>
<circle fill="#C1272D" cx="93.952" cy="24.79" r="5.602"/>
</g>
</g>
<g>
<path fill="#CCCCCC" d="M113.433,47.319c-5.187,0-10.154-0.52-14.743-1.468c-4.118,4.294-12.6,10.066-21.39,9.854
c-1.158,1.755-2.417,3.19-3.501,4.355c9.967,2.521,20.227-5.279,24.891-10.89c4.589,1.094,9.557,1.693,14.743,1.693
c23.106,0,41.87-11.871,42.169-26.585C155.303,37.032,136.539,47.319,113.433,47.319z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

84
app/index.js
View File

@ -1,82 +1,14 @@
import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import { View, Image } from 'react-native'; import { Provider } from 'react-redux';
import { connect } from 'react-redux';
import * as Animatable from 'react-native-animatable';
import setNavigator from './actions/navigator';
import { appInit } from './actions';
import LoginView from './views/login';
import ListServerView from './views/serverList';
import styles from './views/Styles';
import store from './lib/createStore'; import store from './lib/createStore';
export const authenticated = WrappedComponent => class _p extends React.PureComponent { import Routes from './containers/Routes';
constructor() {
super();
this.login = store.getState().login;
if (!this.login.token || this.login.failure) {
return store.getState().navigator.resetTo({
screen: 'Login',
animated: false
});
}
}
render() {
// Wraps the input component in a container, without mutating it. Good!
return ((this.login.isAuthenticated || this.login.user) && <WrappedComponent {...this.props} />);
}
};
//
export class PublicScreen extends React.PureComponent {
render() {
return ((this.login.isAuthenticated || this.login.user) && <ListServerView {...this.props} />);
}
}
const RocketChat = () => (
<Provider store={store}>
<Routes />
</Provider>
);
@connect(null, dispatch => ({ export default RocketChat;
setNavigator: navigator => dispatch(setNavigator(navigator))
}))
export class PrivateScreen extends React.PureComponent {
render() {
return (<LoginView {...this.props} />);
}
}
@connect(() => ({
// logged: state.login.isAuthenticated
}), dispatch => ({
setNavigator: navigator => dispatch(setNavigator(navigator)),
appInit: () => dispatch(appInit())
}))
export const HomeScreen = class extends React.PureComponent {
static propTypes = {
appInit: PropTypes.func.isRequired,
setNavigator: PropTypes.func.isRequired,
navigator: PropTypes.object.isRequired
}
static navigatorStyle = {
navBarHidden: true,
rightButtons: [{
id: 'close',
title: 'Cancel'
}]
};
componentWillMount() {
this.props.setNavigator(this.props.navigator);
this.props.appInit();
//
// this.props.navigator.setDrawerEnabled({
// side: 'left', // the side of the drawer since you can have two, 'left' / 'right'
// enabled: false // should the drawer be enabled or disabled (locked closed)
// });
}
render() {
return (<View style={styles.logoContainer}><Animatable.Text animation='pulse' easing='ease-out' iterationCount='infinite' style={{ textAlign: 'center' }}>
<Image style={styles.logo} source={require('./images/logo.png')} />
</Animatable.Text></View>);
}
};

26
app/lib/createStore.js
View File

@ -3,22 +3,34 @@ import 'regenerator-runtime/runtime';
import { createStore, applyMiddleware } from 'redux'; import { createStore, applyMiddleware } from 'redux';
import createSagaMiddleware from 'redux-saga'; import createSagaMiddleware from 'redux-saga';
import { composeWithDevTools } from 'remote-redux-devtools';
import reducers from '../reducers'; import reducers from '../reducers';
import sagas from '../sagas'; import sagas from '../sagas';
const sagaMiddleware = createSagaMiddleware(); const sagaMiddleware = createSagaMiddleware();
let middleware; let enhacers;
if (__DEV__) { if (__DEV__) {
/* eslint-disable global-require */ /* eslint-disable global-require */
const reduxImmutableStateInvariant = require('redux-immutable-state-invariant').default(); const reduxImmutableStateInvariant = require('redux-immutable-state-invariant').default();
middleware = [sagaMiddleware, reduxImmutableStateInvariant]; enhacers = composeWithDevTools(
applyMiddleware(reduxImmutableStateInvariant),
applyMiddleware(sagaMiddleware)
);
} else { } else {
middleware = [sagaMiddleware]; enhacers = composeWithDevTools(
applyMiddleware(sagaMiddleware)
);
} }
export default createStore( const store = enhacers(createStore)(reducers);
reducers,
applyMiddleware(...middleware)
);
sagaMiddleware.run(sagas); sagaMiddleware.run(sagas);
if (module.hot && typeof module.hot.accept === 'function') {
module.hot.accept(() => {
store.replaceReducer(require('../reducers').default);
sagaMiddleware.run(require('../sagas').default);
});
}
export default store;

58
app/lib/realm.js
View File

@ -1,4 +1,5 @@
import Realm from 'realm'; import Realm from 'realm';
// import { AsyncStorage } from 'react-native';
const serversSchema = { const serversSchema = {
name: 'servers', name: 'servers',
@ -94,63 +95,6 @@ const messagesSchema = {
_updatedAt: { type: 'date', optional: true }, _updatedAt: { type: 'date', optional: true },
temp: { type: 'bool', optional: true } temp: { type: 'bool', optional: true }
} }
// a: {
// attachments: [
// {
// color: 'danger',
// fields: [
// {
// title: 'Bounce Type',
// value: 'Permanent'
// },
// {
// title: 'Bounce Sub Type',
// value: 'General'
// },
// {
// title: 'Reporting MTA',
// value: 'dsn; a8-82.smtp-out.amazonses.com'
// },
// {
// title: 'Timestamp',
// value: 'Tue Apr 19 2016 14:11:08 GMT-0400 (EDT)'
// }
// ]
// },
// {
// fields: [
// {
// title: 'Email Address',
// value: 'aaa@asd.at'
// },
// {
// title: 'Status',
// value: '5.1.1'
// },
// {
// title: 'Action',
// value: 'failed'
// },
// {
// title: 'Diagnostic Code',
// value: 'smtp; 550 5.1.1 <aaa@asd.at>: Recipient address rejected: User unknown in virtual mailbox table'
// }
// ]
// }
// ],
// bot: {
// i: 'EMQ3S3GGNJrrgJa4Z'
// },
// u: {
// _id: 'rocket.cat',
// username: 'rocket.cat'
// },
// roles: [
// 'bot',
// null
// ]
// }
}; };
// //
// Realm.clearTestState(); // Realm.clearTestState();

22
app/lib/rocketchat.js
View File

@ -4,7 +4,7 @@ import { AsyncStorage } from 'react-native';
import { hashPassword } from 'react-native-meteor/lib/utils'; import { hashPassword } from 'react-native-meteor/lib/utils';
import RNFetchBlob from 'react-native-fetch-blob'; import RNFetchBlob from 'react-native-fetch-blob';
import reduxStore from '../lib/createStore'; import reduxStore from './createStore';
import settingsType from '../constants/settings'; import settingsType from '../constants/settings';
import realm from './realm'; import realm from './realm';
import * as actions from '../actions'; import * as actions from '../actions';
@ -366,33 +366,25 @@ const RocketChat = {
} }
}, },
getRooms() { getRooms() {
// Meteor.Accounts.onLogin(() => {
return Promise.all([call('subscriptions/get'), call('rooms/get')]).then(([subscriptions, rooms]) => { return Promise.all([call('subscriptions/get'), call('rooms/get')]).then(([subscriptions, rooms]) => {
// console.log('getRooms resolved', reduxStore.getState().server, subscriptions);
subscriptions = subscriptions.sort((s1, s2) => (s1.rid > s2.rid ? 1 : -1)); subscriptions = subscriptions.sort((s1, s2) => (s1.rid > s2.rid ? 1 : -1));
rooms = rooms.sort((s1, s2) => (s1._id > s2._id ? 1 : -1)); rooms = rooms.sort((s1, s2) => (s1._id > s2._id ? 1 : -1));
const { server, login } = reduxStore.getState();
const data = subscriptions.map((subscription, index) => { const data = subscriptions.map((subscription, index) => {
subscription._updatedAt = rooms[index]._updatedAt; subscription._updatedAt = rooms[index]._updatedAt;
subscription._server = { id: server.server };
return subscription; return subscription;
}); });
// Meteor.subscribe('stream-notify-user', `${ Meteor.userId() }/rooms-changed`, false);
realm.write(() => { realm.write(() => {
data.forEach((subscription) => { data.forEach((subscription) => {
// const subscription = {
// _id: item._id
// };
// if (typeof item.value === 'string') {
// subscription.value = item.value;
// }
subscription._server = { id: reduxStore.getState().server.server };
// write('subscriptions', subscription);
realm.create('subscriptions', subscription, true); realm.create('subscriptions', subscription, true);
}); });
}); });
Meteor.subscribe('stream-notify-user', `${ reduxStore.getState().user.id }/subscriptions-changed`, false); Meteor.subscribe('stream-notify-user', `${ login.user.id }/subscriptions-changed`, false);
return data; return data;
}).then(data => data); });
// });
}, },
logout() { logout() {
return AsyncStorage.clear(); return AsyncStorage.clear();

32
app/navigation.js
View File

@ -1,32 +0,0 @@
import { Navigation } from 'react-native-navigation';
import { Provider } from 'react-redux';
import LoginView from './views/login';
import NewServerView from './views/serverNew';
import ListServerView from './views/serverList';
import RoomsListView from './views/roomsList';
import RoomView from './views/room';
import PhotoView from './views/Photo';
import CreateChannel from './views/CreateChannel';
import store from './lib/createStore';
import { PrivateScreen, HomeScreen, authenticated } from './index';
// console.log('fisateile/', PublicRoute(PublicScreen));
Navigation.registerComponent('home', () => HomeScreen, store, Provider);
Navigation.registerComponent('private', () => PrivateScreen, store, Provider);
Navigation.registerComponent('public', () => ListServerView, store, Provider);
Navigation.registerComponent('Rooms', () => authenticated(RoomsListView), store, Provider);
Navigation.registerComponent('Room', () => RoomView, store, Provider);
Navigation.registerComponent('Photo', () => PhotoView, store, Provider);
Navigation.registerComponent('ListServer', () => ListServerView, store, Provider);
Navigation.registerComponent('Login', () => LoginView, store, Provider);
Navigation.registerComponent('NewServer', () => NewServerView, store, Provider);
Navigation.registerComponent('CreateChannel', () => CreateChannel, store, Provider);
Navigation.startSingleScreenApp({
screen: {
screen: 'home',
title: 'private'
},
animationType: 'slide-up'
});

18
app/presentation/DrawerMenuButton.js Normal file
View File

@ -0,0 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import { TouchableOpacity } from 'react-native';
import Icon from 'react-native-vector-icons/FontAwesome';
const DrawerMenuButton = ({ navigation }) => (
<TouchableOpacity
onPress={() => navigation.navigate('DrawerOpen')}
>
<Icon name='bars' style={{ padding: 10, marginLeft: 10 }} size={20} color='black' />
</TouchableOpacity>
);
DrawerMenuButton.propTypes = {
navigation: PropTypes.object.isRequired
};
export default DrawerMenuButton;

4
app/presentation/KeyboardView.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { KeyboardAvoidingView, Platform } from 'react-native'; import { KeyboardAvoidingView } from 'react-native';
export default class KeyboardView extends React.PureComponent { export default class KeyboardView extends React.PureComponent {
static propTypes = { static propTypes = {
@ -14,7 +14,7 @@ export default class KeyboardView extends React.PureComponent {
render() { render() {
return ( return (
<KeyboardAvoidingView style={this.props.style} behavior={Platform.OS === 'ios' ? 'padding' : null} keyboardVerticalOffset={this.props.keyboardVerticalOffset}> <KeyboardAvoidingView style={this.props.style} behavior='padding' keyboardVerticalOffset={this.props.keyboardVerticalOffset}>
{this.props.children} {this.props.children}
</KeyboardAvoidingView> </KeyboardAvoidingView>
); );

22
app/reducers/app.js Normal file
View File

@ -0,0 +1,22 @@
import { APP } from '../actions/actionsTypes';
const initialState = {
starting: true
};
export default function app(state = initialState, action) {
switch (action.type) {
case APP.INIT:
return {
...state,
starting: true
};
case APP.READY:
return {
...state,
starting: false
};
default:
return state;
}
}

3
app/reducers/index.js
View File

@ -6,8 +6,9 @@ import messages from './messages';
import server from './server'; import server from './server';
import navigator from './navigator'; import navigator from './navigator';
import createChannel from './createChannel'; import createChannel from './createChannel';
import app from './app';
export default combineReducers({ export default combineReducers({
settings, login, meteor, messages, server, navigator, createChannel settings, login, meteor, messages, server, navigator, createChannel, app
}); });

33
app/sagas/createChannel.js
View File

@ -1,5 +1,5 @@
import { delay } from 'redux-saga'; import { delay } from 'redux-saga';
import { select, put, call, fork, take } from 'redux-saga/effects'; import { select, put, call, take, takeEvery } from 'redux-saga/effects';
import { CREATE_CHANNEL, LOGIN } from '../actions/actionsTypes'; import { CREATE_CHANNEL, LOGIN } from '../actions/actionsTypes';
import { createChannelSuccess, createChannelFailure } from '../actions/createChannel'; import { createChannelSuccess, createChannelFailure } from '../actions/createChannel';
import RocketChat from '../lib/rocketchat'; import RocketChat from '../lib/rocketchat';
@ -9,26 +9,23 @@ const create = function* create(data) {
return yield RocketChat.createChannel(data); return yield RocketChat.createChannel(data);
}; };
const get = function* get() { const get = function* get({ data }) {
while (true) { try {
try { const auth = yield select(state => state.login.isAuthenticated);
const { data } = yield take(CREATE_CHANNEL.REQUEST); if (!auth) {
const auth = yield select(state => state.login.isAuthenticated); yield take(LOGIN.SUCCESS);
if (!auth) {
yield take(LOGIN.SUCCESS);
}
const result = yield call(create, data);
yield put(createChannelSuccess(result));
select(({ navigator }) => navigator).dismissModal({
animationType: 'slide-down'
});
} catch (err) {
yield delay(2000);
yield put(createChannelFailure(err));
} }
const result = yield call(create, data);
yield put(createChannelSuccess(result));
select(({ navigator }) => navigator).dismissModal({
animationType: 'slide-down'
});
} catch (err) {
yield delay(2000);
yield put(createChannelFailure(err));
} }
}; };
const getData = function* getData() { const getData = function* getData() {
yield fork(get); yield takeEvery(CREATE_CHANNEL.REQUEST, get);
}; };
export default getData; export default getData;

22
app/sagas/index.js
View File

@ -1,5 +1,4 @@
import { fork, take } from 'redux-saga/effects'; import { all } from 'redux-saga/effects';
import * as types from '../actions/actionsTypes';
import hello from './hello'; import hello from './hello';
import login from './login'; import login from './login';
import connect from './connect'; import connect from './connect';
@ -10,15 +9,16 @@ import createChannel from './createChannel';
import init from './init'; import init from './init';
const root = function* root() { const root = function* root() {
yield fork(init); yield all([
yield take(types.APP.READY); init(),
yield fork(createChannel); createChannel(),
yield fork(hello); hello(),
yield fork(rooms); rooms(),
yield fork(login); login(),
yield fork(connect); connect(),
yield fork(messages); messages(),
yield fork(selectServer); selectServer()
]);
}; };
// Consider using takeEvery // Consider using takeEvery
export default root; export default root;

8
app/sagas/init.js
View File

@ -1,5 +1,5 @@
import { AsyncStorage } from 'react-native'; import { AsyncStorage } from 'react-native';
import { call, put, select, take } from 'redux-saga/effects'; import { call, put, take } from 'redux-saga/effects';
import * as actions from '../actions'; import * as actions from '../actions';
import { setServer } from '../actions/server'; import { setServer } from '../actions/server';
import { APP } from '../actions/actionsTypes'; import { APP } from '../actions/actionsTypes';
@ -7,16 +7,10 @@ import { APP } from '../actions/actionsTypes';
const restore = function* restore() { const restore = function* restore() {
try { try {
yield take(APP.INIT); yield take(APP.INIT);
const { navigator } = yield select(state => state);
const currentServer = yield call([AsyncStorage, 'getItem'], 'currentServer'); const currentServer = yield call([AsyncStorage, 'getItem'], 'currentServer');
yield put(actions.appReady({})); yield put(actions.appReady({}));
if (currentServer) { if (currentServer) {
yield put(setServer(currentServer)); yield put(setServer(currentServer));
} else {
navigator.resetTo({
screen: 'ListServer',
animated: false
});
} }
} catch (e) { } catch (e) {
console.log(e); console.log(e);

61
app/sagas/login.js
View File

@ -1,5 +1,5 @@
import { AsyncStorage } from 'react-native'; import { AsyncStorage } from 'react-native';
import { take, put, call, takeEvery, fork, select, all, race } from 'redux-saga/effects'; import { take, put, call, takeEvery, select, all, race } from 'redux-saga/effects';
import * as types from '../actions/actionsTypes'; import * as types from '../actions/actionsTypes';
import { loginRequest, loginSuccess, loginFailure, setToken, logout } from '../actions/login'; import { loginRequest, loginSuccess, loginFailure, setToken, logout } from '../actions/login';
import RocketChat from '../lib/rocketchat'; import RocketChat from '../lib/rocketchat';
@ -30,7 +30,7 @@ const handleLoginWhenServerChanges = function* handleLoginWhenServerChanges() {
try { try {
yield take(types.METEOR.SUCCESS); yield take(types.METEOR.SUCCESS);
yield call(getToken); yield call(getToken);
const { navigator } = yield select(state => state); // const { navigator } = yield select(state => state);
const user = yield select(getUser); const user = yield select(getUser);
if (user.token) { if (user.token) {
@ -48,9 +48,9 @@ const handleLoginWhenServerChanges = function* handleLoginWhenServerChanges() {
// }); // });
// } // }
} }
navigator.resetTo({ // navigator.resetTo({
screen: 'Rooms' // screen: 'Rooms'
}); // });
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
@ -63,46 +63,33 @@ const saveToken = function* saveToken() {
yield AsyncStorage.setItem(`${ TOKEN_KEY }-${ server }`, JSON.stringify(user)); yield AsyncStorage.setItem(`${ TOKEN_KEY }-${ server }`, JSON.stringify(user));
}; };
const handleLoginRequest = function* handleLoginRequest() { const handleLoginRequest = function* handleLoginRequest({ credentials }) {
while (true) { try {
const { credentials } = yield take(types.LOGIN.REQUEST); const response = yield call(loginCall, credentials);
try { yield put(loginSuccess(response));
const response = yield call(loginCall, credentials); } catch (err) {
yield put(loginSuccess(response)); if (err.error === 403) {
} catch (err) { yield put(logout());
if (err.error === 403) { } else {
yield put(logout()); yield put(loginFailure(err));
} else {
yield put(loginFailure(err));
}
} }
} }
}; };
const handleLoginSubmit = function* handleLoginSubmit() { const handleLoginSubmit = function* handleLoginSubmit({ credentials }) {
while (true) { // put a login request
const { credentials } = yield take(types.LOGIN.SUBMIT); yield put(loginRequest(credentials));
// put a login request // wait for a response
yield put(loginRequest(credentials)); yield race({
// wait for a response success: take(types.LOGIN.SUCCESS),
const { error } = yield race({ error: take(types.LOGIN.FAILURE)
success: take(types.LOGIN.SUCCESS), });
error: take(types.LOGIN.FAILURE)
});
if (!error) {
const { navigator } = yield select(state => state);
navigator.resetTo({
screen: 'Rooms'
});
}
}
}; };
const root = function* root() { const root = function* root() {
yield takeEvery(types.SERVER.CHANGED, handleLoginWhenServerChanges); yield takeEvery(types.SERVER.CHANGED, handleLoginWhenServerChanges);
yield fork(handleLoginRequest); yield takeEvery(types.LOGIN.REQUEST, handleLoginRequest);
yield takeEvery(types.LOGIN.SUCCESS, saveToken); yield takeEvery(types.LOGIN.SUCCESS, saveToken);
yield fork(handleLoginSubmit); yield takeEvery(types.LOGIN.SUBMIT, handleLoginSubmit);
}; };
export default root; export default root;

1
app/sagas/messages.js
View File

@ -5,7 +5,6 @@ import RocketChat from '../lib/rocketchat';
const get = function* get({ rid }) { const get = function* get({ rid }) {
const auth = yield select(state => state.login.isAuthenticated); const auth = yield select(state => state.login.isAuthenticated);
console.log('hey now', yield select(state => state.login));
if (!auth) { if (!auth) {
yield take(LOGIN.SUCCESS); yield take(LOGIN.SUCCESS);
} }

1
app/sagas/rooms.js
View File

@ -13,6 +13,7 @@ const watchRoomsRequest = function* watchRoomsRequest() {
yield call(getRooms); yield call(getRooms);
yield put(roomsSuccess()); yield put(roomsSuccess());
} catch (err) { } catch (err) {
console.log(err);
yield put(roomsFailure(err.status)); yield put(roomsFailure(err.status));
} }
}; };

10
app/sagas/selectServer.js
View File

@ -1,7 +1,7 @@
import { put, takeEvery, call, takeLatest, race, take } from 'redux-saga/effects'; import { put, takeEvery, call, takeLatest, race, take } from 'redux-saga/effects';
import { delay } from 'redux-saga'; import { delay } from 'redux-saga';
import { AsyncStorage } from 'react-native'; import { AsyncStorage } from 'react-native';
import { Navigation } from 'react-native-navigation'; // import { Navigation } from 'react-native-navigation';
import { SERVER } from '../actions/actionsTypes'; import { SERVER } from '../actions/actionsTypes';
import { connectRequest, disconnect } from '../actions/connect'; import { connectRequest, disconnect } from '../actions/connect';
import { changedServer, serverSuccess, serverFailure, serverRequest } from '../actions/server'; import { changedServer, serverSuccess, serverFailure, serverRequest } from '../actions/server';
@ -17,9 +17,6 @@ const selectServer = function* selectServer({ server }) {
yield put(changedServer(server)); yield put(changedServer(server));
yield call([AsyncStorage, 'setItem'], 'currentServer', server); yield call([AsyncStorage, 'setItem'], 'currentServer', server);
yield put(connectRequest(server)); yield put(connectRequest(server));
yield Navigation.dismissModal({
animationType: 'slide-down'
});
}; };
@ -37,7 +34,7 @@ const validateServer = function* validateServer({ server }) {
const addServer = function* addServer({ server }) { const addServer = function* addServer({ server }) {
yield call(serverRequest, server); yield call(serverRequest, server);
const { error } = race({ const { error } = yield race({
error: take(SERVER.FAILURE), error: take(SERVER.FAILURE),
success: take(SERVER.SUCCESS) success: take(SERVER.SUCCESS)
}); });
@ -45,9 +42,6 @@ const addServer = function* addServer({ server }) {
realm.write(() => { realm.write(() => {
realm.create('servers', { id: server, current: false }, true); realm.create('servers', { id: server, current: false }, true);
}); });
Navigation.dismissModal({
animationType: 'slide-down'
});
} }
}; };

78
app/views/CreateChannel.js → app/views/CreateChannelView.js
View File

@ -1,4 +1,3 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
@ -19,8 +18,7 @@ export default class CreateChannelView extends React.Component {
}); });
static propTypes = { static propTypes = {
createChannel: PropTypes.func.isRequired, createChannel: PropTypes.func.isRequired,
result: PropTypes.object.isRequired, result: PropTypes.object.isRequired
navigator: PropTypes.object.isRequired
} }
constructor(props) { constructor(props) {
@ -30,12 +28,6 @@ export default class CreateChannelView extends React.Component {
type: true type: true
}; };
this.state = this.default; this.state = this.default;
this.props.navigator.setTitle({
title: 'Create Channel'
});
// this.props.navigator.setSubTitle({
// subtitle: 'Channels are where your team communicate.'
// });
} }
submit() { submit() {
if (!this.state.channelName.trim() || this.props.result.isFetching) { if (!this.state.channelName.trim() || this.props.result.isFetching) {
@ -45,9 +37,36 @@ export default class CreateChannelView extends React.Component {
this.props.createChannel({ name: channelName, users, type }); this.props.createChannel({ name: channelName, users, type });
} }
renderChannelNameError() {
if (!this.props.result.failure || this.props.result.error.error !== 'error-duplicate-channel-name') {
return null;
}
return (
<Text style={[styles.label_white, styles.label_error]}>
{this.props.result.error.reason}
</Text>
);
}
renderTypeSwitch() {
return (
<View style={[styles.view_white, styles.switchContainer]}>
<Switch
style={[{ flexGrow: 0, flexShrink: 1 }]}
value={this.state.type}
onValueChange={type => this.setState({ type })}
/>
<Text style={[styles.label_white, styles.switchLabel]}>
{this.state.type ? 'Public' : 'Private'}
</Text>
</View>
);
}
render() { render() {
return ( return (
<KeyboardView style={[styles.view_white, { flex: 0, justifyContent: 'flex-start' }]}> <KeyboardView style={[styles.view_white, { flex: 1, justifyContent: 'flex-start' }]}>
<ScrollView> <ScrollView>
<View style={styles.formContainer}> <View style={styles.formContainer}>
<Text style={styles.label_white}>Channel Name</Text> <Text style={styles.label_white}>Channel Name</Text>
@ -62,18 +81,33 @@ export default class CreateChannelView extends React.Component {
// onSubmitEditing={() => this.textInput.focus()} // onSubmitEditing={() => this.textInput.focus()}
placeholder='Type the channel name here' placeholder='Type the channel name here'
/> />
{(this.props.result.failure && this.props.result.error.error === 'error-duplicate-channel-name') ? <Text style={[styles.label_white, { color: 'red', flexGrow: 1, paddingHorizontal: 0, marginBottom: 20 }]}>{this.props.result.error.reason}</Text> : null} {this.renderChannelNameError()}
<View style={[styles.view_white, { flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'center', paddingHorizontal: 0 }]}> {this.renderTypeSwitch()}
<Switch <Text
style={[{ flexGrow: 0, flexShrink: 1 }]} style={[
value={this.state.type} styles.label_white,
onValueChange={type => this.setState({ type })} {
/> color: '#9ea2a8',
<Text style={[styles.label_white, { flexGrow: 1, paddingHorizontal: 10 }]}>{this.state.type ? 'Public' : 'Private'}</Text> flexGrow: 1,
</View> paddingHorizontal: 0,
<Text style={[styles.label_white, { color: '#9ea2a8', flexGrow: 1, paddingHorizontal: 0, marginBottom: 20 }]}>{this.state.type ? 'Everyone can access this channel' : 'Just invited people can access this channel'}</Text> marginBottom: 20
<TouchableOpacity onPress={() => this.submit()} style={[styles.buttonContainer_white, { backgroundColor: (this.state.channelName.length === 0 || this.props.result.isFetching) ? '#e1e5e8' : '#1d74f5' }]}> }]}
<Text style={styles.button_white}> { this.props.result.isFetching ? 'LOADING' : 'CREATE' }!</Text> >
{this.state.type ?
'Everyone can access this channel' :
'Just invited people can access this channel'}
</Text>
<TouchableOpacity
onPress={() => this.submit()}
style={[
styles.buttonContainer_white,
(this.state.channelName.length === 0 || this.props.result.isFetching) ?
styles.disabledButton : styles.enabledButton
]}
>
<Text style={styles.button_white}>
{this.props.result.isFetching ? 'LOADING' : 'CREATE'}!
</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</ScrollView> </ScrollView>

75
app/views/serverList.js → app/views/ListServerView.js
View File

@ -2,9 +2,8 @@ import React from 'react';
import Icon from 'react-native-vector-icons/Ionicons'; import Icon from 'react-native-vector-icons/Ionicons';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Navigation } from 'react-native-navigation';
import Zeroconf from 'react-native-zeroconf'; import Zeroconf from 'react-native-zeroconf';
import { View, Text, SectionList, Platform, StyleSheet } from 'react-native'; import { View, Text, SectionList, StyleSheet } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { setServer } from '../actions/server'; import { setServer } from '../actions/server';
import realm from '../lib/realm'; import realm from '../lib/realm';
@ -66,16 +65,17 @@ const zeroconf = new Zeroconf();
@connect(state => ({ @connect(state => ({
server: state.server.server, server: state.server.server,
login: state.login login: state.login,
connected: state.meteor.connected
}), dispatch => ({ }), dispatch => ({
selectServer: server => dispatch(setServer(server)) selectServer: server => dispatch(setServer(server))
})) }))
export default class ListServerView extends React.Component { export default class ListServerView extends React.Component {
static propTypes = { static propTypes = {
navigator: PropTypes.object.isRequired, navigation: PropTypes.object.isRequired,
login: PropTypes.object.isRequired, login: PropTypes.object.isRequired,
selectServer: PropTypes.func.isRequired, selectServer: PropTypes.func.isRequired,
actions: PropTypes.object, connected: PropTypes.bool.isRequired,
server: PropTypes.string server: PropTypes.string
} }
@ -84,37 +84,28 @@ export default class ListServerView extends React.Component {
this.state = { this.state = {
sections: [] sections: []
}; };
this.redirected = false;
this.props.navigator.setTitle({ realm.addListener('change', this.updateState);
title: 'Servers'
});
this.props.navigator.setButtons({
rightButtons: [{
id: 'add',
title: 'Add'
}],
leftButtons: props.login.isAuthenticated && props.server && Platform.select({
ios: [{
id: 'close',
title: 'Close'
}]
}),
animated: true
});
this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));
} }
componentWillMount() { componentWillMount() {
realm.addListener('change', this.updateState);
zeroconf.on('update', this.updateState); zeroconf.on('update', this.updateState);
zeroconf.scan('http', 'tcp', 'local.'); zeroconf.scan('http', 'tcp', 'local.');
this.state = this.getState(); this.state = this.getState();
}
this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this)); componentDidUpdate() {
if (this.props.connected &&
this.props.server &&
!this.props.login.token &&
!this.redirected) {
this.redirected = true;
this.props.navigation.navigate('Login');
} else if (!this.props.connected) {
this.redirected = false;
}
} }
componentWillUnmount() { componentWillUnmount() {
@ -123,27 +114,6 @@ export default class ListServerView extends React.Component {
zeroconf.removeListener('update', this.updateState); zeroconf.removeListener('update', this.updateState);
} }
onNavigatorEvent = (event) => {
if (event.type === 'NavBarButtonPress') {
if (event.id === 'add') {
Navigation.showModal({
screen: 'NewServer',
animationType: 'slide-up'
// animationType: 'none'
});
}
if (event.id === 'close') {
Navigation.dismissModal({
animationType: 'slide-down'
});
}
}
if (event.id === 'didDisappear' && this.state.server) {
this.props.actions.setCurrentServer(this.state.server);
}
}
onPressItem = (item) => { onPressItem = (item) => {
this.props.selectServer(item.id); this.props.selectServer(item.id);
} }
@ -191,7 +161,14 @@ export default class ListServerView extends React.Component {
> >
{item.id} {item.id}
</Text> </Text>
<Fade visible={this.props.server === item.id}><Icon iconSize={24} size={24} style={styles.serverChecked} name='ios-checkmark-circle-outline' /> </Fade> <Fade visible={this.props.server === item.id}>
<Icon
iconSize={24}
size={24}
style={styles.serverChecked}
name='ios-checkmark-circle-outline'
/>
</Fade>
</View> </View>
); );

112
app/views/login.js → app/views/LoginView.js
View File

@ -15,9 +15,7 @@ import styles from './Styles';
class LoginView extends React.Component { class LoginView extends React.Component {
static propTypes = { static propTypes = {
navigator: PropTypes.object.isRequired,
loginSubmit: PropTypes.func.isRequired, loginSubmit: PropTypes.func.isRequired,
server: PropTypes.string.isRequired,
Accounts_EmailOrUsernamePlaceholder: PropTypes.string, Accounts_EmailOrUsernamePlaceholder: PropTypes.string,
Accounts_PasswordPlaceholder: PropTypes.string, Accounts_PasswordPlaceholder: PropTypes.string,
login: PropTypes.object login: PropTypes.object
@ -35,35 +33,13 @@ class LoginView extends React.Component {
password: '' password: ''
}; };
} }
componentWillReceiveProps() {
const { navigator } = this.props;
navigator.setTitle({
title: 'Login'
});
navigator.setSubTitle({
subtitle: this.props.server
});
navigator.setButtons({
rightButtons: [{
id: 'close',
title: 'Cancel'
}]
});
this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));
}
onNavigatorEvent = (event) => {
if (event.type === 'NavBarButtonPress') {
if (event.id === 'close') {
this.props.navigator.resetTo({
screen: 'ListServer',
animated: false
});
}
}
}
submit = () => { submit = () => {
const { username, password, code } = this.state; const { username, password, code } = this.state;
if (username.trim() === '' || password.trim() === '') {
return;
}
this.props.loginSubmit({ username, password, code }); this.props.loginSubmit({ username, password, code });
Keyboard.dismiss(); Keyboard.dismiss();
} }
@ -89,45 +65,51 @@ class LoginView extends React.Component {
// {this.props.login.isFetching && <Text> LOGANDO</Text>} // {this.props.login.isFetching && <Text> LOGANDO</Text>}
render() { render() {
return ( return (
<KeyboardView style={styles.view} keyboardVerticalOffset={64}> <KeyboardView style={styles.container} keyboardVerticalOffset={128}>
<View style={styles.logoContainer}> <View style={{ alignItems: 'center' }}>
<Image style={styles.logo} source={require('../images/logo.png')} /> <Image
</View> style={styles.logo}
<View style={styles.formContainer}> source={require('../images/logo.png')}
<TextInput
placeholderTextColor={'rgba(255,255,255,.2)'}
style={styles.input}
onChangeText={username => this.setState({ username })}
keyboardType='email-address'
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
autoFocus
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_EmailOrUsernamePlaceholder || 'Email or username'}
/> />
<TextInput
placeholderTextColor={'rgba(255,255,255,.2)'}
style={styles.input}
onChangeText={password => this.setState({ password })}
secureTextEntry
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_PasswordPlaceholder || 'Password'}
/>
{this.renderTOTP()}
<TouchableOpacity style={styles.buttonContainer}>
<Text style={styles.button} onPress={this.submit}>LOGIN</Text>
</TouchableOpacity>
{this.props.login.error && <Text style={styles.error}>{this.props.login.error}</Text>}
</View> </View>
<Spinner visible={this.props.login.isFetching} textContent={'Loading...'} textStyle={{ color: '#FFF' }} /> <View style={styles.loginView}>
<View style={styles.formContainer}>
<TextInput
placeholderTextColor={'rgba(255,255,255,.2)'}
style={styles.input}
onChangeText={username => this.setState({ username })}
keyboardType='email-address'
autoCorrect={false}
returnKeyType='next'
autoCapitalize='none'
autoFocus
underlineColorAndroid='transparent'
onSubmitEditing={() => { this.password.focus(); }}
placeholder={this.props.Accounts_EmailOrUsernamePlaceholder || 'Email or username'}
/>
<TextInput
ref={(e) => { this.password = e; }}
placeholderTextColor={'rgba(255,255,255,.2)'}
style={styles.input}
onChangeText={password => this.setState({ password })}
secureTextEntry
autoCorrect={false}
returnKeyType='done'
autoCapitalize='none'
underlineColorAndroid='transparent'
onSubmitEditing={this.submit}
placeholder={this.props.Accounts_PasswordPlaceholder || 'Password'}
/>
{this.renderTOTP()}
<TouchableOpacity style={styles.buttonContainer}>
<Text style={styles.button} onPress={this.submit}>LOGIN</Text>
</TouchableOpacity>
{this.props.login.error && <Text style={styles.error}>{this.props.login.error}</Text>}
</View>
<Spinner visible={this.props.login.isFetching} textContent={'Loading...'} textStyle={{ color: '#FFF' }} />
</View>
</KeyboardView> </KeyboardView>
); );
} }

52
app/views/serverNew.js → app/views/NewServerView.js
View File

@ -1,6 +1,5 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Navigation } from 'react-native-navigation';
import { Text, TextInput, View, StyleSheet } from 'react-native'; import { Text, TextInput, View, StyleSheet } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { serverRequest, addServer } from '../actions/server'; import { serverRequest, addServer } from '../actions/server';
@ -55,11 +54,11 @@ const styles = StyleSheet.create({
})) }))
export default class NewServerView extends React.Component { export default class NewServerView extends React.Component {
static propTypes = { static propTypes = {
navigator: PropTypes.object.isRequired,
validateServer: PropTypes.func.isRequired, validateServer: PropTypes.func.isRequired,
addServer: PropTypes.func.isRequired, addServer: PropTypes.func.isRequired,
validating: PropTypes.bool.isRequired, validating: PropTypes.bool.isRequired,
validInstance: PropTypes.bool.isRequired validInstance: PropTypes.bool.isRequired,
navigation: PropTypes.object.isRequired
} }
static navigationOptions = () => ({ static navigationOptions = () => ({
@ -73,33 +72,20 @@ export default class NewServerView extends React.Component {
editable: true, editable: true,
text: '' text: ''
}; };
this.adding = false;
this.submit = () => { this.props.validateServer(this.state.defaultServer); // Need to call because in case of submit with empty field
this.props.addServer(this.completeUrl(this.state.text.trim() || this.state.defaultServer));
};
} }
componentDidMount() { componentDidUpdate() {
this.props.navigator.setTitle({ if (this.adding) {
title: 'New server' if (!this.props.validInstance) {
}); /* eslint-disable react/no-did-update-set-state */
this.setState({ editable: true });
this.props.navigator.setButtons({ this.adding = false;
rightButtons: [{ }
id: 'close', if (this.props.validInstance && !this.props.validating) {
title: 'Cancel' this.props.navigation.goBack();
}], this.adding = false;
animated: true
});
this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));
}
onNavigatorEvent = (event) => {
if (event.type === 'NavBarButtonPress') {
if (event.id === 'close') {
Navigation.dismissModal({
animationType: 'slide-down'
});
} }
} }
} }
@ -108,10 +94,18 @@ export default class NewServerView extends React.Component {
this.setState({ text }); this.setState({ text });
this.props.validateServer(this.completeUrl(text)); this.props.validateServer(this.completeUrl(text));
} }
submit = () => {
this.setState({ editable: false });
this.adding = true;
this.props.addServer(this.completeUrl(this.state.text.trim() || this.state.defaultServer));
}
completeUrl = (url) => { completeUrl = (url) => {
url = url.trim(); url = url.trim();
if (/^(\w|[0-9-_]){3,}$/.test(url) && /^(htt(ps?)?)|(loca((l)?|(lh)?|(lho)?|(lhos)?|(lhost:?\d*)?)$)/.test(url) === false) { if (/^(\w|[0-9-_]){3,}$/.test(url) &&
/^(htt(ps?)?)|(loca((l)?|(lh)?|(lho)?|(lhos)?|(lhost:?\d*)?)$)/.test(url) === false) {
url = `${ url }.rocket.chat`; url = `${ url }.rocket.chat`;
} }

4
app/views/Photo.js
View File

@ -16,10 +16,10 @@ const styles = {
export default class extends React.PureComponent { export default class extends React.PureComponent {
static propTypes = { static propTypes = {
image: PropTypes.string.isRequired navigation: PropTypes.object.isRequired
} }
render() { render() {
const { image } = this.props; const { image } = this.props.navigation.state.params;
return ( return (
<View style={styles.imageWrapper}> <View style={styles.imageWrapper}>
<ScrollView contentContainerStyle={styles.imageWrapper} maximumZoomScale={1.5}> <ScrollView contentContainerStyle={styles.imageWrapper} maximumZoomScale={1.5}>

66
app/views/room.js → app/views/RoomView.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Text, View, StyleSheet, Button } from 'react-native'; import { Text, View, StyleSheet, Button, InteractionManager } from 'react-native';
import { ListView } from 'realm/react-native'; import { ListView } from 'realm/react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
@ -9,12 +9,11 @@ import * as actions from '../actions';
import { messagesRequest } from '../actions/messages'; import { messagesRequest } from '../actions/messages';
import realm from '../lib/realm'; import realm from '../lib/realm';
import RocketChat from '../lib/rocketchat'; import RocketChat from '../lib/rocketchat';
import debounce from '../utils/throttle';
import Message from '../containers/Message'; import Message from '../containers/Message';
import MessageBox from '../containers/MessageBox'; import MessageBox from '../containers/MessageBox';
import KeyboardView from '../presentation/KeyboardView'; import KeyboardView from '../presentation/KeyboardView';
const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1._id !== r2._id });
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
@ -56,7 +55,7 @@ const styles = StyleSheet.create({
})) }))
export default class RoomView extends React.Component { export default class RoomView extends React.Component {
static propTypes = { static propTypes = {
navigator: PropTypes.object.isRequired, navigation: PropTypes.object.isRequired,
getMessages: PropTypes.func.isRequired, getMessages: PropTypes.func.isRequired,
rid: PropTypes.string, rid: PropTypes.string,
sid: PropTypes.string, sid: PropTypes.string,
@ -69,42 +68,37 @@ export default class RoomView extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.rid = props.rid || realm.objectForPrimaryKey('subscriptions', props.sid).rid;
// this.rid = 'GENERAL'; this.sid = props.navigation.state.params.room.sid;
this.rid = props.rid || realm.objectForPrimaryKey('subscriptions', this.sid).rid;
this.data = realm.objects('messages').filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid).sorted('ts', true); this.data = realm.objects('messages').filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid).sorted('ts', true);
this.state = { this.state = {
dataSource: ds.cloneWithRows(this.data), slow: false,
dataSource: [],
loaded: true, loaded: true,
joined: typeof props.rid === 'undefined' joined: typeof props.rid === 'undefined'
}; };
this.props.navigator.setTitle({
title: this.props.name || realm.objectForPrimaryKey('subscriptions', this.props.sid).name
});
} }
componentWillMount() { componentWillMount() {
this.props.navigation.setParams({
title: this.props.name || realm.objectForPrimaryKey('subscriptions', this.sid).name
});
this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
this.props.getMessages(this.rid); this.props.getMessages(this.rid);
// const late = setTimeout(() => this.setState({
// loaded: false
// }), 1000);
// RocketChat.loadMessagesForRoom(this.rid, null, () => {
// clearTimeout(late);
// this.setState({
// loaded: true
// });
this.data.addListener(this.updateState); this.data.addListener(this.updateState);
// }); this.state.dataSource = ds.cloneWithRows(this.data);
// this.updateState();
} }
componentDidMount() { componentDidMount() {
return RocketChat.readMessages(this.rid); InteractionManager.runAfterInteractions(() => RocketChat.readMessages(this.rid));
}
componentDidUpdate() {
return !this.props.loading && clearTimeout(this.timer);
} }
componentWillUnmount() { componentWillUnmount() {
this.data.removeListener(this.updateState); clearTimeout(this.timer);
this.data.removeAllListeners();
} }
onEndReached = () => { onEndReached = () => {
@ -126,28 +120,22 @@ export default class RoomView extends React.Component {
} }
} }
updateState = debounce(() => { updateState = () => {
this.setState({ this.setState({
dataSource: ds.cloneWithRows(this.data) dataSource: ds.cloneWithRows(this.data)
}); });
// RocketChat.readMessages(this.rid); };
// this.setState({
// messages: this.messages
// });
}, 100);
sendMessage = message => RocketChat.sendMessage(this.rid, message); sendMessage = message => RocketChat.sendMessage(this.rid, message);
joinRoom = () => { joinRoom = async() => {
RocketChat.joinRoom(this.props.rid) await RocketChat.joinRoom(this.props.rid);
.then(() => { this.setState({
this.setState({ joined: true
joined: true });
});
});
}; };
renderBanner = () => (this.props.loading ? renderBanner = () => (this.state.slow && this.props.loading ?
( (
<View style={styles.bannerContainer}> <View style={styles.bannerContainer}>
<Text style={styles.bannerText}>Loading new messages...</Text> <Text style={styles.bannerText}>Loading new messages...</Text>

73
app/views/roomsList.js → app/views/RoomsListView.js
View File

@ -1,10 +1,9 @@
import ActionButton from 'react-native-action-button'; import ActionButton from 'react-native-action-button';
import { Navigation } from 'react-native-navigation';
import { ListView } from 'realm/react-native'; import { ListView } from 'realm/react-native';
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Icon from 'react-native-vector-icons/Ionicons'; import Icon from 'react-native-vector-icons/Ionicons';
import { View, StyleSheet, TextInput, Platform } from 'react-native'; import { View, StyleSheet, TextInput } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import * as actions from '../actions'; import * as actions from '../actions';
import * as server from '../actions/connect'; import * as server from '../actions/connect';
@ -24,7 +23,8 @@ const styles = StyleSheet.create({
backgroundColor: '#E7E7E7' backgroundColor: '#E7E7E7'
}, },
list: { list: {
width: '100%' width: '100%',
backgroundColor: '#FFFFFF'
}, },
emptyView: { emptyView: {
flexGrow: 1, flexGrow: 1,
@ -67,46 +67,35 @@ const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 });
export default class RoomsListView extends React.Component { export default class RoomsListView extends React.Component {
static propTypes = { static propTypes = {
navigator: PropTypes.object.isRequired, navigation: PropTypes.object.isRequired,
Site_Url: PropTypes.string, Site_Url: PropTypes.string,
server: PropTypes.string server: PropTypes.string
} }
constructor(props) { constructor(props) {
super(props); super(props);
this.data = realm.objects('subscriptions').filtered('_server.id = $0', this.props.server);
this.state = { this.state = {
dataSource: ds.cloneWithRows(this.data), dataSource: [],
searching: false, searching: false,
searchDataSource: [], searchDataSource: [],
searchText: '', searchText: '',
login: false login: false
}; };
this.data.addListener(this.updateState); this.data = realm.objects('subscriptions').filtered('_server.id = $0', this.props.server).sorted('_updatedAt', true);
this.props.navigator.setOnNavigatorEvent(event => event.type === 'NavBarButtonPress' && event.id === 'servers' &&
Navigation.showModal({
screen: 'ListServer',
passProps: {},
navigatorStyle: {},
navigatorButtons: {},
animationType: 'slide-up'
}));
this.props.navigator.setSubTitle({
subtitle: this.props.server
});
} }
componentWillMount() { componentWillMount() {
const button = Platform.OS === 'ios' ? 'leftButtons' : 'rightButtons'; this.data.addListener(this.updateState);
this.props.navigator.setButtons({
[button]: [{ this.state = {
id: 'servers', ...this.state,
title: 'Servers' dataSource: ds.cloneWithRows(this.data)
}], };
animated: true
});
} }
componentWillUnmount() { componentWillUnmount() {
this.data.removeListener(this.updateState); this.data.removeAllListeners();
} }
onSearchChangeText = (text) => { onSearchChangeText = (text) => {
@ -167,7 +156,6 @@ export default class RoomsListView extends React.Component {
}); });
} }
updateState = () => { updateState = () => {
this.setState({ this.setState({
dataSource: ds.cloneWithRows(this.data) dataSource: ds.cloneWithRows(this.data)
@ -176,10 +164,7 @@ export default class RoomsListView extends React.Component {
_onPressItem = (id, item = {}) => { _onPressItem = (id, item = {}) => {
const navigateToRoom = (room) => { const navigateToRoom = (room) => {
this.props.navigator.push({ this.props.navigation.navigate('Room', { room });
screen: 'Room',
passProps: room
});
}; };
const clearSearch = () => { const clearSearch = () => {
@ -220,16 +205,11 @@ export default class RoomsListView extends React.Component {
navigateToRoom({ sid: id }); navigateToRoom({ sid: id });
clearSearch(); clearSearch();
} }
_createChannel = () => {
Navigation.showModal({ _createChannel() {
screen: 'CreateChannel', this.props.navigation.navigate('CreateChannel');
title: 'Create a New Channel',
passProps: {},
navigatorStyle: {},
navigatorButtons: {},
animationType: 'slide-up'
});
} }
renderSearchBar = () => ( renderSearchBar = () => (
<View style={styles.searchBoxView}> <View style={styles.searchBoxView}>
<TextInput <TextInput
@ -247,13 +227,15 @@ export default class RoomsListView extends React.Component {
renderItem = item => ( renderItem = item => (
<RoomItem <RoomItem
key={item._id} unread={item.unread}
name={item.name} name={item.name}
key={item._id}
type={item.t} type={item.t}
baseUrl={this.props.Site_Url} baseUrl={this.props.Site_Url}
onPress={() => this._onPressItem(item._id, item)} onPress={() => this._onPressItem(item._id, item)}
/> />
) )
renderList = () => ( renderList = () => (
<ListView <ListView
dataSource={this.state.dataSource} dataSource={this.state.dataSource}
@ -265,13 +247,16 @@ export default class RoomsListView extends React.Component {
keyboardShouldPersistTaps='always' keyboardShouldPersistTaps='always'
/> />
) )
renderCreateButtons = () => ( renderCreateButtons = () => (
<ActionButton buttonColor='rgba(231,76,60,1)'> <ActionButton buttonColor='rgba(231,76,60,1)'>
<ActionButton.Item buttonColor='#9b59b6' title='Create Channel' onPress={() => { this._createChannel(); }} > <ActionButton.Item buttonColor='#9b59b6' title='Create Channel' onPress={() => { this._createChannel(); }} >
<Icon name='md-chatbubbles' style={styles.actionButtonIcon} /> <Icon name='md-chatbubbles' style={styles.actionButtonIcon} />
</ActionButton.Item> </ActionButton.Item>
</ActionButton>); </ActionButton>
render= () => ( );
render = () => (
<View style={styles.container}> <View style={styles.container}>
<Banner /> <Banner />
{this.renderList()} {this.renderList()}

40
app/views/Styles.js
View File

@ -1,6 +1,16 @@
import { StyleSheet } from 'react-native'; import { StyleSheet, Dimensions } from 'react-native';
export default StyleSheet.create({ export default StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#2f343d',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'stretch'
},
loginView: {
padding: 20
},
view: { view: {
flex: 1, flex: 1,
flexDirection: 'column', flexDirection: 'column',
@ -24,9 +34,9 @@ export default StyleSheet.create({
justifyContent: 'center' justifyContent: 'center'
}, },
logo: { logo: {
width: 150, width: Dimensions.get('window').width - 30,
// backgroundColor: 'red' height: Dimensions.get('window').width - 30,
// height: 150, borderRadius: 5,
resizeMode: 'contain' resizeMode: 'contain'
}, },
formContainer: { formContainer: {
@ -46,6 +56,12 @@ export default StyleSheet.create({
marginBottom: 5, marginBottom: 5,
color: '#2f343d' color: '#2f343d'
}, },
label_error: {
color: 'red',
flexGrow: 1,
paddingHorizontal: 0,
marginBottom: 20
},
input: { input: {
height: 45, height: 45,
marginBottom: 20, marginBottom: 20,
@ -101,5 +117,21 @@ export default StyleSheet.create({
backgroundColor: 'rgba(255,255,255,.2)', backgroundColor: 'rgba(255,255,255,.2)',
left: 0, left: 0,
top: 0 top: 0
},
switchContainer: {
flexDirection: 'row',
justifyContent: 'flex-start',
alignItems: 'center',
paddingHorizontal: 0
},
switchLabel: {
flexGrow: 1,
paddingHorizontal: 10
},
disabledButton: {
backgroundColor: '#e1e5e8'
},
enabledButton: {
backgroundColor: '#1d74f5'
} }
}); });

11
index.android.js
View File

@ -1 +1,10 @@
import './index.ios'; // import 'babel-polyfill';
// import 'regenerator-runtime/runtime';
import { AppRegistry } from 'react-native';
import RocketChat from './app/index';
// import { AppRegistry } from 'react-native';
// import Routes from './app/routes';
//
AppRegistry.registerComponent('RocketChatRN', () => RocketChat);

12
index.ios.js
View File

@ -1,7 +1,11 @@
import 'babel-polyfill'; // import 'babel-polyfill';
import 'regenerator-runtime/runtime'; // import 'regenerator-runtime/runtime';
import './app/navigation'; import { AppRegistry } from 'react-native';
import RocketChat from './app/index';
// import { AppRegistry } from 'react-native'; // import { AppRegistry } from 'react-native';
// import Routes from './app/routes'; // import Routes from './app/routes';
// //
// AppRegistry.registerComponent('RocketChatRN', () => Routes); AppRegistry.registerComponent('RocketChatRN', () => RocketChat);

63
ios/RocketChatRN.xcodeproj/project.pbxproj
View File

@ -5,7 +5,6 @@
}; };
objectVersion = 46; objectVersion = 46;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@ -51,10 +50,8 @@
AE5D35882AE04CC29630FB3D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC6EE17B5550465E98C70FF0 /* Entypo.ttf */; }; AE5D35882AE04CC29630FB3D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC6EE17B5550465E98C70FF0 /* Entypo.ttf */; };
B8E79AF41F3CD167005B464F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; }; B8E79AF41F3CD167005B464F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; };
BED2B77AA660460E8BC9F8E0 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */; }; BED2B77AA660460E8BC9F8E0 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */; };
C03BD55E219B47C9BCA9CABE /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 841151A0236F49EBBC246374 /* libReactNativeNavigation.a */; };
C758F0BD5C3244E2BA073E61 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B696712EE2345A59F007A88 /* libRNImagePicker.a */; }; C758F0BD5C3244E2BA073E61 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B696712EE2345A59F007A88 /* libRNImagePicker.a */; };
CBD0E0A35B174C4DBFED3B31 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E528DE3A405E43B4A37ABA68 /* Zocial.ttf */; }; CBD0E0A35B174C4DBFED3B31 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E528DE3A405E43B4A37ABA68 /* Zocial.ttf */; };
D584DAA0EC56473197D4F6BD /* libAutoGrowTextInput.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91CD29A0CB114F3E9D50596E /* libAutoGrowTextInput.a */; };
D6408D9E4A864FF6BA986857 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A2DD67ADD954AD9873F45FC /* SimpleLineIcons.ttf */; }; D6408D9E4A864FF6BA986857 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A2DD67ADD954AD9873F45FC /* SimpleLineIcons.ttf */; };
EF736EF520A64AE8820E684A /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF26CC845883492D8AC8869B /* libRealmReact.a */; }; EF736EF520A64AE8820E684A /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF26CC845883492D8AC8869B /* libRealmReact.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -277,13 +274,6 @@
remoteGlobalIDString = F60690131CA2766F0003FB26; remoteGlobalIDString = F60690131CA2766F0003FB26;
remoteInfo = RealmReact; remoteInfo = RealmReact;
}; };
60B837611F3F6F4C00677E56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 09FBCE5FF9B547D69122C25F /* AutoGrowTextInput.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D81C36501CDB667F00777FB9;
remoteInfo = AutoGrowTextInput;
};
60B837831F3F6F4C00677E56 /* PBXContainerItemProxy */ = { 60B837831F3F6F4C00677E56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 4B38C7E37A8748E0BC665078 /* RNImagePicker.xcodeproj */; containerPortal = 4B38C7E37A8748E0BC665078 /* RNImagePicker.xcodeproj */;
@ -291,13 +281,6 @@
remoteGlobalIDString = 014A3B5C1C6CF33500B6D375; remoteGlobalIDString = 014A3B5C1C6CF33500B6D375;
remoteInfo = RNImagePicker; remoteInfo = RNImagePicker;
}; };
60B8378C1F3F6F4C00677E56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6F85FE1D97EC4DDBA7286733 /* ReactNativeNavigation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D8AFADBD1BEE6F3F00A4592D;
remoteInfo = ReactNativeNavigation;
};
78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = { 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@ -353,7 +336,6 @@
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* RocketChatRNTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RocketChatRNTests.m; sourceTree = "<group>"; }; 00E356F21AD99517003FC87E /* RocketChatRNTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RocketChatRNTests.m; sourceTree = "<group>"; };
06BB44DD4855498082A744AD /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 06BB44DD4855498082A744AD /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
09FBCE5FF9B547D69122C25F /* AutoGrowTextInput.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AutoGrowTextInput.xcodeproj; path = "../node_modules/react-native-autogrow-textinput/ios/AutoGrowTextInput.xcodeproj"; sourceTree = "<group>"; };
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* RocketChatRN.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RocketChatRN.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* RocketChatRN.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RocketChatRN.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -378,13 +360,10 @@
5A8684E7C27E426C9206E980 /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = "<group>"; }; 5A8684E7C27E426C9206E980 /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = "<group>"; };
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; }; 6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; };
6F85FE1D97EC4DDBA7286733 /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
7A30DA4B2D474348824CD05B /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; }; 7A30DA4B2D474348824CD05B /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
841151A0236F49EBBC246374 /* libReactNativeNavigation.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeNavigation.a; sourceTree = "<group>"; };
8A2DD67ADD954AD9873F45FC /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; }; 8A2DD67ADD954AD9873F45FC /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
91CD29A0CB114F3E9D50596E /* libAutoGrowTextInput.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libAutoGrowTextInput.a; sourceTree = "<group>"; };
9A1E1766CCB84C91A62BD5A6 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; }; 9A1E1766CCB84C91A62BD5A6 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
A18EFC3B0CFE40E0918A8F0C /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; }; A18EFC3B0CFE40E0918A8F0C /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
B37C79D9BD0742CE936B6982 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; B37C79D9BD0742CE936B6982 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
@ -429,8 +408,6 @@
77C35F50C01C43668188886C /* libRNVectorIcons.a in Frameworks */, 77C35F50C01C43668188886C /* libRNVectorIcons.a in Frameworks */,
8A159EDB97C44E52AF62D69C /* libRNSVG.a in Frameworks */, 8A159EDB97C44E52AF62D69C /* libRNSVG.a in Frameworks */,
C758F0BD5C3244E2BA073E61 /* libRNImagePicker.a in Frameworks */, C758F0BD5C3244E2BA073E61 /* libRNImagePicker.a in Frameworks */,
C03BD55E219B47C9BCA9CABE /* libReactNativeNavigation.a in Frameworks */,
D584DAA0EC56473197D4F6BD /* libAutoGrowTextInput.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -602,22 +579,6 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
60B8375E1F3F6F4B00677E56 /* Products */ = {
isa = PBXGroup;
children = (
60B837621F3F6F4C00677E56 /* libAutoGrowTextInput.a */,
);
name = Products;
sourceTree = "<group>";
};
60B837891F3F6F4C00677E56 /* Products */ = {
isa = PBXGroup;
children = (
60B8378D1F3F6F4C00677E56 /* libReactNativeNavigation.a */,
);
name = Products;
sourceTree = "<group>";
};
78C398B11ACF4ADC00677621 /* Products */ = { 78C398B11ACF4ADC00677621 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -647,8 +608,6 @@
22A8B76C8EBA443BB97CE82D /* RNVectorIcons.xcodeproj */, 22A8B76C8EBA443BB97CE82D /* RNVectorIcons.xcodeproj */,
C23AEF1D9EBE4A38A1A6B97B /* RNSVG.xcodeproj */, C23AEF1D9EBE4A38A1A6B97B /* RNSVG.xcodeproj */,
4B38C7E37A8748E0BC665078 /* RNImagePicker.xcodeproj */, 4B38C7E37A8748E0BC665078 /* RNImagePicker.xcodeproj */,
6F85FE1D97EC4DDBA7286733 /* ReactNativeNavigation.xcodeproj */,
09FBCE5FF9B547D69122C25F /* AutoGrowTextInput.xcodeproj */,
); );
name = Libraries; name = Libraries;
sourceTree = "<group>"; sourceTree = "<group>";
@ -869,10 +828,6 @@
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = ""; projectDirPath = "";
projectReferences = ( projectReferences = (
{
ProductGroup = 60B8375E1F3F6F4B00677E56 /* Products */;
ProjectRef = 09FBCE5FF9B547D69122C25F /* AutoGrowTextInput.xcodeproj */;
},
{ {
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@ -917,10 +872,6 @@
ProductGroup = 146834001AC3E56700842450 /* Products */; ProductGroup = 146834001AC3E56700842450 /* Products */;
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
}, },
{
ProductGroup = 60B837891F3F6F4C00677E56 /* Products */;
ProjectRef = 6F85FE1D97EC4DDBA7286733 /* ReactNativeNavigation.xcodeproj */;
},
{ {
ProductGroup = 607D60ED1F325B7D00F639C4 /* Products */; ProductGroup = 607D60ED1F325B7D00F639C4 /* Products */;
ProjectRef = 5A8684E7C27E426C9206E980 /* RealmReact.xcodeproj */; ProjectRef = 5A8684E7C27E426C9206E980 /* RealmReact.xcodeproj */;
@ -1160,13 +1111,6 @@
remoteRef = 607D61151F325B7E00F639C4 /* PBXContainerItemProxy */; remoteRef = 607D61151F325B7E00F639C4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
60B837621F3F6F4C00677E56 /* libAutoGrowTextInput.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libAutoGrowTextInput.a;
remoteRef = 60B837611F3F6F4C00677E56 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
60B837841F3F6F4C00677E56 /* libRNImagePicker.a */ = { 60B837841F3F6F4C00677E56 /* libRNImagePicker.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
@ -1174,13 +1118,6 @@
remoteRef = 60B837831F3F6F4C00677E56 /* PBXContainerItemProxy */; remoteRef = 60B837831F3F6F4C00677E56 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
60B8378D1F3F6F4C00677E56 /* libReactNativeNavigation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libReactNativeNavigation.a;
remoteRef = 60B8378C1F3F6F4C00677E56 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;

32
ios/RocketChatRN/AppDelegate.m
View File

@ -9,11 +9,6 @@
#import "AppDelegate.h" #import "AppDelegate.h"
// **********************************************
// *** DON'T MISS: THE NEXT LINE IS IMPORTANT ***
// **********************************************
#import "RCCManager.h"
#import <React/RCTBundleURLProvider.h> #import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h> #import <React/RCTRootView.h>
@ -25,24 +20,17 @@
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil]; jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
// ********************************************** RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
// *** DON'T MISS: THIS IS HOW WE BOOTSTRAP ***** moduleName:@"RocketChatRN"
// ********************************************** initialProperties:nil
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; launchOptions:launchOptions];
self.window.backgroundColor = [UIColor whiteColor]; rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
[[RCCManager sharedInstance] initBridgeWithBundleURL:jsCodeLocation launchOptions:launchOptions];
// RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
// moduleName:@"RocketChatRN" UIViewController *rootViewController = [UIViewController new];
// initialProperties:nil rootViewController.view = rootView;
// launchOptions:launchOptions]; self.window.rootViewController = rootViewController;
// rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1]; [self.window makeKeyAndVisible];
//
// self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
// UIViewController *rootViewController = [UIViewController new];
// rootViewController.view = rootView;
// self.window.rootViewController = rootViewController;
// [self.window makeKeyAndVisible];
return YES; return YES;
} }

4
ios/RocketChatRN/Info.plist
View File

@ -9,7 +9,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <string>Rocket.Chat.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
@ -38,7 +38,7 @@
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Upload images from camera</string> <string>Upload images from camera</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string></string> <string/>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>Upload images from library</string> <string>Upload images from library</string>
<key>UIAppFonts</key> <key>UIAppFonts</key>

6
package.json
View File

@ -30,7 +30,7 @@
"react-native-img-cache": "^1.4.0", "react-native-img-cache": "^1.4.0",
"react-native-loading-spinner-overlay": "^0.5.2", "react-native-loading-spinner-overlay": "^0.5.2",
"react-native-meteor": "^1.1.0", "react-native-meteor": "^1.1.0",
"react-native-navigation": "^1.1.193", "react-native-modal": "^3.1.0",
"react-native-optimized-flatlist": "^1.0.1", "react-native-optimized-flatlist": "^1.0.1",
"react-native-svg": "^5.4.1", "react-native-svg": "^5.4.1",
"react-native-svg-image": "^1.1.4", "react-native-svg-image": "^1.1.4",
@ -44,8 +44,8 @@
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-saga": "^0.15.6", "redux-saga": "^0.15.6",
"regenerator-runtime": "^0.11.0", "regenerator-runtime": "^0.11.0",
"strip-ansi": "^4.0.0", "remote-redux-devtools": "^0.5.12",
"underscore": "^1.8.3" "strip-ansi": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@storybook/addon-storyshots": "^3.2.6", "@storybook/addon-storyshots": "^3.2.6",

159
yarn.lock
View File

@ -1789,6 +1789,10 @@ clone-stats@^0.0.1:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
clone@2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
clone@^1.0.0, clone@^1.0.2: clone@^1.0.0, clone@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
@ -1865,6 +1869,10 @@ commondir@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
component-emitter@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.0.tgz#ccd113a86388d06482d03de3fc7df98526ba8efe"
compressible@~2.0.5: compressible@~2.0.5:
version "2.0.11" version "2.0.11"
resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
@ -2923,7 +2931,7 @@ fbjs@0.8.12:
setimmediate "^1.0.5" setimmediate "^1.0.5"
ua-parser-js "^0.7.9" ua-parser-js "^0.7.9"
fbjs@^0.8.9: fbjs@^0.8.12, fbjs@^0.8.9:
version "0.8.14" version "0.8.14"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
dependencies: dependencies:
@ -3161,6 +3169,10 @@ get-caller-file@^1.0.1:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
get-params@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/get-params/-/get-params-0.1.2.tgz#bae0dfaba588a0c60d7834c0d8dc2ff60eeef2fe"
get-stream@^3.0.0: get-stream@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@ -3360,7 +3372,7 @@ hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1: hoist-non-react-statics@^2.2.1:
version "2.2.2" version "2.2.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.2.2.tgz#c0eca5a7d5a28c5ada3107eb763b01da6bfa81fb" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.2.2.tgz#c0eca5a7d5a28c5ada3107eb763b01da6bfa81fb"
@ -4042,6 +4054,10 @@ js-yaml@~3.7.0:
argparse "^1.0.7" argparse "^1.0.7"
esprima "^2.6.0" esprima "^2.6.0"
jsan@^3.1.0, jsan@^3.1.5:
version "3.1.9"
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.9.tgz#2705676c1058f0a7d9ac266ad036a5769cfa7c96"
jsbn@~0.1.0: jsbn@~0.1.0:
version "0.1.1" version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@ -4188,6 +4204,10 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2" prelude-ls "~1.1.2"
type-check "~0.3.2" type-check "~0.3.2"
linked-list@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/linked-list/-/linked-list-0.1.0.tgz#798b0ff97d1b92a4fd08480f55aea4e9d49d37bf"
load-json-file@^1.0.0: load-json-file@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@ -4357,14 +4377,14 @@ lodash.uniq@^4.5.0:
version "4.5.0" version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash@4.x.x, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
lodash@^3.10.1, lodash@^3.5.0: lodash@^3.10.1, lodash@^3.5.0:
version "3.10.1" version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
lodash@~2.4.1: lodash@~2.4.1:
version "2.4.2" version "2.4.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
@ -5423,19 +5443,19 @@ promise@^7.1.1:
dependencies: dependencies:
asap "~2.0.3" asap "~2.0.3"
prop-types@15.5.8: prop-types@15.5.10, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
fbjs "^0.8.9"
prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9:
version "15.5.10" version "15.5.10"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
dependencies: dependencies:
fbjs "^0.8.9" fbjs "^0.8.9"
loose-envify "^1.3.1" loose-envify "^1.3.1"
prop-types@15.5.8:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
fbjs "^0.8.9"
proxy-addr@~1.1.5: proxy-addr@~1.1.5:
version "1.1.5" version "1.1.5"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@ -5674,7 +5694,7 @@ react-native-dismiss-keyboard@1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz#32886242b3f2317e121f3aeb9b0a585e2b879b49" resolved "https://registry.yarnpkg.com/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz#32886242b3f2317e121f3aeb9b0a585e2b879b49"
react-native-drawer-layout-polyfill@^1.3.2: react-native-drawer-layout-polyfill@^1.3.0:
version "1.3.2" version "1.3.2"
resolved "https://registry.yarnpkg.com/react-native-drawer-layout-polyfill/-/react-native-drawer-layout-polyfill-1.3.2.tgz#192c84d7a5a6b8a6d2be2c7daa5e4164518d0cc7" resolved "https://registry.yarnpkg.com/react-native-drawer-layout-polyfill/-/react-native-drawer-layout-polyfill-1.3.2.tgz#192c84d7a5a6b8a6d2be2c7daa5e4164518d0cc7"
dependencies: dependencies:
@ -5728,11 +5748,12 @@ react-native-meteor@^1.1.0:
underscore "^1.8.3" underscore "^1.8.3"
wolfy87-eventemitter "^4.3.0" wolfy87-eventemitter "^4.3.0"
react-native-navigation@^1.1.193: react-native-modal@^3.1.0:
version "1.1.198" version "3.1.0"
resolved "https://registry.yarnpkg.com/react-native-navigation/-/react-native-navigation-1.1.198.tgz#8d4edf44a6ec6b56c9a9c58205f1b136cac2be45" resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-3.1.0.tgz#3e6911152e9dcd6e15457cf0c24d7fd833c4a57a"
dependencies: dependencies:
lodash "4.x.x" prop-types "15.5.10"
react-native-animatable "^1.2.3"
react-native-optimized-flatlist@^1.0.1: react-native-optimized-flatlist@^1.0.1:
version "1.0.1" version "1.0.1"
@ -5749,9 +5770,9 @@ react-native-svg@^5.4.1:
color "^0.11.1" color "^0.11.1"
lodash "^4.16.6" lodash "^4.16.6"
react-native-tab-view@^0.0.67: react-native-tab-view@^0.0.65:
version "0.0.67" version "0.0.65"
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.67.tgz#cdd146fe5e5d4baff6c89f2d5d0b15fa23db39d0" resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.65.tgz#b685ea3081ff7c96486cd997361026c407302c59"
dependencies: dependencies:
prop-types "^15.5.8" prop-types "^15.5.8"
@ -5859,15 +5880,16 @@ react-native@0.46.1:
yargs "^6.4.0" yargs "^6.4.0"
react-navigation@^1.0.0-beta.11: react-navigation@^1.0.0-beta.11:
version "1.0.0-beta.12" version "1.0.0-beta.11"
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-1.0.0-beta.12.tgz#cf0f04ffbf9fefe41f5c5a1dab92106b48a29f0a" resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-1.0.0-beta.11.tgz#4271edb23cdbcc6eb88602f7fde0a77f0ef7a160"
dependencies: dependencies:
clamp "^1.0.1" clamp "^1.0.1"
hoist-non-react-statics "^2.2.0" fbjs "^0.8.12"
hoist-non-react-statics "^1.2.0"
path-to-regexp "^1.7.0" path-to-regexp "^1.7.0"
prop-types "^15.5.10" prop-types "^15.5.10"
react-native-drawer-layout-polyfill "^1.3.2" react-native-drawer-layout-polyfill "^1.3.0"
react-native-tab-view "^0.0.67" react-native-tab-view "^0.0.65"
react-proxy@^1.1.7: react-proxy@^1.1.7:
version "1.1.8" version "1.1.8"
@ -6060,6 +6082,13 @@ reduce-function-call@^1.0.1:
dependencies: dependencies:
balanced-match "^0.4.2" balanced-match "^0.4.2"
redux-devtools-instrument@^1.3.3:
version "1.8.2"
resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.8.2.tgz#5e91cfe402e790dae3fd2f0d235f7b7d84b09ffe"
dependencies:
lodash "^4.2.0"
symbol-observable "^1.0.2"
redux-immutable-state-invariant@^2.0.0: redux-immutable-state-invariant@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.0.0.tgz#2954debe7a09ceb65cbe398cff785858c8f30404" resolved "https://registry.yarnpkg.com/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.0.0.tgz#2954debe7a09ceb65cbe398cff785858c8f30404"
@ -6143,6 +6172,33 @@ regjsparser@^0.1.4:
dependencies: dependencies:
jsesc "~0.5.0" jsesc "~0.5.0"
remote-redux-devtools@^0.5.12:
version "0.5.12"
resolved "https://registry.yarnpkg.com/remote-redux-devtools/-/remote-redux-devtools-0.5.12.tgz#42cb95dfa9e54c1d9671317c5e7bba41e68caec2"
dependencies:
jsan "^3.1.5"
querystring "^0.2.0"
redux-devtools-instrument "^1.3.3"
remotedev-utils "^0.1.1"
rn-host-detect "^1.0.1"
socketcluster-client "^5.3.1"
remotedev-serialize@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.0.tgz#074768e98cb7aa806f45994eeb0c8af95120ee32"
dependencies:
jsan "^3.1.0"
remotedev-utils@^0.1.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/remotedev-utils/-/remotedev-utils-0.1.4.tgz#643700819a943678073c75eb185e81d96620b348"
dependencies:
get-params "^0.1.2"
jsan "^3.1.5"
lodash "^4.0.0"
remotedev-serialize "^0.1.0"
shortid "^2.2.6"
remove-trailing-separator@^1.0.1: remove-trailing-separator@^1.0.1:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@ -6266,6 +6322,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^2.0.0" hash-base "^2.0.0"
inherits "^2.0.1" inherits "^2.0.1"
rn-host-detect@^1.0.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/rn-host-detect/-/rn-host-detect-1.1.3.tgz#242d76e2fa485c48d751416e65b7cce596969e91"
rndm@1.2.0: rndm@1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c" resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
@ -6325,6 +6385,26 @@ sax@~1.1.1:
version "1.1.6" version "1.1.6"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240"
sc-channel@~1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/sc-channel/-/sc-channel-1.0.6.tgz#b38bd47a993e78290fbc53467867f6b2a0a08639"
dependencies:
sc-emitter "1.x.x"
sc-emitter@1.x.x, sc-emitter@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/sc-emitter/-/sc-emitter-1.1.0.tgz#ef119d4222f4c64f887b486964ef11116cdd0e75"
dependencies:
component-emitter "1.2.0"
sc-errors@~1.3.0:
version "1.3.3"
resolved "https://registry.yarnpkg.com/sc-errors/-/sc-errors-1.3.3.tgz#c00bc4c766a970cc8d5937d08cd58e931d7dae05"
sc-formatter@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/sc-formatter/-/sc-formatter-3.0.0.tgz#c91b1fe56c260abd5a6a2e6af98c724bc7998a38"
schema-utils@^0.3.0: schema-utils@^0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
@ -6467,6 +6547,10 @@ shellwords@^0.1.0:
version "0.1.0" version "0.1.0"
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"
shortid@^2.2.6:
version "2.2.8"
resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131"
signal-exit@^3.0.0, signal-exit@^3.0.2: signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@ -6505,6 +6589,20 @@ sntp@1.x.x:
dependencies: dependencies:
hoek "2.x.x" hoek "2.x.x"
socketcluster-client@^5.3.1:
version "5.5.2"
resolved "https://registry.yarnpkg.com/socketcluster-client/-/socketcluster-client-5.5.2.tgz#9d4369e0e722ff7e55e5422c2d44f5afe1aff128"
dependencies:
base-64 "0.1.0"
clone "2.1.1"
linked-list "0.1.0"
querystring "0.2.0"
sc-channel "~1.0.6"
sc-emitter "~1.1.0"
sc-errors "~1.3.0"
sc-formatter "~3.0.0"
ws "3.0.0"
sort-keys@^1.0.0: sort-keys@^1.0.0:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@ -6719,7 +6817,7 @@ svgo@^0.7.0:
sax "~1.2.1" sax "~1.2.1"
whet.extend "~0.9.9" whet.extend "~0.9.9"
symbol-observable@^1.0.3: symbol-observable@^1.0.2, symbol-observable@^1.0.3:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
@ -7276,6 +7374,13 @@ write@^0.2.1:
dependencies: dependencies:
mkdirp "^0.5.1" mkdirp "^0.5.1"
ws@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-3.0.0.tgz#98ddb00056c8390cb751e7788788497f99103b6c"
dependencies:
safe-buffer "~5.0.1"
ultron "~1.1.0"
ws@^1.1.0: ws@^1.1.0:
version "1.1.4" version "1.1.4"
resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61" resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"