[FIX] Big names overflow (#2072)
* [FIX] Big names overflow * [FIX] Message time Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com> * [FIX] Some alignments * fix user item overflow * some adjustments Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
parent
8870ef4236
commit
66edd7a3c8
|
@ -53,6 +53,7 @@ const User = React.memo(({
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.titleContainer}
|
style={styles.titleContainer}
|
||||||
onPress={() => navToRoomInfo(navParam)}
|
onPress={() => navToRoomInfo(navParam)}
|
||||||
|
style={styles.titleContainer}
|
||||||
disabled={author._id === user.id}
|
disabled={author._id === user.id}
|
||||||
>
|
>
|
||||||
<Text style={[styles.username, { color: themes[theme].titleText }]} numberOfLines={1}>
|
<Text style={[styles.username, { color: themes[theme].titleText }]} numberOfLines={1}>
|
||||||
|
|
|
@ -23,7 +23,8 @@ const styles = StyleSheet.create({
|
||||||
textContainer: {
|
textContainer: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
justifyContent: 'center'
|
justifyContent: 'center',
|
||||||
|
marginRight: 15
|
||||||
},
|
},
|
||||||
name: {
|
name: {
|
||||||
fontSize: 17,
|
fontSize: 17,
|
||||||
|
|
|
@ -480,7 +480,7 @@ class RoomActionsView extends React.Component {
|
||||||
>
|
>
|
||||||
{t === 'd' && member._id ? <Status style={sharedStyles.status} id={member._id} /> : null }
|
{t === 'd' && member._id ? <Status style={sharedStyles.status} id={member._id} /> : null }
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<View style={styles.roomTitleContainer}>
|
<View style={[styles.roomTitleContainer, item.disabled && styles.roomTitlePadding]}>
|
||||||
{room.t === 'd'
|
{room.t === 'd'
|
||||||
? <Text style={[styles.roomTitle, { color: themes[theme].titleText }]} numberOfLines={1}>{room.fname}</Text>
|
? <Text style={[styles.roomTitle, { color: themes[theme].titleText }]} numberOfLines={1}>{room.fname}</Text>
|
||||||
: (
|
: (
|
||||||
|
@ -497,7 +497,7 @@ class RoomActionsView extends React.Component {
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
theme={theme}
|
theme={theme}
|
||||||
/>
|
/>
|
||||||
{room.t === 'd' && <Markdown msg={member.statusText} style={[styles.roomDescription, { color: themes[theme].auxiliaryText }]} preview theme={theme} />}
|
{room.t === 'd' && <Markdown msg={member.statusText} style={[styles.roomDescription, { color: themes[theme].auxiliaryText }]} preview theme={theme} numberOfLines={1} />}
|
||||||
</View>
|
</View>
|
||||||
{!item.disabled && <DisclosureIndicator theme={theme} />}
|
{!item.disabled && <DisclosureIndicator theme={theme} />}
|
||||||
</>
|
</>
|
||||||
|
|
|
@ -43,9 +43,11 @@ export default StyleSheet.create({
|
||||||
roomTitleContainer: {
|
roomTitleContainer: {
|
||||||
flex: 1
|
flex: 1
|
||||||
},
|
},
|
||||||
|
roomTitlePadding: {
|
||||||
|
paddingRight: 16
|
||||||
|
},
|
||||||
roomTitle: {
|
roomTitle: {
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
paddingRight: 16,
|
|
||||||
...sharedStyles.textMedium
|
...sharedStyles.textMedium
|
||||||
},
|
},
|
||||||
roomDescription: {
|
roomDescription: {
|
||||||
|
@ -53,6 +55,7 @@ export default StyleSheet.create({
|
||||||
...sharedStyles.textRegular
|
...sharedStyles.textRegular
|
||||||
},
|
},
|
||||||
roomTitleRow: {
|
roomTitleRow: {
|
||||||
|
paddingRight: 16,
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center'
|
alignItems: 'center'
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,28 +16,32 @@ export default StyleSheet.create({
|
||||||
justifyContent: 'center'
|
justifyContent: 'center'
|
||||||
},
|
},
|
||||||
avatarContainer: {
|
avatarContainer: {
|
||||||
height: 240,
|
minHeight: 240,
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
marginBottom: 20
|
marginBottom: 20
|
||||||
},
|
},
|
||||||
avatarContainerDirectRoom: {
|
avatarContainerDirectRoom: {
|
||||||
height: 320
|
paddingVertical: 16,
|
||||||
|
minHeight: 320
|
||||||
},
|
},
|
||||||
avatar: {
|
avatar: {
|
||||||
marginHorizontal: 10
|
marginHorizontal: 10
|
||||||
},
|
},
|
||||||
roomTitleContainer: {
|
roomTitleContainer: {
|
||||||
paddingTop: 20,
|
paddingTop: 20,
|
||||||
|
marginHorizontal: 16,
|
||||||
alignItems: 'center'
|
alignItems: 'center'
|
||||||
},
|
},
|
||||||
roomTitle: {
|
roomTitle: {
|
||||||
fontSize: 20,
|
fontSize: 20,
|
||||||
|
...sharedStyles.textAlignCenter,
|
||||||
...sharedStyles.textMedium
|
...sharedStyles.textMedium
|
||||||
},
|
},
|
||||||
roomUsername: {
|
roomUsername: {
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
|
...sharedStyles.textAlignCenter,
|
||||||
...sharedStyles.textRegular
|
...sharedStyles.textRegular
|
||||||
},
|
},
|
||||||
roomTitleRow: {
|
roomTitleRow: {
|
||||||
|
|
|
@ -35,6 +35,7 @@ const styles = StyleSheet.create({
|
||||||
alignItems: 'center'
|
alignItems: 'center'
|
||||||
},
|
},
|
||||||
subtitle: {
|
subtitle: {
|
||||||
|
marginRight: -16,
|
||||||
...sharedStyles.textRegular,
|
...sharedStyles.textRegular,
|
||||||
fontSize: 12
|
fontSize: 12
|
||||||
},
|
},
|
||||||
|
|
|
@ -16,7 +16,8 @@ const styles = StyleSheet.create({
|
||||||
},
|
},
|
||||||
button: {
|
button: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center'
|
alignItems: 'center',
|
||||||
|
marginRight: 64
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
fontSize: 20,
|
fontSize: 20,
|
||||||
|
@ -68,7 +69,7 @@ const Header = React.memo(({
|
||||||
{connecting ? <Text style={[styles.updating, titleColorStyle]}>{I18n.t('Connecting')}</Text> : null}
|
{connecting ? <Text style={[styles.updating, titleColorStyle]}>{I18n.t('Connecting')}</Text> : null}
|
||||||
{isFetching ? <Text style={[styles.updating, titleColorStyle]}>{I18n.t('Updating')}</Text> : null}
|
{isFetching ? <Text style={[styles.updating, titleColorStyle]}>{I18n.t('Updating')}</Text> : null}
|
||||||
<View style={styles.button}>
|
<View style={styles.button}>
|
||||||
<Text style={[styles.server, isFetching && styles.serverSmall, titleColorStyle]}>{serverName}</Text>
|
<Text style={[styles.server, isFetching && styles.serverSmall, titleColorStyle]} numberOfLines={1}>{serverName}</Text>
|
||||||
<Image
|
<Image
|
||||||
style={[
|
style={[
|
||||||
styles.disclosure,
|
styles.disclosure,
|
||||||
|
|
|
@ -60,7 +60,7 @@ const Header = React.memo(({
|
||||||
>
|
>
|
||||||
<HeaderTitle connecting={connecting} isFetching={isFetching} theme={theme} />
|
<HeaderTitle connecting={connecting} isFetching={isFetching} theme={theme} />
|
||||||
<View style={styles.button}>
|
<View style={styles.button}>
|
||||||
<Text style={[styles.server, { color: themes[theme].headerTintColor }]}>{serverName}</Text>
|
<Text style={[styles.server, { color: themes[theme].headerTintColor }]} numberOfLines={1}>{serverName}</Text>
|
||||||
<Image style={[styles.disclosure, showServerDropdown && styles.upsideDown]} source={{ uri: 'disclosure_indicator_server' }} />
|
<Image style={[styles.disclosure, showServerDropdown && styles.upsideDown]} source={{ uri: 'disclosure_indicator_server' }} />
|
||||||
</View>
|
</View>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
|
@ -213,8 +213,8 @@ class ServerDropdown extends Component {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
<View style={styles.serverTextContainer}>
|
<View style={styles.serverTextContainer}>
|
||||||
<Text style={[styles.serverName, { color: themes[theme].titleText }]}>{item.name || item.id}</Text>
|
<Text style={[styles.serverName, { color: themes[theme].titleText }]} numberOfLines={1}>{item.name || item.id}</Text>
|
||||||
<Text style={[styles.serverUrl, { color: themes[theme].auxiliaryText }]}>{item.id}</Text>
|
<Text style={[styles.serverUrl, { color: themes[theme].auxiliaryText }]} numberOfLines={1}>{item.id}</Text>
|
||||||
</View>
|
</View>
|
||||||
{item.id === server ? <Check theme={theme} /> : null}
|
{item.id === server ? <Check theme={theme} /> : null}
|
||||||
</View>
|
</View>
|
||||||
|
|
|
@ -21,7 +21,7 @@ const Item = React.memo(({
|
||||||
{left}
|
{left}
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.itemCenter}>
|
<View style={styles.itemCenter}>
|
||||||
<Text style={[styles.itemText, { color: themes[theme].titleText }]}>
|
<Text style={[styles.itemText, { color: themes[theme].titleText }]} numberOfLines={1}>
|
||||||
{text}
|
{text}
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
|
|
Loading…
Reference in New Issue