Skip to content

Commit a216616

Browse files
committed
Migrated to Android X | Updated build scripts
1 parent cf4fe66 commit a216616

Some content is hidden

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

45 files changed

+68
-58
lines changed

app/build.gradle

+14-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,15 @@ 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+
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
26+
implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
27+
28+
// RxJava2 Dependencies
29+
implementation 'io.reactivex.rxjava2:rxjava:2.2.1'
30+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
31+
32+
// FastAndroidNetworking Dependency
33+
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.2'
3034
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.rxjava2.android.samples;
22

3+
import android.annotation.SuppressLint;
34
import android.app.Application;
45

56
import com.rxjava2.android.samples.model.Events;
@@ -29,6 +30,7 @@ public RxBus bus() {
2930
return bus;
3031
}
3132

33+
@SuppressLint("CheckResult")
3234
public void sendAutoEvent() {
3335
Observable.timer(2, TimeUnit.SECONDS)
3436
.subscribe(new Consumer<Long>() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.View;
77

88
import com.rxjava2.android.samples.R;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.View;
77

88
import com.rxjava2.android.samples.MyApplication;

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

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

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.util.Pair;
77
import android.view.View;

app/src/main/java/com/rxjava2/android/samples/ui/operators/AsyncSubjectExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/BehaviorSubjectExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/BufferExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/CompletableObserverExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ConcatExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/DebounceExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/DeferExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/DelayExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/DisposableExampleActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.os.Bundle;
44
import android.os.SystemClock;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.util.Log;
77
import android.view.View;
88
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/DistinctExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.util.Log;
77
import android.view.View;
88
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/FilterExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/FlowableExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/IntervalExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/LastOperatorExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.util.Log;
77
import android.view.View;
88
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/MapExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/MergeExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/PublishSubjectExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ReduceExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplayExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ReplaySubjectExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ScanExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/SimpleExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/SingleObserverExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/SkipExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/SwitchMapExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.util.Log;
77
import android.view.View;
88
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/TakeExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleFirstExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/ThrottleLastExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/TimerExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

app/src/main/java/com/rxjava2/android/samples/ui/operators/WindowExampleActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
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;import android.widget.TextView;import com.rxjava2.android.samples.R;import com.rxjava2.android.samples.utils.AppConstant;import java.util.concurrent.TimeUnit;import io.reactivex.Observable;import io.reactivex.android.schedulers.AndroidSchedulers;import io.reactivex.functions.Consumer;import io.reactivex.schedulers.Schedulers;public class WindowExampleActivity extends AppCompatActivity { private static final String TAG = WindowExampleActivity.class.getSimpleName(); Button btn; TextView textView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_example); btn = (Button) findViewById(R.id.btn); textView = (TextView) findViewById(R.id.textView); btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { doSomeWork(); } }); } /* * Example using window operator -> It periodically * subdivide items from an Observable into * Observable windows and emit these windows rather than * emitting the items one at a time */ protected void doSomeWork() { Observable.interval(1, TimeUnit.SECONDS).take(12) .window(3, TimeUnit.SECONDS) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getConsumer()); } public Consumer<Observable<Long>> getConsumer() { return new Consumer<Observable<Long>>() { @Override public void accept(Observable<Long> observable) throws Exception { Log.d(TAG, "Sub Divide begin...."); textView.append("Sub Divide begin ...."); textView.append(AppConstant.LINE_SEPARATOR); observable .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Consumer<Long>() { @Override public void accept(Long value) { Log.d(TAG, "Next:" + value); textView.append("Next:" + value); textView.append(AppConstant.LINE_SEPARATOR); } }); } }; }}
1+
package com.rxjava2.android.samples.ui.operators;import android.os.Bundle;import androidx.appcompat.app.AppCompatActivity;import android.util.Log;import android.view.View;import android.widget.Button;import android.widget.TextView;import com.rxjava2.android.samples.R;import com.rxjava2.android.samples.utils.AppConstant;import java.util.concurrent.TimeUnit;import io.reactivex.Observable;import io.reactivex.android.schedulers.AndroidSchedulers;import io.reactivex.functions.Consumer;import io.reactivex.schedulers.Schedulers;public class WindowExampleActivity extends AppCompatActivity { private static final String TAG = WindowExampleActivity.class.getSimpleName(); Button btn; TextView textView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_example); btn = (Button) findViewById(R.id.btn); textView = (TextView) findViewById(R.id.textView); btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { doSomeWork(); } }); } /* * Example using window operator -> It periodically * subdivide items from an Observable into * Observable windows and emit these windows rather than * emitting the items one at a time */ protected void doSomeWork() { Observable.interval(1, TimeUnit.SECONDS).take(12) .window(3, TimeUnit.SECONDS) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(getConsumer()); } public Consumer<Observable<Long>> getConsumer() { return new Consumer<Observable<Long>>() { @Override public void accept(Observable<Long> observable) throws Exception { Log.d(TAG, "Sub Divide begin...."); textView.append("Sub Divide begin ...."); textView.append(AppConstant.LINE_SEPARATOR); observable .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Consumer<Long>() { @Override public void accept(Long value) { Log.d(TAG, "Next:" + value); textView.append("Next:" + value); textView.append(AppConstant.LINE_SEPARATOR); } }); } }; }}

app/src/main/java/com/rxjava2/android/samples/ui/operators/ZipExampleActivity.java

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

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.util.Log;
66
import android.view.View;
77
import android.widget.Button;

0 commit comments

Comments
 (0)