Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove support of FragmentActivity and related widgets #19950

Closed
wants to merge 18 commits into from
Closed

Remove support of FragmentActivity and related widgets #19950

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1cfd96a
remove ReactFragmentActivity.java
dulmandakh Jun 28, 2018
8b1f836
ReactAppTestActivity extends Activity
dulmandakh Jun 28, 2018
5ad46b7
remove FragmentActivity support from TimePicker module
dulmandakh Jun 28, 2018
f3b0562
remove FragmentActivity support from ReactActivityDelegate
dulmandakh Jun 28, 2018
69c9d1a
remove FragmentActivity support from DatePicker module
dulmandakh Jun 28, 2018
20a517d
remove FragmentActivity support from Dialog module
dulmandakh Jun 28, 2018
4f6b28c
remove FragmentActivity support from ShareTestCase
dulmandakh Jun 28, 2018
25def92
remove redundant lib-support-v4 dependencies
dulmandakh Jul 17, 2018
dbfc4cc
crash app if ReactActivityDelegate.getContext has no activity
dulmandakh Jul 17, 2018
a4ea162
Merge branch 'master' into remove-fragment-activity
hramos Jul 20, 2018
6aa3a54
merge master
dulmandakh Aug 7, 2018
c5039af
ReactActivity extends AppCompatActivity
dulmandakh Aug 7, 2018
f263686
Revert "remove ReactFragmentActivity.java"
dulmandakh Aug 7, 2018
6aec2e8
ReactFragmentActivity extends ReactActivity for backward compatibility
dulmandakh Aug 7, 2018
6df6a28
ReactAppTestActivity extends AppCompatActivity
dulmandakh Aug 7, 2018
51cae34
ReactAppTestActivity: add appcompat as buck dependency
dulmandakh Aug 7, 2018
4a2c18b
add appcompat to react/tests
dulmandakh Aug 8, 2018
4c4fe1d
DatePickerDialogModule uses support library
dulmandakh Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;

import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
Expand Down Expand Up @@ -47,7 +47,7 @@
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;

public class ReactAppTestActivity extends FragmentActivity
public class ReactAppTestActivity extends Activity
implements DefaultHardwareBackBtnHandler, PermissionAwareActivity {

public static final String EXTRA_IS_FABRIC_TEST = "is_fabric_test";
Expand Down
6 changes: 3 additions & 3 deletions ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import java.util.List;

import android.app.DatePickerDialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.DialogInterface;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.widget.DatePicker;

import com.facebook.react.bridge.BaseJavaModule;
Expand Down Expand Up @@ -105,7 +105,7 @@ private DialogFragment showDialog(WritableMap options) {
waitForBridgeAndUIIdle();
getInstrumentation().waitForIdleSync();

return (DialogFragment) getActivity().getSupportFragmentManager()
return (DialogFragment) getActivity().getFragmentManager()
.findFragmentByTag(DatePickerDialogModule.FRAGMENT_TAG);
}

Expand Down
8 changes: 0 additions & 8 deletions ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,9 @@

package com.facebook.react.tests;

import java.util.ArrayList;
import java.util.List;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.Instrumentation.ActivityMonitor;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.IntentFilter.MalformedMimeTypeException;
import android.support.v4.app.DialogFragment;

import com.facebook.react.bridge.BaseJavaModule;
import com.facebook.react.testing.ReactInstanceSpecForTest;
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import java.util.ArrayList;
import java.util.List;

import android.app.DialogFragment;
import android.app.TimePickerDialog;
import android.content.DialogInterface;
import android.support.v4.app.DialogFragment;

import com.facebook.react.bridge.BaseJavaModule;
import com.facebook.react.testing.ReactInstanceSpecForTest;
Expand Down Expand Up @@ -94,7 +94,7 @@ private DialogFragment showDialog(WritableMap options) {
waitForBridgeAndUIIdle();
getInstrumentation().waitForIdleSync();

return (DialogFragment) getActivity().getSupportFragmentManager()
return (DialogFragment) getActivity().getFragmentManager()
.findFragmentByTag(TimePickerDialogModule.FRAGMENT_TAG);
}

Expand Down
18 changes: 4 additions & 14 deletions ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.KeyEvent;

import com.facebook.infer.annotation.Assertions;
Expand All @@ -20,36 +19,27 @@
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
import com.facebook.react.modules.core.PermissionListener;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

/**
* Delegate class for {@link ReactActivity} and {@link ReactFragmentActivity}. You can subclass this
* Delegate class for {@link ReactActivity}. You can subclass this
* to provide custom implementations for e.g. {@link #getReactNativeHost()}, if your Application
* class doesn't implement {@link ReactApplication}.
*/
public class ReactActivityDelegate {

private final @Nullable Activity mActivity;
private final @Nullable FragmentActivity mFragmentActivity;
private final @Nullable String mMainComponentName;

private @Nullable ReactRootView mReactRootView;
private @Nullable DoubleTapReloadRecognizer mDoubleTapReloadRecognizer;
private @Nullable PermissionListener mPermissionListener;
private @Nullable Callback mPermissionsCallback;

public ReactActivityDelegate(Activity activity, @Nullable String mainComponentName) {
public ReactActivityDelegate(@Nonnull Activity activity, @Nullable String mainComponentName) {
mActivity = activity;
mMainComponentName = mainComponentName;
mFragmentActivity = null;
}

public ReactActivityDelegate(
FragmentActivity fragmentActivity,
@Nullable String mainComponentName) {
mFragmentActivity = fragmentActivity;
mMainComponentName = mainComponentName;
mActivity = null;
}

protected @Nullable Bundle getLaunchOptions() {
Expand Down Expand Up @@ -209,7 +199,7 @@ private Context getContext() {
if (mActivity != null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be return Assertions.assertNotNull(mActivity) so we still crash if it is null.

return mActivity;
}
return Assertions.assertNotNull(mFragmentActivity);
return null;
}

private Activity getPlainActivity() {
Expand Down
132 changes: 0 additions & 132 deletions ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
View file
Open in desktop

This file was deleted.

50 changes: 14 additions & 36 deletions ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

import javax.annotation.Nullable;

import java.util.Map;

import android.app.Activity;
import android.app.DatePickerDialog.OnDateSetListener;
import android.app.DialogFragment;
Expand Down Expand Up @@ -127,41 +125,21 @@ public void open(@Nullable final ReadableMap options, Promise promise) {
"Tried to open a DatePicker dialog while not attached to an Activity");
return;
}
// We want to support both android.app.Activity and the pre-Honeycomb FragmentActivity
// (for apps that use it for legacy reasons). This unfortunately leads to some code duplication.
if (activity instanceof android.support.v4.app.FragmentActivity) {
android.support.v4.app.FragmentManager fragmentManager =
((android.support.v4.app.FragmentActivity) activity).getSupportFragmentManager();
android.support.v4.app.DialogFragment oldFragment =
(android.support.v4.app.DialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null) {
oldFragment.dismiss();
}
SupportDatePickerDialogFragment fragment = new SupportDatePickerDialogFragment();
if (options != null) {
final Bundle args = createFragmentArguments(options);
fragment.setArguments(args);
}
final DatePickerDialogListener listener = new DatePickerDialogListener(promise);
fragment.setOnDismissListener(listener);
fragment.setOnDateSetListener(listener);
fragment.show(fragmentManager, FRAGMENT_TAG);
} else {
FragmentManager fragmentManager = activity.getFragmentManager();
DialogFragment oldFragment = (DialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null) {
oldFragment.dismiss();
}
DatePickerDialogFragment fragment = new DatePickerDialogFragment();
if (options != null) {
final Bundle args = createFragmentArguments(options);
fragment.setArguments(args);
}
final DatePickerDialogListener listener = new DatePickerDialogListener(promise);
fragment.setOnDismissListener(listener);
fragment.setOnDateSetListener(listener);
fragment.show(fragmentManager, FRAGMENT_TAG);

FragmentManager fragmentManager = activity.getFragmentManager();
DialogFragment oldFragment = (DialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
if (oldFragment != null) {
oldFragment.dismiss();
}
DatePickerDialogFragment fragment = new DatePickerDialogFragment();
if (options != null) {
final Bundle args = createFragmentArguments(options);
fragment.setArguments(args);
}
final DatePickerDialogListener listener = new DatePickerDialogListener(promise);
fragment.setOnDismissListener(listener);
fragment.setOnDateSetListener(listener);
fragment.show(fragmentManager, FRAGMENT_TAG);
}

private Bundle createFragmentArguments(ReadableMap options) {
Expand Down
49 changes: 0 additions & 49 deletions .../src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
View file
Open in desktop

This file was deleted.

Loading