Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const useStyles = () => {
const { theme: { semantics }} = useTheme();
return useMemo(() => StyleSheet.create({
selectionBar: {
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: 16,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const PlayPauseButton = ({
style={({ pressed }) => [
styles.container,
{
backgroundColor: pressed ? semantics.backgroundCorePressed : 'transparent',
backgroundColor: pressed ? semantics.backgroundUtilityPressed : 'transparent',
},
containerStyle,
]}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef, useState } from 'react';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { Linking, StyleSheet } from 'react-native';

import { renderAttachmentPickerItem } from './AttachmentPickerItem';
Expand Down Expand Up @@ -31,12 +31,16 @@ const useMediaPickerStyles = () => {
const {
theme: { semantics },
} = useTheme();
return StyleSheet.create({
container: {
flexGrow: 1,
backgroundColor: semantics.composerBg,
},
});
return useMemo(
() =>
StyleSheet.create({
container: {
flexGrow: 1,
backgroundColor: semantics.backgroundCoreElevation1,
},
}),
[semantics.backgroundCoreElevation1],
);
};

export const AttachmentMediaPickerIcon = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const useStyles = () => {
container: {
alignItems: 'center',
justifyContent: 'center',
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
paddingHorizontal: primitives.spacing2xl,
paddingBottom: primitives.spacing3xl,
},
Expand All @@ -46,7 +46,7 @@ const useStyles = () => {
maxWidth: 200,
},
}),
[semantics.backgroundElevationElevation1, semantics.textSecondary],
[semantics.backgroundCoreElevation1, semantics.textSecondary],
);
};

Expand Down Expand Up @@ -117,7 +117,7 @@ const AttachmentCommandPickerItemUI = ({
return (
<Pressable
style={({ pressed }) => ({
backgroundColor: pressed ? semantics.backgroundCorePressed : undefined,
backgroundColor: pressed ? semantics.backgroundUtilityPressed : undefined,
borderRadius: primitives.radiusSm,
})}
onPress={onPress}
Expand Down Expand Up @@ -175,18 +175,18 @@ const useCommandPickerStyle = () => {
flexGrow: 1,
paddingHorizontal: primitives.spacingXxs,
paddingBottom: primitives.spacing2xl,
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
},
title: {
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
fontWeight: primitives.typographyFontWeightSemiBold,
fontSize: primitives.typographyFontSizeMd,
color: semantics.textPrimary,
paddingHorizontal: primitives.spacingMd,
paddingBottom: primitives.spacingMd,
},
}),
[semantics.composerBg, semantics.textPrimary],
[semantics.backgroundCoreElevation1, semantics.textPrimary],
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ const useStyles = () => {
() =>
StyleSheet.create({
container: {
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
paddingBottom: primitives.spacingSm,
paddingHorizontal: primitives.spacingMd,
alignItems: 'center',
flexDirection: 'row',
},
}),
[semantics.composerBg],
[semantics.backgroundCoreElevation1],
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ const useStyles = () => {
StyleSheet.create({
container: {
maxHeight: DEFAULT_LIST_HEIGHT,
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
borderTopWidth: 1,
borderColor: semantics.borderCoreDefault,
},
flatlist: {
backgroundColor: semantics.composerBg,
shadowColor: semantics.accentBlack,
backgroundColor: semantics.backgroundCoreElevation1,
shadowColor: semantics.textOnAccent,
borderRadius: 8,
elevation: 3,
marginHorizontal: 8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ const useStyles = () => {
StyleSheet.create({
contentContainer: {
flexGrow: 1,
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
...contentContainer,
},
headerContainer: {
flexDirection: 'row',
padding: primitives.spacingSm,
gap: primitives.spacingSm,
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
...header.container,
},
headerMeta: {
Expand Down Expand Up @@ -174,7 +174,7 @@ const useStyles = () => {
item.destructiveText,
item.standardText,
semantics.accentError,
semantics.backgroundElevationElevation1,
semantics.backgroundCoreElevation1,
semantics.textPrimary,
semantics.textTertiary,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const ChannelPreviewMessengerWithContext = (props: ChannelPreviewMessengerPropsW
{
backgroundColor:
pressed && !swipeRegistry?.hasOpen()
? semantics.backgroundCorePressed
? semantics.backgroundUtilityPressed
: 'transparent',
},
container,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ const useStyles = () => {
() =>
StyleSheet.create({
container: {
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
borderTopWidth: 1,
borderTopColor: semantics.borderCoreDefault,
...footer.container,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const useStyles = () => {
() =>
StyleSheet.create({
container: {
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
gap: primitives.spacingXs,
...header.container,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const useStyles = () => {
return useMemo(() => {
return StyleSheet.create({
container: {
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
alignItems: 'center',
flexDirection: 'row',
justifyContent: 'space-evenly',
Expand Down
2 changes: 1 addition & 1 deletion package/src/components/Indicators/LoadingDot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const LoadingDot = (props: Props) => {
<Animated.View
style={[
{
backgroundColor: semantics.chatBgTypingIndicator,
backgroundColor: semantics.chatTextTypingIndicator,
borderRadius: diameter / 2,
height: diameter,
width: diameter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export const ReactionListItemWrapper = (props: ReactionListItemWrapperProps) =>
styles.container,
{
backgroundColor: selected
? semantics.backgroundCoreSelected
? semantics.backgroundUtilitySelected
: pressed
? semantics.backgroundCorePressed
? semantics.backgroundUtilityPressed
: semantics.reactionBg,
},
style,
Expand Down
10 changes: 5 additions & 5 deletions package/src/components/MessageInput/MessageInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ const useStyles = () => {
alignItems: 'center',
flex: 1,
justifyContent: 'center',
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
},
pollSafeArea: {
flex: 1,
backgroundColor: semantics.backgroundElevationElevation1,
backgroundColor: semantics.backgroundCoreElevation1,
},
container: {
alignItems: 'center',
Expand Down Expand Up @@ -107,7 +107,7 @@ const useStyles = () => {
borderWidth: 1,
flex: 1,
flexDirection: 'row',
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
borderColor: semantics.borderCoreDefault,
},
inputButtonsContainer: {
Expand All @@ -132,7 +132,7 @@ const useStyles = () => {
shadowRadius: 12,
},
suggestionsListContainer: {
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
position: 'absolute',
width: '100%',
},
Expand Down Expand Up @@ -404,7 +404,7 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
styles.wrapper,
{
borderTopWidth: 1,
backgroundColor: semantics.composerBg,
backgroundColor: semantics.backgroundCoreElevation1,
borderColor: semantics.borderCoreDefault,
// paddingBottom: BOTTOM_OFFSET,
paddingBottom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const useImageUploadNotSupportedIndicatorStyles = () => {
} = useTheme();
return StyleSheet.create({
container: {
backgroundColor: semantics.backgroundElevationElevation0,
backgroundColor: semantics.backgroundCoreElevation0,
borderRadius: primitives.radiusMax,
position: 'absolute',
left: primitives.spacingXxs,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const useStyles = () => {
theme: { semantics },
} = useTheme();

const { borderCoreOpacity10 } = semantics;
const { borderCoreOpacitySubtle } = semantics;

return useMemo(
() =>
Expand All @@ -101,14 +101,14 @@ const useStyles = () => {
justifyContent: 'center',
alignItems: 'center',
borderRadius: primitives.radiusLg,
borderColor: borderCoreOpacity10,
borderColor: borderCoreOpacitySubtle,
borderWidth: 1,
overflow: 'hidden',
},
wrapper: {
padding: primitives.spacingXxs,
},
}),
[borderCoreOpacity10],
[borderCoreOpacitySubtle],
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export const AudioRecordingButtonWithContext = (props: AudioRecordingButtonProps
const animatedStyle = useAnimatedStyle(() => {
return {
transform: [{ scale: scale.value }],
backgroundColor: pressed.value ? semantics.backgroundCorePressed : 'transparent',
backgroundColor: pressed.value ? semantics.backgroundUtilityPressed : 'transparent',
};
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ScrollToBottomButton = (props: ScrollToBottomButtonProps) => {
style={[
styles.floatingButtonContainer,
primitives.lightElevation1,
{ backgroundColor: semantics.backgroundElevationElevation1 },
{ backgroundColor: semantics.backgroundCoreElevation1 },
]}
>
<Button
Expand Down
Loading
Loading