From 4f1fa1c1642dcfb4bb2620d1374d9de622bd1a7e Mon Sep 17 00:00:00 2001 From: Arhipov Date: Wed, 26 Apr 2017 15:41:45 +0300 Subject: [PATCH 1/3] made onBindItemToViewHolder not abstract --- .../components/adapters/ObservableCollectionAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b83751a..a5e1199 100644 --- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java +++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java @@ -304,12 +304,14 @@ public abstract class ObservableCollectionAdapter Date: Wed, 3 May 2017 17:13:10 +0300 Subject: [PATCH 2/3] 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 3/3] 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; }