-
Notifications
You must be signed in to change notification settings - Fork 3k
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
feat: app sounds #31055
Merged
cristipaval
merged 68 commits into
Expensify:main
from
margelo:origin/feat/update-loading-screen-to-play-animation-and-sound
Feb 12, 2024
Merged
feat: app sounds #31055
Changes from 51 commits
Commits
Show all changes
68 commits
Select commit
Hold shift + click to select a range
594d0c8
feat: add animated splash screen
lauridskern 67923f1
fix: indents
lauridskern 087ca99
feat: select random video each time
lauridskern 5b9a1ff
feat: randomize video and show last shown splash video in dev settings
lauridskern 1adb767
Add MenuItemWithTopDescription component to TestToolMenu
lauridskern d2fa21f
remove old splashscreen hider component
lauridskern 71d23b8
Merge remote-tracking branch 'upstream/main' into origin/feat/update-…
lauridskern 4a3a23a
fix: eslint errors, use the new useThemeStyles hook
lauridskern 83c640f
Merge remote-tracking branch 'upstream/main' into origin/feat/update-…
lauridskern 8ec87c7
Merge remote-tracking branch 'upstream/main' into origin/feat/update-…
lauridskern 35fc53a
wip: install next version of react-native-video for proper opacity su…
hannojg e3a8071
wip(android): migrate to new v6 rn-video api
hannojg bd1be47
ios: pod install rn-video installation
hannojg c1cea21
fix: splash screen video restarting midway
hannojg c643469
fix: add rn-video patch to support opacity
hannojg 270511d
remove windowIsTranslucent for splash screen
hannojg 37d573c
android: fix splash screen opacity fade out looking odd
hannojg 67d191b
Merge branch 'main' of github.com:Expensify/App into origin/feat/upda…
hannojg e7bddc1
add comments to explain new splash screen
hannojg 6f16784
add mock for react-native-video
hannojg 38073a4
better explain
hannojg d7cc842
Merge branch 'main' of github.com:Expensify/App into origin/feat/upda…
hannojg a55c062
fix: animated splash screen different implementations ios android
hannojg bf889b3
TEMP: add workaround for not found on adhoc builds
hannojg a7eafea
add android workaround
hannojg 9b081f5
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 11477c9
chore: update Podfile.lock after merge
kirillzyusko 3f27579
feat: audio player
kirillzyusko 203a441
feat: sound on message send
kirillzyusko e3ab465
feat: mute settings management
kirillzyusko a46900b
fix: XCode build issues (null references in project.pbxproj)
kirillzyusko 27a972f
fix: simplify implementation
kirillzyusko 7796a09
feat: play different sounds for different messages
kirillzyusko ed5b09b
fix: play sound when you send message from '+' menu
kirillzyusko eaaaafb
fix: sound for task completion
kirillzyusko a57272e
refactor: better fs structure
kirillzyusko e393ec4
refactor: remove console.log statements
kirillzyusko 598cd11
fix: silent push on web since we play own sound when message arrives
kirillzyusko fc79b63
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 2dd1515
fix: use modern way for importing React modules in ObjC
kirillzyusko e9c4a55
chore: remove patch since it seems like the problem with iOS builds w…
kirillzyusko 5979ab3
fix: play sound when user completes a task
kirillzyusko 334f187
fix: play when someone sends @here
kirillzyusko 80dba50
fix: exclude undefined to execute all if-statements
kirillzyusko 3b56e55
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko c383046
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 890da12
revert: animated splash screen
kirillzyusko d0a7e35
revert: animated splash screen (part 2)
kirillzyusko a35955e
fix: assure minimimal execution sound play
kirillzyusko cb310a8
chore: move patch back since it's needed
kirillzyusko 330dd8d
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 2224618
chore: reorganize imports
kirillzyusko 2447423
chore: use fs platform specific code separation
kirillzyusko 9f3bc13
chore: combine if-statements in single loops
kirillzyusko 8566418
fix: ts errors
kirillzyusko 92960b3
refactor: optimize performance
kirillzyusko 8f58872
fix: use marketing team wording
kirillzyusko 231aaef
fix: update wording
kirillzyusko 8478839
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 35a28ce
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko a20c54b
fix: do not play sound if channel is muted
kirillzyusko d29768b
chore: added jest mock
kirillzyusko 3be083b
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko 339133e
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko a69cadb
fix: prettier
kirillzyusko 1e828f6
refactor: added dictionary for playing a sound
kirillzyusko 7ed56ec
fix: changes after code review
kirillzyusko 748d554
Merge branch 'main' into origin/feat/update-loading-screen-to-play-an…
kirillzyusko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff --git a/node_modules/react-native-sound/RNSound/RNSound.h b/node_modules/react-native-sound/RNSound/RNSound.h | ||
index 7f5b97b..1a3c840 100644 | ||
--- a/node_modules/react-native-sound/RNSound/RNSound.h | ||
+++ b/node_modules/react-native-sound/RNSound/RNSound.h | ||
@@ -1,17 +1,7 @@ | ||
-#if __has_include(<React/RCTBridgeModule.h>) | ||
#import <React/RCTBridgeModule.h> | ||
-#else | ||
-#import "RCTBridgeModule.h" | ||
-#endif | ||
- | ||
#import <AVFoundation/AVFoundation.h> | ||
- | ||
-#if __has_include(<React/RCTEventEmitter.h>) | ||
#import <React/RCTEventEmitter.h> | ||
-#else | ||
-#import "RCTEventEmitter.h" | ||
-#endif | ||
|
||
@interface RNSound : RCTEventEmitter <RCTBridgeModule, AVAudioPlayerDelegate> | ||
-@property (nonatomic, weak) NSNumber *_key; | ||
+@property(nonatomic, weak) NSNumber *_key; | ||
@end | ||
diff --git a/node_modules/react-native-sound/RNSound/RNSound.m b/node_modules/react-native-sound/RNSound/RNSound.m | ||
index df3784e..d34ac01 100644 | ||
--- a/node_modules/react-native-sound/RNSound/RNSound.m | ||
+++ b/node_modules/react-native-sound/RNSound/RNSound.m | ||
@@ -1,10 +1,6 @@ | ||
#import "RNSound.h" | ||
|
||
-#if __has_include("RCTUtils.h") | ||
-#import "RCTUtils.h" | ||
-#else | ||
#import <React/RCTUtils.h> | ||
-#endif | ||
|
||
@implementation RNSound { | ||
NSMutableDictionary *_playerPool; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ import CONFIG from '@src/CONFIG'; | |
import ONYXKEYS from '@src/ONYXKEYS'; | ||
import type {Network as NetworkOnyx, User as UserOnyx} from '@src/types/onyx'; | ||
import Button from './Button'; | ||
import MenuItemWithTopDescription from './MenuItemWithTopDescription'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why was that added? |
||
import {withNetwork} from './OnyxProvider'; | ||
import Switch from './Switch'; | ||
import TestToolRow from './TestToolRow'; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be added back! 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be that we just need to update with main branch