diff --git a/js/Makefile b/js/Makefile index cad6eb4bf8..bfb88b1d81 100644 --- a/js/Makefile +++ b/js/Makefile @@ -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 diff --git a/js/assets/bootsplash_logo.png b/js/assets/bootsplash_logo.png deleted file mode 100644 index 483957f054..0000000000 Binary files a/js/assets/bootsplash_logo.png and /dev/null differ diff --git a/js/assets/bootsplash_logo@1,5x.png b/js/assets/bootsplash_logo@1,5x.png deleted file mode 100644 index 998df158f4..0000000000 Binary files a/js/assets/bootsplash_logo@1,5x.png and /dev/null differ diff --git a/js/assets/bootsplash_logo@2x.png b/js/assets/bootsplash_logo@2x.png deleted file mode 100644 index 422d8cec7b..0000000000 Binary files a/js/assets/bootsplash_logo@2x.png and /dev/null differ diff --git a/js/assets/bootsplash_logo@3x.png b/js/assets/bootsplash_logo@3x.png deleted file mode 100644 index b3f1f82564..0000000000 Binary files a/js/assets/bootsplash_logo@3x.png and /dev/null differ diff --git a/js/assets/bootsplash_logo@4x.png b/js/assets/bootsplash_logo@4x.png deleted file mode 100644 index 68b0352eed..0000000000 Binary files a/js/assets/bootsplash_logo@4x.png and /dev/null differ diff --git a/js/assets/OpenSans-Bold.ttf b/js/assets/font/OpenSans-Bold.ttf similarity index 100% rename from js/assets/OpenSans-Bold.ttf rename to js/assets/font/OpenSans-Bold.ttf diff --git a/js/assets/OpenSans-BoldItalic.ttf b/js/assets/font/OpenSans-BoldItalic.ttf similarity index 100% rename from js/assets/OpenSans-BoldItalic.ttf rename to js/assets/font/OpenSans-BoldItalic.ttf diff --git a/js/assets/OpenSans-ExtraBold.ttf b/js/assets/font/OpenSans-ExtraBold.ttf similarity index 100% rename from js/assets/OpenSans-ExtraBold.ttf rename to js/assets/font/OpenSans-ExtraBold.ttf diff --git a/js/assets/OpenSans-ExtraBoldItalic.ttf b/js/assets/font/OpenSans-ExtraBoldItalic.ttf similarity index 100% rename from js/assets/OpenSans-ExtraBoldItalic.ttf rename to js/assets/font/OpenSans-ExtraBoldItalic.ttf diff --git a/js/assets/OpenSans-Italic.ttf b/js/assets/font/OpenSans-Italic.ttf similarity index 100% rename from js/assets/OpenSans-Italic.ttf rename to js/assets/font/OpenSans-Italic.ttf diff --git a/js/assets/OpenSans-Light.ttf b/js/assets/font/OpenSans-Light.ttf similarity index 100% rename from js/assets/OpenSans-Light.ttf rename to js/assets/font/OpenSans-Light.ttf diff --git a/js/assets/OpenSans-LightItalic.ttf b/js/assets/font/OpenSans-LightItalic.ttf similarity index 100% rename from js/assets/OpenSans-LightItalic.ttf rename to js/assets/font/OpenSans-LightItalic.ttf diff --git a/js/assets/OpenSans-Regular.ttf b/js/assets/font/OpenSans-Regular.ttf similarity index 100% rename from js/assets/OpenSans-Regular.ttf rename to js/assets/font/OpenSans-Regular.ttf diff --git a/js/assets/OpenSans-SemiBold.ttf b/js/assets/font/OpenSans-SemiBold.ttf similarity index 100% rename from js/assets/OpenSans-SemiBold.ttf rename to js/assets/font/OpenSans-SemiBold.ttf diff --git a/js/assets/OpenSans-SemiBoldItalic.ttf b/js/assets/font/OpenSans-SemiBoldItalic.ttf similarity index 100% rename from js/assets/OpenSans-SemiBoldItalic.ttf rename to js/assets/font/OpenSans-SemiBoldItalic.ttf diff --git a/js/ios/Berty/Sources/Notif_Berty14.mp3 b/js/assets/sound/contact_request_accepted.mp3 similarity index 100% rename from js/ios/Berty/Sources/Notif_Berty14.mp3 rename to js/assets/sound/contact_request_accepted.mp3 diff --git a/js/ios/Berty/Sources/Notif_Berty04.mp3 b/js/assets/sound/contact_request_received.mp3 similarity index 100% rename from js/ios/Berty/Sources/Notif_Berty04.mp3 rename to js/assets/sound/contact_request_received.mp3 diff --git a/js/ios/Berty/Sources/Notif_Berty02.mp3 b/js/assets/sound/contact_request_sent.mp3 similarity index 100% rename from js/ios/Berty/Sources/Notif_Berty02.mp3 rename to js/assets/sound/contact_request_sent.mp3 diff --git a/js/ios/Berty/Sources/Notif_Berty13.mp3 b/js/assets/sound/group_created.mp3 similarity index 100% rename from js/ios/Berty/Sources/Notif_Berty13.mp3 rename to js/assets/sound/group_created.mp3 diff --git a/js/ios/Berty/Sources/Berty_Notif_Message.mp3 b/js/assets/sound/message_received.mp3 similarity index 100% rename from js/ios/Berty/Sources/Berty_Notif_Message.mp3 rename to js/assets/sound/message_received.mp3 diff --git a/js/ios/Berty/Sources/Notif_Berty15message_envoye.mp3 b/js/assets/sound/message_sent.mp3 similarity index 100% rename from js/ios/Berty/Sources/Notif_Berty15message_envoye.mp3 rename to js/assets/sound/message_sent.mp3 diff --git a/js/ios/berty.yaml b/js/ios/berty.yaml index 8c4b9807a9..51bbac9f1d 100644 --- a/js/ios/berty.yaml +++ b/js/ios/berty.yaml @@ -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 diff --git a/js/packages/components/sounds.ts b/js/packages/components/sounds.ts index c461bf85b4..a4c7e5a403 100644 --- a/js/packages/components/sounds.ts +++ b/js/packages/components/sounds.ts @@ -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