Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev_3.7.1

Browse Source 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/gh/base/ToolBarActivity.java
This commit is contained in:
kehaoyuan
2019-10-31 11:40:54 +08:00
parent 707bc9bb1a baa22ae9c9
commit d55c4d12bc
21 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/base/ToolBarActivity.java
View File

@ -93,7 +93,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
if (mToolbar != null) {
setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
mToolbar.setNavigationIcon(provideNavigationIcon());
mToolbar.setNavigationOnClickListener(view -> onBackPressed());
mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
if (mTitleTv != null) {
mTitleTv.setOnClickListener(view -> {
final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
@ -245,7 +245,9 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
}
}
protected boolean showDownloadMenu() {
return false;
protected View.OnClickListener provideNavigationItemClickListener() {
return view -> onBackPressed();
}
protected abstract boolean showDownloadMenu();
}