Skip to content

R
react-native-picker
Commit ff3cfc29 authored by xwenliang's avatar xwenliang
Browse files
Options

fix #86: picker show behind Modal

parent bdcc50d6
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 176 deletions
android/build.gradle
View file @ ff3cfc29
......@@ -23,5 +23,5 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.facebook.react:react-native:0.20.1'
compile 'com.facebook.react:react-native:+'
}
android/src/main/AndroidManifest.xml
View file @ ff3cfc29
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.beefe.picker">
</manifest>
</manifest>
\ No newline at end of file
android/src/main/java/com/beefe/picker/PickerViewModule.java
View file @ ff3cfc29
package com.beefe.picker;
import android.app.Activity;
import android.app.Application;
import android.app.Dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.PixelFormat;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -29,8 +32,6 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
import java.util.ArrayList;
import static android.R.attr.textSize;
/**
* Author: heng <a href="https://github.com/shexiaoheng"/>
* <p>
......@@ -39,13 +40,22 @@ import static android.R.attr.textSize;
* Edited by heng on 16/9/22.
* 1. PopupWindow height : full screen -> assignation
* 2. Added pickerToolBarHeight support
*
* <p>
* Edited by heng on 2016/10/19.
* 1. Added weights support
* 2. Fixed return data bug
* <p>
* Edited by heng on 2016/11/16.
* 1. Used WindowManager replace PopupWindow
* 2. Removed method initOK() toggle() show() isPickerShow()
* 3. Implements Application.ActivityLifecycleCallbacks
* <p>
* Edited by heng on 2016/11/17
* 1. Used Dialog replace WindowManger
* 2. Restore method show() isPickerShow()
*/
public class PickerViewModule extends ReactContextBaseJavaModule {
public class PickerViewModule extends ReactContextBaseJavaModule implements Application.ActivityLifecycleCallbacks {
private static final String REACT_CLASS = "BEEPickerManager";
......@@ -77,8 +87,7 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
private static final String ERROR_NOT_INIT = "please initialize";
private View view;
private PopupWindow popupWindow = null;
private Dialog dialog = null;
private boolean isLoop = true;
......@@ -88,12 +97,6 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
private double[] weights;
private int[] pickerColor = new int[4];
private int[] barBgColor = new int[4];
private int[] confirmTextColor = new int[4];
private int[] cancelTextColor = new int[4];
private int[] titleTextColor = new int[4];
private ArrayList<String> returnData;
private int curStatus;
......@@ -111,11 +114,12 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
public void _init(ReadableMap options) {
Activity activity = getCurrentActivity();
if (activity != null && options.hasKey(PICKER_DATA)) {
view = activity.getLayoutInflater().inflate(R.layout.popup_picker_view, null);
View view = activity.getLayoutInflater().inflate(R.layout.picker_view, null);
RelativeLayout barLayout = (RelativeLayout) view.findViewById(R.id.barLayout);
TextView cancelTV = (TextView) view.findViewById(R.id.cancel);
TextView titleTV = (TextView) view.findViewById(R.id.title);
TextView confirmTV = (TextView) view.findViewById(R.id.confirm);
RelativeLayout pickerLayout = (RelativeLayout) view.findViewById(R.id.pickerLayout);
final PickerViewLinkage pickerViewLinkage = (PickerViewLinkage) view.findViewById(R.id.pickerViewLinkage);
final PickerViewAlone pickerViewAlone = (PickerViewAlone) view.findViewById(R.id.pickerViewAlone);
......@@ -136,21 +140,8 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
if (options.hasKey(TEXT_BAR_COLOR)) {
ReadableArray array = options.getArray(TEXT_BAR_COLOR);
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
barBgColor[i] = array.getInt(i);
break;
case 3:
barBgColor[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
barLayout.setBackgroundColor(Color.argb(barBgColor[3], barBgColor[0], barBgColor[1], barBgColor[2]));
int[] colors = getColor(array);
barLayout.setBackgroundColor(Color.argb(colors[3], colors[0], colors[1], colors[2]));
}
......@@ -161,26 +152,13 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
if (options.hasKey(CONFIRM_TEXT_COLOR)) {
ReadableArray array = options.getArray(CONFIRM_TEXT_COLOR);
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
confirmTextColor[i] = array.getInt(i);
break;
case 3:
confirmTextColor[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
confirmTV.setTextColor(Color.argb(confirmTextColor[3], confirmTextColor[0], confirmTextColor[1], confirmTextColor[2]));
int[] colors = getColor(array);
confirmTV.setTextColor(Color.argb(colors[3], colors[0], colors[1], colors[2]));
}
confirmTV.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
switch (curStatus){
switch (curStatus) {
case 0:
returnData = pickerViewAlone.getSelectedData();
break;
......@@ -200,21 +178,8 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
titleTV.setText(!TextUtils.isEmpty(titleText) ? titleText : "");
if (options.hasKey(TITLE_TEXT_COLOR)) {
ReadableArray array = options.getArray(TITLE_TEXT_COLOR);
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
titleTextColor[i] = array.getInt(i);
break;
case 3:
titleTextColor[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
titleTV.setTextColor(Color.argb(titleTextColor[3], titleTextColor[0], titleTextColor[1], titleTextColor[2]));
int[] colors = getColor(array);
titleTV.setTextColor(Color.argb(colors[3], colors[0], colors[1], colors[2]));
}
if (options.hasKey(CANCEL_TEXT)) {
......@@ -223,26 +188,13 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
cancelTV.setText(!TextUtils.isEmpty(cancelText) ? cancelText : "");
if (options.hasKey(CANCEL_TEXT_COLOR)) {
ReadableArray array = options.getArray(CANCEL_TEXT_COLOR);
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
cancelTextColor[i] = array.getInt(i);
break;
case 3:
cancelTextColor[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
cancelTV.setTextColor(Color.argb(cancelTextColor[3], cancelTextColor[0], cancelTextColor[1], cancelTextColor[2]));
int[] colors = getColor(array);
cancelTV.setTextColor(Color.argb(colors[3], colors[0], colors[1], colors[2]));
}
cancelTV.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
switch (curStatus){
switch (curStatus) {
case 0:
returnData = pickerViewAlone.getSelectedData();
break;
......@@ -310,24 +262,6 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
}
}
if (options.hasKey(PICKER_BG_COLOR)) {
ReadableArray array = options.getArray(PICKER_BG_COLOR);
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
pickerColor[i] = array.getInt(i);
break;
case 3:
pickerColor[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
}
ReadableArray pickerData = options.getArray(PICKER_DATA);
int pickerViewHeight;
......@@ -337,11 +271,10 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
curStatus = 1;
pickerViewLinkage.setVisibility(View.VISIBLE);
pickerViewAlone.setVisibility(View.GONE);
pickerViewLinkage.setPickerData(pickerData, weights);
pickerViewLinkage.setIsLoop(isLoop);
if (options.hasKey(PICKER_BG_COLOR)) {
pickerViewLinkage.setBackgroundColor(Color.argb(pickerColor[3], pickerColor[0], pickerColor[1], pickerColor[2]));
}
pickerViewLinkage.setOnSelectListener(new OnSelectedListener() {
@Override
public void onSelected(ArrayList<String> selectedList) {
......@@ -359,9 +292,6 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
pickerViewAlone.setPickerData(pickerData, weights);
pickerViewAlone.setIsLoop(isLoop);
if (options.hasKey(PICKER_BG_COLOR)) {
pickerViewAlone.setBackgroundColor(Color.argb(pickerColor[3], pickerColor[0], pickerColor[1], pickerColor[2]));
}
pickerViewAlone.setOnSelectedListener(new OnSelectedListener() {
@Override
......@@ -376,58 +306,81 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
break;
}
if (popupWindow == null) {
int height = barViewHeight + pickerViewHeight;
popupWindow = new PopupWindow(WindowManager.LayoutParams.MATCH_PARENT, height);
popupWindow.setBackgroundDrawable(new ColorDrawable());
popupWindow.setAnimationStyle(R.style.PopAnim);
popupWindow.setContentView(view);
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, 0);
if (options.hasKey(PICKER_BG_COLOR)) {
ReadableArray array = options.getArray(PICKER_BG_COLOR);
int[] colors = getColor(array);
pickerLayout.setBackgroundColor(Color.argb(colors[3], colors[0], colors[1], colors[2]));
}
int height = barViewHeight + pickerViewHeight;
if (dialog == null) {
dialog = new Dialog(activity, R.style.Dialog_Full_Screen);
dialog.setContentView(view);
WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
Window window = dialog.getWindow();
if (window != null) {
layoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
layoutParams.format = PixelFormat.TRANSPARENT;
layoutParams.windowAnimations = R.style.PickerAnim;
layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
layoutParams.height = height;
layoutParams.gravity = Gravity.BOTTOM;
window.setAttributes(layoutParams);
}
} else {
popupWindow.dismiss();
popupWindow.setContentView(view);
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, 0);
dialog.dismiss();
dialog.setContentView(view);
}
dialog.show();
}
}
@ReactMethod
public void initOK(Callback callback) {
callback.invoke(popupWindow != null);
}
@ReactMethod
public void toggle() {
if (popupWindow == null)
public void show() {
if (dialog == null) {
return;
if (popupWindow.isShowing()) {
hide();
} else {
show();
}
}
@ReactMethod
public void show() {
if (popupWindow != null) {
popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, 0);
if (!dialog.isShowing()) {
dialog.show();
}
}
@ReactMethod
public void hide() {
if (popupWindow != null) {
popupWindow.dismiss();
if (dialog == null) {
return;
}
if (dialog.isShowing()) {
dialog.dismiss();
}
}
@ReactMethod
public void isPickerShow(Callback callback) {
if (popupWindow == null) {
if (dialog == null) {
callback.invoke(ERROR_NOT_INIT);
} else {
callback.invoke(null, popupWindow.isShowing());
callback.invoke(null, dialog.isShowing());
}
}
private int[] getColor(ReadableArray array) {
int[] colors = new int[4];
for (int i = 0; i < array.size(); i++) {
switch (i) {
case 0:
case 1:
case 2:
colors[i] = array.getInt(i);
break;
case 3:
colors[i] = (int) (array.getDouble(i) * 255);
break;
default:
break;
}
}
return colors;
}
private void commonEvent(String eventKey) {
......@@ -447,4 +400,38 @@ public class PickerViewModule extends ReactContextBaseJavaModule {
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
.emit(eventName, params);
}
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
}
@Override
public void onActivityStarted(Activity activity) {
}
@Override
public void onActivityResumed(Activity activity) {
}
@Override
public void onActivityPaused(Activity activity) {
}
@Override
public void onActivityStopped(Activity activity) {
hide();
}
@Override
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
}
@Override
public void onActivityDestroyed(Activity activity) {
}
}
android/src/main/res/anim/popup_enter.xml → android/src/main/res/anim/picker_enter.xml
View file @ ff3cfc29
......@@ -7,9 +7,4 @@
android:fromYDelta="100%"
android:toXDelta="0"
android:toYDelta="0" />
<!--<alpha-->
<!--android:fromAlpha="0.5"-->
<!--android:duration="500"-->
<!--android:toAlpha="1.0"-->
<!--/>-->
</set>
\ No newline at end of file
android/src/main/res/anim/popup_exit.xml → android/src/main/res/anim/picker_exit.xml
View file @ ff3cfc29
......@@ -8,10 +8,4 @@
android:toXDelta="0"
android:toYDelta="100%" />
<!--<alpha-->
<!--android:fromAlpha="1.0"-->
<!--android:duration="800"-->
<!--android:toAlpha="0.5"-->
<!--/>-->
</set>
\ No newline at end of file
android/src/main/res/values/styles.xml
View file @ ff3cfc29
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="PopAnim">
<item name="android:windowEnterAnimation">@anim/popup_enter</item>
<item name="android:windowExitAnimation">@anim/popup_exit</item>
<style name="Dialog_Full_Screen">
<item name="android:windowIsFloating">true</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@style/PickerAnim</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="PickerAnim">
<item name="android:windowEnterAnimation">@anim/picker_enter</item>
<item name="android:windowExitAnimation">@anim/picker_exit</item>
</style>
</resources>
\ No newline at end of file
ios/RCTBEEPickerManager/RCTBEEPickerManager.m
View file @ ff3cfc29
......@@ -14,6 +14,7 @@
@property(nonatomic,strong)BzwPicker *pick;
@property(nonatomic,assign)float height;
@property(nonatomic,strong) UIWindow * window;
@end
......@@ -25,32 +26,7 @@ RCT_EXPORT_MODULE();
RCT_EXPORT_METHOD(_init:(NSDictionary *)indic){
UIViewController *result = nil;
UIWindow * window = [[UIApplication sharedApplication] keyWindow];
if (window.windowLevel != UIWindowLevelNormal)
{
NSArray *windows = [[UIApplication sharedApplication] windows];
for(UIWindow * tmpWin in windows)
{
if (tmpWin.windowLevel == UIWindowLevelNormal)
{
window = tmpWin;
break;
}
}
}
UIView *frontView = [[window subviews] objectAtIndex:0];
id nextResponder = [frontView nextResponder];
if ([nextResponder isKindOfClass:[UIViewController class]])
result = nextResponder;
else
result = window.rootViewController;
self.window = [[UIApplication sharedApplication].windows lastObject];
NSString *pickerConfirmBtnText=indic[@"pickerConfirmBtnText"];
NSString *pickerCancelBtnText=indic[@"pickerCancelBtnText"];
......@@ -69,7 +45,7 @@ RCT_EXPORT_METHOD(_init:(NSDictionary *)indic){
dataDic[@"pickerData"]=pickerData;
[result.view.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
[self.window.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if ([obj isKindOfClass:[BzwPicker class]]) {
dispatch_async(dispatch_get_main_queue(), ^{
......@@ -98,7 +74,7 @@ RCT_EXPORT_METHOD(_init:(NSDictionary *)indic){
dispatch_async(dispatch_get_main_queue(), ^{
[result.view addSubview:_pick];
[self.window addSubview:_pick];
[UIView animateWithDuration:.3 animations:^{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment