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.

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

Fix/light theme issues #1233

Merged
merged 39 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6dae34c
added peer list updated event
ygit Sep 20, 2023
76859ed
Merge branch 'feature/addHandraiseAPIs' into feature/updatePeerListAPIs
ygit Sep 20, 2023
d4f98c9
added peer list iterator APIs
ygit Sep 20, 2023
c24fa1e
added peer list iterator implementation
ygit Sep 20, 2023
b73f454
updated check
ygit Sep 20, 2023
b085aa4
feat(sdk): :sparkles: added `ON_PEER_LIST_UPDATED` event on RN SDK
stanwolverine Sep 20, 2023
c379519
fix(sdk): :bug: added `sdkId` in `ON_PEER_LIST_UPDATED` event payload
stanwolverine Sep 20, 2023
9654f99
Merge branch 'feature/addHandraiseAPIs' into feature/updatePeerListAPIs
ygit Sep 20, 2023
c621e0e
feat(prebuilt): :sparkles: added `ON_PEER_LIST_UPDATED` event usage
stanwolverine Sep 20, 2023
bddfc90
Merge branch 'develop' into feature/updatePeerListAPIs
ygit Sep 21, 2023
5434c29
Merge branch 'develop' into feature/updatePeerListAPIs
ygit Sep 21, 2023
5ca10ce
Merge branch 'feature/updatePeerListAPIs' of https://github.com/100ms…
ygit Sep 21, 2023
0c8e401
added iOS implementation for onPeerListUpdate event
ygit Sep 21, 2023
b5ccacb
updated example app changelog
ygit Sep 21, 2023
25b49fc
released sample app version 2.3.75 (326) ⚛️
ygit Sep 21, 2023
bdba9a2
updated changelog
ygit Sep 21, 2023
1bb3cbd
converting types to Double before adding to list
ygit Sep 21, 2023
eef10a0
resolved lint warnings
ygit Sep 22, 2023
3c209a7
released sample app version 2.3.77 (328) ⚛️
ygit Sep 26, 2023
ea75921
feat(sdk): :sparkles: added auto enter pip support in android
stanwolverine Sep 27, 2023
b85e282
refactor(example-app): usage of `enterPipMode` method
stanwolverine Sep 27, 2023
3d2732d
feat(prebuilt): :sparkles: added auto enter pip support in prebuilt
stanwolverine Sep 27, 2023
74eb6cf
feat(example-app): :sparkles: added auto enter pip support in example…
stanwolverine Sep 27, 2023
e233e33
updated podfile
ygit Sep 27, 2023
60857ab
feat(sdk): :sparkles: added auto enter pip support for android sdk le…
stanwolverine Sep 27, 2023
e0017ad
feat(example-app): :sparkles: added auto enter pip support in example…
stanwolverine Sep 27, 2023
f31bd53
Merge branch 'feature/android-auto-pip-support' of https://github.com…
stanwolverine Sep 27, 2023
40ef014
fix(sdk): :bug: `lowerLocalPeerHand` api not working
stanwolverine Sep 27, 2023
47c528c
Merge branch 'feature/updatePeerListAPIs' into feature/android-auto-p…
stanwolverine Sep 27, 2023
de878ec
build(prebuilt): removed `react-native-keyboard-controller` lib
stanwolverine Sep 27, 2023
12cae29
released sample app version 2.3.78 (329) and 2.3.80 (331) ⚛️
stanwolverine Sep 28, 2023
d17bb5c
refactor(sdk): :recycle: peerlistiterator code refactoring and minor …
stanwolverine Sep 28, 2023
a3e691f
Merge branch 'feature/updatePeerListAPIs' into feature/android-auto-p…
stanwolverine Sep 28, 2023
b62c2bd
fix(prebuilt): :lipstick: light theme color fixes
stanwolverine Sep 29, 2023
0e40fde
released sample app version 2.3.81 (332) ⚛️
stanwolverine Sep 29, 2023
7b979a0
fix(prebuilt): :sparkles: ligth theme issue in "Welcome to Meeting" s…
stanwolverine Sep 29, 2023
1c41ea9
Merge branch 'develop' into feature/android-auto-pip-support
stanwolverine Oct 5, 2023
fbfc2f8
Merge branch 'feature/android-auto-pip-support' into fix/light-theme-…
stanwolverine Oct 5, 2023
bb1ea89
Merge branch 'develop' into fix/light-theme-issues
stanwolverine Oct 5, 2023
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 @@ -487,10 +487,12 @@ object HMSDecoder {
private fun getHmsAudioTrackSettings(hmsAudioTrackSettings: HMSAudioTrackSettings?): WritableMap {
val settings: WritableMap = Arguments.createMap()
if (hmsAudioTrackSettings != null) {
settings.putBoolean(
"useHardwareAcousticEchoCanceler",
hmsAudioTrackSettings.useHardwareAcousticEchoCanceler,
)
hmsAudioTrackSettings.useHardwareAcousticEchoCanceler?.let {
settings.putBoolean(
"useHardwareAcousticEchoCanceler",
it,
)
}
settings.putString("initialState", hmsAudioTrackSettings.initialState.name)
}
return settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ android {
applicationId "live.hms.rn"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 329
versionName "2.3.78"
versionCode 332
versionName "2.3.81"
missingDimensionStrategy 'react-native-camera', 'general'
}
splits {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
CODE_SIGN_ENTITLEMENTS = RNExample/RNExample.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 331;
CURRENT_PROJECT_VERSION = 332;
DEVELOPMENT_TEAM = 5N85PP82A9;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = RNExample/Info.plist;
Expand Down Expand Up @@ -520,7 +520,7 @@
CODE_SIGN_ENTITLEMENTS = RNExample/RNExample.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 331;
CURRENT_PROJECT_VERSION = 332;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5N85PP82A9;
INFOPLIST_FILE = RNExample/Info.plist;
Expand Down Expand Up @@ -679,7 +679,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = RNExampleBroadcastUpload/RNExampleBroadcastUpload.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 331;
CURRENT_PROJECT_VERSION = 332;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 5N85PP82A9;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -721,7 +721,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 331;
CURRENT_PROJECT_VERSION = 332;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5N85PP82A9;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.3.80</string>
<string>2.3.81</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>331</string>
<string>332</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
8 changes: 7 additions & 1 deletion packages/react-native-room-kit/src/Icons/Leave/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ import React from 'react';
import { Image, StyleSheet } from 'react-native';
import type { ImageProps } from 'react-native';

import { useHMSRoomStyle } from '../../hooks-util';

interface LeaveIconProps extends Omit<ImageProps, 'source'> {}

export const LeaveIcon: React.FC<LeaveIconProps> = ({
style,
...restProps
}) => {
const iconStyles = useHMSRoomStyle((theme) => ({
tintColor: theme.palette.on_surface_high,
}));

return (
<Image
source={require('./assets/leave.png')}
style={[styles.icon, style]}
style={[styles.icon, iconStyles, style]}
{...restProps}
/>
);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions packages/react-native-room-kit/src/Icons/WelcomeHand/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import { Image, StyleSheet } from 'react-native';
import type { ImageProps } from 'react-native';

interface WelcomeHandIconProps extends Omit<ImageProps, 'source'> {}

export const WelcomeHandIcon: React.FC<WelcomeHandIconProps> = ({
style,
...restProps
}) => {
return (
<Image
source={require('./assets/welcome-hand.png')}
style={[styles.icon, style]}
{...restProps}
/>
);
};

const styles = StyleSheet.create({
icon: {
width: 64,
height: 64,
alignItems: 'center',
justifyContent: 'center',
},
});
1 change: 1 addition & 0 deletions packages/react-native-room-kit/src/Icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ export * from './Hamburger';
export * from './Stop';
export * from './Eye';
export * from './Search';
export * from './WelcomeHand';
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
useShowChatAndParticipants,
} from '../../hooks-util';
import type { RootState } from '../../redux';
import { COLORS } from '../../utils/theme';
import { ChatBottomSheetTabs } from '../../utils/types';
import { setActiveChatBottomSheetTab } from '../../redux/actions';

Expand All @@ -25,6 +24,9 @@ const _ChatAndParticipantsHeader: React.FC<WebrtcChatHeaderProps> = ({
);

const hmsRoomStyles = useHMSRoomStyleSheet((theme, typography) => ({
headerTitleWrapper: {
backgroundColor: theme.palette.surface_default,
},
tab: {
backgroundColor: theme.palette.surface_bright,
},
Expand Down Expand Up @@ -67,7 +69,9 @@ const _ChatAndParticipantsHeader: React.FC<WebrtcChatHeaderProps> = ({
: null}
</Text>
) : (
<View style={styles.headerTitleWrapper}>
<View
style={[styles.headerTitleWrapper, hmsRoomStyles.headerTitleWrapper]}
>
{visibleChatBottomSheetTabs.map((tab) => {
const isActive = activeChatBottomSheetTab === tab;

Expand Down Expand Up @@ -118,7 +122,6 @@ const styles = StyleSheet.create({
flexDirection: 'row',
padding: 4,
borderRadius: 8,
backgroundColor: COLORS.SURFACE.DEFAULT,
marginRight: 16,
},
tab: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { StyleProp, ViewStyle } from 'react-native';

import { useHMSRoomColorPalette, useHMSRoomStyleSheet } from '../hooks-util';
import { HMSBaseButton } from './HMSBaseButton';
import { COLORS } from '../utils/theme';

export interface HMSDangerButtonProps {
title: string;
Expand Down Expand Up @@ -34,7 +35,7 @@ export const HMSDangerButton: React.FC<HMSDangerButtonProps> = ({
backgroundColor: theme.palette.alert_error_dim,
},
buttonText: {
color: theme.palette.alert_error_brighter,
color: COLORS.WHITE,
fontFamily: `${typography.font_family}-SemiBold`,
},
disabledText: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { View, ActivityIndicator, Text, StyleSheet } from 'react-native';
import { useSelector } from 'react-redux';

import { COLORS } from '../utils/theme';
import { hexToRgbA } from '../utils/theme';
import type { RootState } from '../redux';
import { HMSLocalVideoView } from './HMSLocalVideoView';
import { useHMSRoomColorPalette, useHMSRoomStyleSheet } from '../hooks-util';
Expand All @@ -22,13 +22,20 @@ export const HMSHLSStreamLoading = () => {
color: theme.palette.on_surface_high,
fontFamily: `${typography.font_family}-Regular`,
},
backdropContainer: {
backgroundColor: theme.palette.background_dim
? hexToRgbA(theme.palette.background_dim, 0.7)
: undefined,
},
}));

return (
<View style={[styles.container, hmsRoomStyles.container]}>
{isLocalVideoMuted ? null : <HMSLocalVideoView />}

<View style={styles.hlsLoaderContainer}>
<View
style={[styles.hlsLoaderContainer, hmsRoomStyles.backdropContainer]}
>
<ActivityIndicator
style={styles.hlsLoader}
size={'large'}
Expand All @@ -52,7 +59,6 @@ const styles = StyleSheet.create({
position: 'absolute',
width: '100%',
height: '100%',
backgroundColor: COLORS.LOADING_BACKDROP,
zIndex: 5,
alignItems: 'center',
justifyContent: 'center',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useShowChatAndParticipants,
} from '../hooks-util';
import { EyeIcon } from '../Icons';
import { hexToRgbA } from '../utils/theme';
import { COLORS, hexToRgbA } from '../utils/theme';
import type { RootState } from '../redux';

const _HMSLiveIndicator = () => {
Expand All @@ -31,7 +31,7 @@ const _HMSLiveIndicator = () => {
backgroundColor: theme.palette.alert_error_default,
},
liveText: {
color: theme.palette.alert_error_brighter,
color: COLORS.WHITE,
fontFamily: `${typograhy.font_family}-SemiBold`,
},
viewers: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { PressableIcon } from './PressableIcon';
import { BottomSheet } from './BottomSheet';
import { StopIcon } from '../Icons';
import { EndRoomModalContent } from './EndRoomModalContent';
import { COLORS } from '../utils/theme';

export const HMSManageLeave: React.FC<LeaveButtonProps> = (props) => {
// TODO: read current meeting joined state
Expand Down Expand Up @@ -93,7 +94,7 @@ const LeaveButton: React.FC<LeaveButtonProps> = (props) => {
borderColor: theme.palette.alert_error_default,
},
icon: {
tintColor: theme.palette.alert_error_brighter,
tintColor: COLORS.WHITE,
},
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useSelector } from 'react-redux';

import type { RootState } from '../redux';
import { useHMSRoomStyleSheet } from '../hooks-util';
import { COLORS } from '../utils/theme';

export const HMSPreviewHLSLiveIndicator = () => {
const isHLSStreaming = useSelector(
Expand All @@ -15,10 +16,10 @@ export const HMSPreviewHLSLiveIndicator = () => {
backgroundColor: theme.palette.alert_error_default,
},
circle: {
backgroundColor: theme.palette.on_surface_high,
backgroundColor: COLORS.WHITE,
},
text: {
color: theme.palette.on_surface_high,
color: COLORS.WHITE,
fontFamily: `${typography.font_family}-SemiBold`,
},
}));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { RootState } from '../redux';
import { RadioIcon } from '../Icons';
import {
useHMSLayoutConfig,
useHMSRoomStyle,
useHMSRoomStyleSheet,
useShouldGoLive,
} from '../hooks-util';
import { HMSPrimaryButton } from './HMSPrimaryButton';
Expand Down Expand Up @@ -36,8 +36,13 @@ export const HMSPreviewJoinButton: React.FC<HMSPreviewJoinButtonProps> = ({

const shouldGoLive = useShouldGoLive();

const liveIconStyles = useHMSRoomStyle((theme) => ({
tintColor: theme.palette.on_primary_low,
const hmsRoomStyles = useHMSRoomStyleSheet((theme) => ({
disabledLiveIcon: {
tintColor: theme.palette.on_primary_low,
},
activeLiveIcon: {
tintColor: theme.palette.on_primary_high,
},
}));

const disabledJoin = userNameInvalid || loading;
Expand All @@ -54,7 +59,13 @@ export const HMSPreviewJoinButton: React.FC<HMSPreviewJoinButtonProps> = ({
disabled={disabledJoin}
leftComponent={
shouldGoLive ? (
<RadioIcon style={disabledJoin ? liveIconStyles : null} />
<RadioIcon
style={
disabledJoin
? hmsRoomStyles.disabledLiveIcon
: hmsRoomStyles.activeLiveIcon
}
/>
) : null
}
style={styles.button}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const HMSPreviewTile: React.FC = () => {
backgroundColor: COLORS.EXTENDED.PURPLE,
},
avatarText: {
color: theme.palette.on_surface_high,
color: COLORS.WHITE,
fontFamily: `${typography.font_family}-SemiBold`,
},
}));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const HMSTextInput: React.FC<HMSTextInputProps> = ({
const handleInputBlur = () => setInputFocused(false);

const {
on_surface_low: onSurfaceLowColor,
on_surface_medium: onSurfaceMediumColor,
on_surface_high: onSurfaceHighColor,
} = useHMSRoomColorPalette();

Expand Down Expand Up @@ -91,7 +91,7 @@ export const HMSTextInput: React.FC<HMSTextInputProps> = ({

// ICON STYLES
sendIcon: {
tintColor: theme.palette.on_surface_low,
tintColor: theme.palette.on_surface_medium,
},
focusedSendIcon: {
tintColor: theme.palette.on_surface_high,
Expand Down Expand Up @@ -123,7 +123,7 @@ export const HMSTextInput: React.FC<HMSTextInputProps> = ({
autoCapitalize={resetProps.autoCapitalize ?? 'words'}
autoCompleteType={resetProps.autoCompleteType ?? 'name'}
placeholderTextColor={
resetProps.placeholderTextColor ?? onSurfaceLowColor
resetProps.placeholderTextColor ?? onSurfaceMediumColor
}
selectionColor={resetProps.selectionColor ?? onSurfaceHighColor}
onFocus={resetProps.onFocus ?? handleInputFocus}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type ParticipantsSearchInputProps = {
export const ParticipantsSearchInput: React.FC<
ParticipantsSearchInputProps
> = ({ searchText, setSearchText }) => {
const { on_surface_low: onSurfaceLowColor } = useHMSRoomColorPalette();
const { on_surface_medium: onSurfaceMediumColor } = useHMSRoomColorPalette();

const textInputStyle = useHMSRoomStyle((theme) => ({
backgroundColor: theme.palette.surface_default,
Expand All @@ -28,7 +28,7 @@ export const ParticipantsSearchInput: React.FC<
style={styles.input}
containerStyle={[styles.textInputContainer, textInputStyle]}
focusedContainerStyle={[styles.focusedTextInputContainer, textInputStyle]}
placeholderTextColor={onSurfaceLowColor}
placeholderTextColor={onSurfaceMediumColor}
leftIcon={<SearchIcon style={styles.searchIcon} />}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const _AvatarView: React.FC<AvatarViewProps> = ({
backgroundColor: COLORS.EXTENDED.PURPLE,
},
avatarText: {
color: theme.palette.on_surface_high,
color: COLORS.WHITE,
fontFamily: `${typography.font_family}-SemiBold`,
},
}));
Expand Down
Loading
Loading