Selaa lähdekoodia

moved screens to screens

Daniel Zlotin 8 vuotta sitten
vanhempi
commit
41c17ec8e0

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java Näytä tiedosto

@@ -6,6 +6,7 @@ import android.widget.FrameLayout;
6 6
 
7 7
 import com.reactnativenavigation.params.ScreenParams;
8 8
 import com.reactnativenavigation.params.TitleBarButtonParams;
9
+import com.reactnativenavigation.screens.ScreenStack;
9 10
 
10 11
 import java.util.List;
11 12
 

android/app/src/main/java/com/reactnativenavigation/layouts/Screen.java → android/app/src/main/java/com/reactnativenavigation/screens/Screen.java Näytä tiedosto

@@ -1,4 +1,4 @@
1
-package com.reactnativenavigation.layouts;
1
+package com.reactnativenavigation.screens;
2 2
 
3 3
 import android.annotation.TargetApi;
4 4
 import android.app.Activity;

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenFactory.java → android/app/src/main/java/com/reactnativenavigation/screens/ScreenFactory.java Näytä tiedosto

@@ -1,4 +1,4 @@
1
-package com.reactnativenavigation.layouts;
1
+package com.reactnativenavigation.screens;
2 2
 
3 3
 import android.content.Context;
4 4
 

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStack.java → android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java Näytä tiedosto

@@ -1,4 +1,4 @@
1
-package com.reactnativenavigation.layouts;
1
+package com.reactnativenavigation.screens;
2 2
 
3 3
 import android.animation.LayoutTransition;
4 4
 import android.content.Context;

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreen.java → android/app/src/main/java/com/reactnativenavigation/screens/SingleScreen.java Näytä tiedosto

@@ -1,8 +1,7 @@
1
-package com.reactnativenavigation.layouts;
1
+package com.reactnativenavigation.screens;
2 2
 
3 3
 import android.content.Context;
4 4
 import android.support.annotation.NonNull;
5
-import android.widget.RelativeLayout;
6 5
 
7 6
 import com.reactnativenavigation.params.ScreenParams;
8 7
 import com.reactnativenavigation.views.ContentView;
@@ -28,7 +27,7 @@ public class SingleScreen extends Screen {
28 27
     private LayoutParams addBelowTopBar() {
29 28
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
30 29
         if (!screenParams.styleParams.drawUnderTopBar) {
31
-            params.addRule(RelativeLayout.BELOW, topBar.getId());
30
+            params.addRule(BELOW, topBar.getId());
32 31
         }
33 32
         return params;
34 33
     }

android/app/src/main/java/com/reactnativenavigation/layouts/TabbedScreen.java → android/app/src/main/java/com/reactnativenavigation/screens/TabbedScreen.java Näytä tiedosto

@@ -1,4 +1,4 @@
1
-package com.reactnativenavigation.layouts;
1
+package com.reactnativenavigation.screens;
2 2
 
3 3
 import android.content.Context;
4 4
 import android.support.annotation.NonNull;
@@ -7,7 +7,6 @@ import android.support.v4.view.PagerAdapter;
7 7
 import android.support.v4.view.ViewPager;
8 8
 import android.view.View;
9 9
 import android.view.ViewGroup;
10
-import android.widget.RelativeLayout;
11 10
 
12 11
 import com.reactnativenavigation.params.ScreenParams;
13 12
 import com.reactnativenavigation.params.TopTabParams;
@@ -51,7 +50,7 @@ public class TabbedScreen extends Screen {
51 50
     private LayoutParams addBelowTopBar() {
52 51
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
53 52
         if (!screenParams.styleParams.drawUnderTopBar) {
54
-            params.addRule(RelativeLayout.BELOW, topBar.getId());
53
+            params.addRule(BELOW, topBar.getId());
55 54
         }
56 55
         return params;
57 56
     }