Skip to content

Commit

Permalink
Merge pull request berty#3021 from aeddi/chore/aeddi/cleanup-assets
Browse files Browse the repository at this point in the history
chore: cleanup assets and iOS project
  • Loading branch information
aeddi authored Jan 22, 2021
2 parents 3eeb661 + 6d65b77 commit 54eb27e
Show file tree
Hide file tree
Showing 24 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion js/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ ios/Berty.xcworkspace: ios/Berty.xcodeproj ios/Podfile ios/vendor/bundle package
cd ios && bundle exec pod install $(if $(filter-out $(CI), true),--repo-update)
touch $@

ios/Berty.xcodeproj: ios/vendor/xcodegen $(xcodegen_yml) $(call rwildcard,ios/Berty/Source,*)
ios/Berty.xcodeproj: ios/vendor/xcodegen $(xcodegen_yml) $(call rwildcard,ios/Berty/Source,*) $(call rwildcard,assets,*)
$(call check-program, swift)
mkdir -p ios/Berty
touch ios/Berty/main.jsbundle
Expand Down
Binary file removed js/assets/bootsplash_logo.png
Binary file not shown.
Binary file removed js/assets/bootsplash_logo@1,5x.png
Binary file not shown.
Binary file removed js/assets/[email protected]
Binary file not shown.
Binary file removed js/assets/[email protected]
Binary file not shown.
Binary file removed js/assets/[email protected]
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 5 additions & 2 deletions js/ios/berty.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,11 @@ targets:
- path: ./Configs/GoogleService
group: Configs
buildPhase: none # will be added by a script
- path: ../assets
name: OpenSans
- path: ../assets/font
name: Fonts
group: Resources
- path: ../assets/sound
name: Sounds
group: Resources
dependencies:
- framework: JavascriptCore.framework
Expand Down
12 changes: 6 additions & 6 deletions js/packages/components/sounds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import mapValues from 'lodash/mapValues'
import { Player } from '@react-native-community/audio-toolkit'

const soundsMap = {
messageReceived: 'Berty_Notif_Message.mp3',
messageSent: 'Notif_Berty15message_envoye.mp3',
contactRequestSent: 'Notif_Berty02.mp3',
contactRequestReceived: 'Notif_Berty04.mp3',
contactRequestAccepted: 'Notif_Berty14.mp3',
groupCreated: 'Notif_Berty13.mp3',
messageReceived: 'message_received.mp3',
messageSent: 'message_sent.mp3',
contactRequestSent: 'contact_request_sent.mp3',
contactRequestReceived: 'contact_request_received.mp3',
contactRequestAccepted: 'contact_request_accepted.mp3',
groupCreated: 'group_created.mp3',
}

export type SoundKey = keyof typeof soundsMap
Expand Down

0 comments on commit 54eb27e

Please sign in to comment.