Skip to content

Commit 98e9e16

Browse files
amitshekhariitbhuamitshekhariitbhu
authored
Merge pull request amitshekhariitbhu#38 from bapspatil/master
Migrated to AndroidX, updated build scripts, code refactoring
2 parents cf4fe66 + ffaaa2f commit 98e9e16

Some content is hidden

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

48 files changed

+168
-167
lines changed

Diff for: ‎app/build.gradle

+17-10
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
}
@@ -20,11 +20,18 @@ android {
2020
}
2121

2222
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'
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
24+
testImplementation 'junit:junit:4.12'
25+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
26+
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
27+
androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
28+
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
29+
implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
30+
31+
// RxJava2 Dependencies
32+
implementation 'io.reactivex.rxjava2:rxjava:2.2.1'
33+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
34+
35+
// FastAndroidNetworking Dependency
36+
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.2'
3037
}

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

-13
This file was deleted.

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

+1-1
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
});

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

+1-1
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
});

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

+2-1
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;
@@ -38,6 +37,8 @@
3837
import com.rxjava2.android.samples.ui.operators.WindowExampleActivity;
3938
import com.rxjava2.android.samples.ui.operators.ZipExampleActivity;
4039

40+
import androidx.appcompat.app.AppCompatActivity;
41+
4142
public class OperatorsActivity extends AppCompatActivity {
4243

4344
@Override

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

+2-1
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;
@@ -13,6 +12,8 @@
1312
import com.rxjava2.android.samples.ui.rxbus.RxBusActivity;
1413
import com.rxjava2.android.samples.ui.search.SearchActivity;
1514

15+
import androidx.appcompat.app.AppCompatActivity;
16+
1617
public class SelectionActivity extends AppCompatActivity {
1718

1819
@Override

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

+1-1
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

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

+11-11
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)

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -10,6 +9,7 @@
109
import com.rxjava2.android.samples.R;
1110
import com.rxjava2.android.samples.utils.AppConstant;
1211

12+
import androidx.appcompat.app.AppCompatActivity;
1313
import io.reactivex.Observer;
1414
import io.reactivex.disposables.Disposable;
1515
import io.reactivex.subjects.AsyncSubject;
@@ -28,8 +28,8 @@ public class AsyncSubjectExampleActivity extends AppCompatActivity {
2828
protected void onCreate(Bundle savedInstanceState) {
2929
super.onCreate(savedInstanceState);
3030
setContentView(R.layout.activity_example);
31-
btn = (Button) findViewById(R.id.btn);
32-
textView = (TextView) findViewById(R.id.textView);
31+
btn = findViewById(R.id.btn);
32+
textView = findViewById(R.id.textView);
3333

3434
btn.setOnClickListener(new View.OnClickListener() {
3535
@Override

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -10,6 +9,7 @@
109
import com.rxjava2.android.samples.R;
1110
import com.rxjava2.android.samples.utils.AppConstant;
1211

12+
import androidx.appcompat.app.AppCompatActivity;
1313
import io.reactivex.Observer;
1414
import io.reactivex.disposables.Disposable;
1515
import io.reactivex.subjects.BehaviorSubject;
@@ -28,8 +28,8 @@ public class BehaviorSubjectExampleActivity extends AppCompatActivity {
2828
protected void onCreate(Bundle savedInstanceState) {
2929
super.onCreate(savedInstanceState);
3030
setContentView(R.layout.activity_example);
31-
btn = (Button) findViewById(R.id.btn);
32-
textView = (TextView) findViewById(R.id.textView);
31+
btn = findViewById(R.id.btn);
32+
textView = findViewById(R.id.textView);
3333

3434
btn.setOnClickListener(new View.OnClickListener() {
3535
@Override

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -12,6 +11,7 @@
1211

1312
import java.util.List;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
1515
import io.reactivex.Observable;
1616
import io.reactivex.Observer;
1717
import io.reactivex.disposables.Disposable;
@@ -29,8 +29,8 @@ public class BufferExampleActivity extends AppCompatActivity {
2929
protected void onCreate(Bundle savedInstanceState) {
3030
super.onCreate(savedInstanceState);
3131
setContentView(R.layout.activity_example);
32-
btn = (Button) findViewById(R.id.btn);
33-
textView = (TextView) findViewById(R.id.textView);
32+
btn = findViewById(R.id.btn);
33+
textView = findViewById(R.id.textView);
3434

3535
btn.setOnClickListener(new View.OnClickListener() {
3636
@Override

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -12,6 +11,7 @@
1211

1312
import java.util.concurrent.TimeUnit;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
1515
import io.reactivex.Completable;
1616
import io.reactivex.CompletableObserver;
1717
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -31,8 +31,8 @@ public class CompletableObserverExampleActivity extends AppCompatActivity {
3131
protected void onCreate(Bundle savedInstanceState) {
3232
super.onCreate(savedInstanceState);
3333
setContentView(R.layout.activity_example);
34-
btn = (Button) findViewById(R.id.btn);
35-
textView = (TextView) findViewById(R.id.textView);
34+
btn = findViewById(R.id.btn);
35+
textView = findViewById(R.id.textView);
3636

3737
btn.setOnClickListener(new View.OnClickListener() {
3838
@Override

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -10,6 +9,7 @@
109
import com.rxjava2.android.samples.R;
1110
import com.rxjava2.android.samples.utils.AppConstant;
1211

12+
import androidx.appcompat.app.AppCompatActivity;
1313
import io.reactivex.Observable;
1414
import io.reactivex.Observer;
1515
import io.reactivex.disposables.Disposable;
@@ -27,8 +27,8 @@ public class ConcatExampleActivity extends AppCompatActivity {
2727
protected void onCreate(Bundle savedInstanceState) {
2828
super.onCreate(savedInstanceState);
2929
setContentView(R.layout.activity_example);
30-
btn = (Button) findViewById(R.id.btn);
31-
textView = (TextView) findViewById(R.id.textView);
30+
btn = findViewById(R.id.btn);
31+
textView = findViewById(R.id.textView);
3232

3333
btn.setOnClickListener(new View.OnClickListener() {
3434
@Override

Diff for: ‎app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rxjava2.android.samples.ui.operators;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.util.Log;
65
import android.view.View;
76
import android.widget.Button;
@@ -12,6 +11,7 @@
1211

1312
import java.util.concurrent.TimeUnit;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
1515
import io.reactivex.Observable;
1616
import io.reactivex.ObservableEmitter;
1717
import io.reactivex.ObservableOnSubscribe;
@@ -34,8 +34,8 @@ public class DebounceExampleActivity extends AppCompatActivity {
3434
protected void onCreate(Bundle savedInstanceState) {
3535
super.onCreate(savedInstanceState);
3636
setContentView(R.layout.activity_example);
37-
btn = (Button) findViewById(R.id.btn);
38-
textView = (TextView) findViewById(R.id.textView);
37+
btn = findViewById(R.id.btn);
38+
textView = findViewById(R.id.textView);
3939

4040
btn.setOnClickListener(new View.OnClickListener() {
4141
@Override

0 commit comments

Comments
 (0)