Commit b8293207 authored by fallenstardust's avatar fallenstardust

修复actionBar更改产生的衍生类问题

parent d17aac06
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
android:name="cn.garymb.ygomobile.ui.activities.WebActivity" android:name="cn.garymb.ygomobile.ui.activities.WebActivity"
android:configChanges="orientation|keyboardHidden|navigation|screenSize" android:configChanges="orientation|keyboardHidden|navigation|screenSize"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/AppTheme" android:theme="@style/AppTheme.Mycard"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" /> android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
<activity <activity
android:name="cn.garymb.ygomobile.ui.mycard.MyCardActivity" android:name="cn.garymb.ygomobile.ui.mycard.MyCardActivity"
......
...@@ -108,7 +108,6 @@ public class BaseActivity extends AppCompatActivity { ...@@ -108,7 +108,6 @@ public class BaseActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getSupportActionBar().hide();
} }
protected void setupActionBar() { protected void setupActionBar() {
......
...@@ -78,6 +78,7 @@ public class CardSearchActivity extends BaseActivity implements CardLoader.CallB ...@@ -78,6 +78,7 @@ public class CardSearchActivity extends BaseActivity implements CardLoader.CallB
// Toolbar toolbar = $(R.id.toolbar); // Toolbar toolbar = $(R.id.toolbar);
// setSupportActionBar(toolbar); // setSupportActionBar(toolbar);
enableBackHome(); enableBackHome();
getSupportActionBar().hide();
mDrawerlayout = $(R.id.drawer_layout); mDrawerlayout = $(R.id.drawer_layout);
mImageLoader = new ImageLoader(true); mImageLoader = new ImageLoader(true);
mListView = $(R.id.list_cards); mListView = $(R.id.list_cards);
......
...@@ -120,7 +120,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi ...@@ -120,7 +120,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getSupportActionBar().hide();
tv_deck = $(R.id.tv_deck); tv_deck = $(R.id.tv_deck);
tv_result_count = $(R.id.result_count); tv_result_count = $(R.id.result_count);
mDeckSpinner = $(R.id.toolbar_list); mDeckSpinner = $(R.id.toolbar_list);
......
...@@ -178,7 +178,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista ...@@ -178,7 +178,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
// 启动 // 启动
NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
NavigationUI.setupWithNavController(navView, navController); NavigationUI.setupWithNavController(navView, navController);
getSupportActionBar().hide();
} }
//调用 //调用
private void onItemSelect() { private void onItemSelect() {
......
...@@ -14,8 +14,7 @@ public class SettingsActivity extends BaseActivity { ...@@ -14,8 +14,7 @@ public class SettingsActivity extends BaseActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
Toolbar toolbar = $(R.id.toolbar); getSupportActionBar().hide();
setSupportActionBar(toolbar);
enableBackHome(); enableBackHome();
getFragmentManager().beginTransaction().replace(R.id.fragment, new SettingFragment()).commit(); getFragmentManager().beginTransaction().replace(R.id.fragment, new SettingFragment()).commit();
} }
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
android:background="#80000000" android:background="#80000000"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/content_toolbar" />
<FrameLayout <FrameLayout
android:id="@+id/fragment" android:id="@+id/fragment"
android:layout_width="match_parent" android:layout_width="match_parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment