Libs updated

aarcosg · Jun 7, 2016 · 92bd201 · 92bd201
1 parent bc02db4
commit 92bd201
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 87 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -58,25 +58,26 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
     //Android
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
-    compile 'com.android.support:support-v4:23.3.0'
-    compile 'com.android.support:recyclerview-v7:23.3.0'
-    compile 'com.android.support:cardview-v7:23.3.0'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:cardview-v7:23.4.0'
     compile 'com.android.support:multidex:1.0.1'
 
     //Google Play Services
-    compile 'com.google.android.gms:play-services:8.4.0'
+    compile 'com.google.android.gms:play-services:9.0.2'
 
     //ButterKnife
-    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.jakewharton:butterknife:8.0.1'
+    apt 'com.jakewharton:butterknife-compiler:8.0.1'
 
     //Google Maps Utils
     compile 'com.google.maps.android:android-maps-utils:0.4.3'
 
     //OkHTTP3
-    compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
+    compile 'com.squareup.okhttp3:okhttp:3.3.1'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
 
     //GSON
     compile 'com.google.code.gson:gson:2.6.2'
@@ -93,23 +94,23 @@ dependencies {
     }
 
     //Dagger 2
-    apt 'com.google.dagger:dagger-compiler:2.1'
-    compile 'com.google.dagger:dagger:2.1'
+    apt 'com.google.dagger:dagger-compiler:2.2'
+    compile 'com.google.dagger:dagger:2.2'
 
     //Retrofit
     compile 'com.squareup.retrofit2:retrofit:2.0.2'
     compile 'com.squareup.retrofit2:converter-gson:2.0.2'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
 
     //RxJava
-    compile 'io.reactivex:rxjava:1.1.2'
-    compile 'io.reactivex:rxandroid:1.1.0'
+    compile 'io.reactivex:rxjava:1.1.5'
+    compile 'io.reactivex:rxandroid:1.2.0'
 
     //RxFit
-    compile 'com.patloew.rxfit:rxfit:1.2.0'
+    compile 'com.patloew.rxfit:rxfit:1.2.1'
 
     //RxGoogleMaps
-    compile 'com.sdoward:rxgooglemaps:0.2@aar'
+    compile 'com.sdoward:rxgooglemaps:1.0@aar'
 
     //RxPermissions
     compile 'com.tbruyelle.rxpermissions:rxpermissions:0.7.0@aar'

diff --git a/app/src/main/java/us/idinfor/smartcitizen/interactor/ActivityTimelineInteractorImpl.java b/app/src/main/java/us/idinfor/smartcitizen/interactor/ActivityTimelineInteractorImpl.java
@@ -37,7 +37,7 @@ public Observable<List<ActivityDetails>> getGoogleFitQueryResponse(int timeRange
 
         return RxFit.checkConnection()
             .andThen(RxFit.History.read(dataReadRequestServer)
-            .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+            .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
             .flatMapObservable(dataReadResult -> Observable.just(
                     GoogleFitHelper.getActivityDetailsListFromBuckets(dataReadResult.getBuckets())
             ))

diff --git a/app/src/main/java/us/idinfor/smartcitizen/interactor/FitnessInteractorImpl.java b/app/src/main/java/us/idinfor/smartcitizen/interactor/FitnessInteractorImpl.java
@@ -53,7 +53,7 @@ public Observable<ActivityDetails> getGoogleFitQueryResponse(int timeRange) {
 
         return RxFit.checkConnection()
             .andThen(RxFit.History.read(dataReadRequestServer)
-            .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+            .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
             .flatMapObservable(dataReadResult -> Observable.from(dataReadResult.getBuckets()))
             .flatMap(bucket -> Observable.just(GoogleFitHelper.getActivityDetailsFromBucket(bucket))
             .subscribeOn(Schedulers.computation())

diff --git a/app/src/main/java/us/idinfor/smartcitizen/interactor/LocationDetailsInteractorImpl.java b/app/src/main/java/us/idinfor/smartcitizen/interactor/LocationDetailsInteractorImpl.java
@@ -36,7 +36,7 @@ public Observable<List<LatLng>> getGoogleFitQueryResponse(int timeRange) {
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 GoogleFitHelper.getPointListFromDataSets(dataReadResult.getDataSets())
                         ))

diff --git a/app/src/main/java/us/idinfor/smartcitizen/interactor/SyncServiceInteractorImpl.java b/app/src/main/java/us/idinfor/smartcitizen/interactor/SyncServiceInteractorImpl.java
@@ -165,7 +165,7 @@ public Observable<List<LocationSampleFit>> queryLocationsToGoogleFit(long startT
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getLocationListFromDataSets(dataReadResult.getDataSets())
                         ))
@@ -188,7 +188,7 @@ public Observable<List<ActivitySegmentFit>> queryActivitiesToGoogleFit(long star
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getActivitySegmentListFromBuckets(dataReadResult.getBuckets())
                         ))
@@ -209,7 +209,7 @@ public Observable<List<StepCountDeltaFit>> queryStepsToGoogleFit(long startTime,
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getStepsListFromDataSets(dataReadResult.getDataSets())
                         ))
@@ -230,7 +230,7 @@ public Observable<List<DistanceDeltaFit>> queryDistancesToGoogleFit(long startTi
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getDistanceListFromDataSets(dataReadResult.getDataSets())
                         ))
