From 915ccfb9dd92e43d8fbffb072fb4d90bec5bcdaa Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 6 Dec 2017 14:40:59 -0200 Subject: [PATCH] RoomsList search layout: - iOS on list header - Android on view header --- android/gradle.properties | 1 + app/views/RoomsListView/Header.js | 61 ++++++++++++++++++++++++++----- app/views/RoomsListView/index.js | 4 +- 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 1fd964e90..52b9156ea 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -18,3 +18,4 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +VERSIONCODE=999999 \ No newline at end of file diff --git a/app/views/RoomsListView/Header.js b/app/views/RoomsListView/Header.js index 59808eb7a..e178d17da 100644 --- a/app/views/RoomsListView/Header.js +++ b/app/views/RoomsListView/Header.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Text, View, StyleSheet, Platform, TouchableOpacity, Dimensions } from 'react-native'; +import { Text, View, StyleSheet, Platform, TouchableOpacity, Dimensions, TextInput } from 'react-native'; import Icon from 'react-native-vector-icons/Ionicons'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; @@ -85,7 +85,7 @@ const styles = StyleSheet.create({ user: state.login.user, baseUrl: state.settings.Site_Url })) -export default class extends React.PureComponent { +export default class extends React.Component { static propTypes = { navigation: PropTypes.object.isRequired, user: PropTypes.object.isRequired, @@ -95,7 +95,8 @@ export default class extends React.PureComponent { constructor(props) { super(props); this.state = { - isModalVisible: false + isModalVisible: false, + searching: false }; } @@ -151,15 +152,12 @@ export default class extends React.PureComponent { } renderRight() { - if (Platform.OS !== 'ios') { - return; - } return ( - {Platform.OS !== 'ios' ? + {Platform.OS === 'android' ? alert('search!')} + onPress={() => this.setState({ searching: true })} > {this.renderLeft()} {this.renderTitle()} {this.renderRight()} + + ); + } + + renderSearch() { + if (!this.state.searching) { + return null; + } + return ( + + + this.setState({ searching: false })} + > + + + + + + ); + } + + render() { + return ( + + {this.renderHeader()} + {this.renderSearch()}