diff --git a/app/components/channel_drawer/channels_list/channels_list.js b/app/components/channel_drawer/channels_list/channels_list.js index e220574fb..0cd2f14af 100644 --- a/app/components/channel_drawer/channels_list/channels_list.js +++ b/app/components/channel_drawer/channels_list/channels_list.js @@ -144,17 +144,18 @@ class ChannelsList extends React.PureComponent { - + + + {title} {settings} @@ -224,6 +227,10 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { fontWeight: 'normal', paddingLeft: 16 }, + switchContainer: { + position: 'relative', + top: -1 + }, settingsContainer: { alignItems: 'center', justifyContent: 'center', diff --git a/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js b/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js index bdca1daee..d25accc09 100644 --- a/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js +++ b/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js @@ -93,7 +93,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { height: 32, justifyContent: 'center', marginLeft: 6, - marginRight: 10, + marginRight: 5, paddingHorizontal: 6 }, switcherDivider: { diff --git a/app/components/search_bar/search_bar.android.js b/app/components/search_bar/search_bar.android.js index 8bf99b04e..fb8a61220 100644 --- a/app/components/search_bar/search_bar.android.js +++ b/app/components/search_bar/search_bar.android.js @@ -49,8 +49,8 @@ export default class SearchBarAndroid extends PureComponent { static defaultProps = { backArrowSize: 24, - deleteIconSize: 16, - searchIconSize: 16, + deleteIconSize: 20, + searchIconSize: 24, blurOnSubmit: true, placeholder: 'Search', showCancelButton: true, @@ -99,6 +99,10 @@ export default class SearchBarAndroid extends PureComponent { }); }; + onClearPress = () => { + this.onChangeText(''); + }; + onChangeText = (value) => { this.props.onChangeText(value); }; @@ -170,7 +174,7 @@ export default class SearchBarAndroid extends PureComponent { { backgroundColor: inputColor, height: inputHeight, - paddingLeft: isFocused ? 0 : inputHeight * 0.25 + paddingLeft: 7 } ]} > @@ -212,13 +216,14 @@ export default class SearchBarAndroid extends PureComponent { style={[ styles.searchBarInput, inputNoBackground, - {height: this.props.inputHeight} + {height: this.props.inputHeight}, + isFocused ? {} : styles.searchBarBlurredInput ]} /> {isFocused && value ? - this.onChangeText('')}> + {this.props.iconSearch} : - @@ -417,10 +414,10 @@ export default class Search extends Component { > {this.props.iconDelete} : - - +