From d26e7dc696a7b4f24554c456a48fc8e10b68a27b Mon Sep 17 00:00:00 2001 From: "minghan.yang" Date: Thu, 26 Dec 2019 22:42:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=90=E7=A0=81?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 9 +- .../android/samples/model/CheckMemory.java | 4 + .../android/samples/model/NetWork.java | 9 + .../android/samples/ui/OperatorsActivity.java | 39 +++- .../android/samples/ui/SelectionActivity.java | 2 +- .../ui/cache/CacheExampleActivity.java | 2 +- .../ComposeOperatorExampleActivity.java | 2 +- .../ui/networking/NetworkingActivity.java | 2 +- .../AsyncSubjectExampleActivity.java | 2 +- .../BehaviorSubjectExampleActivity.java | 2 +- .../ui/operators/BufferExampleActivity.java | 4 +- .../CompletableObserverExampleActivity.java | 2 +- .../ui/operators/ConcatExampleActivity.java | 26 ++- .../ui/operators/DebounceExampleActivity.java | 3 +- .../ui/operators/DeferExampleActivity.java | 2 +- .../ui/operators/DelayExampleActivity.java | 2 +- .../operators/DisposableExampleActivity.java | 2 +- .../ui/operators/DistinctExampleActivity.java | 4 +- .../ui/operators/FilterExampleActivity.java | 3 +- .../ui/operators/FlowableExampleActivity.java | 4 +- .../ui/operators/IntervalExampleActivity.java | 2 +- .../LastOperatorExampleActivity.java | 5 +- .../ui/operators/MapExampleActivity.java | 2 +- .../ui/operators/MergeExampleActivity.java | 10 +- .../PublishSubjectExampleActivity.java | 2 +- .../ui/operators/ReduceExampleActivity.java | 2 +- .../ui/operators/ReplayExampleActivity.java | 4 +- .../ReplaySubjectExampleActivity.java | 2 +- .../ui/operators/ScanExampleActivity.java | 2 +- .../ui/operators/SimpleExampleActivity.java | 2 +- .../operators/SingleAllOperatorActivity.java | 29 +++ .../SingleObserverConcatActivity.java | 52 +++++ .../SingleObserverExampleActivity.java | 2 +- .../ui/operators/SkipExampleActivity.java | 2 +- .../operators/SwitchMapExampleActivity.java | 5 +- .../ui/operators/TakeExampleActivity.java | 2 +- .../operators/TakeOperatorBaseActivity.java | 5 +- .../ThrottleFirstExampleActivity.java | 2 +- .../ThrottleLastExampleActivity.java | 2 +- .../ui/operators/TimerExampleActivity.java | 2 +- .../ui/operators/WindowExampleActivity.java | 2 +- .../ui/operators/ZipExampleActivity.java | 2 +- .../ui/pagination/PaginationActivity.java | 7 +- .../ui/pagination/PaginationAdapter.java | 3 +- .../samples/ui/rxbus/RxBusActivity.java | 2 +- .../samples/ui/search/SearchActivity.java | 2 +- .../main/res/layout/activity_pagination.xml | 2 +- .../res/layout/activity_signle_concat.xml | 31 +++ .../layout/activity_single_all_operator.xml | 219 ++++++++++++++++++ build.gradle | 8 +- 50 files changed, 471 insertions(+), 68 deletions(-) create mode 100644 app/src/main/java/com/rxjava2/android/samples/model/CheckMemory.java create mode 100644 app/src/main/java/com/rxjava2/android/samples/model/NetWork.java create mode 100644 app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleAllOperatorActivity.java create mode 100644 app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverConcatActivity.java create mode 100644 app/src/main/res/layout/activity_signle_concat.xml create mode 100644 app/src/main/res/layout/activity_single_all_operator.xml diff --git a/app/build.gradle b/app/build.gradle index fe13a5b..6a640de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + + sourceSets { + } } compileOptions { sourceCompatibility = '1.8' @@ -29,8 +32,10 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' androidTestImplementation 'androidx.test:rules:1.1.0-alpha4' - implementation 'androidx.appcompat:appcompat:1.0.0-rc02' - implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02' + implementation 'com.android.support:support-annotations:28.0.0' + + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' // RxJava2 Dependencies implementation 'io.reactivex.rxjava2:rxjava:2.2.2' diff --git a/app/src/main/java/com/rxjava2/android/samples/model/CheckMemory.java b/app/src/main/java/com/rxjava2/android/samples/model/CheckMemory.java new file mode 100644 index 0000000..b19b632 --- /dev/null +++ b/app/src/main/java/com/rxjava2/android/samples/model/CheckMemory.java @@ -0,0 +1,4 @@ +package com.rxjava2.android.samples.model; + +public class CheckMemory { +} diff --git a/app/src/main/java/com/rxjava2/android/samples/model/NetWork.java b/app/src/main/java/com/rxjava2/android/samples/model/NetWork.java new file mode 100644 index 0000000..10f30f4 --- /dev/null +++ b/app/src/main/java/com/rxjava2/android/samples/model/NetWork.java @@ -0,0 +1,9 @@ +package com.rxjava2.android.samples.model; + +public class NetWork { + public String status; + + public NetWork(String status) { + this.status = status; + } +} diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/OperatorsActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/OperatorsActivity.java index 3986c9a..0dea1c4 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/OperatorsActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/OperatorsActivity.java @@ -2,6 +2,7 @@ import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import com.rxjava2.android.samples.R; @@ -27,6 +28,7 @@ import com.rxjava2.android.samples.ui.operators.ReplaySubjectExampleActivity; import com.rxjava2.android.samples.ui.operators.ScanExampleActivity; import com.rxjava2.android.samples.ui.operators.SimpleExampleActivity; +import com.rxjava2.android.samples.ui.operators.SingleAllOperatorActivity; import com.rxjava2.android.samples.ui.operators.SingleObserverExampleActivity; import com.rxjava2.android.samples.ui.operators.SkipExampleActivity; import com.rxjava2.android.samples.ui.operators.SwitchMapExampleActivity; @@ -39,7 +41,6 @@ import com.rxjava2.android.samples.ui.operators.WindowExampleActivity; import com.rxjava2.android.samples.ui.operators.ZipExampleActivity; -import androidx.appcompat.app.AppCompatActivity; public class OperatorsActivity extends AppCompatActivity { @@ -50,123 +51,151 @@ protected void onCreate(Bundle savedInstanceState) { } public void startSimpleActivity(View view) { + //最简单的用法 startActivity(new Intent(OperatorsActivity.this, SimpleExampleActivity.class)); } public void startMapActivity(View view) { + //map操作符将获取到的结果转化为想要的结果之后交给，观察者处理 startActivity(new Intent(OperatorsActivity.this, MapExampleActivity.class)); } public void startZipActivity(View view) { + //将两个被观察者转化为一个被观察者，将两个被观察者的结果合并处理 startActivity(new Intent(OperatorsActivity.this, ZipExampleActivity.class)); } public void startDisposableActivity(View view) { + //使用该操作符可以防止Activity被销毁时，请求结果才返回的情形 startActivity(new Intent(OperatorsActivity.this, DisposableExampleActivity.class)); } public void startTakeActivity(View view) { + //被观察者列表的第一个被观察者到指定数量的被观察者 startActivity(new Intent(OperatorsActivity.this, TakeExampleActivity.class)); } public void startTimerActivity(View view) { + //延时发送操作符 startActivity(new Intent(OperatorsActivity.this, TimerExampleActivity.class)); } public void startIntervalActivity(View view) { + //每个多长时间进行一次操作 startActivity(new Intent(OperatorsActivity.this, IntervalExampleActivity.class)); } public void startSingleObserverActivity(View view) { - startActivity(new Intent(OperatorsActivity.this, SingleObserverExampleActivity.class)); + //Single及其操作符的使用 + startActivity(new Intent(OperatorsActivity.this, SingleAllOperatorActivity.class)); } public void startCompletableObserverActivity(View view) { + //指示完成的操作符 startActivity(new Intent(OperatorsActivity.this, CompletableObserverExampleActivity.class)); } public void startFlowableActivity(View view) { + //Flowable中reduce做减法示例 startActivity(new Intent(OperatorsActivity.this, FlowableExampleActivity.class)); } public void startReduceActivity(View view) { + //与上个示例类似 startActivity(new Intent(OperatorsActivity.this, ReduceExampleActivity.class)); } public void startBufferActivity(View view) { + //重复以及跳跃式发送Observable startActivity(new Intent(OperatorsActivity.this, BufferExampleActivity.class)); } public void startFilterActivity(View view) { + //过滤filter startActivity(new Intent(OperatorsActivity.this, FilterExampleActivity.class)); } public void startSkipActivity(View view) { + //越过多少个Observable startActivity(new Intent(OperatorsActivity.this, SkipExampleActivity.class)); } public void startScanActivity(View view) { + //实现累加功能 startActivity(new Intent(OperatorsActivity.this, ScanExampleActivity.class)); } public void startReplayActivity(View view) { + //重复订阅 startActivity(new Intent(OperatorsActivity.this, ReplayExampleActivity.class)); } public void startConcatActivity(View view) { + //concat顺序执行,但其中一个observer调用OnError之后，后续observer仍然可以继续执行 startActivity(new Intent(OperatorsActivity.this, ConcatExampleActivity.class)); } public void startMergeActivity(View view) { + //merge任意执行Observable startActivity(new Intent(OperatorsActivity.this, MergeExampleActivity.class)); } public void startDeferActivity(View view) { + //推迟创建 startActivity(new Intent(OperatorsActivity.this, DeferExampleActivity.class)); } public void startDistinctActivity(View view) { + //去除重复元素 startActivity(new Intent(OperatorsActivity.this, DistinctExampleActivity.class)); } public void startLastOperatorActivity(View view) { + //获取最后一个Observable来使用 startActivity(new Intent(OperatorsActivity.this, LastOperatorExampleActivity.class)); } public void startReplaySubjectActivity(View view) { + //重复订阅 startActivity(new Intent(OperatorsActivity.this, ReplaySubjectExampleActivity.class)); } public void startPublishSubjectActivity(View view) { + //单独订阅 startActivity(new Intent(OperatorsActivity.this, PublishSubjectExampleActivity.class)); } public void startBehaviorSubjectActivity(View view) { + //类似交叉执行 startActivity(new Intent(OperatorsActivity.this, BehaviorSubjectExampleActivity.class)); } public void startAsyncSubjectActivity(View view) { + //异步订阅 startActivity(new Intent(OperatorsActivity.this, AsyncSubjectExampleActivity.class)); } public void startThrottleFirstActivity(View view) { - startActivity(new Intent(OperatorsActivity.this,ThrottleFirstExampleActivity.class)); + //给定一个时间范围，在这个时间范围内只取第一个数据源 + startActivity(new Intent(OperatorsActivity.this, ThrottleFirstExampleActivity.class)); } public void startThrottleLastActivity(View view) { + //给定一个时间范围，在这个时间范围内只取最后一个数据源 startActivity(new Intent(OperatorsActivity.this, ThrottleLastExampleActivity.class)); } public void startDebounceActivity(View view) { + //防抖动 startActivity(new Intent(OperatorsActivity.this, DebounceExampleActivity.class)); } public void startWindowActivity(View view) { - startActivity(new Intent(OperatorsActivity.this,WindowExampleActivity.class)); + startActivity(new Intent(OperatorsActivity.this, WindowExampleActivity.class)); } public void startDelayActivity(View view) { - startActivity(new Intent(OperatorsActivity.this,DelayExampleActivity.class)); + startActivity(new Intent(OperatorsActivity.this, DelayExampleActivity.class)); } public void startSwitchMapActivity(View view) { diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/SelectionActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/SelectionActivity.java index fd392dd..4f224f4 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/SelectionActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/SelectionActivity.java @@ -2,6 +2,7 @@ import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import com.rxjava2.android.samples.MyApplication; @@ -13,7 +14,6 @@ import com.rxjava2.android.samples.ui.rxbus.RxBusActivity; import com.rxjava2.android.samples.ui.search.SearchActivity; -import androidx.appcompat.app.AppCompatActivity; public class SelectionActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/cache/CacheExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/cache/CacheExampleActivity.java index bd98f63..3b0c85d 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/cache/CacheExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/cache/CacheExampleActivity.java @@ -14,7 +14,7 @@ import com.rxjava2.android.samples.ui.cache.source.NetworkDataSource; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/compose/ComposeOperatorExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/compose/ComposeOperatorExampleActivity.java index 89ab45b..68fc094 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/compose/ComposeOperatorExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/compose/ComposeOperatorExampleActivity.java @@ -4,7 +4,7 @@ import com.rxjava2.android.samples.R; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Flowable; import io.reactivex.Observable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/networking/NetworkingActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/networking/NetworkingActivity.java index 6878e3a..7cace95 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/networking/NetworkingActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/networking/NetworkingActivity.java @@ -5,7 +5,7 @@ import android.util.Pair; import android.view.View; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import com.rx2androidnetworking.Rx2AndroidNetworking; import com.rxjava2.android.samples.R; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java index d2243a2..30e1a29 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.operators; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; @@ -9,7 +10,6 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.subjects.AsyncSubject; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java index 9eeadd0..9a9bb46 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.subjects.BehaviorSubject; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java index 9171136..5fe3aa8 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java @@ -11,7 +11,7 @@ import java.util.List; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -44,7 +44,7 @@ public void onClick(View view) { * simple example using buffer operator - bundles all emitted values into a list */ private void doSomeWork() { - + //从第一个Observable开始，发射count个。第二次发射是从第一个初始值下标加skip Observable> buffered = getObservable().buffer(3, 1); // 3 means, it takes max of three from its start index and create list diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java index 4ee612f..0c2c3ed 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Completable; import io.reactivex.CompletableObserver; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java index 8bb3e2b..695902b 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java @@ -7,9 +7,11 @@ import android.widget.TextView; import com.rxjava2.android.samples.R; +import com.rxjava2.android.samples.model.NetWork; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; + import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -48,18 +50,18 @@ public void onClick(View view) { */ private void doSomeWork() { final String[] aStrings = {"A1", "A2", "A3", "A4"}; - final String[] bStrings = {"B1", "B2", "B3"}; + final NetWork[] bStrings = {new NetWork("status1"), new NetWork("status2"), new NetWork("status3")}; final Observable aObservable = Observable.fromArray(aStrings); - final Observable bObservable = Observable.fromArray(bStrings); + final Observable bObservable = Observable.fromArray(bStrings); Observable.concat(aObservable, bObservable) .subscribe(getObserver()); } - private Observer getObserver() { - return new Observer() { + private Observer getObserver() { + return new Observer() { @Override public void onSubscribe(Disposable d) { @@ -67,10 +69,18 @@ public void onSubscribe(Disposable d) { } @Override - public void onNext(String value) { - textView.append(" onNext : value : " + value); + public void onNext(Object value) { + String valueStr = ""; + if (value instanceof String) + valueStr = (String) value; + else + valueStr = ((NetWork) value).status; + textView.append(" onNext : value : " + valueStr); + if ("A3".equals(valueStr)) { + onError(new Throwable("Throwable")); + } textView.append(AppConstant.LINE_SEPARATOR); - Log.d(TAG, " onNext : value : " + value); + Log.d(TAG, " onNext : value : " + valueStr); } @Override diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java index 7837381..7ff49c8 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; @@ -51,6 +51,7 @@ public void onClick(View view) { */ private void doSomeWork() { getObservable() + //发射当前数据距离下一个数据之间的间隔超过500ms时当前发射的数据生效 .debounce(500, TimeUnit.MILLISECONDS) // Run on a background thread .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DeferExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DeferExampleActivity.java index 0e6249c..f456028 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DeferExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DeferExampleActivity.java @@ -10,7 +10,7 @@ import com.rxjava2.android.samples.model.Car; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DelayExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DelayExampleActivity.java index 212092c..47369df 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DelayExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DelayExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DisposableExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DisposableExampleActivity.java index 9e51b3c..0b26cb6 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DisposableExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DisposableExampleActivity.java @@ -12,7 +12,7 @@ import java.util.concurrent.Callable; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableSource; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DistinctExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DistinctExampleActivity.java index af2c0e3..276365d 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/DistinctExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/DistinctExampleActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.operators; import android.os.Bundle; +import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; @@ -9,8 +10,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/FilterExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/FilterExampleActivity.java index 35ddf9a..82fabc4 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/FilterExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/FilterExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -49,6 +49,7 @@ private void doSomeWork() { .filter(new Predicate() { @Override public boolean test(Integer integer) { + //为true的时候，将返回该integer return integer % 2 == 0; } }) diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/FlowableExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/FlowableExampleActivity.java index 2bf727f..15917af 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/FlowableExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/FlowableExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Flowable; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; @@ -45,7 +45,7 @@ public void onClick(View view) { private void doSomeWork() { Flowable observable = Flowable.just(1, 2, 3, 4); - + //reduce含义为减少，但是在示例中做的是减法 observable.reduce(50, new BiFunction() { @Override public Integer apply(Integer t1, Integer t2) { diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/IntervalExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/IntervalExampleActivity.java index 36baeaf..6c42f41 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/IntervalExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/IntervalExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/LastOperatorExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/LastOperatorExampleActivity.java index 5cc3087..1c193a9 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/LastOperatorExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/LastOperatorExampleActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.operators; import android.os.Bundle; +import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; @@ -9,8 +10,8 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; + +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/MapExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/MapExampleActivity.java index 29794ca..4652d06 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/MapExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/MapExampleActivity.java @@ -14,7 +14,7 @@ import java.util.List; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/MergeExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/MergeExampleActivity.java index 01551bf..89e6a8e 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/MergeExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/MergeExampleActivity.java @@ -9,7 +9,10 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; + +import java.util.concurrent.TimeUnit; + import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -51,7 +54,7 @@ private void doSomeWork() { final Observable aObservable = Observable.fromArray(aStrings); final Observable bObservable = Observable.fromArray(bStrings); - Observable.merge(aObservable, bObservable) + Observable.timer(500, TimeUnit.MILLISECONDS).merge(aObservable, bObservable) .subscribe(getObserver()); } @@ -68,6 +71,9 @@ public void onSubscribe(Disposable d) { public void onNext(String value) { textView.append(" onNext : value : " + value); textView.append(AppConstant.LINE_SEPARATOR); + if ("A3".equals(value)) { + onError(new Throwable("妙计出错")); + } Log.d(TAG, " onNext : value : " + value); } diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/PublishSubjectExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/PublishSubjectExampleActivity.java index d03266b..e2640ca 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/PublishSubjectExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/PublishSubjectExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.subjects.PublishSubject; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReduceExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReduceExampleActivity.java index aa8aec1..12cba79 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReduceExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReduceExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.MaybeObserver; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplayExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplayExampleActivity.java index c1ce888..c11f493 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplayExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplayExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.observables.ConnectableObservable; @@ -45,7 +45,7 @@ public void onClick(View view) { private void doSomeWork() { PublishSubject source = PublishSubject.create(); - ConnectableObservable connectableObservable = source.replay(3); // bufferSize = 3 to retain 3 values to replay + ConnectableObservable connectableObservable = source.replay(2); // bufferSize = 3 to retain 3 values to replay connectableObservable.connect(); // connecting the connectableObservable connectableObservable.subscribe(getFirstObserver()); diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplaySubjectExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplaySubjectExampleActivity.java index 34bb5e4..a987dc4 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplaySubjectExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplaySubjectExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.subjects.ReplaySubject; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ScanExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ScanExampleActivity.java index 0c263c2..700f38e 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ScanExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ScanExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SimpleExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SimpleExampleActivity.java index 6329b1b..8f9b171 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SimpleExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SimpleExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleAllOperatorActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleAllOperatorActivity.java new file mode 100644 index 0000000..4fd3e11 --- /dev/null +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleAllOperatorActivity.java @@ -0,0 +1,29 @@ +package com.rxjava2.android.samples.ui.operators; + +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.view.View; + +import com.rxjava2.android.samples.R; +import com.rxjava2.android.samples.ui.OperatorsActivity; + +/** + * Single操作集合 + */ +public class SingleAllOperatorActivity extends AppCompatActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_single_all_operator); + } + + public void startSingleJustActivity(View view) { + startActivity(new Intent(SingleAllOperatorActivity.this, SingleObserverExampleActivity.class)); + } + + public void startSingleConcatActivity(View view) { + startActivity(new Intent(SingleAllOperatorActivity.this, SingleObserverConcatActivity.class)); + } +} diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverConcatActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverConcatActivity.java new file mode 100644 index 0000000..1362a29 --- /dev/null +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverConcatActivity.java @@ -0,0 +1,52 @@ +package com.rxjava2.android.samples.ui.operators; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import com.rxjava2.android.samples.R; +import com.rxjava2.android.samples.model.CheckMemory; +import com.rxjava2.android.samples.model.NetWork; + +import io.reactivex.Single; + +public class SingleObserverConcatActivity extends AppCompatActivity { + + private static final String TAG = SingleObserverExampleActivity.class.getSimpleName(); + Button btn; + TextView textView; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_signle_concat); + btn = findViewById(R.id.btn); + textView = findViewById(R.id.textView); + + btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + doSomeWork(); + } + }); + } + + private void doSomeWork() { + Single.concat(Single.just(checkNetWork()), Single.just(checkMemory())); + } + + private NetWork checkNetWork() { + NetWork netWork = new NetWork(""); + return netWork; + } + + private CheckMemory checkMemory() { + CheckMemory checkMemory = new CheckMemory(); + return checkMemory; + } + + +} diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverExampleActivity.java index 403f070..d5e95b2 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Single; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SkipExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SkipExampleActivity.java index 06ad8eb..3c989ff 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SkipExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SkipExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SwitchMapExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SwitchMapExampleActivity.java index d787bc5..438bec5 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/SwitchMapExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/SwitchMapExampleActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.operators; import android.os.Bundle; +import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; @@ -12,8 +13,8 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; + +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableSource; import io.reactivex.Observer; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeExampleActivity.java index 74b4b9f..ec241de 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeExampleActivity.java @@ -9,7 +9,7 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.utils.AppConstant; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeOperatorBaseActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeOperatorBaseActivity.java index a078b5b..62c134f 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeOperatorBaseActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeOperatorBaseActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.operators; import android.os.Bundle; +import android.support.annotation.Nullable; import android.util.Log; import android.widget.Button; import android.widget.TextView; @@ -9,8 +10,8 @@ import com.rxjava2.android.samples.utils.AppConstant; import com.rxjava2.android.samples.utils.ObserverAdapter; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; + +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleFirstExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleFirstExampleActivity.java index a009cc1..9050ca3 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleFirstExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleFirstExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleLastExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleLastExampleActivity.java index b48e208..8947bab 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleLastExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleLastExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TimerExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TimerExampleActivity.java index cbfa1e1..3810d91 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/TimerExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/TimerExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/WindowExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/WindowExampleActivity.java index 881db12..4bd411b 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/WindowExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/WindowExampleActivity.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.Consumer; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ZipExampleActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ZipExampleActivity.java index 11cb394..21ce3de 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/operators/ZipExampleActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/operators/ZipExampleActivity.java @@ -13,7 +13,7 @@ import java.util.List; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationActivity.java index e9c89a9..1cf8eee 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationActivity.java @@ -1,12 +1,13 @@ package com.rxjava2.android.samples.ui.pagination; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ProgressBar; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; + import com.rxjava2.android.samples.R; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationAdapter.java b/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationAdapter.java index ddc0402..ec7f91c 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationAdapter.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/pagination/PaginationAdapter.java @@ -1,5 +1,6 @@ package com.rxjava2.android.samples.ui.pagination; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import androidx.recyclerview.widget.RecyclerView; + /** * Created by amitshekhar on 15/03/17. diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/rxbus/RxBusActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/rxbus/RxBusActivity.java index a991e5e..6b3e819 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/rxbus/RxBusActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/rxbus/RxBusActivity.java @@ -1,6 +1,7 @@ package com.rxjava2.android.samples.ui.rxbus; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -9,7 +10,6 @@ import com.rxjava2.android.samples.R; import com.rxjava2.android.samples.model.Events; -import androidx.appcompat.app.AppCompatActivity; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.functions.Consumer; diff --git a/app/src/main/java/com/rxjava2/android/samples/ui/search/SearchActivity.java b/app/src/main/java/com/rxjava2/android/samples/ui/search/SearchActivity.java index d9353c9..59e325e 100644 --- a/app/src/main/java/com/rxjava2/android/samples/ui/search/SearchActivity.java +++ b/app/src/main/java/com/rxjava2/android/samples/ui/search/SearchActivity.java @@ -1,10 +1,10 @@ package com.rxjava2.android.samples.ui.search; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.widget.SearchView; import android.widget.TextView; -import androidx.appcompat.app.AppCompatActivity; import com.rxjava2.android.samples.R; diff --git a/app/src/main/res/layout/activity_pagination.xml b/app/src/main/res/layout/activity_pagination.xml index d47a5aa..f4a049b 100644 --- a/app/src/main/res/layout/activity_pagination.xml +++ b/app/src/main/res/layout/activity_pagination.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + +