EventBus: in Fragments, use onResume() & onPause() methods

droidparts · Dec 14, 2015 · 7387948 · 7387948
1 parent fb0f50d
commit 7387948
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 42 deletions.
diff --git a/droidparts-support/src/org/droidparts/activity/support/v4/FragmentActivity.java b/droidparts-support/src/org/droidparts/activity/support/v4/FragmentActivity.java
@@ -35,13 +35,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		SupportDelegate.onActivityResume(this);
+		SupportDelegate.onResume(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		SupportDelegate.onActivityPause(this);
+		SupportDelegate.onPause(this);
 	}
 
 	@Override

diff --git a/droidparts-support/src/org/droidparts/activity/support/v7/AppCompatActivity.java b/droidparts-support/src/org/droidparts/activity/support/v7/AppCompatActivity.java
@@ -43,13 +43,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		SupportDelegate.onActivityResume(this);
+		SupportDelegate.onResume(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		SupportDelegate.onActivityPause(this);
+		SupportDelegate.onPause(this);
 	}
 
 	@Override

diff --git a/droidparts-support/src/org/droidparts/fragment/support/v4/DialogFragment.java b/droidparts-support/src/org/droidparts/fragment/support/v4/DialogFragment.java
@@ -35,16 +35,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		SupportDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		SupportDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		SupportDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts-support/src/org/droidparts/fragment/support/v4/Fragment.java b/droidparts-support/src/org/droidparts/fragment/support/v4/Fragment.java
@@ -34,16 +34,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		SupportDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		SupportDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		SupportDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts-support/src/org/droidparts/fragment/support/v4/ListFragment.java b/droidparts-support/src/org/droidparts/fragment/support/v4/ListFragment.java
@@ -34,16 +34,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		SupportDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		SupportDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		SupportDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts/src/org/droidparts/activity/Activity.java b/droidparts/src/org/droidparts/activity/Activity.java
@@ -34,13 +34,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		BaseDelegate.onActivityResume(this);
+		BaseDelegate.onResume(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		BaseDelegate.onActivityPause(this);
+		BaseDelegate.onPause(this);
 	}
 
 	@Override

diff --git a/droidparts/src/org/droidparts/activity/ListActivity.java b/droidparts/src/org/droidparts/activity/ListActivity.java
@@ -34,13 +34,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		BaseDelegate.onActivityResume(this);
+		BaseDelegate.onResume(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		BaseDelegate.onActivityPause(this);
+		BaseDelegate.onPause(this);
 	}
 
 	@Override

diff --git a/droidparts/src/org/droidparts/activity/PreferenceActivity.java b/droidparts/src/org/droidparts/activity/PreferenceActivity.java
@@ -34,13 +34,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		BaseDelegate.onActivityResume(this);
+		BaseDelegate.onResume(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		BaseDelegate.onActivityPause(this);
+		BaseDelegate.onPause(this);
 	}
 
 	@Override

diff --git a/droidparts/src/org/droidparts/fragment/DialogFragment.java b/droidparts/src/org/droidparts/fragment/DialogFragment.java
@@ -15,6 +15,7 @@
  */
 package org.droidparts.fragment;
 
+import org.droidparts.inner.delegate.BaseDelegate;
 import org.droidparts.inner.delegate.FragmentDelegate;
 
 import android.app.Activity;
@@ -35,16 +36,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		BaseDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		BaseDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		FragmentDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts/src/org/droidparts/fragment/Fragment.java b/droidparts/src/org/droidparts/fragment/Fragment.java
@@ -15,6 +15,7 @@
  */
 package org.droidparts.fragment;
 
+import org.droidparts.inner.delegate.BaseDelegate;
 import org.droidparts.inner.delegate.FragmentDelegate;
 
 import android.os.Bundle;
@@ -34,16 +35,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		BaseDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		BaseDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		FragmentDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts/src/org/droidparts/fragment/ListFragment.java b/droidparts/src/org/droidparts/fragment/ListFragment.java
@@ -15,6 +15,7 @@
  */
 package org.droidparts.fragment;
 
+import org.droidparts.inner.delegate.BaseDelegate;
 import org.droidparts.inner.delegate.FragmentDelegate;
 
 import android.os.Bundle;
@@ -34,16 +35,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		BaseDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		BaseDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		FragmentDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts/src/org/droidparts/fragment/PreferenceFragment.java b/droidparts/src/org/droidparts/fragment/PreferenceFragment.java
@@ -15,6 +15,7 @@
  */
 package org.droidparts.fragment;
 
+import org.droidparts.inner.delegate.BaseDelegate;
 import org.droidparts.inner.delegate.FragmentDelegate;
 
 import android.os.Bundle;
@@ -34,16 +35,28 @@ public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
 		return view;
 	}
 
+	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
+		return super.onCreateView(inflater, container, savedInstanceState);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		BaseDelegate.onResume(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		BaseDelegate.onPause(this);
+	}
+
 	@Override
 	public void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		FragmentDelegate.onFragmentSaveInstanceState(this, injected, outState);
 	}
 
-	protected View onCreateView(Bundle savedInstanceState, LayoutInflater inflater, ViewGroup container) {
-		return super.onCreateView(inflater, container, savedInstanceState);
-	}
-
 	public final boolean isInjected() {
 		return injected;
 	}

diff --git a/droidparts/src/org/droidparts/inner/delegate/BaseDelegate.java b/droidparts/src/org/droidparts/inner/delegate/BaseDelegate.java
@@ -64,12 +64,12 @@ public static void onActivityCreate(Activity activity, Bundle savedInstanceState
 		InstanceStateSaver.onCreate(activity, savedInstanceState);
 	}
 
-	public static void onActivityResume(Activity activity) {
-		EventBus.registerAnnotatedReceiver(activity);
+	public static void onResume(Object obj) {
+		EventBus.registerAnnotatedReceiver(obj);
 	}
 
-	public static void onActivityPause(Activity activity) {
-		EventBus.unregisterAnnotatedReceiver(activity);
+	public static void onPause(Object obj) {
+		EventBus.unregisterAnnotatedReceiver(obj);
 	}
 
 	public static void onActivitySaveInstanceState(Activity activity, Bundle outState) {