Browse Source

fixing nvm

Daniel Zlotin 7 years ago
parent
commit
db958390b3

+ 2
- 0
.travis.yml View File

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

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

@@ -42,6 +42,7 @@ public class ApplicationLifecycleTest {
42 42
     @Test
43 43
     public void _1_showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
44 44
         launchTheApp();
45
+
45 46
         assertMainShown();
46 47
     }
47 48
 

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

@@ -33,7 +33,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
33 33
         onBackPressed();
34 34
     }
35 35
 
36
-    public long splashViewMinimumDuration() {
36
+    public long splashMinimumDuration() {
37 37
         return 1000;
38 38
     }
39 39
 }

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

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