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

1、fix skipactivity/baseappcompatactivity potential npe

Browse Source 
2、fix appcontroller logic
This commit is contained in:
CsHeng
2017-05-08 15:22:57 +08:00
parent 1c6907373b
commit 375f538bc1
8 changed files with 139 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java
View File

@ -12,46 +12,47 @@ import com.gh.gamecenter.R;
*/
abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity implements ToolbarController {
protected Toolbar mToolbar;
protected Toolbar mToolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
initNavigationBar();
Util_Window.initStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.theme));
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
initNavigationBar();
Util_Window.initStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.theme));
}
private void initNavigationBar() {
mToolbar = (Toolbar) findViewById(R.id.toolbar_navigation);
if ( mToolbar!=null)
mToolbar.setTitle("");
setSupportActionBar(mToolbar);
}
private void initNavigationBar() {
mToolbar = (Toolbar) findViewById(R.id.toolbar_navigation);
if (mToolbar != null) {
mToolbar.setTitle("");
}
setSupportActionBar(mToolbar);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
return onNavigationIconClicked();
}
return super.onOptionsItemSelected(item);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
return onNavigationIconClicked();
}
return super.onOptionsItemSelected(item);
}
protected abstract boolean onNavigationIconClicked();
protected abstract boolean onNavigationIconClicked();
@Override
public void setNavigationTitle(int res) {
mToolbar.setTitle(res);
}
@Override
public void setNavigationTitle(int res) {
mToolbar.setTitle(res);
}
@Override
public void setNavigationTitle(CharSequence res) {
mToolbar.setTitle(res);
}
@Override
public void setNavigationTitle(CharSequence res) {
mToolbar.setTitle(res);
}
@Override
public Toolbar getToolBar() {
return mToolbar;
}
@Override
public Toolbar getToolBar() {
return mToolbar;
}
}