Browse Source

Terminate ActionMenuView creation \m/

Guy Carmeli 8 years ago
parent
commit
1786f1637d

+ 3
- 21
android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java View File

@@ -1,13 +1,10 @@
1 1
 package com.reactnativenavigation.views;
2 2
 
3
-import android.app.Activity;
4 3
 import android.content.Context;
5
-import android.support.v7.widget.ActionMenuView;
4
+import android.graphics.Color;
6 5
 import android.support.v7.widget.Toolbar;
7 6
 import android.view.Menu;
8
-import android.view.MenuInflater;
9 7
 
10
-import com.reactnativenavigation.R;
11 8
 import com.reactnativenavigation.animation.HideOnScrollAnimator;
12 9
 import com.reactnativenavigation.params.TitleBarButtonParams;
13 10
 
@@ -15,40 +12,25 @@ import java.util.List;
15 12
 
16 13
 public class TitleBar extends Toolbar {
17 14
 
18
-    private Menu menu;
19
-    private ActionMenuView actionMenuView;
20 15
     private boolean hideOnScroll = false;
21 16
     private HideOnScrollAnimator hideOnScrollAnimator;
22 17
 
23 18
     public TitleBar(Context context) {
24 19
         super(context);
25
-        createMenu();
26 20
     }
27 21
 
28 22
     public void setButtons(List<TitleBarButtonParams> buttons) {
23
+        Menu menu = getMenu();
29 24
         menu.clear();
30 25
 
31 26
         for (int i = 0; i < buttons.size(); i++) {
32
-            final TitleBarButton button = new TitleBarButton(menu, actionMenuView, buttons.get(i));
27
+            final TitleBarButton button = new TitleBarButton(menu, this, buttons.get(i));
33 28
             // Add button in reverse order because in iOS index 0 starts at right
34 29
             final int index = buttons.size() - i - 1;
35 30
             button.addToMenu(index);
36 31
         }
37 32
     }
38 33
 
39
-    public void setupMenuButton() {
40
-
41
-    }
42
-
43
-    private void createMenu() {
44
-        MenuInflater menuInflater = ((Activity) getContext()).getMenuInflater();
45
-        actionMenuView = new ActionMenuView(getContext());
46
-        menu = actionMenuView.getMenu();
47
-        menuInflater.inflate(R.menu.stub, menu);
48
-        addView(actionMenuView);
49
-        // TODO: Maybe setSupportActionBar
50
-    }
51
-
52 34
     public void setHideOnScroll(boolean hideOnScroll) {
53 35
         this.hideOnScroll = hideOnScroll;
54 36
     }

+ 2
- 3
android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java View File

@@ -1,7 +1,6 @@
1 1
 package com.reactnativenavigation.views;
2 2
 
3 3
 import android.support.annotation.NonNull;
4
-import android.support.v7.widget.ActionMenuView;
5 4
 import android.view.Menu;
6 5
 import android.view.MenuItem;
7 6
 import android.view.View;
@@ -16,10 +15,10 @@ import java.util.ArrayList;
16 15
 public class TitleBarButton {
17 16
 
18 17
     private final Menu menu;
19
-    private final ActionMenuView parent;
18
+    private final View parent;
20 19
     private TitleBarButtonParams buttonParams;
21 20
 
22
-    public TitleBarButton(Menu menu, ActionMenuView parent, TitleBarButtonParams buttonParams) {
21
+    public TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams) {
23 22
         this.menu = menu;
24 23
         this.parent = parent;
25 24
         this.buttonParams = buttonParams;