From 9c3560c4ff9ceecbafd60c0f43d9b786293a3385 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 5 Aug 2019 00:15:17 +0700 Subject: [PATCH 1/9] test update --- KeyboardView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KeyboardView.js b/KeyboardView.js index d82d529..e472bdd 100644 --- a/KeyboardView.js +++ b/KeyboardView.js @@ -144,7 +144,7 @@ export default class extends Component { } else { return ( {childViews} From 8696f0d2dede29fa34a77380e159cb65277f5981 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 5 Aug 2019 00:19:14 +0700 Subject: [PATCH 2/9] test update --- KeyboardView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/KeyboardView.js b/KeyboardView.js index e472bdd..34f142c 100644 --- a/KeyboardView.js +++ b/KeyboardView.js @@ -23,6 +23,7 @@ const styles = StyleSheet.create({ }, androidInputAvoid: isAndroid ? { + marginBottom: 100, bottom: SCREEN_HEIGHT, transform: [{ translateY: SCREEN_HEIGHT }] } : {} From 85f0aa0b2cb050fc8d5a215bb750967a094b2aeb Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 5 Aug 2019 00:46:57 +0700 Subject: [PATCH 3/9] UPDATE --- KeyboardView.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/KeyboardView.js b/KeyboardView.js index 34f142c..1282e4e 100644 --- a/KeyboardView.js +++ b/KeyboardView.js @@ -23,7 +23,6 @@ const styles = StyleSheet.create({ }, androidInputAvoid: isAndroid ? { - marginBottom: 100, bottom: SCREEN_HEIGHT, transform: [{ translateY: SCREEN_HEIGHT }] } : {} @@ -39,12 +38,14 @@ export default class extends Component { onHide: PropTypes.func, hideWhenKeyboardIsDismissed: PropTypes.bool, contentVisible: PropTypes.bool, - keyboardPlaceholderHeight: PropTypes.number + keyboardPlaceholderHeight: PropTypes.number, + stickyViewStyle: PropTypes.object, }; static defaultProps = { hideWhenKeyboardIsDismissed: true, - contentVisible: true + contentVisible: true, + stickyViewStyle: {} }; static dismiss = isIOS ? @@ -97,8 +98,10 @@ export default class extends Component { {cover} {stickyView && ( - - {stickyView} + + + {stickyView} + )} @@ -145,7 +148,7 @@ export default class extends Component { } else { return ( {childViews} From c134eb29d26088c0417a0a0ac887c699d2dca98b Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 8 Aug 2019 14:23:57 +0700 Subject: [PATCH 4/9] update --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index bfe498b..72377c0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,12 +11,12 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "25.0.0" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } From 8e199715012f9c51291c7183841ec054b1881d0b Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 8 Aug 2019 14:25:27 +0700 Subject: [PATCH 5/9] RUN CHECK --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 72377c0..8d34f82 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,9 +20,9 @@ android { versionCode 1 versionName "1.0" } - lintOptions { - abortOnError false - } + // lintOptions { + // abortOnError false + // } } repositories { From b1bbeef15a466ed743198e8780c171166ea5a819 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 8 Aug 2019 16:44:00 +0700 Subject: [PATCH 6/9] update --- .../java/im/shimo/react/keyboard/KeyboardContentView.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java index e3917dc..e778fd8 100644 --- a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java +++ b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java @@ -16,6 +16,7 @@ class KeyboardContentView extends ReactViewGroup implements RootView { public KeyboardContentView(Context context) { super(context); + void handleException (Throwable t); } @Override @@ -54,6 +55,11 @@ public void onChildStartedNativeGesture(MotionEvent androidEvent) { mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, getEventDispatcher()); } + // Override + // public void handleException(Throwable t) { + + // }; + @Override public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { // No-op - override in order to still receive events to onInterceptTouchEvent From a392d3d0180b8fe656dd1dc6185b986b0f4ae3d3 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 8 Aug 2019 16:45:34 +0700 Subject: [PATCH 7/9] update --- .../java/im/shimo/react/keyboard/KeyboardContentView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java index e778fd8..f7892e6 100644 --- a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java +++ b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java @@ -14,9 +14,12 @@ class KeyboardContentView extends ReactViewGroup implements RootView { private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this); + public interface RootView { + void handleException (Throwable t); + } + public KeyboardContentView(Context context) { super(context); - void handleException (Throwable t); } @Override From 3c92af72fdf5a1b42328cb8a82d9f385e53141f1 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 8 Aug 2019 17:02:29 +0700 Subject: [PATCH 8/9] update --- android/build.gradle | 5 ++++- .../im/shimo/react/keyboard/KeyboardContentView.java | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 8d34f82..3a52c8d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,7 +30,10 @@ repositories { jcenter() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$projectDir/../../../node_modules/react-native/android" + // url "$projectDir/../../../node_modules/react-native/android" + // url "$rootDir/../node_modules/react-native/android" + url "$projectDir/../node_modules/react-native/android" + // maven { url "$projectDir/../node_modules/react-native/android" } } } diff --git a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java index f7892e6..e3917dc 100644 --- a/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java +++ b/android/src/main/java/im/shimo/react/keyboard/KeyboardContentView.java @@ -14,10 +14,6 @@ class KeyboardContentView extends ReactViewGroup implements RootView { private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this); - public interface RootView { - void handleException (Throwable t); - } - public KeyboardContentView(Context context) { super(context); } @@ -58,11 +54,6 @@ public void onChildStartedNativeGesture(MotionEvent androidEvent) { mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, getEventDispatcher()); } - // Override - // public void handleException(Throwable t) { - - // }; - @Override public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { // No-op - override in order to still receive events to onInterceptTouchEvent From e98976bbe2b2abc407f2dfc0a00d6ce71c88b358 Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 24 Aug 2019 10:00:30 +0700 Subject: [PATCH 9/9] Add space for text input --- KeyboardView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/KeyboardView.js b/KeyboardView.js index 1282e4e..312324a 100644 --- a/KeyboardView.js +++ b/KeyboardView.js @@ -98,7 +98,9 @@ export default class extends Component { {cover} {stickyView && ( - + {stickyView}