Skip to content

Commit

Permalink
An essential revert of '243070a#diff-8e3b74ad18aa49187acd4240321bc9b9'…
Browse files Browse the repository at this point in the history
… to bring back support for showing dialogs over standard Android activities (#222)
  • Loading branch information
mganandraj authored and acoates-ms committed Jan 8, 2020
1 parent a978d6b commit e91e19f
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.content.DialogInterface.OnDismissListener;
import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;

import com.facebook.common.logging.FLog;
import com.facebook.react.bridge.Callback;
Expand Down Expand Up @@ -68,13 +67,31 @@ public DialogModule(ReactApplicationContext reactContext) {
return NAME;
}

/**
* Helper to allow this module to work with both the standard FragmentManager
* and the Support/AndroidX FragmentManager (for apps that need to use the former for legacy reasons).
* Since the two APIs don't share a common interface there's unfortunately some
* code duplication.
* Please not that the direct usage of standard FragmentManager is deprecated in API v28
*/
private class FragmentManagerHelper {
private final @Nonnull FragmentManager mFragmentManager;
private final @Nonnull androidx.fragment.app.FragmentManager mFragmentManager;
private final @Nullable android.app.FragmentManager mPlatformFragmentManager;

private @Nullable Object mFragmentToShow;

public FragmentManagerHelper(@Nonnull FragmentManager fragmentManager) {
private boolean isUsingPlatformFragmentManager() {
return mPlatformFragmentManager != null;
}

public FragmentManagerHelper(android.app.FragmentManager platformFragmentManager) {
mFragmentManager = null;
mPlatformFragmentManager = platformFragmentManager;
}

public FragmentManagerHelper(@Nonnull androidx.fragment.app.FragmentManager fragmentManager) {
mFragmentManager = fragmentManager;
mPlatformFragmentManager = null;
}

public void showPendingAlert() {
Expand All @@ -85,18 +102,31 @@ public void showPendingAlert() {
}

dismissExisting();
((AlertFragment) mFragmentToShow).show(mFragmentManager, FRAGMENT_TAG);
if(isUsingPlatformFragmentManager()) {
((PlatformAlertFragment) mFragmentToShow).show(mPlatformFragmentManager, FRAGMENT_TAG);
} else {
((AlertFragment) mFragmentToShow).show(mFragmentManager, FRAGMENT_TAG);
}
mFragmentToShow = null;
}

private void dismissExisting() {
if (!mIsInForeground) {
return;
}
AlertFragment oldFragment =
(AlertFragment) mFragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null && oldFragment.isResumed()) {
oldFragment.dismiss();

if(isUsingPlatformFragmentManager()) {
PlatformAlertFragment oldFragment =
(PlatformAlertFragment) mPlatformFragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null && oldFragment.isResumed()) {
oldFragment.dismiss();
}
} else {
AlertFragment oldFragment =
(AlertFragment) mFragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null && oldFragment.isResumed()) {
oldFragment.dismiss();
}
}
}

Expand All @@ -108,14 +138,26 @@ public void showNewAlert(Bundle arguments, Callback actionCallback) {
AlertFragmentListener actionListener =
actionCallback != null ? new AlertFragmentListener(actionCallback) : null;

AlertFragment alertFragment = new AlertFragment(actionListener, arguments);
if (mIsInForeground && !mFragmentManager.isStateSaved()) {
if (arguments.containsKey(KEY_CANCELABLE)) {
alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
if(isUsingPlatformFragmentManager()) {
PlatformAlertFragment PlatformAlertFragment = new PlatformAlertFragment(actionListener, arguments);
if (mIsInForeground && !mPlatformFragmentManager.isStateSaved()) {
if (arguments.containsKey(KEY_CANCELABLE)) {
PlatformAlertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
}
PlatformAlertFragment.show(mPlatformFragmentManager, FRAGMENT_TAG);
} else {
mFragmentToShow = PlatformAlertFragment;
}
alertFragment.show(mFragmentManager, FRAGMENT_TAG);
} else {
mFragmentToShow = alertFragment;
AlertFragment alertFragment = new AlertFragment(actionListener, arguments);
if (mIsInForeground && !mFragmentManager.isStateSaved()) {
if (arguments.containsKey(KEY_CANCELABLE)) {
alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
}
alertFragment.show(mFragmentManager, FRAGMENT_TAG);
} else {
mFragmentToShow = alertFragment;
}
}
}
}
Expand Down Expand Up @@ -239,9 +281,16 @@ public void run() {
*/
private @Nullable FragmentManagerHelper getFragmentManagerHelper() {
Activity activity = getCurrentActivity();
if (activity == null || !(activity instanceof FragmentActivity)) {
if (activity == null) {
return null;
}

if(activity instanceof FragmentActivity) {
return new FragmentManagerHelper(((FragmentActivity) activity).getSupportFragmentManager());
} else if(activity.getFragmentManager() != null){
return new FragmentManagerHelper(activity.getFragmentManager());
} else {
return null;
}
return new FragmentManagerHelper(((FragmentActivity) activity).getSupportFragmentManager());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.modules.dialog;

import javax.annotation.Nullable;

import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.content.Context;
import android.os.Bundle;

/**
* A fragment used to display the dialog based on the platform DialogFragment control. Please note that the usage of this control is deprecated in API v28 in favor of the newer Jetpack/Support controls.
*/
public class PlatformAlertFragment extends DialogFragment implements DialogInterface.OnClickListener {
/* package */ static final String ARG_TITLE = "title";
/* package */ static final String ARG_MESSAGE = "message";
/* package */ static final String ARG_BUTTON_POSITIVE = "button_positive";
/* package */ static final String ARG_BUTTON_NEGATIVE = "button_negative";
/* package */ static final String ARG_BUTTON_NEUTRAL = "button_neutral";
/* package */ static final String ARG_ITEMS = "items";

private final @Nullable DialogModule.AlertFragmentListener mListener;

public PlatformAlertFragment() {
mListener = null;
}

@SuppressLint("ValidFragment")
public PlatformAlertFragment(@Nullable DialogModule.AlertFragmentListener listener, Bundle arguments) {
mListener = listener;
setArguments(arguments);
}


public static Dialog createDialog(
Context activityContext, Bundle arguments, DialogInterface.OnClickListener fragment) {
AlertDialog.Builder builder = new AlertDialog.Builder(activityContext)
.setTitle(arguments.getString(ARG_TITLE));

if (arguments.containsKey(ARG_BUTTON_POSITIVE)) {
builder.setPositiveButton(arguments.getString(ARG_BUTTON_POSITIVE), fragment);
}

if (arguments.containsKey(ARG_BUTTON_NEGATIVE)) {
builder.setNegativeButton(arguments.getString(ARG_BUTTON_NEGATIVE), fragment);
}

if (arguments.containsKey(ARG_BUTTON_NEUTRAL)) {
builder.setNeutralButton(arguments.getString(ARG_BUTTON_NEUTRAL), fragment);
}

// if both message and items are set, Android will only show the message
// and ignore the items argument entirely
if (arguments.containsKey(ARG_MESSAGE)) {
builder.setMessage(arguments.getString(ARG_MESSAGE));
}

if (arguments.containsKey(ARG_ITEMS)) {
builder.setItems(arguments.getCharSequenceArray(ARG_ITEMS), fragment);
}

return builder.create();
}

@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return createDialog(getActivity(), getArguments(), this);
}

@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null) {
mListener.onClick(dialog, which);
}
}

@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
if (mListener != null) {
mListener.onDismiss(dialog);
}
}
}

0 comments on commit e91e19f

Please sign in to comment.