Browse Source

Set different ids for collapsed and expended fabs

Guy Carmeli 8 years ago
parent
commit
78b877f91e

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/params/FabParams.java View File

8
     public Drawable collapsedIcon;
8
     public Drawable collapsedIcon;
9
     public Drawable expendedIcon;
9
     public Drawable expendedIcon;
10
     public StyleParams.Color backgroundColor;
10
     public StyleParams.Color backgroundColor;
11
-    public String id;
11
+    public String collapsedId;
12
+    public String expendedId;
12
     public String navigatorEventId;
13
     public String navigatorEventId;
13
     public List<FabActionParams> actions;
14
     public List<FabActionParams> actions;
14
 
15
 

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/params/parsers/FabParamsParser.java View File

10
 public class FabParamsParser extends Parser {
10
 public class FabParamsParser extends Parser {
11
     public FabParams parse(Bundle params, final String navigatorEventId) {
11
     public FabParams parse(Bundle params, final String navigatorEventId) {
12
         FabParams fabParams = new FabParams();
12
         FabParams fabParams = new FabParams();
13
-        fabParams.id = params.getString("id");
13
+        fabParams.collapsedId = params.getString("collapsedId");
14
+        fabParams.expendedId = params.getString("expendedId");
14
         fabParams.navigatorEventId = navigatorEventId;
15
         fabParams.navigatorEventId = navigatorEventId;
15
         fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
16
         fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
16
 
17
 

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

92
                     fabAnimator.hideCollapsed();
92
                     fabAnimator.hideCollapsed();
93
                     fabAnimator.showExpended();
93
                     fabAnimator.showExpended();
94
                     showActions();
94
                     showActions();
95
-                } else {
96
-                    NavigationApplication.instance.sendNavigatorEvent(params.id, params.navigatorEventId);
97
                 }
95
                 }
96
+                NavigationApplication.instance.sendNavigatorEvent(params.collapsedId, params.navigatorEventId);
98
             }
97
             }
99
         });
98
         });
100
     }
99
     }
108
             @Override
107
             @Override
109
             public void onClick(View v) {
108
             public void onClick(View v) {
110
                 fabAnimator.collapse();
109
                 fabAnimator.collapse();
110
+                NavigationApplication.instance.sendNavigatorEvent(params.expendedId, params.navigatorEventId);
111
             }
111
             }
112
         });
112
         });
113
     }
113
     }