浏览代码

rightButtons --> titleBarButtons

Daniel Zlotin 8 年前
父节点
当前提交
082bf51a90

+ 6
- 0
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java 查看文件

99
 
99
 
100
     @Override
100
     @Override
101
     public boolean onKeyUp(int keyCode, KeyEvent event) {
101
     public boolean onKeyUp(int keyCode, KeyEvent event) {
102
+
102
         return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
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
     private NavigationReactInstance getNavigationReactInstance() {
111
     private NavigationReactInstance getNavigationReactInstance() {
106
         return NavigationApplication.instance.getNavigationReactInstance();
112
         return NavigationApplication.instance.getNavigationReactInstance();
107
     }
113
     }

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/react/JsDevReloadHandler.java 查看文件

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

+ 2
- 0
src/deprecated/platformSpecificDeprecated.android.js 查看文件

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