Skip to content

Commit 88d1eb5

Browse files
HariharanITSupriyaAdepbhupendra1011
authored
Preprod (#767)
* RTM 1.x.x migration to signaling 2.x.x (#733) Add RTM 2.x (signaling) * android build failing (#747) * change default recording mode (#748) * undo destroy (#749) * add pagination (#760) * removes config * Fix Boost checksum error by overriding podspec URL (#765) * Fix Boost checksum error by overriding podspec URL * fix the link * Add global spoken and target (#761) * wip add global spoken and target * remove unused session state * add padding to translate menu * add target change * only host can enable the caption or transcript * add translated view for captions * add start guard * add host name while starting stt * add translation entry * fix the spelling * sort selected lang first * Feature/add global stt queue (#762) * add stt queue and feedback * add auto start stt * update the local message constant * add toasts * update spoken language for host * fix the selected translation state when spoken ang is changed * add open states for popups * add spoken lang filter from target * update the label * change the original translate order in caption panel * fix the ui state * update the popup text * add right arrow icon * update the toast notifications * add arrow in captio container * hide transcript label * update transcript data * fix the race condition for name * add a different config.json file * revert the config * Release/4.1.13 (#771) * 4.1.12-beta-1 * 4.1.12 * update the version numbers * 4.1.12-1 * Updated the beta cli version * 4.1.13-beta.2 * set btns as null in toast (#768) * Updated beta version * 4.1.13-beta.3 * Updated prod version number * 4.1.13 * add delay to prevent the auto start race condition (#769) * add delay only if stt auto start is true (#770) * Updated prod version * 4.1.13-1 --------- Co-authored-by: Hariharan G <ghariharanit@gmail.com> --------- Co-authored-by: Supriya Adep <supriya@agora.io> Co-authored-by: Bhupendra Negi <bhupendra1011@gmail.com> Co-authored-by: Supriya Adep <supriya33adep@gmail.com>
1 parent 35d1e98 commit 88d1eb5

28 files changed

Lines changed: 1414 additions & 1119 deletions

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "agora-appbuilder-core",
3-
"version": "4.1.12-1",
3+
"version": "4.1.13-1",
44
"description": "React Native template for RTE app builder",
55
"main": "index.js",
66
"files": [

template/defaultConfig.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ const DefaultConfig = {
7777
CHAT_ORG_NAME: '',
7878
CHAT_APP_NAME: '',
7979
CHAT_URL: '',
80-
CLI_VERSION: '3.1.12-1',
81-
CORE_VERSION: '4.1.12-1',
80+
CLI_VERSION: '3.1.13-1',
81+
CORE_VERSION: '4.1.13-1',
8282
DISABLE_LANDSCAPE_MODE: false,
8383
STT_AUTO_START: false,
8484
CLOUD_RECORDING_AUTO_START: false,

template/src/assets/font-styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
-moz-osx-font-smoothing: grayscale;
2525
}
2626

27+
.icon-arrow-right:before {
28+
content: '\e9a5';
29+
color: #fff;
30+
}
2731
.icon-lang-translate:before {
2832
content: '\e9a4';
2933
color: #fff;
140 Bytes
Binary file not shown.

template/src/assets/selection.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

template/src/atoms/ActionMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ const styles = StyleSheet.create({
460460
marginLeft: 12,
461461
},
462462
iconContainerEnd: {
463-
marginLeft: 10,
463+
marginLeft: 'auto',
464464
display: 'flex',
465465
justifyContent: 'center',
466466
alignItems: 'center',

template/src/atoms/CustomIcon.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export interface IconsInterface {
2525
clipboard: string;
2626
tick: string;
2727
'tick-fill': string;
28+
'arrow-right': string;
2829
'arrow-down': string;
2930
'arrow-up': string;
3031
'screen-share': string;

template/src/atoms/Popup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const Popup = (props: PopupProps) => {
106106
<></>
107107
)}
108108

109-
{title ? <Spacer size={32} /> : null}
109+
{title ? <Spacer size={24} /> : null}
110110
</>
111111
) : (
112112
<></>

template/src/components/Controls.tsx

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ const MoreButton = (props: {fields: ToolbarMoreButtonDefaultFields}) => {
320320
setIsCaptionON,
321321
// language: prevLang,
322322
isSTTActive,
323-
// setIsSTTActive,
323+
sttDepsReady,
324324
isSTTError,
325-
handleTranslateConfigChange,
325+
confirmSpokenLanguageChange,
326326
} = useCaption();
327327

328328
const isTranscriptON = sidePanel === SidePanelType.Transcript;
@@ -538,7 +538,13 @@ const MoreButton = (props: {fields: ToolbarMoreButtonDefaultFields}) => {
538538
icon: `${isCaptionON ? 'captions-off' : 'captions'}`,
539539
iconColor: $config.SECONDARY_ACTION_COLOR,
540540
textColor: $config.FONT_COLOR,
541-
disabled: !($config.ENABLE_STT && $config.ENABLE_CAPTION),
541+
disabled:
542+
!sttDepsReady ||
543+
!(
544+
$config.ENABLE_STT &&
545+
$config.ENABLE_CAPTION &&
546+
(isHost || isSTTActive)
547+
),
542548
title: captionLabel(isCaptionON),
543549
onPress: () => {
544550
setActionMenuVisible(false);
@@ -560,11 +566,14 @@ const MoreButton = (props: {fields: ToolbarMoreButtonDefaultFields}) => {
560566
icon: 'transcript',
561567
iconColor: $config.SECONDARY_ACTION_COLOR,
562568
textColor: $config.FONT_COLOR,
563-
disabled: !(
564-
$config.ENABLE_STT &&
565-
$config.ENABLE_CAPTION &&
566-
$config.ENABLE_MEETING_TRANSCRIPT
567-
),
569+
disabled:
570+
!sttDepsReady ||
571+
!(
572+
$config.ENABLE_STT &&
573+
$config.ENABLE_CAPTION &&
574+
$config.ENABLE_MEETING_TRANSCRIPT &&
575+
(isHost || isSTTActive)
576+
),
568577
title: transcriptLabel(isTranscriptON),
569578
onPress: () => {
570579
setActionMenuVisible(false);
@@ -837,30 +846,15 @@ const MoreButton = (props: {fields: ToolbarMoreButtonDefaultFields}) => {
837846
setActionMenuVisible(false);
838847
}, [currentLayout]);
839848

840-
const onConfirm = async (inputTranslateConfig: LanguageTranslationConfig) => {
849+
const onConfirm = async (newSpokenLang: LanguageType) => {
841850
console.log(
842-
'[STT_PER_USER_BOT] Controls onConfirm called',
843-
inputTranslateConfig,
851+
'[STT_GLOBAL] spoken language changed confirm called',
852+
newSpokenLang,
844853
);
845854
const isCaptionClicked = STT_clicked.current === 'caption';
846855
const isTranscriptClicked = STT_clicked.current === 'transcript';
847856
setLanguagePopup(false);
848-
// isFirstTimePopupOpen.current = false;
849-
// const method = isCaptionClicked
850-
// ? isCaptionON
851-
// : isTranscriptON
852-
// ? 'stop'
853-
// : 'start';
854-
855-
// if (method === 'stop') return; // not closing the stt service as it will stop for whole channel
856-
// if (method === 'start' && isSTTActive === true) return; // not triggering the start service if STT Service already started by anyone else in the channel
857-
858857
try {
859-
// const res = await start(language, language);
860-
// if (res?.message.includes('STARTED')) {
861-
// // channel is already started now restart
862-
// await restart(language, language);
863-
// }
864858
if (isTranscriptClicked) {
865859
if (!isTranscriptON) {
866860
setSidePanel(SidePanelType.Transcript);
@@ -872,7 +866,7 @@ const MoreButton = (props: {fields: ToolbarMoreButtonDefaultFields}) => {
872866
setIsCaptionON(prev => !prev);
873867
} else {
874868
}
875-
await handleTranslateConfigChange(inputTranslateConfig);
869+
await confirmSpokenLanguageChange(newSpokenLang);
876870
} catch (error) {
877871
setIsCaptionON(false);
878872
setSidePanel(SidePanelType.None);
@@ -1271,11 +1265,6 @@ const Controls = (props: ControlsProps) => {
12711265
// addStreamMessageListener();
12721266
// }, [sttLanguage]);
12731267

1274-
// Ask bhupendra
1275-
// React.useEffect(() => {
1276-
// setIsSTTActive(isSTTActive);
1277-
// }, [isSTTActive]);
1278-
12791268
const isHidden = (hide: ToolbarItemHide = false) => {
12801269
try {
12811270
return typeof hide === 'boolean'

0 commit comments

Comments
 (0)