From 546a43bda04bd5f24d24ebefb86cf790f8a17e57 Mon Sep 17 00:00:00 2001
From: Maxime Goovaerts <mgoovaerts@fb.com>
Date: Fri, 4 Aug 2017 08:54:49 -0700
Subject: [PATCH] Expose offset parameters for ToastAndroid

Reviewed By: brosenfeld

Differential Revision: D5560628

fbshipit-source-id: b1457493e8429958fbd7bc9c490cffaa33b4a95a
---
 .../ToastAndroid/ToastAndroid.android.js      | 15 ++++++++++
 RNTester/js/ToastAndroidExample.android.js    | 28 +++++++++++++++++++
 .../react/modules/toast/ToastModule.java      | 22 +++++++++++++--
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index 36899ca30f..befc396f96 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule ToastAndroid
+ * @flow
  */
 
 'use strict';
@@ -23,10 +24,14 @@ var RCTToastAndroid = require('NativeModules').ToastAndroid;
  * There is also a function `showWithGravity` to specify the layout gravity. May be
  * ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER.
  *
+ * The 'showWithGravityWithOffset' function adds on the ability to specify offset
+ * These offset values will translate to pixels.
+ *
  * Basic usage:
  * ```javascript
  * ToastAndroid.show('A pikachu appeared nearby !', ToastAndroid.SHORT);
  * ToastAndroid.showWithGravity('All Your Base Are Belong To Us', ToastAndroid.SHORT, ToastAndroid.CENTER);
+ * ToastAndroid.showWithGravityAndOffset('A wild toast appeared!', ToastAndroid.LONG, ToastAndroid.BOTTOM, 25, 50);
  * ```
  */
 
@@ -55,6 +60,16 @@ var ToastAndroid = {
   ): void {
     RCTToastAndroid.showWithGravity(message, duration, gravity);
   },
+
+  showWithGravityAndOffset: function (
+    message: string,
+    duration: number,
+    gravity: number,
+    xOffset: number,
+    yOffset: number,
+  ): void {
+    RCTToastAndroid.showWithGravityAndOffset(message, duration, gravity, xOffset, yOffset);
+  },
 };
 
 module.exports = ToastAndroid;
diff --git a/RNTester/js/ToastAndroidExample.android.js b/RNTester/js/ToastAndroidExample.android.js
index 34dc88e99d..120d6d1a53 100644
--- a/RNTester/js/ToastAndroidExample.android.js
+++ b/RNTester/js/ToastAndroidExample.android.js
@@ -82,6 +82,34 @@ class ToastExample extends React.Component {
             <Text style={styles.text}>Click me.</Text>
           </TouchableWithoutFeedback>
         </RNTesterBlock>
+        <RNTesterBlock title="Toast with x offset">
+          <TouchableWithoutFeedback
+            onPress={() =>
+              ToastAndroid.showWithGravityAndOffset(
+                'This is a toast with x offset',
+                ToastAndroid.SHORT,
+                ToastAndroid.CENTER,
+                50,
+                0,
+              )
+            }>
+            <Text style={styles.text}>Click me.</Text>
+          </TouchableWithoutFeedback>
+        </RNTesterBlock>
+        <RNTesterBlock title="Toast with y offset">
+          <TouchableWithoutFeedback
+            onPress={() =>
+              ToastAndroid.showWithGravityAndOffset(
+                'This is a toast with y offset',
+                ToastAndroid.SHORT,
+                ToastAndroid.BOTTOM,
+                0,
+                50,
+              )
+            }>
+            <Text style={styles.text}>Click me.</Text>
+          </TouchableWithoutFeedback>
+        </RNTesterBlock>
       </RNTesterPage>
     );
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
index 1ffc334b75..6902df223e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
@@ -11,15 +11,13 @@ package com.facebook.react.modules.toast;
 
 import android.view.Gravity;
 import android.widget.Toast;
-
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.common.MapBuilder;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
-
 import java.util.Map;
 
 /**
@@ -76,4 +74,22 @@ public class ToastModule extends ReactContextBaseJavaModule {
       }
     });
   }
+
+  @ReactMethod
+  public void showWithGravityAndOffset(
+      final String message,
+      final int duration,
+      final int gravity,
+      final int xOffset,
+      final int yOffset) {
+    UiThreadUtil.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            Toast toast = Toast.makeText(getReactApplicationContext(), message, duration);
+            toast.setGravity(gravity, xOffset, yOffset);
+            toast.show();
+          }
+        });
+  }
 }