Daniel Zlotin vor 8 Jahren
Ursprung
Commit
70ecfeffd1

+ 5
- 3
android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java Datei anzeigen

@@ -16,10 +16,12 @@ import java.util.List;
16 16
  * BottomTabs (app) - boolean
17 17
  * TopBar (per screen)
18 18
  * - TitleBar
19
- * - TopTabs (segmented control / view pager)
19
+ * - - RightButtons
20
+ * - - LeftButton
21
+ * - TopTabs (segmented control / view pager tabs)
20 22
  * DeviceStatusBar (app) (colors are per screen)
21 23
  * AndroidNavigationBar (app) (colors are per screen)
22
- * SideMenu (app) - boolean
24
+ * SideMenu (app) - boolean, (menu icon is screen-based)
23 25
  */
24 26
 public class NavigationReactModule extends ReactContextBaseJavaModule {
25 27
     public static final String NAME = "NavigationReactModule";
@@ -107,7 +109,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
107 109
 
108 110
     @ReactMethod
109 111
     public void dismissAllModals() {
110
-        NavigationCommandsHandler.dismissAlModals();
112
+        NavigationCommandsHandler.dismissAllModals();
111 113
     }
112 114
 
113 115
     @ReactMethod

+ 0
- 2
android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java Datei anzeigen

@@ -3,7 +3,6 @@ package com.reactnativenavigation.controllers;
3 3
 import android.app.Activity;
4 4
 import android.app.Dialog;
5 5
 import android.content.DialogInterface;
6
-import android.util.Log;
7 6
 import android.view.Window;
8 7
 
9 8
 import com.reactnativenavigation.R;
@@ -71,7 +70,6 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
71 70
 
72 71
     @Override
73 72
     public void onBackPressed() {
74
-        Log.d("LOG", "Modal.onBackPressed ");
75 73
         if (!layout.onBackPressed()) {
76 74
             super.onBackPressed();
77 75
         }

+ 0
- 6
android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java Datei anzeigen

@@ -1,7 +1,6 @@
1 1
 package com.reactnativenavigation.controllers;
2 2
 
3 3
 import android.app.Activity;
4
-import android.util.Log;
5 4
 
6 5
 import com.reactnativenavigation.layouts.ScreenStackContainer;
7 6
 import com.reactnativenavigation.params.ScreenParams;
@@ -34,11 +33,6 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
34 33
         }
35 34
     }
36 35
 
37
-    public boolean onBackPressed() {
38
-        Log.d("LOG", "ModalController.onBackPressed ");
39
-        return false;
40
-    }
41
-
42 36
     public boolean isShowing() {
43 37
         return !stack.empty();
44 38
     }

+ 2
- 6
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java Datei anzeigen

@@ -90,13 +90,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
90 90
 
91 91
     @Override
92 92
     public void onBackPressed() {
93
-        if (modalController.onBackPressed()) {
94
-            return;
93
+        if (!layout.onBackPressed()) {
94
+            getNavigationReactInstance().onBackPressed();
95 95
         }
96
-        if (layout.onBackPressed()) {
97
-            return;
98
-        }
99
-        getNavigationReactInstance().onBackPressed();
100 96
     }
101 97
 
102 98
     @Override

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java Datei anzeigen

@@ -165,7 +165,7 @@ public class NavigationCommandsHandler {
165 165
         });
166 166
     }
167 167
 
168
-    public static void dismissAlModals() {
168
+    public static void dismissAllModals() {
169 169
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
170 170
         if (currentActivity == null) {
171 171
             return;

+ 13
- 0
android/app/src/main/java/com/reactnativenavigation/screens/Screen.java Datei anzeigen

@@ -5,6 +5,7 @@ import android.app.Activity;
5 5
 import android.content.Context;
6 6
 import android.graphics.Color;
7 7
 import android.os.Build;
8
+import android.util.Log;
8 9
 import android.view.Window;
9 10
 import android.widget.RelativeLayout;
10 11
 
@@ -106,6 +107,18 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
106 107
         }
107 108
     }
108 109
 
110
+    @Override
111
+    protected void onAttachedToWindow() {
112
+        super.onAttachedToWindow();
113
+        Log.d("LOG", "Screen.onAttachedToWindow " + this);
114
+    }
115
+
116
+    @Override
117
+    protected void onDetachedFromWindow() {
118
+        super.onDetachedFromWindow();
119
+        Log.d("LOG", "Screen.onDetachedFromWindow " + this);
120
+    }
121
+
109 122
     @Override
110 123
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
111 124
         topBarVisibilityAnimator.onScrollChanged(direction);