Skip to content

Y
YGOMobile
Commit 96d310b0 authored by fallenstardust's avatar fallenstardust
Browse files
Options

调整布局

parent a880213f
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 152 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ 96d310b0
......@@ -48,7 +48,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
private BottomNavigationBar bottomNavigationBar;
private FrameLayout frameLayout;
private Fragment mFragment;
private SettingFragment mSettingFragment;
private HomeFragment fragment_home;
private CardSearchFragment fragment_search;
......@@ -102,7 +101,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
bottomNavigationBar = (BottomNavigationBar) findViewById(R.id.bottom_navigation_bar);
bottomNavigationBar
.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.mycard, R.string.mycard))
.addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.settings))
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java
View file @ 96d310b0
......@@ -24,6 +24,7 @@ import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
......@@ -168,11 +169,11 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
startActivity(new Intent(getActivity(), FileLogActivity.class));
return true;
}
});*/
});
cv_reset_res = view.findViewById(R.id.action_reset_game_res);
cv_reset_res.setOnClickListener(this);
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.setOnClickListener(this);
cv_help = view.findViewById(R.id.action_help);
......@@ -629,10 +630,6 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
case R.id.action_download_ex:
WebActivity.open(getContext(), getString(R.string.action_download_expansions), Constants.URL_YGO233_ADVANCE);
break;
case R.id.action_join_qq_group:
String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
joinQQGroup(key);
break;
case R.id.action_help: {
final DialogPlus dialog = new DialogPlus(getContext());
dialog.setContentView(R.layout.dialog_help);
......@@ -652,10 +649,14 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
});
}
break;
break;/*
case R.id.action_join_qq_group:
String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
joinQQGroup(key);
break;
case R.id.action_reset_game_res:
updateImages();
break;
break;*/
case R.id.nav_webpage: {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(BuildConfig.URL_DONATE));
......
mobile/src/main/res/layout/activity_home.xml
View file @ 96d310b0
......@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#80000000">
android:background="#aa000000">
</FrameLayout>
......
mobile/src/main/res/layout/fragment_home.xml
View file @ 96d310b0
......@@ -68,14 +68,14 @@
android:layout_height="match_parent"
android:layout_margin="5dp"
android:orientation="horizontal"
android:weightSum="1">
android:weightSum="3">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="5dp"
android:layout_marginBottom="60dp"
android:layout_weight="0.5"
android:layout_weight="2"
android:background="@drawable/dialogshort"
android:orientation="vertical">
......@@ -104,9 +104,8 @@
android:id="@+id/shimmer_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:layout_alignParentLeft="true"
android:background="@drawable/window2s"
android:background="@drawable/window3"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title"
......@@ -115,25 +114,36 @@
</LinearLayout>
<LinearLayout
android:id="@+id/rightbar"
android:id="@+id/bottombar"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="15dp"
android:layout_gravity="right"
android:layout_marginBottom="60dp"
android:layout_weight="1"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/dialogshort"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="YGOPro"
android:background="@drawable/veil2"
android:textSize="10sp">
</androidx.appcompat.widget.AppCompatTextView>
<androidx.cardview.widget.CardView
android:id="@+id/action_game"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -149,33 +159,32 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="-30dp"
android:layout_marginStart="-10dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="-10dp"
android:layout_marginEnd="-10dp"
android:layout_marginRight="-20dp"
android:layout_marginBottom="-20dp"
android:layout_marginBottom="-10dp"
android:scaleType="fitEnd"
android:src="@drawable/start" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/action_game"
android:textColor="@color/holo_blue_bright"
android:textColor="@color/holo_green_bright"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_reset_game_res"
android:layout_width="80dp"
<androidx.cardview.widget.CardView
android:id="@+id/action_bot"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -198,26 +207,25 @@
android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp"
android:scaleType="fitEnd"
android:src="@drawable/reset" />
android:src="@drawable/help" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/reset_game_res"
android:text="@string/bot_mode"
android:textColor="@color/holo_blue_bright"
android:textSize="10sp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_replay"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -233,19 +241,19 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="-30dp"
android:layout_marginStart="-10dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="-10dp"
android:layout_marginEnd="-10dp"
android:layout_marginRight="-20dp"
android:layout_marginBottom="-20dp"
android:layout_marginBottom="-10dp"
android:scaleType="fitEnd"
android:src="@drawable/replay" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/replay"
......@@ -257,9 +265,9 @@
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_download_ex"
android:layout_width="80dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -275,19 +283,19 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="-30dp"
android:layout_marginStart="-10dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="-10dp"
android:layout_marginEnd="-10dp"
android:layout_marginRight="-20dp"
android:layout_marginBottom="-20dp"
android:layout_marginBottom="-10dp"
android:scaleType="fitEnd"
android:src="@drawable/downloadimages" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/action_download_expansions"
......@@ -297,17 +305,34 @@
</RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/ic_launcher3"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/dialogshort"
android:layout_gravity="bottom"
android:orientation="vertical">
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_join_qq_group"
android:layout_width="80dp"
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/Function_Menu"
android:background="@drawable/veil2"
android:textSize="10sp">
</androidx.appcompat.widget.AppCompatTextView>
<androidx.cardview.widget.CardView
android:id="@+id/action_help"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="5dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -330,68 +355,25 @@
android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp"
android:scaleType="fitEnd"
android:src="@drawable/joinqqgroup" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/Join_QQ"
android:textColor="@color/holo_blue_bright"
android:textSize="10sp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/action_help"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
app:cardBackgroundColor="@color/transparent"
app:cardElevation="0dp"
app:cardUseCompatPadding="false"
app:elevation="0dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="-30dp"
android:layout_marginRight="-20dp"
android:layout_marginBottom="-20dp"
android:scaleType="fitEnd"
android:src="@drawable/help" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/help"
android:textColor="@color/holo_blue_bright"
android:textColor="@color/holo_green_bright"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/nav_webpage"
android:layout_width="100dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:layout_margin="5dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
......@@ -419,56 +401,15 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/donation"
android:textColor="@color/holo_blue_bright"
android:textColor="@color/selector_text_color_white_gold"
android:textSize="10sp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/action_bot"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"
app:cardBackgroundColor="@color/transparent"
app:cardElevation="0dp"
app:cardUseCompatPadding="false"
app:elevation="0dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-30dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="-30dp"
android:layout_marginRight="-20dp"
android:layout_marginBottom="-20dp"
android:scaleType="fitEnd"
android:src="@drawable/help" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/window3"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/bot_mode"
android:textColor="@color/holo_blue_bright"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
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