Browse Source

rightButtons --> titleBarButtons

Daniel Zlotin 8 years ago
parent
commit
082bf51a90

+ 6
- 0
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java View File

@@ -99,9 +99,15 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
99 99
 
100 100
     @Override
101 101
     public boolean onKeyUp(int keyCode, KeyEvent event) {
102
+
102 103
         return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
103 104
     }
104 105
 
106
+    @Override
107
+    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
108
+        return super.onKeyMultiple(keyCode, repeatCount, event);
109
+    }
110
+
105 111
     private NavigationReactInstance getNavigationReactInstance() {
106 112
         return NavigationApplication.instance.getNavigationReactInstance();
107 113
     }

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/react/JsDevReloadHandler.java View File

@@ -13,6 +13,7 @@ public class JsDevReloadHandler {
13 13
 
14 14
     //TODO yuck.
15 15
     public static boolean onKeyUp(View currentFocus, int keyCode) {
16
+
16 17
         ReactInstanceManager reactInstanceManager = NavigationApplication
17 18
                 .instance
18 19
                 .getNavigationReactInstance()

+ 2
- 0
src/deprecated/platformSpecificDeprecated.android.js View File

@@ -164,6 +164,8 @@ function addNavigatorButtons(screen) {
164 164
   // Get image uri from image id
165 165
   const rightButtons = screen.rightButtons ? screen.rightButtons : screen.navigatorButtons ?
166 166
                                                                    screen.navigatorButtons.rightButtons : null;
167
+  screen.titleBarButtons = rightButtons;
168
+  
167 169
   if (rightButtons) {
168 170
     rightButtons.forEach(function(button) {
169 171
       if (button.icon) {