From ad17a2f2908f430b05fd2836d3f08873988bce10 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Sun, 21 Feb 2016 16:35:44 -0800 Subject: [PATCH] Use ReactActivity for UIExplorer and Movies examples Summary:This also fixes the examples since the app lifecycle methods were renamed recently. Closes https://github.com/facebook/react-native/pull/6053 Differential Revision: D2959525 Pulled By: mkonicek fb-gh-sync-id: 4a445b5e69b55aa75a1063054cf4c78de1f15da6 shipit-source-id: 4a445b5e69b55aa75a1063054cf4c78de1f15da6 --- .../facebook/react/movies/MoviesActivity.java | 79 +++++------------- .../app/src/main/java/UIExplorerActivity.java | 82 ++++++------------- 2 files changed, 44 insertions(+), 117 deletions(-) diff --git a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java b/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java index 3b2626601..a5dc16093 100644 --- a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java +++ b/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java @@ -11,79 +11,42 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - package com.facebook.react.movies; -import android.app.Activity; -import android.os.Bundle; -import android.view.KeyEvent; - -import com.facebook.react.LifecycleState; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactRootView; -import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; +import com.facebook.react.ReactActivity; +import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; -public class MoviesActivity extends Activity implements DefaultHardwareBackBtnHandler { +import java.util.Arrays; +import java.util.List; - private ReactInstanceManager mReactInstanceManager; +import javax.annotation.Nullable; +public class MoviesActivity extends ReactActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - mReactInstanceManager = ReactInstanceManager.builder() - .setApplication(getApplication()) - .setBundleAssetName("MoviesApp.android.bundle") - .setJSMainModuleName("Examples/Movies/MoviesApp.android") - .addPackage(new MainReactPackage()) - .setUseDeveloperSupport(true) - .setInitialLifecycleState(LifecycleState.RESUMED) - .build(); - - ((ReactRootView) findViewById(R.id.react_root_view)) - .startReactApplication(mReactInstanceManager, "MoviesApp", null); + protected String getMainComponentName() { + return "MoviesApp"; } @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_MENU && mReactInstanceManager != null) { - mReactInstanceManager.showDevOptionsDialog(); - return true; - } - return super.onKeyUp(keyCode, event); + protected @Nullable String getBundleAssetName() { + return "MoviesApp.android.bundle"; + }; + + @Override + protected String getJSMainModuleName() { + return "Examples/Movies/MoviesApp.android"; } @Override - protected void onPause() { - super.onPause(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onPause(); - } + protected boolean getUseDeveloperSupport() { + return true; } @Override - protected void onResume() { - super.onResume(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onResume(this, this); - } - } - - @Override - public void onBackPressed() { - if (mReactInstanceManager != null) { - mReactInstanceManager.onBackPressed(); - } else { - super.onBackPressed(); - } - } - - @Override - public void invokeDefaultOnBackPressed() { - super.onBackPressed(); + protected List getPackages() { + return Arrays.asList( + new MainReactPackage() + ); } } diff --git a/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java b/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java index c1dd73f6d..f4867da6b 100644 --- a/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java +++ b/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java @@ -14,76 +14,40 @@ package com.facebook.react.uiapp; -import android.app.Activity; -import android.os.Bundle; -import android.view.KeyEvent; - -import com.facebook.react.LifecycleState; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactRootView; -import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; +import com.facebook.react.ReactActivity; +import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; -public class UIExplorerActivity extends Activity implements DefaultHardwareBackBtnHandler { +import java.util.Arrays; +import java.util.List; - private ReactInstanceManager mReactInstanceManager; +import javax.annotation.Nullable; +public class UIExplorerActivity extends ReactActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - mReactInstanceManager = ReactInstanceManager.builder() - .setApplication(getApplication()) - .setBundleAssetName("UIExplorerApp.android.bundle") - .setJSMainModuleName("Examples/UIExplorer/UIExplorerApp.android") - .addPackage(new MainReactPackage()) - .setUseDeveloperSupport(true) - .setInitialLifecycleState(LifecycleState.RESUMED) - .build(); - - ((ReactRootView) findViewById(R.id.react_root_view)) - .startReactApplication(mReactInstanceManager, "UIExplorerApp", null); + protected String getMainComponentName() { + return "UIExplorerApp"; } @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_MENU && mReactInstanceManager != null) { - mReactInstanceManager.showDevOptionsDialog(); + protected @Nullable String getBundleAssetName() { + return "UIExplorerApp.android.bundle"; + }; + + @Override + protected String getJSMainModuleName() { + return "Examples/UIExplorer/UIExplorerApp.android"; + } + + @Override + protected boolean getUseDeveloperSupport() { return true; - } - return super.onKeyUp(keyCode, event); } @Override - protected void onPause() { - super.onPause(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onPause(); - } - } - - @Override - protected void onResume() { - super.onResume(); - - if (mReactInstanceManager != null) { - mReactInstanceManager.onResume(this, this); - } - } - - @Override - public void onBackPressed() { - if (mReactInstanceManager != null) { - mReactInstanceManager.onBackPressed(); - } else { - super.onBackPressed(); - } - } - - @Override - public void invokeDefaultOnBackPressed() { - super.onBackPressed(); + protected List getPackages() { + return Arrays.asList( + new MainReactPackage() + ); } }