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.

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

Dev add audio #19

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2d74e6a
Updated acknowledgements
stevemanone Apr 24, 2018
fe3468a
Merge remote-tracking branch 'upstream/master'
stevemanone Apr 24, 2018
b3a1d1a
Misc changes
stevemanone Apr 24, 2018
8c311ad
Misc changes done to allow compatibility with 5/3 demo phone.
stevemanone May 3, 2018
1644048
Updated .gitignore
stevemanone May 26, 2018
734a761
Added RNFirebase
bdougsand May 29, 2018
299c589
Bare-bones image picker and upload functionality
bdougsand May 29, 2018
55c43d0
Refactored to add metadata with the uploaded video
Jun 2, 2018
5c208cc
Firebase InstanceID generation
Jun 4, 2018
af53850
First stab at creating the Help page
bdougsand Jun 5, 2018
7659ece
remnants behavior and most of layout - placeholder audio
sashamaryl Jun 6, 2018
3af081f
Scale fonts by pixel ratio
bdougsand Jun 6, 2018
9362014
Added icons and play button to Help section headers
bdougsand Jun 6, 2018
0a5279d
Help page: Show a darker icon while a sound is playing
bdougsand Jun 9, 2018
f68209d
Begin button animation on press in instead of after release
bdougsand Jun 9, 2018
dda523d
Settings page
ranjani23 Jun 10, 2018
766236b
New files
ranjani23 Jun 10, 2018
a91d5c3
Remnants fully working (audio still placeholders).
sashamaryl Jun 10, 2018
a873f21
Initial Commit of Nav Bar
stevemanone Jun 10, 2018
a0e193d
First pass at object chooser pages
JacksBurden Jun 5, 2018
1686a20
remove unused videos object
carpeliam Jun 10, 2018
cea9416
remnants: working: placeholder audio, temp-to-perm images
sashamaryl Jun 10, 2018
803b955
Css fixes
ranjani23 Jun 10, 2018
4c62418
Merge remote-tracking branch 'stevemanone/GlobalNavBar'
bdougsand Jun 11, 2018
b49ade2
Merge help page into global nav branch
bdougsand Jun 11, 2018
1250409
Help page: fixed a silly mistake
bdougsand Jun 11, 2018
5de627f
Misc bug fixes (YouTube videos are now working and can be watched, the
stevemanone Jun 13, 2018
22601fd
Merge remote-tracking branch 'aashiyaan/GlobalNavBar' into GlobalNavBar
stevemanone Jun 13, 2018
720f7b0
Deleted audio test files
mikeyavorsky Jun 13, 2018
21866ad
Added remnant_#.mp3 files and updated config.js and Remnant.js to ref…
mikeyavorsky Jun 13, 2018
c83cbb9
Firebase messaging token generation added
Jun 13, 2018
a1ef102
AsyncStorage integrated WIP
Jun 13, 2018
4937076
Minor fixes to UploadPage
bdougsand Jun 19, 2018
a5826f1
Progress bar component
bdougsand Jun 19, 2018
8d6d57b
Upload progress: show MB instead of bytes and size the bar correctly
bdougsand Jun 19, 2018
44d9e04
WIP: Record the user's uploaded videos
bdougsand Jun 19, 2018
5487f1c
added touch and hold indicator icon, and pointHinter movement
sashamaryl Jun 20, 2018
127edcd
Added navigation to return to remnants chooser after audio has finish…
mikeyavorsky Jun 20, 2018
6a22969
Merged nav-return, audio, and tap-n-hold
mikeyavorsky Jun 20, 2018
4dde58a
Merge pull request #2 from mikeyavorsky/remnants_manual_layout
sashamaryl Jun 20, 2018
40ce083
working on presshint delay and stop
sashamaryl Jun 20, 2018
63f1467
pulling in mikes new changes .
sashamaryl Jun 20, 2018
72d04d3
Added code necessary to provide previous page information to help
stevemanone Jun 23, 2018
0974439
Added screen to contact creators
Jun 23, 2018
5315719
pass previous screen to help page via navigation params
bhinebaugh Jun 23, 2018
8c0b0a2
Merge branch 'remnants-tap-n-hold' of https://github.com/sashamaryl/c…
Jun 24, 2018
c570838
scroll help page to the section set in props from nav params
bhinebaugh Jun 24, 2018
119350e
Refactored to make the app work
Jun 24, 2018
af9ee14
add translations to help page and display according to langauge setting
bhinebaugh Jun 26, 2018
1b0277b
Merge branch 'help-page' into 'firebase'
bdougsand Jun 26, 2018
21b9421
Prevent button callbacks from being called multiple times
bdougsand Jun 26, 2018
5378191
Tweaked some contact form styles
bdougsand Jun 26, 2018
35af34e
Contact form: Display success or failure
bdougsand Jun 26, 2018
6338267
Really ugly 'request deletion' feature
bdougsand Jun 26, 2018
2afd8dd
Merge branch 'firebase' into byron/master
bdougsand Jun 26, 2018
5ad8905
Merge remote-tracking branch 'ranjani/SettingsPage' into GlobalNavBar
bdougsand Jun 26, 2018
38f21c8
Persistent settings with language Refactor
ranjani23 Jun 26, 2018
034c443
Merge remote-tracking branch 'ranjani/master' into GlobalNavBar
bdougsand Jun 26, 2018
2ed2212
Added few more names to credits
ranjani23 Jun 26, 2018
4bd68b1
Removed about page button
bdougsand Jun 27, 2018
8b81a16
Remmeber Lang pref on reload app
ranjani23 Jun 27, 2018
fb694a7
Merge remote-tracking branch 'ranjani/master' into GlobalNavBar
bdougsand Jun 27, 2018
b67bc74
Code cleanup
Jun 27, 2018
4994a4e
Merge remote-tracking branch 'origin/GlobalNavBar' into mergeIt
Jun 27, 2018
2d27446
Removed conflicts
Jun 27, 2018
901f5b8
Merge pull request #18 from bhavsar-dhara/mergeIt
ranjani23 Jul 11, 2018
9eea49a
added audio files for help and settings to project
sashamaryl Jul 12, 2018
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
Prev Previous commit
Next Next commit
Refactored to make the app work
dharabhavsar committed Jun 24, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 119350e3e51ea66315380b9e0faa3cac331c8bbc
6 changes: 6 additions & 0 deletions .buckconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[android]
target = Google Inc.:Google APIs:23

[maven_repositories]
central = https://repo1.maven.org/maven2
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pbxproj -text
225 changes: 38 additions & 187 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,174 +1,10 @@
# Created by https://www.gitignore.io/api/reactnative

### ReactNative ###
# React Native Stack Base
### ReactNative.Android Stack ###
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml
.idea

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Freeline
freeline.py
freeline/
freeline_project_description.json

### ReactNative.macOS Stack ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### ReactNative.Buck Stack ###
buck-out/
.buckconfig.local
.buckd/
.buckversion
.fakebuckversion

### ReactNative.Node Stack ###
# Logs
logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env


### ReactNative.Gradle Stack ###
.gradle
**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Cache of project
.gradletasknamecache

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
# OSX
#
.DS_Store

### ReactNative.Xcode Stack ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
DerivedData/

## Various settings
build/
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -177,29 +13,44 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
xcuserdata
*.xccheckout
*.xcscmblueprint

### ReactNative.Linux Stack ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
project.xcworkspace

# KDE directory preferences
.directory
# Android/IntelliJ
#
build/
.idea
.gradle
local.properties
*.iml

# Linux trash folder which might appear on any partition or disk
.Trash-*
# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# .nfs files are created when an open file is removed but is still being accessed
.nfs*
# BUCK
buck-out/
\.buckd/
*.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

# End of https://www.gitignore.io/api/reactnative
*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots

google-services.json
# Bundle artifact
*.jsbundle
2 changes: 1 addition & 1 deletion ObjectChooser.js
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ class ObjectChooser extends React.Component {
pressAnimation="spring"
style={styles.navIcon}
navigation={navigation}
// route="Upload" />
// route="Upload" /> // TODO
route="RemnantChooser" />
</View>
</View>
4 changes: 2 additions & 2 deletions android/app/BUCK
Original file line number Diff line number Diff line change
@@ -45,12 +45,12 @@ android_library(

android_build_config(
name = "build_config",
package = "org.aashiyaan",
package = "com.conversations",
)

android_resource(
name = "res",
package = "com.converations",
package = "com.conversations",
res = "src/main/res",
)

9 changes: 4 additions & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -138,13 +138,11 @@ android {
}

dependencies {
implementation project(':react-native-youtube')
implementation project(':react-native-image-picker')
compile project(':react-native-youtube')
compile project(':react-native-image-picker')
implementation(project(':react-native-firebase')) {
transitive = false
}
implementation project(':react-native-firebase')
implementation project(':react-native-youtube')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:23.0.1"
implementation 'com.android.support:multidex:1.0.3'
@@ -155,7 +153,8 @@ dependencies {
implementation "com.google.firebase:firebase-storage:15.0.2"
implementation "com.google.firebase:firebase-messaging:15.0.2"
implementation "com.google.firebase:firebase-firestore:16.0.0"
implementation project(':react-native-sound')
compile project(':react-native-sound')
compile project(":react-native-shared-preferences")
}

// Run this once to be able to run the application with BUCK
46 changes: 46 additions & 0 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"project_info": {
"project_number": "945753827871",
"firebase_url": "https://aashiyaan-9d167.firebaseio.com",
"project_id": "aashiyaan-9d167",
"storage_bucket": "aashiyaan-9d167.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:945753827871:android:6178f0c772cdb353",
"android_client_info": {
"package_name": "org.aashiyaan"
}
},
"oauth_client": [
{
"client_id": "945753827871-r42dq25k6mbi5o4mrpmvbihfdqab76gp.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "945753827871-r42dq25k6mbi5o4mrpmvbihfdqab76gp.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAzCWz2DsGG6_kMt7LR_V3Yyk4bOw00Qdk"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
4 changes: 3 additions & 1 deletion android/app/src/main/java/org/aashiyaan/MainApplication.java
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
import com.facebook.react.ReactApplication;
import com.inprogress.reactnativeyoutube.ReactNativeYouTube;
import com.imagepicker.ImagePickerPackage;
import in.sriraman.sharedpreferences.RNSharedPreferencesReactPackage;
import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.auth.RNFirebaseAuthPackage;
import io.invertase.firebase.storage.RNFirebaseStoragePackage;
@@ -39,7 +40,8 @@ protected List<ReactPackage> getPackages() {
new RNFirebaseStoragePackage(),
new RNFirebaseMessagingPackage(),
new RNFirebaseFirestorePackage(),
new RNSoundPackage()
new RNSoundPackage(),
new RNSharedPreferencesReactPackage()
);
}

2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -11,5 +11,7 @@ include ':react-native-youtube'
project(':react-native-youtube').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-youtube/android')
include ':react-native-sound'
project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
include ':react-native-shared-preferences'
project(':react-native-shared-preferences').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-shared-preferences/android')

include ':app'
Loading