Fix for Android
This commit is contained in:
parent
806149447b
commit
1350116591
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -21,8 +21,10 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
|
|||
if (mention === 'all' || mention === 'here') {
|
||||
return (
|
||||
<View style={styles.mentionView}>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}>
|
||||
@
|
||||
<Text>
|
||||
<View>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
|
||||
</View>
|
||||
<View>
|
||||
<Text
|
||||
style={[
|
||||
|
@ -72,8 +74,10 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
|
|||
const m = useRealName && user.name ? user.name : user.username;
|
||||
return (
|
||||
<View style={styles.mentionView}>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}>
|
||||
@
|
||||
<Text>
|
||||
<View>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
|
||||
</View>
|
||||
<View>
|
||||
<Text style={[styles.mention, mentionStyle, ...style]} onPress={handlePress}>
|
||||
{` ${m} `}
|
||||
|
|
|
@ -39,8 +39,10 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
|
|||
if (channels && channels.length && channels.findIndex(channel => channel.name === hashtag) !== -1) {
|
||||
return (
|
||||
<View style={styles.mentionView}>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText }]}>
|
||||
#
|
||||
<Text>
|
||||
<View>
|
||||
<Text style={[styles.plainText, styles.text, { color: themes[theme].bodyText, marginBottom: -4 }]}>@</Text>
|
||||
</View>
|
||||
<View>
|
||||
<Text
|
||||
style={[
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import { Platform, StyleSheet } from 'react-native';
|
||||
|
||||
import { isIOS } from '../../lib/methods/helpers';
|
||||
import sharedStyles from '../../views/Styles';
|
||||
|
||||
const codeFontFamily = Platform.select({
|
||||
|
@ -57,13 +58,13 @@ export default StyleSheet.create({
|
|||
height: 30
|
||||
},
|
||||
temp: { opacity: 0.3 },
|
||||
mentionView: { marginBottom: -4 },
|
||||
mentionView: { height: 20, marginBottom: isIOS ? -2 : -4 },
|
||||
mention: {
|
||||
fontSize: 16,
|
||||
...sharedStyles.textMedium,
|
||||
borderRadius: 4,
|
||||
overflow: 'hidden',
|
||||
marginBottom: -2
|
||||
marginBottom: -4
|
||||
},
|
||||
paragraph: {
|
||||
marginTop: 0,
|
||||
|
|
Loading…
Reference in New Issue