From ba66d1e63dc1e0848eaabc44cf0b312cea6c775b Mon Sep 17 00:00:00 2001 From: jreziga Date: Tue, 13 Sep 2016 19:38:20 +0200 Subject: [PATCH 1/5] Compatibility react 0.29.0 --- .../AndroidKeyboardAdjustPackage.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustPackage.java b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustPackage.java index b6a7445..4a822bf 100644 --- a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustPackage.java +++ b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustPackage.java @@ -14,15 +14,13 @@ public class AndroidKeyboardAdjustPackage implements ReactPackage { - private Activity mActivity = null; - - public AndroidKeyboardAdjustPackage(Activity activity) { - mActivity = activity; + public AndroidKeyboardAdjustPackage() { + } @Override public List createNativeModules(ReactApplicationContext reactApplicationContext) { - return Collections.singletonList(new AndroidKeyboardAdjustModule(reactApplicationContext, mActivity)); + return Collections.singletonList(new AndroidKeyboardAdjustModule(reactApplicationContext)); } @Override From d6ebfc5b1906b5f8905c1ac58031ce194a10f5de Mon Sep 17 00:00:00 2001 From: jreziga Date: Tue, 13 Sep 2016 19:38:33 +0200 Subject: [PATCH 2/5] Compatibility react 0.29.0 --- .../AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java index 13e85e8..57d804f 100644 --- a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java +++ b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java @@ -14,9 +14,9 @@ public class AndroidKeyboardAdjustModule extends ReactContextBaseJavaModule { private Activity activity; - public AndroidKeyboardAdjustModule(ReactApplicationContext reactApplicationContext, Activity activity) { + public AndroidKeyboardAdjustModule(ReactApplicationContext reactApplicationContext) { super(reactApplicationContext); - this.activity = activity; + this.activity = getCurrentActivity(); } @Override From 2e3e2d0f1a994cfb7715067fe00b51e07c6b8ecb Mon Sep 17 00:00:00 2001 From: jreziga Date: Tue, 13 Sep 2016 19:38:55 +0200 Subject: [PATCH 3/5] Compatibility react 0.29.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c2190b..b52d286 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Add the package to the `getPackages` method protected List getPackages() { return Arrays.asList( ... - new AndroidKeyboardAdjustPackage(this) + new AndroidKeyboardAdjustPackage() ); } ``` From 960aac65ea4fd699928f81eb68a54411d6aa4bc1 Mon Sep 17 00:00:00 2001 From: jreziga Date: Tue, 13 Sep 2016 19:47:06 +0200 Subject: [PATCH 4/5] Fix NativeModules import --- index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 1f66d4e..9603ce1 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,3 @@ -var AndroidKeyboardAdjust = require('NativeModules').AndroidKeyboardAdjust; -module.exports = AndroidKeyboardAdjust; \ No newline at end of file +import { NativeModules } from 'react-native'; +var AndroidKeyboardAdjust = NativeModules.AndroidKeyboardAdjust; +module.exports = AndroidKeyboardAdjust; From d2c5d57a90c307eff82f54bbb04c606f2c233589 Mon Sep 17 00:00:00 2001 From: jreziga Date: Tue, 13 Sep 2016 19:53:01 +0200 Subject: [PATCH 5/5] Compatibility react 0.29.0 --- .../AndroidKeyboardAdjustModule.java | 94 ++++++++++++++----- 1 file changed, 73 insertions(+), 21 deletions(-) diff --git a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java index 57d804f..0ffcd3b 100644 --- a/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java +++ b/android/src/main/java/net/zubricky/AndroidKeyboardAdjust/AndroidKeyboardAdjustModule.java @@ -12,11 +12,8 @@ */ public class AndroidKeyboardAdjustModule extends ReactContextBaseJavaModule { - private Activity activity; - public AndroidKeyboardAdjustModule(ReactApplicationContext reactApplicationContext) { super(reactApplicationContext); - this.activity = getCurrentActivity(); } @Override @@ -26,90 +23,145 @@ public String getName() { @ReactMethod public void setAdjustNothing() { - this.activity.runOnUiThread(new Runnable() { + + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING); } }); } @ReactMethod public void setAdjustPan() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); } }); } @ReactMethod public void setAdjustResize() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } }); } @ReactMethod public void setAdjustUnspecified() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED); } }); } @ReactMethod public void setAlwaysHidden() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); } }); } @ReactMethod public void setAlwaysVisible() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); } }); } @ReactMethod public void setVisible() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); } }); } @ReactMethod public void setHidden() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); } }); } @ReactMethod public void setUnchanged() { - this.activity.runOnUiThread(new Runnable() { + final Activity activity = getCurrentActivity(); + + if (activity == null) { + return; + } + + activity.runOnUiThread(new Runnable() { @Override public void run() { - AndroidKeyboardAdjustModule.this.activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED); + activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED); } }); }