fix?
This commit is contained in:
parent
a5fd47fa8a
commit
d35e625acc
|
@ -235,6 +235,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -338,6 +339,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -441,6 +443,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -565,6 +568,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -689,6 +693,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -813,6 +818,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
@ -937,6 +943,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
|
|||
"position": "absolute",
|
||||
},
|
||||
Object {
|
||||
"borderRadius": 20,
|
||||
"height": 40,
|
||||
"width": 40,
|
||||
},
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package com.rocketchatrn;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import com.facebook.react.ReactActivity;
|
||||
|
||||
public class MainActivity extends ReactActivity {
|
||||
|
|
|
@ -28,6 +28,7 @@ public class MainApplication extends Application implements ReactApplication {
|
|||
@Override
|
||||
protected List<ReactPackage> getPackages() {
|
||||
return Arrays.<ReactPackage>asList(
|
||||
new MainReactPackage(),
|
||||
new SvgPackage(),
|
||||
new ImagePickerPackage(),
|
||||
new VectorIconsPackage(),
|
||||
|
@ -42,4 +43,10 @@ public class MainApplication extends Application implements ReactApplication {
|
|||
public ReactNativeHost getReactNativeHost() {
|
||||
return mReactNativeHost;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
SoLoader.init(this, /* native exopackage */ false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,8 @@ class Avatar extends React.PureComponent {
|
|||
|
||||
const avatarStyle = {
|
||||
width: size,
|
||||
height: size
|
||||
height: size,
|
||||
borderRadius
|
||||
};
|
||||
|
||||
const uri = avatar || `${ baseUrl }/avatar/${ text }`;
|
||||
|
|
|
@ -42,7 +42,7 @@ export default class Routes extends React.Component {
|
|||
iterationCount='infinite'
|
||||
style={{ textAlign: 'center' }}
|
||||
>
|
||||
<Image style={styles.logo} source={require('../images/logo.png')} />
|
||||
<Image style={styles.logo} source={require('../images/logo.png')} resizeMode={Image.resizeMode.center} />
|
||||
</Animatable.Text>
|
||||
</View>
|
||||
);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import { StackNavigator, DrawerNavigator } from 'react-navigation';
|
||||
import { Platform } from 'react-native';
|
||||
// import { Platform } from 'react-native';
|
||||
|
||||
import Sidebar from '../../containers/Sidebar';
|
||||
import DrawerMenuButton from '../../presentation/DrawerMenuButton';
|
||||
|
@ -9,8 +9,8 @@ import RoomsListView from '../../views/RoomsListView';
|
|||
import RoomView from '../../views/RoomView';
|
||||
import CreateChannelView from '../../views/CreateChannelView';
|
||||
|
||||
const drawerPosition = Platform.OS === 'ios' ? 'right' : 'left';
|
||||
const drawerIconPosition = Platform.OS === 'ios' ? 'headerRight' : 'headerLeft';
|
||||
const drawerPosition = 'left';
|
||||
const drawerIconPosition = 'headerLeft';
|
||||
|
||||
|
||||
const AuthRoutes = StackNavigator(
|
||||
|
@ -28,8 +28,8 @@ const AuthRoutes = StackNavigator(
|
|||
screen: RoomView,
|
||||
navigationOptions({ navigation }) {
|
||||
return {
|
||||
title: navigation.state.params.title || 'Room',
|
||||
[drawerIconPosition]: (<DrawerMenuButton navigation={navigation} />)
|
||||
title: navigation.state.params.title || 'Room'
|
||||
// [drawerIconPosition]: (<DrawerMenuButton navigation={navigation} />)÷
|
||||
};
|
||||
}
|
||||
},
|
||||
|
|
|
@ -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>
|
Before Width: | Height: | Size: 6.3 KiB |
|
@ -227,7 +227,8 @@ export default class RoomsListView extends React.Component {
|
|||
|
||||
renderItem = item => (
|
||||
<RoomItem
|
||||
{...item}
|
||||
unread={item.unread}
|
||||
name={item.name}
|
||||
key={item._id}
|
||||
type={item.t}
|
||||
baseUrl={this.props.Site_Url}
|
||||
|
|
|
@ -24,9 +24,8 @@ export default StyleSheet.create({
|
|||
justifyContent: 'center'
|
||||
},
|
||||
logo: {
|
||||
width: 150,
|
||||
// backgroundColor: 'red'
|
||||
// height: 150,
|
||||
// width: 80,
|
||||
borderRadius: 5,
|
||||
resizeMode: 'contain'
|
||||
},
|
||||
formContainer: {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue