diff --git a/app/components/channel_drawer/channels_list/channels_list.js b/app/components/channel_drawer/channels_list/channels_list.js index e672f9f44..a8061dd37 100644 --- a/app/components/channel_drawer/channels_list/channels_list.js +++ b/app/components/channel_drawer/channels_list/channels_list.js @@ -106,7 +106,11 @@ class ChannelsList extends React.PureComponent { backgroundColor: changeOpacity(theme.sidebarHeaderTextColor, 0.2), color: theme.sidebarHeaderTextColor, fontSize: 15, - lineHeight: 66 + ...Platform.select({ + android: { + marginBottom: -5 + } + }) }; const title = ( @@ -116,7 +120,7 @@ class ChannelsList extends React.PureComponent { placeholder={intl.formatMessage({id: 'mobile.channel_drawer.search', defaultMessage: 'Jump to...'})} cancelTitle={intl.formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})} backgroundColor='transparent' - inputHeight={33} + inputHeight={34} inputStyle={searchBarInput} placeholderTextColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)} tintColorSearch={changeOpacity(theme.sidebarHeaderTextColor, 0.5)} diff --git a/app/components/emoji_picker/emoji_picker.js b/app/components/emoji_picker/emoji_picker.js index 7df794160..e37fc5df5 100644 --- a/app/components/emoji_picker/emoji_picker.js +++ b/app/components/emoji_picker/emoji_picker.js @@ -441,6 +441,17 @@ export default class EmojiPicker extends PureComponent { keyboardOffset = 52; } + const searchBarInput = { + backgroundColor: theme.centerChannelBg, + color: theme.centerChannelColor, + fontSize: 13, + ...Platform.select({ + android: { + marginBottom: -3 + } + }) + }; + return ( {isFocused && value ? diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js index bd13eb5ca..56dee34e3 100644 --- a/app/screens/channel_add_members/channel_add_members.js +++ b/app/screens/channel_add_members/channel_add_members.js @@ -7,6 +7,7 @@ import {injectIntl, intlShape} from 'react-intl'; import { Alert, InteractionManager, + Platform, View } from 'react-native'; @@ -238,6 +239,17 @@ class ChannelAddMembers extends PureComponent { ); } + const searchBarInput = { + backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), + color: theme.centerChannelColor, + fontSize: 15, + ...Platform.select({ + android: { + marginBottom: -5 + } + }) + }; + return ( @@ -250,12 +262,7 @@ class ChannelAddMembers extends PureComponent { cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})} backgroundColor='transparent' inputHeight={33} - inputStyle={{ - backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), - color: theme.centerChannelColor, - fontSize: 15, - lineHeight: 66 - }} + inputStyle={searchBarInput} placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)} tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)} tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)} diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js index befd2cdac..e9ad9929c 100644 --- a/app/screens/channel_members/channel_members.js +++ b/app/screens/channel_members/channel_members.js @@ -6,6 +6,7 @@ import PropTypes from 'prop-types'; import { Alert, InteractionManager, + Platform, View } from 'react-native'; import {injectIntl, intlShape} from 'react-intl'; @@ -285,6 +286,17 @@ class ChannelMembers extends PureComponent { ); } + const searchBarInput = { + backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), + color: theme.centerChannelColor, + fontSize: 15, + ...Platform.select({ + android: { + marginBottom: -5 + } + }) + }; + return ( @@ -297,12 +309,7 @@ class ChannelMembers extends PureComponent { cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})} backgroundColor='transparent' inputHeight={33} - inputStyle={{ - backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), - color: theme.centerChannelColor, - fontSize: 15, - lineHeight: 66 - }} + inputStyle={searchBarInput} placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)} tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)} tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)} diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js index 2ba8028bc..491ee231d 100644 --- a/app/screens/more_channels/more_channels.js +++ b/app/screens/more_channels/more_channels.js @@ -284,6 +284,17 @@ class MoreChannels extends PureComponent { if (adding) { content = (); } else { + const searchBarInput = { + backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), + color: theme.centerChannelColor, + fontSize: 15, + ...Platform.select({ + android: { + marginBottom: -5 + } + }) + }; + content = ( @@ -464,12 +476,7 @@ class MoreDirectMessages extends PureComponent { cancelTitle={this.props.intl.formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})} backgroundColor='transparent' inputHeight={33} - inputStyle={{ - backgroundColor: changeOpacity(theme.centerChannelColor, 0.2), - color: theme.centerChannelColor, - fontSize: 15, - lineHeight: 66 - }} + inputStyle={searchBarInput} placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)} tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)} tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)} diff --git a/app/screens/search/search.js b/app/screens/search/search.js index cc99963a2..471b153ba 100644 --- a/app/screens/search/search.js +++ b/app/screens/search/search.js @@ -603,8 +603,7 @@ class Search extends PureComponent { const searchBarInput = { backgroundColor: changeOpacity(theme.sidebarHeaderTextColor, 0.2), color: theme.sidebarHeaderTextColor, - fontSize: 15, - lineHeight: 66 + fontSize: 15 }; return (