Daniel Zlotin 8 years ago
parent
commit
7bb6c811d4

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

@@ -4,6 +4,7 @@ import android.app.Activity;
4 4
 import android.content.Intent;
5 5
 import android.os.Bundle;
6 6
 import android.support.v7.app.AppCompatActivity;
7
+import android.util.Log;
7 8
 import android.view.KeyEvent;
8 9
 
9 10
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -99,15 +100,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
99 100
 
100 101
     @Override
101 102
     public boolean onKeyUp(int keyCode, KeyEvent event) {
102
-
103 103
         return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
104 104
     }
105 105
 
106
-    @Override
107
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
108
-        return super.onKeyMultiple(keyCode, repeatCount, event);
109
-    }
110
-
111 106
     private NavigationReactInstance getNavigationReactInstance() {
112 107
         return NavigationApplication.instance.getNavigationReactInstance();
113 108
     }

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

@@ -164,8 +164,7 @@ 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 168
   if (rightButtons) {
170 169
     rightButtons.forEach(function(button) {
171 170
       if (button.icon) {
@@ -176,6 +175,8 @@ function addNavigatorButtons(screen) {
176 175
       }
177 176
     });
178 177
   }
178
+
179
+  screen.titleBarButtons = rightButtons;
179 180
 }
180 181
 
181 182
 function addNavigationStyleParams(screen) {