[IMPROVEMENT] Move directory to header (#2414)

app/views/RoomsListView/ListHeader/Directory.js

@@ -1,44 +0,0 @@
-import React from 'react';
-import { View, Text, StyleSheet } from 'react-native';
-import PropTypes from 'prop-types';
-
-import Touch from '../../../utils/touch';
-import { CustomIcon } from '../../../lib/Icons';
-import I18n from '../../../i18n';
-import styles from '../styles';
-import DisclosureIndicator from '../../../containers/DisclosureIndicator';
-import { themes } from '../../../constants/colors';
-import { withTheme } from '../../../theme';
-
-const Directory = React.memo(({ goDirectory, theme, searching }) => {
-	if (searching > 0) {
-		return null;
-	}
-	const color = { color: themes[theme].headerSecondaryText };
-	return (
-		<Touch
-			onPress={goDirectory}
-			theme={theme}
-			style={{ backgroundColor: themes[theme].headerSecondaryBackground }}
-		>
-			<View
-				style={[
-					styles.dropdownContainerHeader,
-					{ borderBottomWidth: StyleSheet.hairlineWidth, borderColor: themes[theme].separatorColor }
-				]}
-			>
-				<CustomIcon style={[styles.directoryIcon, color]} size={22} name='directory' />
-				<Text style={[styles.directoryText, color]}>{I18n.t('Directory')}</Text>
-				<DisclosureIndicator theme={theme} />
-			</View>
-		</Touch>
-	);
-});
-
-Directory.propTypes = {
-	searching: PropTypes.bool,
-	goDirectory: PropTypes.func,
-	theme: PropTypes.string
-};
-
-export default withTheme(Directory);

app/views/RoomsListView/ListHeader/index.js

@@ -2,20 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import Queue from './Queue';
-import Directory from './Directory';
 import Sort from './Sort';
 
 const ListHeader = React.memo(({
 	searching,
 	sortBy,
 	toggleSort,
-	goDirectory,
 	goQueue,
 	queueSize,
 	inquiryEnabled
 }) => (
 	<>
-		<Directory searching={searching} goDirectory={goDirectory} />
 		<Sort searching={searching} sortBy={sortBy} toggleSort={toggleSort} />
 		<Queue searching={searching} goQueue={goQueue} queueSize={queueSize} inquiryEnabled={inquiryEnabled} />
 	</>
@@ -25,7 +22,6 @@ ListHeader.propTypes = {
 	searching: PropTypes.bool,
 	sortBy: PropTypes.string,
 	toggleSort: PropTypes.func,
-	goDirectory: PropTypes.func,
 	goQueue: PropTypes.func,
 	queueSize: PropTypes.number,
 	inquiryEnabled: PropTypes.bool

app/views/RoomsListView/index.js

@@ -372,6 +372,12 @@ class RoomsListView extends React.Component {
 						onPress={this.initSearching}
 						testID='rooms-list-view-search'
 					/>
+					<Item
+						title='directory'
+						iconName='directory'
+						onPress={this.goDirectory}
+						testID='rooms-list-view-directory'
+					/>
 				</CustomHeaderButtons>
 			))
 		};

app/views/RoomsListView/styles.js

@@ -116,15 +116,5 @@ export default StyleSheet.create({
 	serverSeparator: {
 		height: StyleSheet.hairlineWidth,
 		marginLeft: 72
-	},
-	directoryIcon: {
-		width: 22,
-		height: 22,
-		marginHorizontal: 12
-	},
-	directoryText: {
-		fontSize: 16,
-		flex: 1,
-		...sharedStyles.textRegular
 	}
 });