Skip to content

Commit

Permalink
Merge pull request #31 from dappros/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
4RGUS authored Nov 2, 2021
2 parents abb09b2 + a11520e commit a8a937c
Show file tree
Hide file tree
Showing 12 changed files with 610 additions and 212 deletions.
1 change: 1 addition & 0 deletions android/app/src/main/java/com/ethora/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.otomogroove.OGReactNativeWaveform.OGWavePackage;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
Expand Down
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
rootProject.name = 'ethora'
include ':react-native-audiowaveform'
project(':react-native-audiowaveform').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-audiowaveform/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
2 changes: 2 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ target 'ethora' do
:hermes_enabled => false
)

pod 'OGReactNativeWaveform', :path => '../node_modules/react-native-audiowaveform'

target 'ethoraTests' do
inherit! :complete
# Pods for testing
Expand Down
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
"dependencies": {
"@invertase/react-native-apple-authentication": "^2.1.2",
"@react-native-async-storage/async-storage": "^1.15.5",
"@react-native-clipboard/clipboard": "^1.8.4",
"@react-native-clipboard/clipboard": "^1.9.0",
"@react-native-community/audio-toolkit": "^2.0.3",
"@react-native-community/checkbox": "^0.5.8",
"@react-native-community/masked-view": "^0.1.11",
"@react-native-community/netinfo": "^6.0.0",
"@react-native-community/push-notification-ios": "^1.8.0",
"@react-native-community/slider": "^4.1.10",
"@react-native-community/viewpager": "^5.0.11",
"@react-native-firebase/analytics": "^11.1.2",
"@react-native-firebase/app": "^11.1.2",
Expand All @@ -38,6 +39,7 @@
"react": "17.0.1",
"react-native": "0.64.2",
"react-native-audio-recorder-player": "^3.1.2",
"react-native-audiowaveform": "^2.0.5",
"react-native-beautiful-video-recorder": "^2.0.1",
"react-native-bootsplash": "^3.2.6",
"react-native-camera": "^4.2.1",
Expand All @@ -50,6 +52,7 @@
"react-native-gesture-handler": "^1.10.3",
"react-native-get-random-values": "^1.7.0",
"react-native-gifted-chat": "^0.16.3",
"react-native-hyperlink": "^0.0.19",
"react-native-image-picker": "^3.7.0",
"react-native-linear-gradient": "^2.5.6",
"react-native-material-menu": "^1.2.0",
Expand All @@ -66,10 +69,14 @@
"react-native-share": "^6.2.1",
"react-native-simple-toast": "^1.1.3",
"react-native-skeleton-content-nonexpo": "^1.0.11",
"react-native-slider": "^0.11.0",
"react-native-svg": "^12.0.3",
"react-native-tab-view": "^2.14.0",
"react-native-typing-animation": "^0.1.7",
"react-native-vector-icons": "^8.1.0",
"react-native-video": "^5.2.0-alpha1",
"react-native-video-controls": "^2.8.1",
"react-native-video-player": "^0.12.0",
"react-native-walkthrough-tooltip": "^1.2.0",
"react-redux": "^7.2.4",
"realm": "^10.8.0",
Expand Down
Loading

0 comments on commit a8a937c

Please sign in to comment.