Skip to content

Commit c7247cf

Browse files
author
Kaushik Gopal
committed
refactor: change timer to timeout demo fragment
1 parent 141ae17 commit c7247cf

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

app/src/main/java/com/morihacky/android/rxjava/MainFragment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.view.ViewGroup;
88
import butterknife.ButterKnife;
99
import butterknife.OnClick;
10-
import com.morihacky.android.rxjava.R;
1110
import com.morihacky.android.rxjava.rxbus.RxBusDemoFragment;
1211

1312
public class MainFragment
@@ -94,7 +93,7 @@ public void demoTimeout() {
9493
getActivity().getSupportFragmentManager()
9594
.beginTransaction()
9695
.addToBackStack(this.toString())
97-
.replace(R.id.activity_main, new DemoTimeoutFragment(), this.toString())
96+
.replace(R.id.activity_main, new TimeoutDemoFragment(), this.toString())
9897
.commit();
9998
}
10099

app/src/main/java/com/morihacky/android/rxjava/DemoTimeoutFragment.java renamed to app/src/main/java/com/morihacky/android/rxjava/TimeoutDemoFragment.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import butterknife.ButterKnife;
1414
import butterknife.InjectView;
1515
import butterknife.OnClick;
16-
import com.morihacky.android.rxjava.R;
1716
import java.util.ArrayList;
1817
import java.util.List;
1918
import java.util.concurrent.TimeUnit;
@@ -26,7 +25,7 @@
2625
import rx.schedulers.Schedulers;
2726
import timber.log.Timber;
2827

29-
public class DemoTimeoutFragment
28+
public class TimeoutDemoFragment
3029
extends BaseFragment {
3130

3231
@InjectView(R.id.list_threading_log) ListView _logsList;
@@ -59,15 +58,15 @@ public View onCreateView(LayoutInflater inflater,
5958

6059
@OnClick(R.id.btn_demo_timeout_1_2s)
6160
public void onStart2sTask() {
62-
_subscription = AppObservable.bindFragment(DemoTimeoutFragment.this,
61+
_subscription = AppObservable.bindFragment(TimeoutDemoFragment.this,
6362
_getObservableTask_2sToComplete())
6463
.observeOn(AndroidSchedulers.mainThread())
6564
.subscribe(_getEventCompletionObserver());
6665
}
6766

6867
@OnClick(R.id.btn_demo_timeout_1_5s)
6968
public void onStart5sTask() {
70-
_subscription = AppObservable.bindFragment(DemoTimeoutFragment.this,
69+
_subscription = AppObservable.bindFragment(TimeoutDemoFragment.this,
7170
_getObservableFor5sTask())
7271
.timeout(2, TimeUnit.SECONDS, _getTimeoutObservable())
7372
.subscribeOn(Schedulers.computation())
File renamed without changes.

0 commit comments

Comments
 (0)