Skip to content

Commit

Permalink
- change logic of set toolbar.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mycoola committed Jul 9, 2018
1 parent e34ba92 commit fd21b14
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions liband/src/main/java/com/liband/BaseActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@ public void setToolbar(Toolbar toolbar, TextView toolbarTitle, final String titl
toolbarTitle.setVisibility(View.GONE);
}
toolbar.setBackgroundColor(color);

toolbar.setNavigationIcon(navigationIcon);
getSupportActionBar().setDisplayShowTitleEnabled(false);
if (navigationIcon != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(false);

getSupportActionBar().setDisplayHomeAsUpEnabled(true);
toolbar.setNavigationIcon(navigationIcon);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand All @@ -112,7 +111,6 @@ public void onClick(View v) {
});
} else {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down

0 comments on commit fd21b14

Please sign in to comment.