Skip to content

Commit d443f68

Browse files
author
Kaushik Gopal
committed
chore: upgrade RxAndroid from 0.23 to 0.24
1 parent 1ccb0cf commit d443f68

11 files changed

+104
-16
lines changed

‎app/app.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
8383
</content>
8484
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8585
<orderEntry type="sourceFolder" forTests="false" />
86+
<orderEntry type="library" exported="" name="rxandroid-0.24.0" level="project" />
8687
<orderEntry type="library" exported="" name="okhttp-urlconnection-2.0.0" level="project" />
8788
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
88-
<orderEntry type="library" exported="" name="rxandroid-0.23.0" level="project" />
8989
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
90+
<orderEntry type="library" exported="" name="rxjava-1.0.4" level="project" />
9091
<orderEntry type="library" exported="" name="okio-1.0.0" level="project" />
9192
<orderEntry type="library" exported="" name="timber-2.4.2" level="project" />
92-
<orderEntry type="library" exported="" name="rxjava-1.0.0-rc.9" level="project" />
9393
<orderEntry type="library" exported="" name="support-v13-21.0.2" level="project" />
9494
<orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
9595
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77

88
compile 'com.jakewharton:butterknife:5.1.1'
99
compile 'com.jakewharton.timber:timber:2.4.2'
10-
compile 'io.reactivex:rxandroid:0.23.0'
10+
compile 'io.reactivex:rxandroid:0.24.0'
1111
//compile 'io.reactivex:rxjava-math:0.21.0'
1212

1313
compile 'com.squareup.retrofit:retrofit:1.6.1'

