Skip to content
This repository has been archived by the owner on Aug 9, 2020. It is now read-only.

refactor to Rxjava3 #61

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

refactor to Rxjava3 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ buildscript {
}

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
applicationId "io.victoralbertos.app"
minSdkVersion 16
targetSdkVersion 24
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/OnPreResultActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.view.View;
import android.widget.TextView;
import app.multi_start.FirstActivity;
import io.reactivex.Observable;
import io.reactivex.rxjava3.core.Observable;
import io.victoralbertos.app.R;
import rx_activity_result2.RxActivityResult;

Expand Down
8 changes: 4 additions & 4 deletions rx_activity_result/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ group='com.github.VictorAlbertos'
version='0.4.4-2.x'

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
minSdkVersion 16
targetSdkVersion 25
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"
}
Expand All @@ -22,7 +22,7 @@ android {

dependencies {
api "androidx.fragment:fragment:1.0.0"
api "io.reactivex.rxjava2:rxjava:2.2.3"
api "io.reactivex.rxjava3:rxjava:3.0.4"

testImplementation 'junit:junit:4.12'
}
Expand Down
7 changes: 4 additions & 3 deletions rx_activity_result/src/main/java/rx_activity_result2/ActivitiesLifecycleCallbacks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import android.os.Bundle;
import androidx.annotation.Nullable;

import io.reactivex.Observable;
import io.reactivex.functions.Function;
import io.reactivex.functions.Predicate;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.functions.*;


import java.util.concurrent.TimeUnit;

class ActivitiesLifecycleCallbacks {
Expand Down
3 changes: 2 additions & 1 deletion rx_activity_result/src/main/java/rx_activity_result2/HolderActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
import android.content.IntentSender;
import android.os.Bundle;

import io.reactivex.functions.Action;
import io.reactivex.rxjava3.functions.Action;


public class HolderActivity extends Activity {
private static Request request;
Expand Down
4 changes: 3 additions & 1 deletion rx_activity_result/src/main/java/rx_activity_result2/OnPreResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import android.content.Intent;
import androidx.annotation.Nullable;
import io.reactivex.Observable;

import io.reactivex.rxjava3.core.Observable;


public interface OnPreResult<T> {
Observable<T> response(int requestCode, int resultCode, @Nullable Intent data);
Expand Down
6 changes: 3 additions & 3 deletions rx_activity_result/src/main/java/rx_activity_result2/RxActivityResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

import java.util.List;

import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.functions.Consumer;
import io.reactivex.rxjava3.subjects.PublishSubject;


public final class RxActivityResult {
Expand Down