Commit 96d310b0 authored by fallenstardust's avatar fallenstardust

调整布局

parent a880213f
...@@ -48,7 +48,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista ...@@ -48,7 +48,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
private BottomNavigationBar bottomNavigationBar; private BottomNavigationBar bottomNavigationBar;
private FrameLayout frameLayout; private FrameLayout frameLayout;
private Fragment mFragment; private Fragment mFragment;
private SettingFragment mSettingFragment;
private HomeFragment fragment_home; private HomeFragment fragment_home;
private CardSearchFragment fragment_search; private CardSearchFragment fragment_search;
...@@ -102,7 +101,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista ...@@ -102,7 +101,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
bottomNavigationBar = (BottomNavigationBar) findViewById(R.id.bottom_navigation_bar); bottomNavigationBar = (BottomNavigationBar) findViewById(R.id.bottom_navigation_bar);
bottomNavigationBar bottomNavigationBar
.addItem(new BottomNavigationItem(R.drawable.ic_home, R.string.mc_home)) .addItem(new BottomNavigationItem(R.drawable.ic_home, R.string.mc_home))
.addItem(new BottomNavigationItem(R.drawable.ic_search, R.string.search)) .addItem(new BottomNavigationItem(R.drawable.searcher, R.string.search))
.addItem(new BottomNavigationItem(R.drawable.ic_add, R.string.deck_manager)) .addItem(new BottomNavigationItem(R.drawable.ic_add, R.string.deck_manager))
.addItem(new BottomNavigationItem(R.drawable.mycard, R.string.mycard)) .addItem(new BottomNavigationItem(R.drawable.mycard, R.string.mycard))
.addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.settings)) .addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.settings))
......
...@@ -24,6 +24,7 @@ import android.view.inputmethod.EditorInfo; ...@@ -24,6 +24,7 @@ import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
...@@ -168,11 +169,11 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -168,11 +169,11 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
startActivity(new Intent(getActivity(), FileLogActivity.class)); startActivity(new Intent(getActivity(), FileLogActivity.class));
return true; return true;
} }
});*/ });
cv_reset_res = view.findViewById(R.id.action_reset_game_res); cv_reset_res = view.findViewById(R.id.action_reset_game_res);
cv_reset_res.setOnClickListener(this); cv_reset_res.setOnClickListener(this);
cv_join_QQ = view.findViewById(R.id.action_join_qq_group); cv_join_QQ = view.findViewById(R.id.action_join_qq_group);
cv_join_QQ.setOnClickListener(this); cv_join_QQ.setOnClickListener(this);*/
cv_donation = view.findViewById(R.id.nav_webpage); cv_donation = view.findViewById(R.id.nav_webpage);
cv_donation.setOnClickListener(this); cv_donation.setOnClickListener(this);
cv_help = view.findViewById(R.id.action_help); cv_help = view.findViewById(R.id.action_help);
...@@ -629,10 +630,6 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -629,10 +630,6 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
case R.id.action_download_ex: case R.id.action_download_ex:
WebActivity.open(getContext(), getString(R.string.action_download_expansions), Constants.URL_YGO233_ADVANCE); WebActivity.open(getContext(), getString(R.string.action_download_expansions), Constants.URL_YGO233_ADVANCE);
break; break;
case R.id.action_join_qq_group:
String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
joinQQGroup(key);
break;
case R.id.action_help: { case R.id.action_help: {
final DialogPlus dialog = new DialogPlus(getContext()); final DialogPlus dialog = new DialogPlus(getContext());
dialog.setContentView(R.layout.dialog_help); dialog.setContentView(R.layout.dialog_help);
...@@ -652,10 +649,14 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -652,10 +649,14 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
}); });
} }
break;/*
case R.id.action_join_qq_group:
String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
joinQQGroup(key);
break; break;
case R.id.action_reset_game_res: case R.id.action_reset_game_res:
updateImages(); updateImages();
break; break;*/
case R.id.nav_webpage: { case R.id.nav_webpage: {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(BuildConfig.URL_DONATE)); intent.setData(Uri.parse(BuildConfig.URL_DONATE));
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="#80000000"> android:background="#aa000000">
</FrameLayout> </FrameLayout>
......
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