Browse Source

fixing nvm

Daniel Zlotin 7 years ago
parent
commit
db958390b3

+ 2
- 0
.travis.yml View File

25
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
25
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
26
 
26
 
27
 install:
27
 install:
28
+  - touch $HOME/.bash_profile
29
+  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
28
   - nvm install $NODE_VERSION
30
   - nvm install $NODE_VERSION
29
   - nvm use $NODE_VERSION
31
   - nvm use $NODE_VERSION
30
   - nvm ls
32
   - nvm ls

+ 1
- 0
AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java View File

42
     @Test
42
     @Test
43
     public void _1_showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
43
     public void _1_showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
44
         launchTheApp();
44
         launchTheApp();
45
+
45
         assertMainShown();
46
         assertMainShown();
46
     }
47
     }
47
 
48
 

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java View File

33
         onBackPressed();
33
         onBackPressed();
34
     }
34
     }
35
 
35
 
36
-    public long splashViewMinimumDuration() {
36
+    public long splashMinimumDuration() {
37
         return 1000;
37
         return 1000;
38
     }
38
     }
39
 }
39
 }

+ 2
- 2
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivityLifecycleHandler.java View File

76
             createReactContext(new OnContextCreated() {
76
             createReactContext(new OnContextCreated() {
77
                 @Override
77
                 @Override
78
                 public void onContextCreated(long timeElapsed) {
78
                 public void onContextCreated(long timeElapsed) {
79
-                    emitAppLaunchedAfterDelay(activity.splashViewMinimumDuration() - timeElapsed);
79
+                    emitAppLaunchedAfterDelay(activity.splashMinimumDuration() - timeElapsed);
80
                 }
80
                 }
81
             });
81
             });
82
         } else if (waitingForAppLaunchedEvent(activity)) {
82
         } else if (waitingForAppLaunchedEvent(activity)) {
83
-            emitAppLaunchedAfterDelay(activity.splashViewMinimumDuration());
83
+            emitAppLaunchedAfterDelay(activity.splashMinimumDuration());
84
         }
84
         }
85
     }
85
     }
86
 
86