From 4d06add49b478064a1a13bac1253d088fad86f92 Mon Sep 17 00:00:00 2001 From: Kaushik Gopal Date: Wed, 24 Dec 2014 13:50:41 -0800 Subject: [PATCH 001/238] chore: upgradle gradle for Android Studio 1.0 updat --- Android-RxJava.iml | 4 +++- app/app.iml | 19 +++++++++++-------- app/build.gradle | 15 ++++++++------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Android-RxJava.iml b/Android-RxJava.iml index 0bb6048a..55503402 100644 --- a/Android-RxJava.iml +++ b/Android-RxJava.iml @@ -7,7 +7,9 @@ - + + + diff --git a/app/app.iml b/app/app.iml index 3306acd6..5f13451b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -10,7 +10,7 @@ - + - - + - + + + - - + - + diff --git a/app/build.gradle b/app/build.gradle index 2d319374..f34b8794 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' dependencies { - compile 'com.android.support:support-v13:20.0.+' + compile 'com.android.support:support-v13:21.0.2' compile 'com.google.guava:guava:17.+' compile 'com.jakewharton:butterknife:5.1.1' - compile 'com.jakewharton.timber:timber:2.2.2' - compile 'com.netflix.rxjava:rxjava-android:0.20.4' + compile 'com.jakewharton.timber:timber:2.4.2' + compile 'io.reactivex:rxandroid:0.22.0' + //compile 'io.reactivex:rxjava-math:0.21.0' compile 'com.squareup.retrofit:retrofit:1.6.1' compile 'com.squareup.okhttp:okhttp:2.0.0' @@ -16,19 +17,19 @@ dependencies { } android { - compileSdkVersion 19 - buildToolsVersion '19.1.0' + compileSdkVersion 21 + buildToolsVersion '21.1.2' defaultConfig { applicationId "com.morihacky.android.rxjava" minSdkVersion 14 - targetSdkVersion 19 + targetSdkVersion 21 versionCode 1 versionName "1.0" } buildTypes { release { - runProguard false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/build.gradle b/build.gradle index 7744ab79..b24a4434 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e61d1fd..985d63d6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Wed Dec 24 12:27:06 PST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip From 35939b8018a16e23b399a32de1bfabd3201bd51a Mon Sep 17 00:00:00 2001 From: Kaushik Gopal Date: Wed, 24 Dec 2014 14:20:35 -0800 Subject: [PATCH 002/238] feat: setup RxBus Demo fragments --- .../android/rxjava/MainFragment.java | 10 ++++++ .../rxjava/rxbus/RxBusDemoFragment.java | 36 +++++++++++++++++++ .../android/rxjava/rxbus/RxBusFrag1.java | 23 ++++++++++++ .../android/rxjava/rxbus/RxBusFrag2.java | 23 ++++++++++++ .../android/rxjava/rxbus/RxBusFrag3.java | 23 ++++++++++++ app/src/main/res/layout/fragment_main.xml | 6 ++++ .../main/res/layout/fragment_rxbus_demo.xml | 33 +++++++++++++++++ .../main/res/layout/fragment_rxbus_frag1.xml | 11 ++++++ .../main/res/layout/fragment_rxbus_frag2.xml | 8 +++++ .../main/res/layout/fragment_rxbus_frag3.xml | 8 +++++ app/src/main/res/values/colors.xml | 6 ++++ app/src/main/res/values/strings.xml | 1 + 12 files changed, 188 insertions(+) create mode 100644 app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemoFragment.java create mode 100644 app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag1.java create mode 100644 app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag2.java create mode 100644 app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag3.java create mode 100644 app/src/main/res/layout/fragment_rxbus_demo.xml create mode 100644 app/src/main/res/layout/fragment_rxbus_frag1.xml create mode 100644 app/src/main/res/layout/fragment_rxbus_frag2.xml create mode 100644 app/src/main/res/layout/fragment_rxbus_frag3.xml create mode 100644 app/src/main/res/values/colors.xml diff --git a/app/src/main/java/com/morihacky/android/rxjava/MainFragment.java b/app/src/main/java/com/morihacky/android/rxjava/MainFragment.java index 1598da77..ba7b8517 100644 --- a/app/src/main/java/com/morihacky/android/rxjava/MainFragment.java +++ b/app/src/main/java/com/morihacky/android/rxjava/MainFragment.java @@ -9,6 +9,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import com.morihacky.android.rxjava.app.R; +import com.morihacky.android.rxjava.rxbus.RxBusDemoFragment; public class MainFragment extends Fragment { @@ -76,6 +77,15 @@ public void demoPolling() { .commit(); } + @OnClick(R.id.btn_demo_rxbus) + public void demoRxBus() { + getActivity().getSupportFragmentManager() + .beginTransaction() + .addToBackStack(this.toString()) + .replace(R.id.activity_main, new RxBusDemoFragment(), this.toString()) + .commit(); + } + //@OnClick(R.id.btn_demo_subject_timeout) public void demoTimeout() { getActivity().getSupportFragmentManager() diff --git a/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemoFragment.java b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemoFragment.java new file mode 100644 index 00000000..8a41450e --- /dev/null +++ b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusDemoFragment.java @@ -0,0 +1,36 @@ +package com.morihacky.android.rxjava.rxbus; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import butterknife.ButterKnife; +import com.morihacky.android.rxjava.app.R; + +public class RxBusDemoFragment + extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View layout = inflater.inflate(R.layout.fragment_rxbus_demo, container, false); + ButterKnife.inject(this, layout); + return layout; + } + + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + getActivity().getSupportFragmentManager() + .beginTransaction() + .replace(R.id.demo_rxbus_frag_1, new RxBusFrag1()) + .replace(R.id.demo_rxbus_frag_2, new RxBusFrag2()) + .replace(R.id.demo_rxbus_frag_3, new RxBusFrag3()) + .commit(); + } + +} diff --git a/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag1.java b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag1.java new file mode 100644 index 00000000..29669374 --- /dev/null +++ b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag1.java @@ -0,0 +1,23 @@ +package com.morihacky.android.rxjava.rxbus; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import butterknife.ButterKnife; +import com.morihacky.android.rxjava.app.R; + +public class RxBusFrag1 + extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View layout = inflater.inflate(R.layout.fragment_rxbus_frag1, container, false); + ButterKnife.inject(this, layout); + return layout; + } +} diff --git a/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag2.java b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag2.java new file mode 100644 index 00000000..14b73f9c --- /dev/null +++ b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag2.java @@ -0,0 +1,23 @@ +package com.morihacky.android.rxjava.rxbus; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import butterknife.ButterKnife; +import com.morihacky.android.rxjava.app.R; + +public class RxBusFrag2 + extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View layout = inflater.inflate(R.layout.fragment_rxbus_frag2, container, false); + ButterKnife.inject(this, layout); + return layout; + } +} diff --git a/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag3.java b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag3.java new file mode 100644 index 00000000..cabe6bae --- /dev/null +++ b/app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBusFrag3.java @@ -0,0 +1,23 @@ +package com.morihacky.android.rxjava.rxbus; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import butterknife.ButterKnife; +import com.morihacky.android.rxjava.app.R; + +public class RxBusFrag3 + extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View layout = inflater.inflate(R.layout.fragment_rxbus_frag3, container, false); + ButterKnife.inject(this, layout); + return layout; + } +} diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 8e66e952..eacafd6a 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -50,5 +50,11 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:text="@string/btn_demo_polling"/> + +