‎app/src/main/java/com/morihacky/android/rxjava/ConcurrencyWithSchedulersDemoFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import rx.Observer;
2323
import rx.Subscriber;
2424
import rx.Subscription;
25-
import rx.android.observables.AndroidObservable;
25+
import rx.android.app.AppObservable;
2626
import rx.android.schedulers.AndroidSchedulers;
2727
import rx.schedulers.Schedulers;
2828
import timber.log.Timber;
@@ -66,7 +66,7 @@ public void startLongOperation() {
6666
_progress.setVisibility(View.VISIBLE);
6767
_log("Button Clicked");
6868

69-
_subscription = AndroidObservable.bindFragment(this, _getObservable()) // Observable
69+
_subscription = AppObservable.bindFragment(this, _getObservable()) // Observable
7070
.subscribeOn(Schedulers.io())
7171
.observeOn(AndroidSchedulers.mainThread())
7272
.subscribe(_getObserver()); // Observer

‎app/src/main/java/com/morihacky/android/rxjava/DemoTimeoutFragment.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import rx.Observer;
2323
import rx.Subscriber;
2424
import rx.Subscription;
25-
import rx.android.observables.AndroidObservable;
25+
import rx.android.app.AppObservable;
2626
import rx.android.schedulers.AndroidSchedulers;
2727
import rx.schedulers.Schedulers;
2828
import timber.log.Timber;
@@ -60,16 +60,15 @@ public View onCreateView(LayoutInflater inflater,
6060

6161
@OnClick(R.id.btn_demo_timeout_1_2s)
6262
public void onStart2sTask() {
63-
_subscription = AndroidObservable.bindFragment(DemoTimeoutFragment.this,
64-
_getObservableTask_2sToComplete())
63+
_subscription = AppObservable.bindFragment(DemoTimeoutFragment.this,
64+
_getObservableTask_2sToComplete())
6565
.observeOn(AndroidSchedulers.mainThread())
6666
.subscribe(_getEventCompletionObserver());
6767
}
6868

6969
@OnClick(R.id.btn_demo_timeout_1_5s)
7070
public void onStart5sTask() {
71-
_subscription = AndroidObservable.bindFragment(DemoTimeoutFragment.this,
72-
_getObservableFor5sTask())
71+
_subscription = AppObservable.bindFragment(DemoTimeoutFragment.this, _getObservableFor5sTask())
7372
.timeout(2, TimeUnit.SECONDS, _getTimeoutObservable())
7473
.subscribeOn(Schedulers.computation())
7574
.observeOn(AndroidSchedulers.mainThread())

‎app/src/main/java/com/morihacky/android/rxjava/MainActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
2121
getSupportFragmentManager().beginTransaction()
2222
.addToBackStack(this.toString())
2323
.replace(R.id.activity_main, new MainFragment(), this.toString())
24+
//.replace(R.id.activity_main, new TimingDemoFragment(), this.toString())
2425
.commit();
2526
}
2627

‎app/src/main/java/com/morihacky/android/rxjava/SubjectDebounceSearchEmitterFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import rx.Observer;
2323
import rx.Subscriber;
2424
import rx.Subscription;
25-
import rx.android.observables.AndroidObservable;
25+
import rx.android.app.AppObservable;
2626
import rx.android.schedulers.AndroidSchedulers;
2727
import rx.schedulers.Schedulers;
2828
import rx.subjects.PublishSubject;
@@ -85,8 +85,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
8585
_setupLogger();
8686

8787
_searchTextEmitterSubject = PublishSubject.create();
88-
_subscription = AndroidObservable.bindFragment(SubjectDebounceSearchEmitterFragment.this,
89-
Observable.switchOnNext(_searchTextEmitterSubject))
88+
_subscription = AppObservable.bindFragment(SubjectDebounceSearchEmitterFragment.this,
89+
Observable.switchOnNext(_searchTextEmitterSubject))
9090
.debounce(400, TimeUnit.MILLISECONDS, Schedulers.io())
9191
.observeOn(AndroidSchedulers.mainThread())
9292
.subscribe(_getSearchObserver());

‎app/src/main/java/com/morihacky/android/rxjava/TimingDemoFragment.java‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
package com.morihacky.android.rxjava;
2+
3+
import android.os.Bundle;
4+
import android.support.annotation.Nullable;
5+
import android.support.v4.app.Fragment;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
import butterknife.ButterKnife;
10+
import butterknife.OnClick;
11+
import com.morihacky.android.rxjava.app.R;
12+
import java.util.concurrent.TimeUnit;
13+
import rx.Notification;
14+
import rx.Observable;
15+
import rx.android.schedulers.AndroidSchedulers;
16+
import rx.functions.Action0;
17+
import rx.functions.Action1;
18+
import rx.functions.Func1;
19+
import timber.log.Timber;
20+
21+
public class TimingDemoFragment
22+
extends Fragment {
23+
24+
@Override
25+
public View onCreateView(LayoutInflater inflater,
26+
@Nullable ViewGroup container,
27+
@Nullable Bundle savedInstanceState) {
28+
View layout = inflater.inflate(R.layout.fragment_timing_demo, container, false);
29+
ButterKnife.inject(this, layout);
30+
return layout;
31+
}
32+
33+
@OnClick(R.id.btn_start_demo)
34+
public void onStartButtonClicked() {
35+
Timber.d("-------------------- Shutter clicked");
36+
37+
Observable.just(1)
38+
.flatMap(new Func1<Integer, Observable<Object>>() {
39+
@Override
40+
public Observable<Object> call(Integer integer) {
41+
return _getCountdownFlashObservable();
42+
}
43+
})
44+
.repeat(3)
45+
.subscribe();
46+
}
47+
48+
private Observable<Object> _getCountdownFlashObservable() {
49+
return Observable.interval(1, TimeUnit.SECONDS)
50+
.map(new Func1<Long, Object>() {
51+
@Override
52+
public Object call(Long aLong) {
53+
Timber.d("-------------------- Number to show %s", String.valueOf(3l - aLong));
54+
return 3l - aLong;
55+
}
56+
})
57+
.take(3)
58+
.observeOn(AndroidSchedulers.mainThread())
59+
.doOnNext(new Action1<Object>() {
60+
@Override
61+
public void call(Object o) {
62+
Timber.d("-------------------- %s", String.valueOf(o));
63+
}
64+
})
65+
.delay(1, TimeUnit.SECONDS)
66+
.observeOn(AndroidSchedulers.mainThread())
67+
.doOnCompleted(new Action0() {
68+
@Override
69+
public void call() {
70+
Timber.d("-------------------- FLASH!");
71+
}
72+
});
73+
}
74+
}

‎app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemo_Bottom1Fragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import rx.functions.Action1;
1616
import rx.subscriptions.CompositeSubscription;
1717

18-
import static rx.android.observables.AndroidObservable.bindFragment;
18+
import static rx.android.app.AppObservable.bindFragment;
1919

2020
public class RxBusDemo_Bottom1Fragment
2121
extends Fragment {

‎app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemo_Bottom2Fragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import rx.functions.Action1;
2020
import rx.subscriptions.CompositeSubscription;
2121

22-
import static rx.android.observables.AndroidObservable.bindFragment;
22+
import static rx.android.app.AppObservable.bindFragment;
2323

2424
public class RxBusDemo_Bottom2Fragment
2525
extends Fragment {

‎app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemo_Bottom3Fragment.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import rx.observables.ConnectableObservable;
2222
import rx.subscriptions.CompositeSubscription;
2323

24-
import static rx.android.observables.AndroidObservable.bindFragment;
24+
import static rx.android.app.AppObservable.bindFragment;
2525

2626
public class RxBusDemo_Bottom3Fragment
2727
extends Fragment {
@@ -79,6 +79,7 @@ public void call(List<Object> taps) {
7979
}));
8080

8181
_subscriptions.add(tapEventEmitter.connect());
82+
8283
}
8384

8485
@Override

0 commit comments

Comments
 (0)