From e242ca909adc5acac84152a5ca3c66f480ee4550 Mon Sep 17 00:00:00 2001 From: Oleg Date: Wed, 26 Apr 2017 15:49:05 +0300 Subject: [PATCH 1/7] rxjava 1.2.10 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7ba31be..af6e053 100644 --- a/build.gradle +++ b/build.gradle @@ -23,5 +23,5 @@ dependencies { provided 'com.android.support:recyclerview-v7:25.3.1' provided 'io.reactivex:rxandroid:1.2.1' - provided 'io.reactivex:rxjava:1.2.9' + provided 'io.reactivex:rxjava:1.2.10' } From d456ce34b13c186f87700c0a8f3a98b30a817530 Mon Sep 17 00:00:00 2001 From: Oleg Date: Wed, 26 Apr 2017 15:49:27 +0300 Subject: [PATCH 2/7] small fix --- .../components/adapters/ObservableCollectionAdapter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java index 8236233..f224d99 100644 --- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java +++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java @@ -464,7 +464,9 @@ public abstract class ObservableCollectionAdapter payloads) { - // do nothing by default + // do nothing by default - let delegates do it } @Nullable From 3f2cf0d70b86d69ff96f25c5d8c47c94112d9508 Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Wed, 3 May 2017 17:13:10 +0300 Subject: [PATCH 3/7] added ability to turn off menu invalidation --- .../navigation/SimpleActionBarDrawerToggle.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java index 8bdf30d..5436d1f 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java @@ -45,6 +45,8 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle @NonNull private final View sidebar; + private boolean isInvalidateOptionsMenuSupported = true; + private boolean hamburgerShowed; private boolean sidebarDisabled; @@ -222,7 +224,13 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle @Override public void onDrawerOpened(@NonNull final View drawerView) { activity.hideSoftInput(); - activity.supportInvalidateOptionsMenu(); + if (isInvalidateOptionsMenuSupported) { + activity.supportInvalidateOptionsMenu(); + } + } + + public void setInvalidateOptionsMenu(final boolean isInvalidateOptionsMenuSupported) { + this.isInvalidateOptionsMenuSupported = isInvalidateOptionsMenuSupported; } @Override From fe22c49ed08b80ce775b50fcf1ef0e56063a9918 Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Wed, 3 May 2017 17:21:22 +0300 Subject: [PATCH 4/7] added comment --- .../navigation/SimpleActionBarDrawerToggle.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java index 5436d1f..8b3d6c4 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java @@ -209,7 +209,9 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle @Override public void onDrawerClosed(@NonNull final View view) { - activity.supportInvalidateOptionsMenu(); + if (isInvalidateOptionsMenuSupported) { + activity.supportInvalidateOptionsMenu(); + } } /** @@ -229,7 +231,12 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle } } - public void setInvalidateOptionsMenu(final boolean isInvalidateOptionsMenuSupported) { + /** + * Set turn on/off invocation of supportInvalidateOptionsMenu + * + * @param isInvalidateOptionsMenuSupported flag for turning on/off invocation. + */ + public void setInvalidateOptionsMenuSupported(final boolean isInvalidateOptionsMenuSupported) { this.isInvalidateOptionsMenuSupported = isInvalidateOptionsMenuSupported; } From 9ee8aaddca0e85e3e7f96233bfdf777bc531967a Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Thu, 4 May 2017 13:15:12 +0300 Subject: [PATCH 5/7] update build tools version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index af6e053..479bb27 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion 25 - buildToolsVersion '25.0.2' + buildToolsVersion '25.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From bf089b8fad098d08fa93b816c33edab667198843 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Fri, 5 May 2017 16:54:10 +0300 Subject: [PATCH 6/7] added comment to empty method body --- .../components/adapters/ObservableCollectionAdapter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java index a5e1199..ddd294c 100644 --- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java +++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java @@ -311,6 +311,7 @@ public abstract class ObservableCollectionAdapter Date: Wed, 10 May 2017 21:18:51 +0300 Subject: [PATCH 7/7] rxjava version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 479bb27..9a623fd 100644 --- a/build.gradle +++ b/build.gradle @@ -23,5 +23,5 @@ dependencies { provided 'com.android.support:recyclerview-v7:25.3.1' provided 'io.reactivex:rxandroid:1.2.1' - provided 'io.reactivex:rxjava:1.2.10' + provided 'io.reactivex:rxjava:1.3.0' }