Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat:proper badge theme use for server list #8313

Merged
merged 5 commits into from
Nov 5, 2024
Merged

feat:proper badge theme use for server list #8313

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c98f9e
fix(MM-61209): mention badge incorrect theme color
rahimrahman Nov 4, 2024
e3f93d5
@asaadmahmood color correction
rahimrahman Nov 4, 2024
bcd7fdc
@asaadmahmood borderWidth 1px
rahimrahman Nov 4, 2024
e3aed9f
remove borderWidth: 1
rahimrahman Nov 5, 2024
f07a7a6
Merge branch 'main' into feat/new-badge-server-list
rahimrahman Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/components/badge/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Props = {
};

export default function Badge({
borderColor,
borderColor: borderColorProp,
color,
visible = true,
type = 'Normal',
Expand Down Expand Up @@ -60,9 +60,15 @@ export default function Badge({
return null;
}

// @ts-expect-error: backgroundColor definitely exists
const {backgroundColor = rest.backgroundColor || theme.mentionBg, ...restStyle} =
const {

// @ts-expect-error: backgroundColor & borderColor definitely exist
backgroundColor = rest.backgroundColor || theme.mentionBg, borderColor: styleBorderColor,

...restStyle} =
StyleSheet.flatten(style) || {};

const borderColor = borderColorProp || styleBorderColor || theme.centerChannelBg;
const textColor = color || theme.mentionColor;
let lineHeight = Platform.select({android: 21, ios: 16.5});
let fontSize = 12;
Expand Down
8 changes: 4 additions & 4 deletions app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
badge: {
left: 18,
top: -5,
borderColor: theme.centerChannelBg,
borderWidth: 1,
rahimrahman marked this conversation as resolved.
Show resolved Hide resolved
},
button: {
borderRadius: 8,
Expand Down Expand Up @@ -404,9 +404,9 @@ const ServerItem = ({
<View style={serverStyle}>
{!switching &&
<ServerIcon
badgeBackgroundColor={theme.mentionColor}
badgeBorderColor={theme.mentionBg}
badgeColor={theme.mentionBg}
badgeBackgroundColor={theme.buttonBg}
badgeBorderColor={theme.centerChannelBg}
badgeColor={theme.buttonColor}
badgeStyle={styles.badge}
iconColor={changeOpacity(theme.centerChannelColor, 0.56)}
hasUnreads={badge.isUnread}
Expand Down
Loading