Ver código fonte

Minor fixes to Snackbar

Guy Carmeli 8 anos atrás
pai
commit
9cb46fa547

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java Ver arquivo

157
     }
157
     }
158
 
158
 
159
     @ReactMethod
159
     @ReactMethod
160
-    public void showSnackbar(final String navigatorId, final ReadableMap params) {
160
+    public void showSnackbar(final ReadableMap params) {
161
         SnackbarParams snackbarParams = new SnackbarParamsParser().parse(BundleConverter.toBundle(params));
161
         SnackbarParams snackbarParams = new SnackbarParamsParser().parse(BundleConverter.toBundle(params));
162
         NavigationCommandsHandler.showSnackbar(snackbarParams);
162
         NavigationCommandsHandler.showSnackbar(snackbarParams);
163
     }
163
     }

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/views/Snakbar.java Ver arquivo

7
 import com.reactnativenavigation.params.SnackbarParams;
7
 import com.reactnativenavigation.params.SnackbarParams;
8
 
8
 
9
 public class Snakbar {
9
 public class Snakbar {
10
-    private final SnackbarContainer parent;
10
+    private final OnDismissListener parent;
11
     private final String navigatorEventId;
11
     private final String navigatorEventId;
12
     private final SnackbarParams params;
12
     private final SnackbarParams params;
13
     private Snackbar snackbar;
13
     private Snackbar snackbar;
16
         void onDismiss();
16
         void onDismiss();
17
     }
17
     }
18
 
18
 
19
-    public Snakbar(SnackbarContainer parent, String navigatorEventId, SnackbarParams params) {
19
+    public Snakbar(OnDismissListener parent, String navigatorEventId, SnackbarParams params) {
20
         this.parent = parent;
20
         this.parent = parent;
21
         this.navigatorEventId = navigatorEventId;
21
         this.navigatorEventId = navigatorEventId;
22
         this.params = params;
22
         this.params = params;
24
     }
24
     }
25
 
25
 
26
     private void create() {
26
     private void create() {
27
-        snackbar = Snackbar.make(parent, params.text, params.duration);
27
+        snackbar = Snackbar.make((View) parent, params.text, params.duration);
28
         setAction(navigatorEventId, params, snackbar);
28
         setAction(navigatorEventId, params, snackbar);
29
         setStyle(snackbar, params);
29
         setStyle(snackbar, params);
30
         setOnDismissListener();
30
         setOnDismissListener();

+ 1
- 1
src/deprecated/platformSpecificDeprecated.android.js Ver arquivo

419
 }
419
 }
420
 
420
 
421
 function showSnackbar(navigator, params) {
421
 function showSnackbar(navigator, params) {
422
-  return newPlatformSpecific.showSnackbar(navigator.navigatorEventID, params);
422
+  return newPlatformSpecific.showSnackbar(params);
423
 }
423
 }
424
 
424
 
425
 export default {
425
 export default {

+ 2
- 2
src/platformSpecific.android.js Ver arquivo

108
   NativeReactModule.setBottomTabBadgeByNavigatorId(navigatorId, badge);
108
   NativeReactModule.setBottomTabBadgeByNavigatorId(navigatorId, badge);
109
 }
109
 }
110
 
110
 
111
-function showSnackbar(navigatorEventId, params) {
112
-  NativeReactModule.showSnackbar(navigatorEventId, params);
111
+function showSnackbar(params) {
112
+  NativeReactModule.showSnackbar(params);
113
 }
113
 }
114
 
114
 
115
 module.exports = {
115
 module.exports = {