Skip to content

Commit 82c0f5b

Browse files
amitshekhariitbhuamitshekhariitbhu
committed
Merge branch 'master' of github.com:amitshekhariitbhu/RxJava2-Android-Samples
2 parents 27cf2bb + 5012240 commit 82c0f5b

File tree

58 files changed

+472
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+472
-172
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Users switching from 1.x to 2.x have to re-organize their imports, but carefully
3535

3636
Add this in your build.gradle
3737
```groovy
38-
compile 'io.reactivex.rxjava2:rxjava:2.1.1'
38+
compile 'io.reactivex.rxjava2:rxjava:2.2.2'
3939
```
4040
If you are using RxAndroid also, then add the following
4141
```groovy
42-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
42+
compile 'io.reactivex.rxjava2:rxandroid:2.1.0'
4343
```
4444

4545
# RxJava 2 Examples present in this sample project

‎app/build.gradle‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.2"
66

77
defaultConfig {
88
applicationId "com.rxjava2.android.samples"
99
minSdkVersion 16
10-
targetSdkVersion 25
10+
targetSdkVersion 28
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -17,14 +17,25 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
compileOptions {
21+
sourceCompatibility = '1.8'
22+
targetCompatibility = '1.8'
23+
}
2024
}
2125

2226
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
testCompile 'junit:junit:4.12'
25-
compile 'com.android.support:appcompat-v7:25.1.0'
26-
compile 'com.android.support:recyclerview-v7:25.1.0'
27-
compile 'io.reactivex.rxjava2:rxjava:2.1.1'
28-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
29-
compile 'com.amitshekhar.android:rx2-android-networking:1.0.0'
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
testImplementation 'junit:junit:4.12'
29+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
30+
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
31+
androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
32+
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
33+
implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
34+
35+
// RxJava2 Dependencies
36+
implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
37+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
38+
39+
// FastAndroidNetworking Dependency
40+
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.2'
3041
}

‎app/src/androidTest/java/com/rxjava2/android/samples/ApplicationTest.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@
132132
<activity
133133
android:name=".ui.operators.SwitchMapExampleActivity"
134134
android:label="@string/switch_map" />
135+
136+
<activity android:name=".ui.operators.TakeWhileExampleActivity"
137+
android:label="@string/take_while"/>
138+
139+
<activity android:name=".ui.operators.TakeUntilExampleActivity"
140+
android:label="@string/take_until"/>
135141
</application>
136142

137143
</manifest>

