Skip to content

Commit

Permalink
Merge pull request #977 from jolocom/feature/#966_loading_screen_sett…
Browse files Browse the repository at this point in the history
…ing_up_account

Loading screen with the logic of setting up an identity account
  • Loading branch information
Exulansis authored May 1, 2018
2 parents 6011be2 + 98fdea0 commit ea9cb8f
Show file tree
Hide file tree
Showing 62 changed files with 8,214 additions and 3,932 deletions.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@ node_modules/
build/
.tern-project
.expo/
android/.gradle
*.xcodeproj/


yarn.lock
coverage/

# React Native Android
android/.gradle
android/.build
android/.gradle

# React Native IOS
ios/main.jsbundle
ios/main.jsbundle.map

# Haul
haul-debug.log

# Editors
.vscode/
yarn-error.log

*.xcodeproj/
10 changes: 2 additions & 8 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,8 @@ android {
}

dependencies {

compile project(':react-native-svg')
compile project(':react-native-vector-icons')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules
compile project(':react-native-keychain')
compile project(':react-native-sqlite-storage')
implementation project(':react-native-fetch-blob')
implementation project(':react-native-sqlite-storage')
implementation project(':react-native-svg')
implementation project(':react-native-vector-icons')
implementation fileTree(dir: "libs", include: ["*.jar"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import com.oblador.keychain.KeychainPackage;
import com.RNFetchBlob.RNFetchBlobPackage;
import org.reactnative.camera.RNCameraPackage;
import com.horcrux.svg.SvgPackage;
import com.oblador.keychain.KeychainPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
Expand All @@ -28,6 +29,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNFetchBlobPackage(),
new RNCameraPackage(),
new SvgPackage(),
new KeychainPackage(),
Expand Down
12 changes: 12 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
rootProject.name = 'smartwallet'
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':react-native-keychain'
project(':react-native-keychain').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keychain/android')
include ':react-native-fetch-blob'
project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
include ':react-native-camera'
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
include ':react-native-fetch-blob'
project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
include ':react-native-camera'
project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
include ':react-native-svg'
Expand Down
2 changes: 0 additions & 2 deletions ios/main.jsbundle

This file was deleted.

1 change: 0 additions & 1 deletion ios/main.jsbundle.map

This file was deleted.

Loading

0 comments on commit ea9cb8f

Please sign in to comment.