Browse Source

Add back button listener to TabbedScreen

Guy Carmeli 8 years ago
parent
commit
04ad2ea00b

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

10
                                 ScreenParams screenParams,
10
                                 ScreenParams screenParams,
11
                                 TitleBarBackButtonListener titleBarBackButtonListener) {
11
                                 TitleBarBackButtonListener titleBarBackButtonListener) {
12
         if (screenParams.hasTopTabs()) {
12
         if (screenParams.hasTopTabs()) {
13
-            return new TabbedScreen(context, screenParams);
13
+            return new TabbedScreen(context, screenParams, titleBarBackButtonListener);
14
         } else {
14
         } else {
15
             return new SingleScreen(context, screenParams, titleBarBackButtonListener);
15
             return new SingleScreen(context, screenParams, titleBarBackButtonListener);
16
         }
16
         }

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/screens/TabbedScreen.java View File

8
 import android.view.View;
8
 import android.view.View;
9
 import android.view.ViewGroup;
9
 import android.view.ViewGroup;
10
 
10
 
11
-import com.reactnativenavigation.NavigationApplication;
12
 import com.reactnativenavigation.params.ScreenParams;
11
 import com.reactnativenavigation.params.ScreenParams;
13
 import com.reactnativenavigation.params.TopTabParams;
12
 import com.reactnativenavigation.params.TopTabParams;
14
 import com.reactnativenavigation.views.ContentView;
13
 import com.reactnativenavigation.views.ContentView;
14
+import com.reactnativenavigation.views.TitleBarBackButtonListener;
15
 
15
 
16
 import java.util.ArrayList;
16
 import java.util.ArrayList;
17
 import java.util.List;
17
 import java.util.List;
24
     private ViewPager viewPager;
24
     private ViewPager viewPager;
25
     private ContentViewPagerAdapter adapter;
25
     private ContentViewPagerAdapter adapter;
26
 
26
 
27
-    public TabbedScreen(Context context, ScreenParams screenParams) {
28
-        super(context, screenParams);
27
+    public TabbedScreen(Context context, ScreenParams screenParams, TitleBarBackButtonListener backButtonListener) {
28
+        super(context, screenParams, backButtonListener);
29
     }
29
     }
30
 
30
 
31
     @Override
31
     @Override