‎app/src/main/java/com/rxjava2/android/samples/MyApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void sendAutoEvent() {
3333
Observable.timer(2, TimeUnit.SECONDS)
3434
.subscribe(new Consumer<Long>() {
3535
@Override
36-
public void accept(Long aLong) throws Exception {
36+
public void accept(Long aLong) {
3737
bus.send(new Events.AutoEvent());
3838
}
3939
});

‎app/src/main/java/com/rxjava2/android/samples/model/Car.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void setBrand(String brand) {
1919
public Observable<String> brandDeferObservable() {
2020
return Observable.defer(new Callable<ObservableSource<? extends String>>() {
2121
@Override
22-
public ObservableSource<? extends String> call() throws Exception {
22+
public ObservableSource<? extends String> call() {
2323
return Observable.just(brand);
2424
}
2525
});

‎app/src/main/java/com/rxjava2/android/samples/ui/OperatorsActivity.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.view.View;
76

87
import com.rxjava2.android.samples.R;
@@ -32,12 +31,16 @@
3231
import com.rxjava2.android.samples.ui.operators.SkipExampleActivity;
3332
import com.rxjava2.android.samples.ui.operators.SwitchMapExampleActivity;
3433
import com.rxjava2.android.samples.ui.operators.TakeExampleActivity;
34+
import com.rxjava2.android.samples.ui.operators.TakeUntilExampleActivity;
35+
import com.rxjava2.android.samples.ui.operators.TakeWhileExampleActivity;
3536
import com.rxjava2.android.samples.ui.operators.ThrottleFirstExampleActivity;
3637
import com.rxjava2.android.samples.ui.operators.ThrottleLastExampleActivity;
3738
import com.rxjava2.android.samples.ui.operators.TimerExampleActivity;
3839
import com.rxjava2.android.samples.ui.operators.WindowExampleActivity;
3940
import com.rxjava2.android.samples.ui.operators.ZipExampleActivity;
4041

42+
import androidx.appcompat.app.AppCompatActivity;
43+
4144
public class OperatorsActivity extends AppCompatActivity {
4245

4346
@Override
@@ -169,4 +172,12 @@ public void startDelayActivity(View view) {
169172
public void startSwitchMapActivity(View view) {
170173
startActivity(new Intent(OperatorsActivity.this, SwitchMapExampleActivity.class));
171174
}
175+
176+
public void startTakeWhileActivity(View view) {
177+
startActivity(new Intent(OperatorsActivity.this, TakeWhileExampleActivity.class));
178+
}
179+
180+
public void startTakeUntilActivity(View view) {
181+
startActivity(new Intent(OperatorsActivity.this, TakeUntilExampleActivity.class));
182+
}
172183
}

‎app/src/main/java/com/rxjava2/android/samples/ui/SelectionActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.view.View;
76

87
import com.rxjava2.android.samples.MyApplication;
@@ -14,6 +13,8 @@
1413
import com.rxjava2.android.samples.ui.rxbus.RxBusActivity;
1514
import com.rxjava2.android.samples.ui.search.SearchActivity;
1615

16+
import androidx.appcompat.app.AppCompatActivity;
17+
1718
public class SelectionActivity extends AppCompatActivity {
1819

1920
@Override

‎app/src/main/java/com/rxjava2/android/samples/ui/compose/ComposeOperatorExampleActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.rxjava2.android.samples.ui.compose;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54

65
import com.rxjava2.android.samples.R;
76

7+
import androidx.appcompat.app.AppCompatActivity;
88
import io.reactivex.Flowable;
99
import io.reactivex.Observable;
1010

‎app/src/main/java/com/rxjava2/android/samples/ui/networking/NetworkingActivity.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.networking;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.util.Pair;
76
import android.view.View;
@@ -16,6 +15,7 @@
1615
import java.util.ArrayList;
1716
import java.util.List;
1817

18+
import androidx.appcompat.app.AppCompatActivity;
1919
import io.reactivex.Observable;
2020
import io.reactivex.ObservableSource;
2121
import io.reactivex.Observer;
@@ -52,7 +52,7 @@ public void map(View view) {
5252
.observeOn(AndroidSchedulers.mainThread())
5353
.map(new Function<ApiUser, User>() {
5454
@Override
55-
public User apply(ApiUser apiUser) throws Exception {
55+
public User apply(ApiUser apiUser) {
5656
// here we get ApiUser from server
5757
User user = new User(apiUser);
5858
// then by converting, we are returning user
@@ -115,7 +115,7 @@ private void findUsersWhoLovesBoth() {
115115
Observable.zip(getCricketFansObservable(), getFootballFansObservable(),
116116
new BiFunction<List<User>, List<User>, List<User>>() {
117117
@Override
118-
public List<User> apply(List<User> cricketFans, List<User> footballFans) throws Exception {
118+
public List<User> apply(List<User> cricketFans, List<User> footballFans) {
119119
List<User> userWhoLovesBoth =
120120
filterUserWhoLovesBoth(cricketFans, footballFans);
121121
return userWhoLovesBoth;
@@ -183,13 +183,13 @@ public void flatMapAndFilter(View view) {
183183
getAllMyFriendsObservable()
184184
.flatMap(new Function<List<User>, ObservableSource<User>>() { // flatMap - to return users one by one
185185
@Override
186-
public ObservableSource<User> apply(List<User> usersList) throws Exception {
186+
public ObservableSource<User> apply(List<User> usersList) {
187187
return Observable.fromIterable(usersList); // returning user one by one from usersList.
188188
}
189189
})
190190
.filter(new Predicate<User>() {
191191
@Override
192-
public boolean test(User user) throws Exception {
192+
public boolean test(User user) {
193193
// filtering user who follows me.
194194
return user.isFollowing;
195195
}
@@ -229,7 +229,7 @@ public void take(View view) {
229229
getUserListObservable()
230230
.flatMap(new Function<List<User>, ObservableSource<User>>() { // flatMap - to return users one by one
231231
@Override
232-
public ObservableSource<User> apply(List<User> usersList) throws Exception {
232+
public ObservableSource<User> apply(List<User> usersList) {
233233
return Observable.fromIterable(usersList); // returning user one by one from usersList.
234234
}
235235
})
@@ -269,13 +269,13 @@ public void flatMap(View view) {
269269
getUserListObservable()
270270
.flatMap(new Function<List<User>, ObservableSource<User>>() { // flatMap - to return users one by one
271271
@Override
272-
public ObservableSource<User> apply(List<User> usersList) throws Exception {
272+
public ObservableSource<User> apply(List<User> usersList) {
273273
return Observable.fromIterable(usersList); // returning user one by one from usersList.
274274
}
275275
})
276276
.flatMap(new Function<User, ObservableSource<UserDetail>>() {
277277
@Override
278-
public ObservableSource<UserDetail> apply(User user) throws Exception {
278+
public ObservableSource<UserDetail> apply(User user) {
279279
// here we get the user one by one
280280
// and returns corresponding getUserDetailObservable
281281
// for that userId
@@ -331,21 +331,21 @@ public void flatMapWithZip(View view) {
331331
getUserListObservable()
332332
.flatMap(new Function<List<User>, ObservableSource<User>>() { // flatMap - to return users one by one
333333
@Override
334-
public ObservableSource<User> apply(List<User> usersList) throws Exception {
334+
public ObservableSource<User> apply(List<User> usersList) {
335335
return Observable.fromIterable(usersList); // returning user one by one from usersList.
336336
}
337337
})
338338
.flatMap(new Function<User, ObservableSource<Pair<UserDetail, User>>>() {
339339
@Override
340-
public ObservableSource<Pair<UserDetail, User>> apply(User user) throws Exception {
340+
public ObservableSource<Pair<UserDetail, User>> apply(User user) {
341341
// here we get the user one by one and then we are zipping
342342
// two observable - one getUserDetailObservable (network call to get userDetail)
343343
// and another Observable.just(user) - just to emit user
344344
return Observable.zip(getUserDetailObservable(user.id),
345345
Observable.just(user),
346346
new BiFunction<UserDetail, User, Pair<UserDetail, User>>() {
347347
@Override
348-
public Pair<UserDetail, User> apply(UserDetail userDetail, User user) throws Exception {
348+
public Pair<UserDetail, User> apply(UserDetail userDetail, User user) {
349349
// runs when network call completes
350350
// we get here userDetail for the corresponding user
351351
return new Pair<>(userDetail, user); // returning the pair(userDetail, user)

0 commit comments

Comments
 (0)