Merge pull request #33 from mazurio/release-122

1.2.2
mazurio · May 10, 2016 · 8cefbc5 · 8cefbc5
2 parents 8d2f0b3 + 137b8c2
commit 8cefbc5
Show file tree

Hide file tree

Showing 34 changed files with 1,420 additions and 1,840 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,14 +40,14 @@ android {
     productFlavors {
         pro {
             applicationId 'com.bodyweight.fitness.pro'
-            versionCode 121
-            versionName "1.2.1"
+            versionCode 122
+            versionName "1.2.2"
         }
 
         free {
             applicationId 'com.bodyweight.fitness.free'
-            versionCode 121
-            versionName "1.2.1"
+            versionCode 122
+            versionName "1.2.2"
         }
     }
     buildTypes {
@@ -98,8 +98,8 @@ dependencies {
     kapt 'com.jakewharton:butterknife:6.1.0'
 
     compile 'com.netflix.rxjava:rxjava-core:0.20.7'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'io.reactivex:rxandroid:1.2.0'
+    compile 'io.reactivex:rxjava:1.1.5'
 
     compile 'com.trello:rxlifecycle:0.5.0'
     compile 'com.trello:rxlifecycle-components:0.5.0'
@@ -108,7 +108,7 @@ dependencies {
     compile 'com.github.johnkil.android-robototextview:robototextview:2.5.0'
     compile 'com.gordonwong:material-sheet-fab:1.2.1'
     compile 'com.github.bmarrdev:android-DecoView-charting:v1.0.1'
-
+    compile 'io.github.kobakei:ratethisapp:1.0.3'
     compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
         transitive = true;
     }

diff --git a/app/src/main/java/com/bodyweight/fitness/App.java b/app/src/main/java/com/bodyweight/fitness/App.java
diff --git a/app/src/main/java/com/bodyweight/fitness/adapter/CalendarAdapter.java b/app/src/main/java/com/bodyweight/fitness/adapter/CalendarAdapter.java
diff --git a/app/src/main/java/com/bodyweight/fitness/adapter/CalendarListAdapter.java b/app/src/main/java/com/bodyweight/fitness/adapter/CalendarListAdapter.java