[MediaWiki-commits] [Gerrit] Hygiene: move Fragment callbacks into Fragments - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: move Fragment callbacks into Fragments
..
Hygiene: move Fragment callbacks into Fragments
Fragment callbacks are often tiny interfaces and not worth distinct
files. Roll the callbacks into their Fragments:
• FragmentCallback -> CallbackFragment.Callback
• CrashReportFragmentCallback -> CrashReportFragment.Callback
No functional changes intended.
Change-Id: If3d8f6b31d3ce61b9ddcf56b1185640eea512627
---
M app/src/main/java/org/wikipedia/activity/CallbackFragment.java
D app/src/main/java/org/wikipedia/activity/FragmentCallback.java
M app/src/main/java/org/wikipedia/activity/FragmentUtil.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
M app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
M app/src/main/java/org/wikipedia/crash/CrashReportFragment.java
D app/src/main/java/org/wikipedia/crash/CrashReportFragmentCallback.java
M app/src/main/java/org/wikipedia/settings/PreferenceLoaderFragment.java
M app/src/main/java/org/wikipedia/useroption/ui/UserOptionRowActivity.java
M app/src/main/java/org/wikipedia/useroption/ui/UserOptionRowFragment.java
10 files changed, 35 insertions(+), 32 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
b/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
index c35aa62..dffa787 100644
--- a/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
+++ b/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
@@ -2,6 +2,10 @@
import android.support.annotation.Nullable;
-public interface CallbackFragment {
+import org.wikipedia.activity.CallbackFragment.Callback;
+
+public interface CallbackFragment {
+interface Callback { }
+
@Nullable T getCallback();
}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
b/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
deleted file mode 100644
index 52b0976..000
--- a/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.wikipedia.activity;
-
-public interface FragmentCallback { }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
b/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
index 17a9440..167c3a8 100644
--- a/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
+++ b/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
@@ -4,13 +4,15 @@
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
+import org.wikipedia.activity.CallbackFragment.Callback;
+
public final class FragmentUtil {
-@Nullable public static FragmentCallback getCallback(@NonNull Fragment
fragment) {
-return getCallback(fragment, FragmentCallback.class);
+@Nullable public static Callback getCallback(@NonNull Fragment fragment) {
+return getCallback(fragment, Callback.class);
}
-@Nullable public static T
getCallback(@NonNull Fragment fragment,
-
@NonNull Class callback) {
+@Nullable public static T getCallback(@NonNull
Fragment fragment,
+ @NonNull
Class callback) {
if (callback.isInstance(fragment.getTargetFragment())) {
//noinspection unchecked
return (T) fragment.getTargetFragment();
@@ -23,4 +25,4 @@
}
private FragmentUtil() { }
-}
\ No newline at end of file
+}
diff --git
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
index 672b583..00c5af0 100644
--- a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
@@ -7,12 +7,13 @@
import android.view.MenuItem;
import org.wikipedia.R;
+import org.wikipedia.activity.CallbackFragment.Callback;
/**
* Boilerplate for a {@link android.support.v4.app.FragmentActivity}
containing a single stack of
* Fragments.
*/
-public abstract class SingleFragmentActivity>
+public abstract class SingleFragmentActivity>
extends ThemedActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
index 4fc3489..e3a27ff 100644
--- a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
+++ b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
@@ -8,7 +8,7 @@
import org.wikipedia.activity.SingleFragmentActivity;
public class CrashReportActivity extends
[MediaWiki-commits] [Gerrit] Hygiene: move Fragment callbacks into Fragments - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289791
Change subject: Hygiene: move Fragment callbacks into Fragments
..
Hygiene: move Fragment callbacks into Fragments
Fragment callbacks are often tiny interfaces and not worth distinct
files. Roll the callbacks into their Fragments:
• FragmentCallback -> CallbackFragment.Callback
• CrashReportFragmentCallback -> CrashReportFragment.Callback
No functional changes intended.
Change-Id: If3d8f6b31d3ce61b9ddcf56b1185640eea512627
---
M app/src/main/java/org/wikipedia/activity/CallbackFragment.java
D app/src/main/java/org/wikipedia/activity/FragmentCallback.java
M app/src/main/java/org/wikipedia/activity/FragmentUtil.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
M app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
M app/src/main/java/org/wikipedia/crash/CrashReportFragment.java
D app/src/main/java/org/wikipedia/crash/CrashReportFragmentCallback.java
M app/src/main/java/org/wikipedia/settings/PreferenceLoaderFragment.java
M app/src/main/java/org/wikipedia/useroption/ui/UserOptionRowActivity.java
M app/src/main/java/org/wikipedia/useroption/ui/UserOptionRowFragment.java
10 files changed, 35 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/91/289791/1
diff --git a/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
b/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
index c35aa62..dffa787 100644
--- a/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
+++ b/app/src/main/java/org/wikipedia/activity/CallbackFragment.java
@@ -2,6 +2,10 @@
import android.support.annotation.Nullable;
-public interface CallbackFragment {
+import org.wikipedia.activity.CallbackFragment.Callback;
+
+public interface CallbackFragment {
+interface Callback { }
+
@Nullable T getCallback();
}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
b/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
deleted file mode 100644
index 52b0976..000
--- a/app/src/main/java/org/wikipedia/activity/FragmentCallback.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.wikipedia.activity;
-
-public interface FragmentCallback { }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
b/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
index 17a9440..167c3a8 100644
--- a/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
+++ b/app/src/main/java/org/wikipedia/activity/FragmentUtil.java
@@ -4,13 +4,15 @@
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
+import org.wikipedia.activity.CallbackFragment.Callback;
+
public final class FragmentUtil {
-@Nullable public static FragmentCallback getCallback(@NonNull Fragment
fragment) {
-return getCallback(fragment, FragmentCallback.class);
+@Nullable public static Callback getCallback(@NonNull Fragment fragment) {
+return getCallback(fragment, Callback.class);
}
-@Nullable public static T
getCallback(@NonNull Fragment fragment,
-
@NonNull Class callback) {
+@Nullable public static T getCallback(@NonNull
Fragment fragment,
+ @NonNull
Class callback) {
if (callback.isInstance(fragment.getTargetFragment())) {
//noinspection unchecked
return (T) fragment.getTargetFragment();
@@ -23,4 +25,4 @@
}
private FragmentUtil() { }
-}
\ No newline at end of file
+}
diff --git
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
index 672b583..00c5af0 100644
--- a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
@@ -7,12 +7,13 @@
import android.view.MenuItem;
import org.wikipedia.R;
+import org.wikipedia.activity.CallbackFragment.Callback;
/**
* Boilerplate for a {@link android.support.v4.app.FragmentActivity}
containing a single stack of
* Fragments.
*/
-public abstract class SingleFragmentActivity>
+public abstract class SingleFragmentActivity>
extends ThemedActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
index 4fc3489..e3a27ff 100644
--- a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
+++ b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java
@@ -8,7 +8,7 @@
import org.wikipedia.activity.SingleFragmentActivity;
