Merge pull request #22 from miguelbcr/master

Added interface in order to pre process data before finishing onActivityResult

Author: VictorAlbertos

.gitignore

@@ -1,8 +1,37 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+**/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio
+.navigation/
+.idea/
+**/*.iml
+
+# Android Studio captures folder
+captures/
+
+# .DS_Store files
+**/.DS_Store

.idea/.name

@@ -13,13 +13,13 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
 
     defaultConfig {
         applicationId "io.victoralbertos.app"
-        minSdkVersion 18
-        targetSdkVersion 23
+        minSdkVersion 16
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -43,9 +43,9 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(":rx_activity_result")
 
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'io.reactivex:rxjava:1.1.10'
 
     testCompile 'junit:junit:4.12'
     androidTestCompile ("com.android.support.test:runner:0.4.1") {

.idea/compiler.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="${applicationId}.test"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
+</manifest>

.idea/gradle.xml

@@ -0,0 +1,28 @@
+package app;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import io.victoralbertos.app.R;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+public class OnPreResultTest {
+    @Rule public ActivityTestRule<OnPreResultActivity> activityRule = new ActivityTestRule<>(OnPreResultActivity.class);
+
+    @Test public void CheckHasBothResults() {
+        onView(withId(R.id.start_pre_for_result)).perform(click());
+        onView(withId(R.id.pre_result)).check(matches(withText("Do whatever you want with the data, but not with the UI")));
+        onView(withId(R.id.result)).check(matches(withText("Well done first")));
+    }
+
+}