toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat:proper badge theme use for server list (#8313)

Browse source 
* fix(MM-61209): mention badge incorrect theme color

* @asaadmahmood color correction

* @asaadmahmood borderWidth 1px

* remove borderWidth: 1
This commit is contained in:
Rahim Rahman 2024-11-05 07:11:17 -07:00 committed by GitHub
parent aa85f22729
commit 97e74c92af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/badge/index.tsx
View file

@ -66,7 +66,7 @@ export default function Badge({
...restStyle ...restStyle
} = (StyleSheet.flatten(style) || {}) as TextStyle; } = (StyleSheet.flatten(style) || {}) as TextStyle;
const borderColor = borderColorProp || styleBorderColor || theme.mentionBg; const borderColor = borderColorProp || styleBorderColor || theme.centerChannelBg;
const textColor = color || theme.mentionColor; const textColor = color || theme.mentionColor;
let lineHeight = Platform.select({android: 21, ios: 16.5}); let lineHeight = Platform.select({android: 21, ios: 16.5});
let fontSize = 12; let fontSize = 12;

7
app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
View file

@ -59,7 +59,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
badge: { badge: {
left: 18, left: 18,
top: -5, top: -5,
borderColor: theme.centerChannelBg,
}, },
button: { button: {
borderRadius: 8, borderRadius: 8,
@ -404,9 +403,9 @@ const ServerItem = ({
<View style={serverStyle}> <View style={serverStyle}>
{!switching && {!switching &&
<ServerIcon <ServerIcon
badgeBackgroundColor={theme.mentionColor} badgeBackgroundColor={theme.buttonBg}
badgeBorderColor={theme.mentionBg} badgeBorderColor={theme.centerChannelBg}
badgeColor={theme.mentionBg} badgeColor={theme.buttonColor}
badgeStyle={styles.badge} badgeStyle={styles.badge}
iconColor={changeOpacity(theme.centerChannelColor, 0.56)} iconColor={changeOpacity(theme.centerChannelColor, 0.56)}
hasUnreads={badge.isUnread} hasUnreads={badge.isUnread}