Skip to content

Commit 62cdfa4

Browse files
Merge pull request #1038 from Yarikx/android-view-observable
rxjava-android: parameterize OperatorViewClick by concrete view type
2 parents f045aeb + bc37906 commit 62cdfa4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/ViewObservable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class ViewObservable {
2828

29-
public static Observable<View> clicks(final View view, final boolean emitInitialValue) {
29+
public static <T extends View> Observable<T> clicks(final T view, final boolean emitInitialValue) {
3030
return Observable.create(new OperatorViewClick(view, emitInitialValue));
3131
}
3232

Diff for: rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorViewClick.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
import rx.functions.Action0;
2929
import android.view.View;
3030

31-
public final class OperatorViewClick implements Observable.OnSubscribe<View> {
31+
public final class OperatorViewClick<T extends View> implements Observable.OnSubscribe<T> {
3232
private final boolean emitInitialValue;
33-
private final View view;
33+
private final T view;
3434

35-
public OperatorViewClick(final View view, final boolean emitInitialValue) {
35+
public OperatorViewClick(final T view, final boolean emitInitialValue) {
3636
this.emitInitialValue = emitInitialValue;
3737
this.view = view;
3838
}
3939

4040
@Override
41-
public void call(final Subscriber<? super View> observer) {
41+
public void call(final Subscriber<? super T> observer) {
4242
Assertions.assertUiThread();
4343
final CompositeOnClickListener composite = CachedListeners.getFromViewOrCreate(view);
4444

0 commit comments

Comments
 (0)