Browse Source

Rebase fixes

Guy Carmeli 8 years ago
parent
commit
3a2e2d7dc8

+ 2
- 4
android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java View File

1
 package com.reactnativenavigation.layouts;
1
 package com.reactnativenavigation.layouts;
2
 
2
 
3
-import android.graphics.Color;
4
 import android.support.v7.app.AppCompatActivity;
3
 import android.support.v7.app.AppCompatActivity;
5
 import android.view.View;
4
 import android.view.View;
6
 import android.widget.RelativeLayout;
5
 import android.widget.RelativeLayout;
13
 import com.reactnativenavigation.screens.ScreenStack;
12
 import com.reactnativenavigation.screens.ScreenStack;
14
 import com.reactnativenavigation.views.BottomTabs;
13
 import com.reactnativenavigation.views.BottomTabs;
15
 
14
 
16
-import java.util.ArrayList;
17
 import java.util.List;
15
 import java.util.List;
18
 
16
 
19
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
17
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
129
         currentScreenStack.destroy();
127
         currentScreenStack.destroy();
130
         removeView(currentScreenStack);
128
         removeView(currentScreenStack);
131
 
129
 
132
-        ScreenStack newStack = new ScreenStack(getContext(), params);
130
+        ScreenStack newStack = new ScreenStack(activity, params);
133
         screenStacks[currentStackIndex] = newStack;
131
         screenStacks[currentStackIndex] = newStack;
134
         addView(newStack, 0, new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
132
         addView(newStack, 0, new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
135
     }
133
     }
158
     }
156
     }
159
 
157
 
160
     private void createAndAddScreenStack(int position) {
158
     private void createAndAddScreenStack(int position) {
161
-        ScreenStack newStack = new ScreenStack(getContext(), params.tabParams.get(position));
159
+        ScreenStack newStack = new ScreenStack(activity, params.tabParams.get(position));
162
         screenStacks[position] = newStack;
160
         screenStacks[position] = newStack;
163
         addView(newStack, 0, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
161
         addView(newStack, 0, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
164
     }
162
     }

+ 5
- 0
android/app/src/main/java/com/reactnativenavigation/screens/FragmentScreen.java View File

102
     public void preventUnmountOnDetachedFromWindow() {
102
     public void preventUnmountOnDetachedFromWindow() {
103
         // nothing
103
         // nothing
104
     }
104
     }
105
+
106
+    @Override
107
+    public void preventMountAfterReattachedToWindow() {
108
+        // nothing
109
+    }
105
 }
110
 }