Skip to content

Commit ae8d5d2

Browse files
miguelbcrmiguelbcr
committed
Conflicts: app/src/androidTest/java/com/miguelbcr/ui/rx_paparazzo/sample/ApplicationTest.java rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo/interactors/DownloadImage.java
2 parents ea3bc61 + f87868d commit ae8d5d2

13 files changed

Lines changed: 39 additions & 28 deletions

File tree

‎.idea/copyright/profiles_settings.xml‎

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

‎README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ allprojects {
3434
And add next dependencies in the build.gradle of the module:
3535
```gradle
3636
dependencies {
37-
compile "com.github.miguelbcr:RxPaparazzo:0.3.2"
38-
compile "io.reactivex:rxjava:1.1.10"
37+
compile "com.github.miguelbcr:RxPaparazzo:0.4.0"
38+
compile 'io.reactivex:rxandroid:1.2.1'
3939
}
4040
```
4141

@@ -69,6 +69,8 @@ Also, this instance holds a reference to the data as the appropriate response, a
6969
```java
7070
RxPaparazzo.takeImage(activityOrFragment)
7171
.usingCamera()
72+
.subscribeOn(Schedulers.io())
73+
.observeOn(AndroidSchedulers.mainThread())
7274
.subscribe(response -> {
7375
if (response.resultCode() != RESULT_OK) {
7476
response.targetUI().showUserCanceled();
@@ -88,6 +90,8 @@ By default, the path is under app name folder on the root of the external storag
8890
```java
8991
RxPaparazzo.takeImage(activityOrFragment)
9092
.usingGallery()
93+
.subscribeOn(Schedulers.io())
94+
.observeOn(AndroidSchedulers.mainThread())
9195
.subscribe(response -> {
9296
if (response.resultCode() != RESULT_OK) {
9397
response.targetUI().showUserCanceled();
@@ -104,6 +108,8 @@ The `response` instance holds a reference to the path where the image was persis
104108
```java
105109
RxPaparazzo.takeImages(activityOrFragment)
106110
.usingGallery()
111+
.subscribeOn(Schedulers.io())
112+
.observeOn(AndroidSchedulers.mainThread())
107113
.subscribe(response -> {
108114
if (response.resultCode() != RESULT_OK) {
109115
response.targetUI().showUserCanceled();

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dependencies {
4444
testCompile 'junit:junit:4.12'
4545
compile 'com.android.support:appcompat-v7:24.2.1'
4646
compile 'com.android.support:design:24.2.1'
47+
compile 'io.reactivex:rxandroid:1.2.1'
4748
compile 'com.squareup.picasso:picasso:2.5.2'
4849
compile project(':rx_paparazzo')
4950

‎app/src/androidTest/java/com/miguelbcr/ui/rx_paparazzo/sample/ApplicationTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.view.View;
1818
import android.view.WindowManager;
1919
import android.widget.ImageView;
20-
2120
import com.miguelbcr.ui.rx_paparazzo.entities.Config;
2221
import com.miguelbcr.ui.rx_paparazzo.entities.TargetUi;
2322
import com.miguelbcr.ui.rx_paparazzo.entities.size.Size;
@@ -27,7 +26,8 @@
2726
import com.miguelbcr.ui.rx_paparazzo.interactors.ImageUtils;
2827
import com.miguelbcr.ui.rx_paparazzo.sample.activities.StartActivity;
2928
import com.miguelbcr.ui.rx_paparazzo.sample.activities.Testable;
30-
29+
import java.io.File;
30+
import java.util.List;
3131
import org.hamcrest.Description;
3232
import org.hamcrest.Matcher;
3333
import org.junit.Before;
@@ -37,9 +37,6 @@
3737
import org.junit.runner.RunWith;
3838
import org.junit.runners.MethodSorters;
3939

40-
import java.io.File;
41-
import java.util.List;
42-
4340
import static android.support.test.espresso.Espresso.onView;
4441
import static android.support.test.espresso.action.ViewActions.click;
4542
import static android.support.test.espresso.assertion.ViewAssertions.matches;

‎app/src/androidTest/java/com/miguelbcr/ui/rx_paparazzo/sample/recyclerview/RecyclerViewMatcher.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.res.Resources;
44
import android.support.v7.widget.RecyclerView;
55
import android.view.View;
6-
76
import org.hamcrest.Description;
87
import org.hamcrest.Matcher;
98
import org.hamcrest.TypeSafeMatcher;

‎app/src/main/java/com/miguelbcr/ui/rx_paparazzo/sample/activities/SampleActivity.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import java.util.ArrayList;
2525
import java.util.List;
26+
import rx.android.schedulers.AndroidSchedulers;
27+
import rx.schedulers.Schedulers;
2628

2729
public class SampleActivity extends AppCompatActivity implements Testable {
2830
private Toolbar toolbar;
@@ -72,6 +74,8 @@ private void captureImage() {
7274
RxPaparazzo.takeImage(SampleActivity.this)
7375
.size(size)
7476
.usingCamera()
77+
.subscribeOn(Schedulers.io())
78+
.observeOn(AndroidSchedulers.mainThread())
7579
.subscribe(response -> {
7680
if (response.resultCode() == RxPaparazzo.RESULT_DENIED_PERMISSION) {
7781
response.targetUI().showUserDidNotGrantPermissions();
@@ -99,6 +103,8 @@ private void captureImageWithCrop() {
99103
.size(size)
100104
.crop(options)
101105
.usingCamera()
106+
.subscribeOn(Schedulers.io())
107+
.observeOn(AndroidSchedulers.mainThread())
102108
.subscribe(response -> {
103109
if (response.resultCode() != RESULT_OK) {
104110
response.targetUI().showUserCanceled();
@@ -122,6 +128,8 @@ private void pickupImage() {
122128
.crop(options)
123129
.size(size)
124130
.usingGallery()
131+
.subscribeOn(Schedulers.io())
132+
.observeOn(AndroidSchedulers.mainThread())
125133
.subscribe(response -> {
126134
if (response.resultCode() != RESULT_OK) {
127135
response.targetUI().showUserCanceled();
@@ -142,6 +150,8 @@ private void pickupImages() {
142150
.crop()
143151
.size(size)
144152
.usingGallery()
153+
.subscribeOn(Schedulers.io())
154+
.observeOn(AndroidSchedulers.mainThread())
145155
.subscribe(response -> {
146156
if (response.resultCode() != RESULT_OK) {
147157
response.targetUI().showUserCanceled();

‎app/src/main/java/com/miguelbcr/ui/rx_paparazzo/sample/fragments/SampleFragment.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.io.File;
2727
import java.util.ArrayList;
2828
import java.util.List;
29+
import rx.android.schedulers.AndroidSchedulers;
30+
import rx.schedulers.Schedulers;
2931

3032
public class SampleFragment extends Fragment implements Testable {
3133
private ImageView imageView;
@@ -67,6 +69,8 @@ private void captureImage() {
6769
RxPaparazzo.takeImage(this)
6870
.size(size)
6971
.usingCamera()
72+
.subscribeOn(Schedulers.io())
73+
.observeOn(AndroidSchedulers.mainThread())
7074
.subscribe(response -> {
7175

7276
if (response.resultCode() != Activity.RESULT_OK) {
@@ -88,6 +92,8 @@ private void captureImageWithCrop() {
8892
.size(size)
8993
.crop(options)
9094
.usingCamera()
95+
.subscribeOn(Schedulers.io())
96+
.observeOn(AndroidSchedulers.mainThread())
9197
.subscribe(response -> {
9298
if (response.resultCode() != Activity.RESULT_OK) {
9399
response.targetUI().showUserCanceled();
@@ -108,6 +114,8 @@ private void pickupImage() {
108114
.crop(options)
109115
.size(size)
110116
.usingGallery()
117+
.subscribeOn(Schedulers.io())
118+
.observeOn(AndroidSchedulers.mainThread())
111119
.subscribe(response -> {
112120
if (response.resultCode() != Activity.RESULT_OK) {
113121
response.targetUI().showUserCanceled();
@@ -125,6 +133,8 @@ private void pickupImages() {
125133
.crop()
126134
.size(size)
127135
.usingGallery()
136+
.subscribeOn(Schedulers.io())
137+
.observeOn(AndroidSchedulers.mainThread())
128138
.subscribe(response -> {
129139
if (response.resultCode() != Activity.RESULT_OK) {
130140
response.targetUI().showUserCanceled();

‎rx_paparazzo/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ android {
3636

3737
dependencies {
3838
compile fileTree(dir: 'libs', include: ['*.jar'])
39-
compile 'io.reactivex:rxjava:1.1.10'
40-
compile 'io.reactivex:rxandroid:1.2.1'
39+
compile 'io.reactivex:rxjava:1.2.2'
4140

42-
compile 'com.github.VictorAlbertos:RxActivityResult:0.3.7'
43-
compile 'com.tbruyelle.rxpermissions:rxpermissions:0.7.1@aar'
41+
compile 'com.github.VictorAlbertos:RxActivityResult:0.3.9'
42+
compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.0@aar'
4443
compile 'com.yalantis:ucrop:2.2.0'
4544

4645
testCompile 'junit:junit:4.12'

‎rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo/interactors/DownloadImage.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@
1717
package com.miguelbcr.ui.rx_paparazzo.interactors;
1818

1919
import android.net.Uri;
20-
2120
import com.miguelbcr.ui.rx_paparazzo.entities.TargetUi;
22-
2321
import java.io.BufferedInputStream;
2422
import java.io.File;
2523
import java.io.InputStream;
2624
import java.net.URL;
2725
import java.net.URLConnection;
28-
2926
import rx.Observable;
3027
import rx.Subscriber;
31-
import rx.android.schedulers.AndroidSchedulers;
3228
import rx.schedulers.Schedulers;
3329

3430
public final class DownloadImage extends UseCase<String> {
@@ -63,13 +59,11 @@ public void call(Subscriber<? super String> subscriber) {
6359

6460
subscriber.onCompleted();
6561
} catch (Exception e) {
66-
subscriber.onNext(null);
6762
subscriber.onError(e);
6863
}
6964
}
7065
})
71-
.subscribeOn(Schedulers.io())
72-
.observeOn(AndroidSchedulers.mainThread());
66+
.subscribeOn(Schedulers.io());
7367
}
7468

7569
private String downloadFile() throws Exception {

‎rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo/interactors/GrantPermissions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public Observable<Void> react() {
4242
return Observable.just(null);
4343
}
4444

45-
return RxPermissions.getInstance(targetUi.activity())
45+
return new RxPermissions(targetUi.activity())
4646
.request(permissions)
4747
.flatMap(new Func1<Boolean, Observable<Void>>() {
4848
@Override

0 commit comments

Comments
 (0)