[MM-24642] Sidebar fixes (mattermost#4286)

* Fixes to height and padding * Add underlayColor * Rename to index * Revert height change for overflow change * Increase toValue * Update Android offset
moweex · May 18, 2020 · a819cce · a819cce
1 parent d3a6e16
commit a819cce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/components/search_bar/index.js b/app/components/search_bar/index.js
@@ -175,7 +175,7 @@ export default class Search extends PureComponent {
                 Animated.timing(
                     this.leftComponentAnimated,
                     {
-                        toValue: 100,
+                        toValue: 115,
                         duration: 200,
                     },
                 ),
@@ -273,6 +273,7 @@ export default class Search extends PureComponent {
                 size: 25,
                 color: searchBarStyle.clearIconColorAndroid,
                 name: 'arrow-back',
+                underlayColor: 'transparent',
             };
 
             clearIcon = {

diff --git a/app/components/sidebars/main/channels_list/channels_list.js b/app/components/sidebars/main/channels_list/channels_list.js
@@ -228,7 +228,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         searchContainer: {
             flex: 1,
             flexDirection: 'row',
-            overflow: 'hidden',
             ...Platform.select({
                 android: {
                     marginBottom: 1,

diff --git a/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js b/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js
@@ -19,7 +19,7 @@ import {displayUsername} from '@mm-redux/utils/user_utils';
 import {t} from 'app/utils/i18n';
 import ChannelItem from 'app/components/sidebars/main/channels_list/channel_item';
 import {ListTypes} from 'app/constants';
-import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing';
+import {paddingLeft} from 'app/components/safe_area_view/iphone_x_spacing';
 
 const VIEWABILITY_CONFIG = ListTypes.VISIBILITY_CONFIG_DEFAULTS;
 
@@ -362,7 +362,7 @@ class FilteredList extends Component {
 
         return (
             <React.Fragment>
-                <View style={[styles.titleContainer, padding(isLandscape)]}>
+                <View style={[styles.titleContainer, paddingLeft(isLandscape)]}>
                     <Text style={styles.title}>
                         {intl.formatMessage({id, defaultMessage}).toUpperCase()}
                     </Text>

diff --git a/app/components/sidebars/main/channels_list/list/list.js b/app/components/sidebars/main/channels_list/list/list.js
@@ -21,7 +21,7 @@ import {General} from '@mm-redux/constants';
 import {debounce} from '@mm-redux/actions/helpers';
 
 import ChannelItem from 'app/components/sidebars/main/channels_list/channel_item';
-import {paddingLeft as padding} from 'app/components/safe_area_view/iphone_x_spacing';
+import {paddingLeft} from 'app/components/safe_area_view/iphone_x_spacing';
 import {DeviceTypes, ListTypes} from 'app/constants';
 import {SidebarSectionTypes} from 'app/constants/view';
 
@@ -333,7 +333,7 @@ export default class List extends PureComponent {
 
         return (
             <React.Fragment>
-                <View style={[styles.titleContainer, padding(isLandscape)]}>
+                <View style={[styles.titleContainer, paddingLeft(isLandscape)]}>
                     <Text style={styles.title}>
                         {intl.formatMessage({id, defaultMessage}).toUpperCase()}
                     </Text>

diff --git a/app/components/sidebars/main/main_sidebar_base.js b/app/components/sidebars/main/main_sidebar_base.js
@@ -196,7 +196,7 @@ export default class MainSidebarBase extends Component {
             searching,
         } = this.state;
 
-        const offset = Platform.select({android: 60, ios: 0});
+        const offset = Platform.select({android: 64, ios: 0});
         const multipleTeams = teamsCount > 1;
         const showTeams = !searching && multipleTeams;
         if (this.drawerSwiper) {