Skip to content

Commit 0df4e6e

Browse files
khushal87khushal87
authored
Merge pull request #2217 from GetStream/develop
Next Release
2 parents cad02e6 + 29e054a commit 0df4e6e

File tree

12 files changed

+86
-99
lines changed

12 files changed

+86
-99
lines changed

‎.github/workflows/changelog-preview.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
cd package/
2929
yarn --frozen-lockfile
3030
cd native-package/
31-
yarn --frozen-lockfile
31+
yarn
3232
cd ../../examples/SampleApp/
33-
yarn --frozen-lockfile
33+
yarn
3434
3535
- name: Generate Changelog
3636
id: generate_changelog

‎.github/workflows/check-pr.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,5 @@ jobs:
2929
run: yarn lerna-workspaces run lint && cd docusaurus && npx prettier --check '**/*.mdx'
3030
- name: Test
3131
run: yarn test:coverage
32-
- name: SonarCloud Scan
33-
uses: sonarsource/sonarcloud-github-action@master
34-
with:
35-
args: >
36-
-Dsonar.organization=getstream
37-
-Dsonar.projectKey=GetStream_stream-chat-react-native
38-
-Dsonar.javascript.lcov.reportPaths=./package/coverage/lcov.info
39-
-Dsonar.sources=package/src/
40-
-Dsonar.test.exclusions=**/__tests__/**
41-
-Dsonar.verbose=true
4232
env:
4333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎.github/workflows/next-release.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,8 @@ jobs:
3333
run: yarn lerna-workspaces run lint && (cd docusaurus; npx prettier --check '**/*.mdx')
3434
- name: Test
3535
run: yarn test:coverage
36-
- name: SonarCloud Scan
37-
uses: sonarsource/sonarcloud-github-action@master
38-
with:
39-
args: >
40-
-Dsonar.organization=getstream
41-
-Dsonar.projectKey=GetStream_stream-chat-react-native
42-
-Dsonar.javascript.lcov.reportPaths=./package/coverage/lcov.info
43-
-Dsonar.sources=package/src/
44-
-Dsonar.test.exclusions=**/__tests__/**
45-
-Dsonar.verbose=true
4636
env:
4737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4938
- name: Publish Next Release
5039
run: GITHUB_SHORT_SHA="$(git rev-parse --short $GITHUB_SHA)" yarn release-next
5140
env:

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
1010

1111
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
12-
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=GetStream_stream-chat-react-native&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=GetStream_stream-chat-react-native)
1312
[![Build Status](https://github.com/GetStream/stream-chat-react-native/workflows/build/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
1413
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
1514

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7105,10 +7105,10 @@ [email protected]:
71057105
version "0.0.0"
71067106
uid ""
71077107

7108-
stream-chat-react-native-core@5.15.3:
7109-
version "5.15.3"
7110-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.3.tgz#c8312bc7d374587f1f023abaffc746620b7396a4"
7111-
integrity sha512-d6cNXTW9vMP/yjyHteAGHze6/ye/rLsUedPyhXyFGewdm3wz2zJPEDlKrUjR8QAbDwmUnttLSKELVdt98WhSHw==
7108+
stream-chat-react-native-core@5.16.0:
7109+
version "5.16.0"
7110+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.16.0.tgz#c3475a8f297732b0d765b5976d209b1ee838bea4"
7111+
integrity sha512-ZiKEl6JI1G/SzbjqMZH158x21R1nJiDPUbEx1t23SXb/6nN/ihL331kVQt0Ei95FeKcb77l71fhd2B7lAhzupQ==
71127112
dependencies:
71137113
"@babel/runtime" "^7.12.5"
71147114
"@gorhom/bottom-sheet" "4.4.5"

‎examples/SampleApp/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7055,10 +7055,10 @@ statuses@~1.5.0:
70557055
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
70567056
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
70577057

7058-
stream-chat-react-native-core@5.15.3:
7059-
version "5.15.3"
7060-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.3.tgz#c8312bc7d374587f1f023abaffc746620b7396a4"
7061-
integrity sha512-d6cNXTW9vMP/yjyHteAGHze6/ye/rLsUedPyhXyFGewdm3wz2zJPEDlKrUjR8QAbDwmUnttLSKELVdt98WhSHw==
7058+
stream-chat-react-native-core@5.16.0:
7059+
version "5.16.0"
7060+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.16.0.tgz#c3475a8f297732b0d765b5976d209b1ee838bea4"
7061+
integrity sha512-ZiKEl6JI1G/SzbjqMZH158x21R1nJiDPUbEx1t23SXb/6nN/ihL331kVQt0Ei95FeKcb77l71fhd2B7lAhzupQ==
70627062
dependencies:
70637063
"@babel/runtime" "^7.12.5"
70647064
"@gorhom/bottom-sheet" "4.4.5"

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7183,10 +7183,10 @@ statuses@~1.5.0:
71837183
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
71847184
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
71857185

7186-
stream-chat-react-native-core@5.15.3:
7187-
version "5.15.3"
7188-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.3.tgz#c8312bc7d374587f1f023abaffc746620b7396a4"
7189-
integrity sha512-d6cNXTW9vMP/yjyHteAGHze6/ye/rLsUedPyhXyFGewdm3wz2zJPEDlKrUjR8QAbDwmUnttLSKELVdt98WhSHw==
7186+
stream-chat-react-native-core@5.16.0:
7187+
version "5.16.0"
7188+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.16.0.tgz#c3475a8f297732b0d765b5976d209b1ee838bea4"
7189+
integrity sha512-ZiKEl6JI1G/SzbjqMZH158x21R1nJiDPUbEx1t23SXb/6nN/ihL331kVQt0Ei95FeKcb77l71fhd2B7lAhzupQ==
71907190
dependencies:
71917191
"@babel/runtime" "^7.12.5"
71927192
"@gorhom/bottom-sheet" "4.4.5"

‎package/expo-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,10 +3036,10 @@ [email protected]:
30363036
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
30373037
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
30383038

3039-
stream-chat-react-native-core@5.15.3:
3040-
version "5.15.3"
3041-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.3.tgz#c8312bc7d374587f1f023abaffc746620b7396a4"
3042-
integrity sha512-d6cNXTW9vMP/yjyHteAGHze6/ye/rLsUedPyhXyFGewdm3wz2zJPEDlKrUjR8QAbDwmUnttLSKELVdt98WhSHw==
3039+
stream-chat-react-native-core@5.16.0:
3040+
version "5.16.0"
3041+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.16.0.tgz#c3475a8f297732b0d765b5976d209b1ee838bea4"
3042+
integrity sha512-ZiKEl6JI1G/SzbjqMZH158x21R1nJiDPUbEx1t23SXb/6nN/ihL331kVQt0Ei95FeKcb77l71fhd2B7lAhzupQ==
30433043
dependencies:
30443044
"@babel/runtime" "^7.12.5"
30453045
"@gorhom/bottom-sheet" "4.4.5"

‎package/native-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4381,10 +4381,10 @@ statuses@~1.5.0:
43814381
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
43824382
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
43834383

4384-
stream-chat-react-native-core@5.15.3:
4385-
version "5.15.3"
4386-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.3.tgz#c8312bc7d374587f1f023abaffc746620b7396a4"
4387-
integrity sha512-d6cNXTW9vMP/yjyHteAGHze6/ye/rLsUedPyhXyFGewdm3wz2zJPEDlKrUjR8QAbDwmUnttLSKELVdt98WhSHw==
4384+
stream-chat-react-native-core@5.16.0:
4385+
version "5.16.0"
4386+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.16.0.tgz#c3475a8f297732b0d765b5976d209b1ee838bea4"
4387+
integrity sha512-ZiKEl6JI1G/SzbjqMZH158x21R1nJiDPUbEx1t23SXb/6nN/ihL331kVQt0Ei95FeKcb77l71fhd2B7lAhzupQ==
43884388
dependencies:
43894389
"@babel/runtime" "^7.12.5"
43904390
"@gorhom/bottom-sheet" "4.4.5"

‎package/src/components/Attachment/Gallery.tsx‎

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -35,52 +35,6 @@ import { isVideoPackageAvailable } from '../../native';
3535
import type { DefaultStreamChatGenerics } from '../../types/types';
3636
import { getUrlWithoutParams } from '../../utils/utils';
3737

38-
const styles = StyleSheet.create({
39-
errorTextSize: { fontSize: 10 },
40-
galleryContainer: {
41-
borderTopLeftRadius: 13,
42-
borderTopRightRadius: 13,
43-
flexDirection: 'row',
44-
flexWrap: 'wrap',
45-
overflow: 'hidden',
46-
},
47-
imageContainer: {
48-
alignItems: 'center',
49-
display: 'flex',
50-
flexDirection: 'row',
51-
justifyContent: 'center',
52-
padding: 1,
53-
},
54-
imageContainerStyle: { alignItems: 'center', flex: 1, justifyContent: 'center' },
55-
imageLoadingErrorIndicatorStyle: {
56-
bottom: 4,
57-
left: 4,
58-
position: 'absolute',
59-
},
60-
imageLoadingIndicatorContainer: {
61-
height: '100%',
62-
justifyContent: 'center',
63-
position: 'absolute',
64-
width: '100%',
65-
},
66-
imageLoadingIndicatorStyle: {
67-
alignItems: 'center',
68-
justifyContent: 'center',
69-
position: 'absolute',
70-
},
71-
imageReloadContainerStyle: {
72-
...StyleSheet.absoluteFillObject,
73-
alignItems: 'center',
74-
justifyContent: 'center',
75-
},
76-
moreImagesContainer: {
77-
alignItems: 'center',
78-
justifyContent: 'center',
79-
margin: 1,
80-
},
81-
moreImagesText: { color: '#FFFFFF', fontSize: 26, fontWeight: '700' },
82-
});
83-
8438
export type GalleryPropsWithContext<
8539
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
8640
> = Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
@@ -468,18 +422,19 @@ const GalleryImageThumbnail = <
468422

469423
const {
470424
theme: {
471-
messageSimple: {
472-
gallery: { image },
473-
},
425+
messageSimple: { gallery },
474426
},
475427
} = useTheme();
476428

477429
return (
478430
<View
479-
style={{
480-
height: thumbnail.height - 1,
481-
width: thumbnail.width - 1,
482-
}}
431+
style={[
432+
{
433+
height: thumbnail.height - 1,
434+
width: thumbnail.width - 1,
435+
},
436+
gallery.thumbnail,
437+
]}
483438
>
484439
{isLoadingImageError ? (
485440
<>
@@ -502,7 +457,7 @@ const GalleryImageThumbnail = <
502457
resizeMode={thumbnail.resizeMode}
503458
style={[
504459
borderRadius,
505-
image,
460+
gallery.image,
506461
{
507462
height: thumbnail.height - 1,
508463
width: thumbnail.width - 1,
@@ -680,4 +635,50 @@ export const Gallery = <
680635
);
681636
};
682637

638+
const styles = StyleSheet.create({
639+
errorTextSize: { fontSize: 10 },
640+
galleryContainer: {
641+
borderTopLeftRadius: 13,
642+
borderTopRightRadius: 13,
643+
flexDirection: 'row',
644+
flexWrap: 'wrap',
645+
overflow: 'hidden',
646+
},
647+
imageContainer: {
648+
alignItems: 'center',
649+
display: 'flex',
650+
flexDirection: 'row',
651+
justifyContent: 'center',
652+
padding: 1,
653+
},
654+
imageContainerStyle: { alignItems: 'center', flex: 1, justifyContent: 'center' },
655+
imageLoadingErrorIndicatorStyle: {
656+
bottom: 4,
657+
left: 4,
658+
position: 'absolute',
659+
},
660+
imageLoadingIndicatorContainer: {
661+
height: '100%',
662+
justifyContent: 'center',
663+
position: 'absolute',
664+
width: '100%',
665+
},
666+
imageLoadingIndicatorStyle: {
667+
alignItems: 'center',
668+
justifyContent: 'center',
669+
position: 'absolute',
670+
},
671+
imageReloadContainerStyle: {
672+
...StyleSheet.absoluteFillObject,
673+
alignItems: 'center',
674+
justifyContent: 'center',
675+
},
676+
moreImagesContainer: {
677+
alignItems: 'center',
678+
justifyContent: 'center',
679+
margin: 1,
680+
},
681+
moreImagesText: { color: '#FFFFFF', fontSize: 26, fontWeight: '700' },
682+
});
683+
683684
Gallery.displayName = 'Gallery{messageSimple{gallery}}';

0 commit comments

Comments
 (0)