Skip to content

Commit 73167b2

Browse files
diegolmellodiegolmello
authored
regression: Minor theme regressions (#6522)
1 parent 2ad4055 commit 73167b2

File tree

10 files changed

+148
-91
lines changed

10 files changed

+148
-91
lines changed

‎android/app/src/main/res/drawable-xxxhdpi/message_empty_dark.png‎

-492 KB
Binary file not shown.

‎app/containers/MessageComposer/MessageComposer.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { useCloseKeyboardWhenOrientationChanges } from './hooks/useCloseKeyboard
2222
import { useEmojiKeyboard } from './hooks/useEmojiKeyboard';
2323
import EmojiPicker from '../EmojiPicker';
2424
import { MessageComposerContent } from './components/MessageComposerContent';
25+
import { useTheme } from '../../theme';
2526

2627
export const MessageComposer = ({
2728
forwardedRef,
@@ -47,6 +48,7 @@ export const MessageComposer = ({
4748
const { setAlsoSendThreadToChannel, setAutocompleteParams } = useMessageComposerApi();
4849
const recordingAudio = useRecordingAudio();
4950
const { formatShortnameToUnicode } = useShortnameToUnicode();
51+
const { colors } = useTheme();
5052

5153
useImperativeHandle(forwardedRef, () => ({
5254
closeEmojiKeyboardAndAction,
@@ -196,7 +198,7 @@ export const MessageComposer = ({
196198
onLayout={handleLayout}>
197199
{children}
198200
</MessageComposerContent>
199-
<Animated.View style={emojiKeyboardStyle}>
201+
<Animated.View style={[emojiKeyboardStyle, { backgroundColor: colors.surfaceLight }]}>
200202
{showEmojiKeyboard && !showEmojiSearchbar ? <EmojiPicker onItemClicked={onKeyboardItemSelected} isEmojiKeyboard /> : null}
201203
</Animated.View>
202204
<Autocomplete

‎app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap‎

Lines changed: 144 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,14 @@ exports[`MessageComposer Audio tap record 1`] = `
246246
</View>,
247247
<View
248248
style={
249-
{
250-
"height": 0,
251-
}
249+
[
250+
{
251+
"height": 0,
252+
},
253+
{
254+
"backgroundColor": "#FFFFFF",
255+
},
256+
]
252257
}
253258
/>,
254259
]
@@ -685,9 +690,14 @@ exports[`MessageComposer Quote Add quote \`abc\` 1`] = `
685690
</View>,
686691
<View
687692
style={
688-
{
689-
"height": 0,
690-
}
693+
[
694+
{
695+
"height": 0,
696+
},
697+
{
698+
"backgroundColor": "#FFFFFF",
699+
},
700+
]
691701
}
692702
/>,
693703
]
@@ -1306,9 +1316,14 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = `
13061316
</View>,
13071317
<View
13081318
style={
1309-
{
1310-
"height": 0,
1311-
}
1319+
[
1320+
{
1321+
"height": 0,
1322+
},
1323+
{
1324+
"backgroundColor": "#FFFFFF",
1325+
},
1326+
]
13121327
}
13131328
/>,
13141329
]
@@ -1927,9 +1942,14 @@ exports[`MessageComposer Quote Remove a quote 1`] = `
19271942
</View>,
19281943
<View
19291944
style={
1930-
{
1931-
"height": 0,
1932-
}
1945+
[
1946+
{
1947+
"height": 0,
1948+
},
1949+
{
1950+
"backgroundColor": "#FFFFFF",
1951+
},
1952+
]
19331953
}
19341954
/>,
19351955
]
@@ -2534,9 +2554,14 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = `
25342554
</View>,
25352555
<View
25362556
style={
2537-
{
2538-
"height": 0,
2539-
}
2557+
[
2558+
{
2559+
"height": 0,
2560+
},
2561+
{
2562+
"backgroundColor": "#FFFFFF",
2563+
},
2564+
]
25402565
}
25412566
/>,
25422567
]
@@ -3141,9 +3166,14 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = `
31413166
</View>,
31423167
<View
31433168
style={
3144-
{
3145-
"height": 0,
3146-
}
3169+
[
3170+
{
3171+
"height": 0,
3172+
},
3173+
{
3174+
"backgroundColor": "#FFFFFF",
3175+
},
3176+
]
31473177
}
31483178
/>,
31493179
]
@@ -3748,9 +3778,14 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = `
37483778
</View>,
37493779
<View
37503780
style={
3751-
{
3752-
"height": 0,
3753-
}
3781+
[
3782+
{
3783+
"height": 0,
3784+
},
3785+
{
3786+
"backgroundColor": "#FFFFFF",
3787+
},
3788+
]
37543789
}
37553790
/>,
37563791
]
@@ -4355,9 +4390,14 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = `
43554390
</View>,
43564391
<View
43574392
style={
4358-
{
4359-
"height": 0,
4360-
}
4393+
[
4394+
{
4395+
"height": 0,
4396+
},
4397+
{
4398+
"backgroundColor": "#FFFFFF",
4399+
},
4400+
]
43614401
}
43624402
/>,
43634403
]
@@ -4962,9 +5002,14 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = `
49625002
</View>,
49635003
<View
49645004
style={
4965-
{
4966-
"height": 0,
4967-
}
5005+
[
5006+
{
5007+
"height": 0,
5008+
},
5009+
{
5010+
"backgroundColor": "#FFFFFF",
5011+
},
5012+
]
49685013
}
49695014
/>,
49705015
]
@@ -5569,9 +5614,14 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = `
55695614
</View>,
55705615
<View
55715616
style={
5572-
{
5573-
"height": 0,
5574-
}
5617+
[
5618+
{
5619+
"height": 0,
5620+
},
5621+
{
5622+
"backgroundColor": "#FFFFFF",
5623+
},
5624+
]
55755625
}
55765626
/>,
55775627
]
@@ -6176,9 +6226,14 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = `
61766226
</View>,
61776227
<View
61786228
style={
6179-
{
6180-
"height": 0,
6181-
}
6229+
[
6230+
{
6231+
"height": 0,
6232+
},
6233+
{
6234+
"backgroundColor": "#FFFFFF",
6235+
},
6236+
]
61826237
}
61836238
/>,
61846239
]
@@ -6783,9 +6838,14 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = `
67836838
</View>,
67846839
<View
67856840
style={
6786-
{
6787-
"height": 0,
6788-
}
6841+
[
6842+
{
6843+
"height": 0,
6844+
},
6845+
{
6846+
"backgroundColor": "#FFFFFF",
6847+
},
6848+
]
67896849
}
67906850
/>,
67916851
]
@@ -7390,9 +7450,14 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = `
73907450
</View>,
73917451
<View
73927452
style={
7393-
{
7394-
"height": 0,
7395-
}
7453+
[
7454+
{
7455+
"height": 0,
7456+
},
7457+
{
7458+
"backgroundColor": "#FFFFFF",
7459+
},
7460+
]
73967461
}
73977462
/>,
73987463
]
@@ -7997,9 +8062,14 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = `
79978062
</View>,
79988063
<View
79998064
style={
8000-
{
8001-
"height": 0,
8002-
}
8065+
[
8066+
{
8067+
"height": 0,
8068+
},
8069+
{
8070+
"backgroundColor": "#FFFFFF",
8071+
},
8072+
]
80038073
}
80048074
/>,
80058075
]
@@ -8604,9 +8674,14 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = `
86048674
</View>,
86058675
<View
86068676
style={
8607-
{
8608-
"height": 0,
8609-
}
8677+
[
8678+
{
8679+
"height": 0,
8680+
},
8681+
{
8682+
"backgroundColor": "#FFFFFF",
8683+
},
8684+
]
86108685
}
86118686
/>,
86128687
]
@@ -9059,9 +9134,14 @@ exports[`MessageComposer Toolbar tap actions 1`] = `
90599134
</View>,
90609135
<View
90619136
style={
9062-
{
9063-
"height": 0,
9064-
}
9137+
[
9138+
{
9139+
"height": 0,
9140+
},
9141+
{
9142+
"backgroundColor": "#FFFFFF",
9143+
},
9144+
]
90659145
}
90669146
/>,
90679147
]
@@ -9362,9 +9442,14 @@ exports[`MessageComposer Toolbar tap emoji 1`] = `
93629442
</View>,
93639443
<View
93649444
style={
9365-
{
9366-
"height": 0,
9367-
}
9445+
[
9446+
{
9447+
"height": 0,
9448+
},
9449+
{
9450+
"backgroundColor": "#FFFFFF",
9451+
},
9452+
]
93689453
}
93699454
>
93709455
<View
@@ -11392,9 +11477,14 @@ exports[`MessageComposer Toolbar tap mention 1`] = `
1139211477
</View>,
1139311478
<View
1139411479
style={
11395-
{
11396-
"height": 0,
11397-
}
11480+
[
11481+
{
11482+
"height": 0,
11483+
},
11484+
{
11485+
"backgroundColor": "#FFFFFF",
11486+
},
11487+
]
1139811488
}
1139911489
/>,
1140011490
]

‎app/views/RoomView/List/components/EmptyRoom.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const styles = StyleSheet.create({
1414
export const EmptyRoom = React.memo(({ length, rid }: { length: number; rid: string }) => {
1515
const { theme } = useTheme();
1616
if (length === 0 || !rid) {
17-
return <ImageBackground source={{ uri: `message_empty_${theme}` }} style={styles.image} />;
17+
return <ImageBackground source={{ uri: `message_empty_${theme === 'dark' ? 'black' : theme}` }} style={styles.image} />;
1818
}
1919
return null;
2020
});

‎ios/RocketChatRN/Images.xcassets/audio_thumb.imageset/Contents.json‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎ios/RocketChatRN/Images.xcassets/audio_thumb.imageset/audio_thumb.png‎

-251 Bytes
Binary file not shown.

‎ios/RocketChatRN/Images.xcassets/audio_thumb.imageset/[email protected]‎

-488 Bytes
Binary file not shown.

‎ios/RocketChatRN/Images.xcassets/audio_thumb.imageset/[email protected]‎

-686 Bytes
Binary file not shown.

‎ios/RocketChatRN/Images.xcassets/message_empty_dark.imageset/Contents.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ios/RocketChatRN/Images.xcassets/message_empty_dark.imageset/Message Empty Dark Theme.pdf‎

-112 KB
Binary file not shown.

0 commit comments

Comments
 (0)