Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show & Hide methods when on shy mode. #722

Merged
merged 5 commits into from
Mar 31, 2017
Merged

Show & Hide methods when on shy mode. #722

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dc240f
Added methods for showing / hiding the BottomBar when on shy mode.
roughike Mar 29, 2017
8c24f3c
Better naming.
roughike Mar 29, 2017
18726e0
Refactored the hide / show methods to a separate ShySettings class, s…
roughike Mar 29, 2017
1e7cc56
Merge branch 'development' into feature/show-and-hide
roughike Mar 29, 2017
f7decf5
Made getting shy settings not throw an exception when the bottombar i…
roughike Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'development' into feature/show-and-hide 
# Conflicts:
#	bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
  • Loading branch information
@roughike
roughike committed Mar 29, 2017
commit 1e7cc56511cbd528d659c8a6828a21cab6d4ae68
2 changes: 2 additions & 0 deletions bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ boolean isShyHeightAlreadyCalculated() {
return shyHeightAlreadyCalculated;
}

private boolean isIconsOnlyMode() { return !isTabletMode && hasBehavior(BEHAVIOR_ICONS_ONLY); }

private boolean hasBehavior(int behavior) {
return (behaviors | behavior) == behaviors;
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.