@@ -251,7 +251,7 @@ public Observable<List<CaloriesExpendedFit>> queryCaloriesExpendedToGoogleFit(lo
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getCaloriesExpendedListFromDataSets(dataReadResult.getDataSets())
                         ))
@@ -272,7 +272,7 @@ public Observable<List<HeartRateSampleFit>> queryHeartRateSamplesToGoogleFit(lon
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getHeartRateSampleListFromDataSets(dataReadResult.getDataSets())
                         ))
@@ -294,7 +294,7 @@ public Observable<List<ActivitySegmentFit>> querySleepActivityToGoogleFit(long s
 
         return RxFit.checkConnection()
                 .andThen(RxFit.History.read(dataReadRequestServer)
-                        .compose(new RxFit.OnExceptionResumeNext.Single<>(RxFit.History.read(dataReadRequest)))
+                        .compose(RxFit.OnExceptionResumeNext.with(RxFit.History.read(dataReadRequest)))
                         .flatMapObservable(dataReadResult -> Observable.just(
                                 SyncServiceUtils.getSleepActivityListFromBuckets(dataReadResult.getBuckets())
                         ))

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/activity/MainActivity.java b/app/src/main/java/us/idinfor/smartcitizen/ui/activity/MainActivity.java
@@ -20,10 +20,10 @@
 
 import javax.inject.Inject;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 import us.idinfor.smartcitizen.R;
-import us.idinfor.smartcitizen.utils.Utils;
 import us.idinfor.smartcitizen.data.api.hermes.entity.User;
 import us.idinfor.smartcitizen.di.HasComponent;
 import us.idinfor.smartcitizen.di.components.DaggerMainComponent;
@@ -33,6 +33,7 @@
 import us.idinfor.smartcitizen.mvp.view.MainView;
 import us.idinfor.smartcitizen.service.SyncService;
 import us.idinfor.smartcitizen.ui.fragment.FitnessFragment;
+import us.idinfor.smartcitizen.utils.Utils;
 
 public class MainActivity extends BaseActivity
         implements MainView, HasComponent<MainComponent>, NavigationView.OnNavigationItemSelectedListener {
@@ -42,11 +43,11 @@ public class MainActivity extends BaseActivity
     private static final long DRAWER_DELAY_MS = 265;
     private static final String NAV_ITEM_ID = "nav_item_id";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
-    @Bind(R.id.navigation_view)
+    @BindView(R.id.navigation_view)
     NavigationView mNavigationView;
-    @Bind(R.id.drawer_layout)
+    @BindView(R.id.drawer_layout)
     DrawerLayout mDrawerLayout;
     TextView mUserNameTV;
 
@@ -55,6 +56,7 @@ public class MainActivity extends BaseActivity
     @Inject
     MainPresenter mMainPresenter;
 
+    private Unbinder mUnbinder;
     private MainComponent mMainComponent;
     private final Handler mDrawerActionHandler = new Handler();
     private ActionBarDrawerToggle mDrawerToggle;
@@ -80,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
         setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        mUnbinder = ButterKnife.bind(this);
         buildActionBarToolbar(getString(R.string.app_name),false);
 
         mTitle = mDrawerTitle = getTitle();
@@ -107,7 +109,7 @@ protected void onDestroy() {
         if(mDrawerLayout != null){
             mDrawerLayout.removeDrawerListener(mDrawerToggle);
         }
-        ButterKnife.unbind(this);
+        mUnbinder.unbind();
     }
 
     @Override

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityDurationPagerAdapter.java b/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityDurationPagerAdapter.java
@@ -10,33 +10,35 @@
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 import us.idinfor.smartcitizen.R;
-import us.idinfor.smartcitizen.utils.Utils;
 import us.idinfor.smartcitizen.data.api.google.fit.entity.ActivitySummaryFit;
+import us.idinfor.smartcitizen.utils.Utils;
 
 public class ActivityDurationPagerAdapter extends PagerAdapter {
 
-    Context mContext;
-    LayoutInflater mLayoutInflater;
-    List<ActivitySummaryFit> activities;
-    @Bind(R.id.activityIcon)
+    private Context mContext;
+    private LayoutInflater mLayoutInflater;
+    private List<ActivitySummaryFit> mActivities;
+    private Unbinder mUnbinder;
+    @BindView(R.id.activityIcon)
     ImageView mActivityIcon;
-    @Bind(R.id.activityDuration)
+    @BindView(R.id.activityDuration)
     TextView mActivityDuration;
-    @Bind(R.id.activityName)
+    @BindView(R.id.activityName)
     TextView mActivityName;
 
     public ActivityDurationPagerAdapter(Context context, List<ActivitySummaryFit> activities) {
         mContext = context;
-        this.activities = activities;
+        mActivities = activities;
         mLayoutInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
     @Override
     public int getCount() {
-        return activities.size();
+        return mActivities.size();
     }
 
     @Override
@@ -47,8 +49,8 @@ public boolean isViewFromObject(View view, Object object) {
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
         View itemView = mLayoutInflater.inflate(R.layout.activity_duration_pager_item, container, false);
-        ButterKnife.bind(this, itemView);
-        ActivitySummaryFit activitySummary = activities.get(position);
+        mUnbinder = ButterKnife.bind(this, itemView);
+        ActivitySummaryFit activitySummary = mActivities.get(position);
 
         Integer icon = Utils.getIconResourceId(mContext,activitySummary.getName());
 
@@ -76,6 +78,6 @@ public Object instantiateItem(ViewGroup container, int position) {
     @Override
     public void destroyItem(ViewGroup container, int position, Object object) {
         container.removeView((View) object);
-        ButterKnife.unbind(object);
+        mUnbinder.unbind();
     }
 }
diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityTimelineAdapter.java b/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityTimelineAdapter.java
@@ -20,11 +20,11 @@
 import java.util.List;
 import java.util.Locale;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import us.idinfor.smartcitizen.R;
-import us.idinfor.smartcitizen.utils.Utils;
 import us.idinfor.smartcitizen.data.api.google.fit.ActivityDetails;
+import us.idinfor.smartcitizen.utils.Utils;
 
 public class ActivityTimelineAdapter extends RecyclerView.Adapter<ActivityTimelineAdapter.ViewHolder> implements View.OnClickListener {
 
@@ -126,19 +126,19 @@ public void clear() {
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
-        @Bind(R.id.icon)
+        @BindView(R.id.icon)
         RoundedImageView mIcon;
-        @Bind(R.id.wrapper)
+        @BindView(R.id.wrapper)
         LinearLayout mWrapper;
-        @Bind(R.id.duration)
+        @BindView(R.id.duration)
         TextView mDuration;
-        @Bind(R.id.startTime)
+        @BindView(R.id.startTime)
         TextView mStartTime;
-        @Bind(R.id.stepsCounter)
+        @BindView(R.id.stepsCounter)
         TextView mStepsCounter;
-        @Bind(R.id.caloriesCounter)
+        @BindView(R.id.caloriesCounter)
         TextView mCaloriesCounter;
-        @Bind(R.id.distanceCounter)
+        @BindView(R.id.distanceCounter)
         TextView mDistanceCounter;
 
         public ViewHolder(View itemView) {

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/ActivityTimelineFragment.java b/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/ActivityTimelineFragment.java
@@ -17,8 +17,9 @@
 
 import javax.inject.Inject;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 import us.idinfor.smartcitizen.Constants;
 import us.idinfor.smartcitizen.R;
 import us.idinfor.smartcitizen.data.api.google.fit.ActivityDetails;
@@ -35,11 +36,12 @@ public class ActivityTimelineFragment extends BaseFragment implements ActivityTi
     @Inject
     ActivityTimelinePresenter mActivityTimelinePresenter;
 
-    @Bind(R.id.progressBar)
+    @BindView(R.id.progressBar)
     ProgressBar mProgressBar;
-    @Bind(R.id.activitiesRecyclerView)
+    @BindView(R.id.activitiesRecyclerView)
     RecyclerView mActivitiesRecyclerView;
 
+    private Unbinder mUnbinder;
     private ActivityTimelineAdapter mAdapter;
 
     public ActivityTimelineFragment() {
@@ -55,7 +57,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final View fragmentView = inflater.inflate(R.layout.fragment_activity_timeline, container, false);
-        ButterKnife.bind(this, fragmentView);
+        mUnbinder = ButterKnife.bind(this, fragmentView);
         this.mActivityTimelinePresenter.setView(this);
         this.mActivityTimelinePresenter.onCreateView();
         return fragmentView;
@@ -76,7 +78,7 @@ public void onResume() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        mUnbinder.unbind();
     }
 
     @Override