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.

Sign up for GitHub

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

[QA-1212] Fix chromecast #8323

Merged
merged 2 commits into from
May 3, 2024
Merged

[QA-1212] Fix chromecast #8323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b6194
[QA-121] Fix chromecast support
raymondjacobson May 3, 2024
b76a313
Clean up
raymondjacobson May 3, 2024
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
21 changes: 12 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
"@escape.tech/mookme": "2.4.1",
"@redux-devtools/remote": "0.8.0",
"@web3modal/ethers": "4.1.0",
"react-native-google-cast": "4.6.2",
"pg": "8.8.0"
},
"overrides": {
Expand Down
16 changes: 8 additions & 8 deletions packages/mobile/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ PODS:
- FingerprintPro (2.3.2)
- fmt (6.2.1)
- glog (0.3.5)
- google-cast-sdk-dynamic-xcframework-no-bluetooth (4.8.0)
- google-cast-sdk-dynamic-xcframework-no-bluetooth (4.7.1)
- hermes-engine (0.73.1):
- hermes-engine/Pre-built (= 0.73.1)
- hermes-engine/Pre-built (0.73.1)
Expand All @@ -54,7 +54,7 @@ PODS:
- lottie-ios (~> 4.3.3)
- React-Core
- nSure (1.3.1)
- PromisesObjC (2.3.1)
- PromisesObjC (2.4.0)
- RCT-Folly (2022.05.16.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -948,7 +948,7 @@ PODS:
- React
- react-native-google-cast/NoBluetoothArm (= 4.6.2)
- react-native-google-cast/NoBluetoothArm (4.6.2):
- google-cast-sdk-dynamic-xcframework-no-bluetooth
- google-cast-sdk-dynamic-xcframework-no-bluetooth (= 4.7.1)
- React
- react-native-google-cast/RNGoogleCast
- react-native-google-cast/RNGoogleCast (4.6.2):
Expand Down Expand Up @@ -1301,7 +1301,7 @@ DEPENDENCIES:
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
- react-native-fast-crypto (from `../../../node_modules/react-native-fast-crypto`)
- react-native-get-random-values (from `../../../node_modules/react-native-get-random-values`)
- react-native-google-cast (from `../node_modules/react-native-google-cast`)
- react-native-google-cast (from `../../../node_modules/react-native-google-cast`)
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
- react-native-in-app-review (from `../node_modules/react-native-in-app-review`)
- "react-native-keep-awake (from `../node_modules/@sayem314/react-native-keep-awake`)"
Expand Down Expand Up @@ -1471,7 +1471,7 @@ EXTERNAL SOURCES:
react-native-get-random-values:
:path: "../../../node_modules/react-native-get-random-values"
react-native-google-cast:
:path: "../node_modules/react-native-google-cast"
:path: "../../../node_modules/react-native-google-cast"
react-native-image-picker:
:path: "../node_modules/react-native-image-picker"
react-native-in-app-review:
Expand Down Expand Up @@ -1605,15 +1605,15 @@ SPEC CHECKSUMS:
FingerprintPro: c6444f5a00d1126446da664124529e754475f198
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
google-cast-sdk-dynamic-xcframework-no-bluetooth: 09d47191ef8821d82e813e754bcf98bc61a3dbc9
google-cast-sdk-dynamic-xcframework-no-bluetooth: 1fa9e267df3fd6f8a1c6e3345142ca5286297968
hermes-engine: 34df9d5034e90bd9bf1505e1ca198760373935af
JWT: ef71dfb03e1f842081e64dc42eef0e164f35d251
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e
lottie-react-native: a2ae9c27c273b060b2affff2957bc0ff7fdca353
nSure: b2d7022f54c180c5afd88f9f79073841e1cfa844
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
RCTRequired: 6dda55e483f75d2b43781d8ad5bd7df276a50981
RCTTypeSafety: df0f2632f4e89938b9b9f6152b5e6c66fc6e969e
Expand Down Expand Up @@ -1643,7 +1643,7 @@ SPEC CHECKSUMS:
react-native-document-picker: b4f4a23b73f864ce17965b284c0757648993805b
react-native-fast-crypto: 5943c42466b86ad70be60d3a5f64bd22251e5d9e
react-native-get-random-values: 384787fd76976f5aec9465aff6fa9e9129af1e74
react-native-google-cast: 18b9b2fc518caabfa65d309409e160b3fc6d1733
react-native-google-cast: 0a82cf63114470403e41e04ffa2b13d6448b6112
react-native-image-picker: 6c51359eca7a7df9f07e297218c25696eb9da976
react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
react-native-keep-awake: ad1d67f617756b139536977a0bf06b27cec0714a
Expand Down
13 changes: 13 additions & 0 deletions packages/mobile/patches/react-native-google-cast+4.6.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/react-native-google-cast/react-native-google-cast.podspec b/node_modules/react-native-google-cast/react-native-google-cast.podspec
index d1948aa..39212a4 100644
--- a/node_modules/react-native-google-cast/react-native-google-cast.podspec
+++ b/node_modules/react-native-google-cast/react-native-google-cast.podspec
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|

s.subspec 'NoBluetoothArm' do |ss|
ss.dependency "#{package['name']}/RNGoogleCast"
- ss.dependency 'google-cast-sdk-dynamic-xcframework-no-bluetooth'
+ ss.dependency 'google-cast-sdk-dynamic-xcframework-no-bluetooth', '4.7.1'
end

s.subspec 'RNGoogleCast' do |ss|
3 changes: 3 additions & 0 deletions packages/mobile/src/components/audio/AudioPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import {
OfflineDownloadStatus
} from 'app/store/offline-downloads/slice'

import { useChromecast } from './GoogleCast'
import { useSavePodcastProgress } from './useSavePodcastProgress'

const { getUserId } = accountSelectors
Expand Down Expand Up @@ -185,6 +186,8 @@ export const AudioPlayer = () => {
const nftAccessSignatureMap = useSelector(getNftAccessSignatureMap)
const { storageNodeSelector } = useAppContext()

useChromecast()

// Queue Things
const queueIndex = useSelector(getIndex)
const queueShuffle = useSelector(getShuffle)
Expand Down
15 changes: 14 additions & 1 deletion packages/mobile/src/components/audio/GoogleCast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const { getCurrentTrack, getPlaying, getSeek, getCounter } = playerSelectors

const { getUser } = cacheUsersSelectors

export { CastState } from 'react-native-google-cast'

export const useChromecast = () => {
const dispatch = useDispatch()

Expand Down Expand Up @@ -135,7 +137,18 @@ export const useChromecast = () => {
}
}, [client, seek])

useEffect(() => {
if (
castState === CastState.CONNECTED ||
castState === CastState.CONNECTING
) {
TrackPlayer.setVolume(0)
} else {
TrackPlayer.setVolume(1)
Comment on lines +145 to +147
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do the volume controls control the device you're casting to?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they do on android, but don't on iOS (see PR description).
this setVolume controls the phone though, and the way chromecast works, both the phone and the cast device are playing the track at the same time. it doesn't have to be that way, but would mean we have to rewrite a lot of the player control logic

}
}, [castState])

return {
isCasting: castState === CastState.CONNECTED
castState
}
}
20 changes: 9 additions & 11 deletions packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import {
} from '@audius/harmony-native'
import { useAirplay } from 'app/components/audio/Airplay'
import { Button } from 'app/components/core'
import { useIsOfflineModeEnabled } from 'app/hooks/useIsOfflineModeEnabled'
import { useFeatureFlag } from 'app/hooks/useRemoteConfig'
import { useToast } from 'app/hooks/useToast'
import { makeStyles } from 'app/styles'
Expand Down Expand Up @@ -113,7 +112,6 @@ export const ActionsBar = ({ track }: ActionsBarProps) => {
const accountUser = useSelector(getAccountUser)
const { neutral, neutralLight6, primary } = useThemeColors()
const dispatch = useDispatch()
const isOfflineModeEnabled = useIsOfflineModeEnabled()
const isReachable = useSelector(getIsReachable)
const { isEnabled: isNewPodcastControlsEnabled } = useFeatureFlag(
FeatureFlags.PODCAST_CONTROL_UPDATES_ENABLED,
Expand Down Expand Up @@ -269,7 +267,15 @@ export const ActionsBar = ({ track }: ActionsBarProps) => {
/>
)
}
return isOfflineModeEnabled && !isReachable ? (
return isReachable ? (
<CastButton
style={{
...styles.button,
...styles.icon,
tintColor: isCasting ? primary : neutral
}}
/>
) : (
<View style={{ ...styles.button, width: 24 }}>
<IconCastChromecast
fill={neutralLight6}
Expand All @@ -278,14 +284,6 @@ export const ActionsBar = ({ track }: ActionsBarProps) => {
style={{ transform: [{ scaleX: -1 }] }}
/>
</View>
) : (
<CastButton
style={{
...styles.button,
...styles.icon,
tintColor: isCasting ? primary : neutral
}}
/>
)
}

Expand Down