Skip to content

Y
YGOMobile
Commit 85a07ca9 authored by fallenstardust's avatar fallenstardust
Browse files
Options

动态按钮高度

parent 2fc0d570
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 75 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java
View file @ 85a07ca9
...@@ -8,6 +8,7 @@ import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath; ...@@ -8,6 +8,7 @@ import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
...@@ -23,6 +24,7 @@ import android.view.ViewGroup; ...@@ -23,6 +24,7 @@ import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
...@@ -87,6 +89,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -87,6 +89,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
private static final String ARG_MC_NEWS_LIST = "mcNewsList"; private static final String ARG_MC_NEWS_LIST = "mcNewsList";
private boolean isMcNewsLoadException = false; private boolean isMcNewsLoadException = false;
private FrameLayout ll_back;
ShimmerTextView tv; ShimmerTextView tv;
Shimmer shimmer; Shimmer shimmer;
private SwipeMenuRecyclerView mServerList; private SwipeMenuRecyclerView mServerList;
...@@ -106,10 +109,8 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -106,10 +109,8 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
private CardView cv_watch_replay; private CardView cv_watch_replay;
//辅助功能 //辅助功能
private CardView cv_download_ex; private CardView cv_download_ex;
private CardView cv_reset_res;
//外连 //外连
private CardView cv_donation; private CardView cv_donation;
private CardView cv_join_QQ;
private CardView cv_help; private CardView cv_help;
@Nullable @Nullable
...@@ -124,7 +125,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -124,7 +125,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
initBanner(layoutView, savedInstanceState); initBanner(layoutView, savedInstanceState);
initView(layoutView); initView(layoutView);
//event //event
if(!EventBus.getDefault().isRegistered(this)){//加上判断 if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
return layoutView; return layoutView;
...@@ -179,14 +180,17 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -179,14 +180,17 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
cv_help = view.findViewById(R.id.action_help); cv_help = view.findViewById(R.id.action_help);
cv_help.setOnClickListener(this); cv_help.setOnClickListener(this);
ll_back = view.findViewById(R.id.return_to_duel);
ll_back.setOnClickListener(this);
tv = (ShimmerTextView) view.findViewById(R.id.shimmer_tv); tv = (ShimmerTextView) view.findViewById(R.id.shimmer_tv);
toggleAnimation(tv); toggleAnimation(tv);
mImageLoader = new ImageLoader(false); mImageLoader = new ImageLoader(false);
mCardManager = DataManager.get().getCardManager(); mCardManager = DataManager.get().getCardManager();
} }
//轮播图 //轮播图
public void initBanner(View view, Bundle saveBundle){ public void initBanner(View view, Bundle saveBundle) {
xb_banner = view.findViewById(R.id.xb_banner); xb_banner = view.findViewById(R.id.xb_banner);
cv_banner = view.findViewById(R.id.cv_banner); cv_banner = view.findViewById(R.id.cv_banner);
tv_banner_loading = view.findViewById(R.id.tv_banner_loading); tv_banner_loading = view.findViewById(R.id.tv_banner_loading);
...@@ -419,13 +423,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -419,13 +423,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
public void BacktoDuel() { public void BacktoDuel() {
tv.setOnClickListener((v) -> {
openGame();
});
if (YGOStarter.isGameRunning(getActivity())) { if (YGOStarter.isGameRunning(getActivity())) {
tv.setVisibility(View.VISIBLE); ll_back.setVisibility(View.VISIBLE);
} else { } else {
tv.setVisibility(View.GONE); ll_back.setVisibility(View.GONE);
} }
} }
...@@ -663,6 +664,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener { ...@@ -663,6 +664,10 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
startActivity(intent); startActivity(intent);
} }
break; break;
case R.id.return_to_duel: {
openGame();
}
break;
case R.id.tv_banner_loading: case R.id.tv_banner_loading:
if (isMcNewsLoadException) if (isMcNewsLoadException)
findMcNews(); findMcNews();
......
mobile/src/main/res/layout/fragment_home.xml
View file @ 85a07ca9
...@@ -66,7 +66,9 @@ ...@@ -66,7 +66,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="60dp"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="3"> android:weightSum="3">
...@@ -74,7 +76,6 @@ ...@@ -74,7 +76,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="60dp"
android:layout_weight="2" android:layout_weight="2"
android:background="@drawable/dialogshort" android:background="@drawable/dialogshort"
android:orientation="vertical"> android:orientation="vertical">
...@@ -100,16 +101,39 @@ ...@@ -100,16 +101,39 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" /> android:scrollbars="none" />
<FrameLayout
android:id="@+id/return_to_duel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/window3"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:gravity="center"
android:src="@drawable/ic_launcher3" />
<cn.garymb.ygomobile.ui.widget.ShimmerTextView <cn.garymb.ygomobile.ui.widget.ShimmerTextView
android:id="@+id/shimmer_tv" android:id="@+id/shimmer_tv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/window3"
android:gravity="center" android:gravity="center"
android:text="@string/return_to_duel" android:text="@string/return_to_duel"
android:textColor="@color/item_title" android:textColor="@color/item_title" />
android:visibility="visible" /> </LinearLayout>
</FrameLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
...@@ -118,13 +142,11 @@ ...@@ -118,13 +142,11 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginBottom="60dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/dialogshort" android:background="@drawable/dialogshort"
android:orientation="vertical"> android:orientation="vertical">
...@@ -134,13 +156,13 @@ ...@@ -134,13 +156,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/veil2" android:background="@drawable/veil2"
android:gravity="center" android:gravity="center"
android:text="YGOPro" android:text="@string/Function_Menu"
android:textSize="10sp"> android:textSize="10sp">
</androidx.appcompat.widget.AppCompatTextView> </androidx.appcompat.widget.AppCompatTextView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/action_game" android:id="@+id/action_help"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_margin="5dp" android:layout_margin="5dp"
...@@ -166,7 +188,7 @@ ...@@ -166,7 +188,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/start" /> android:src="@drawable/help" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -174,14 +196,14 @@ ...@@ -174,14 +196,14 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/action_game" android:text="@string/help"
android:textColor="@color/brightgreen" android:textColor="@color/holo_blue_bright"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_bot" android:id="@+id/nav_webpage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_margin="5dp" android:layout_margin="5dp"
...@@ -207,7 +229,7 @@ ...@@ -207,7 +229,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/bot" /> android:src="@drawable/about" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -215,18 +237,38 @@ ...@@ -215,18 +237,38 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/bot_mode" android:text="@string/donation"
android:textColor="@color/brightgreen" android:textColor="@color/holo_blue_bright"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_marginTop="5dp"
android:background="@drawable/dialogshort"
android:orientation="vertical"
android:weightSum="4">
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/action_replay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:background="@drawable/veil2"
android:gravity="center"
android:text="@string/action_game"
android:textSize="10sp">
</androidx.appcompat.widget.AppCompatTextView>
<androidx.cardview.widget.CardView
android:id="@+id/action_game"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_weight="1"
android:clickable="true" android:clickable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical" android:orientation="vertical"
...@@ -249,7 +291,7 @@ ...@@ -249,7 +291,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/replay" /> android:src="@drawable/start" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -257,18 +299,18 @@ ...@@ -257,18 +299,18 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/replay" android:text="YGOPro"
android:textColor="@color/brightgreen" android:textColor="@color/brightgreen"
android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView
android:id="@+id/action_download_ex" android:id="@+id/action_bot"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="0dp"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_weight="1"
android:clickable="true" android:clickable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical" android:orientation="vertical"
...@@ -291,7 +333,7 @@ ...@@ -291,7 +333,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/downloadimages" /> android:src="@drawable/bot" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -299,40 +341,19 @@ ...@@ -299,40 +341,19 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/action_download_expansions" android:text="@string/bot_mode"
android:textColor="@color/brightgreen" android:textColor="@color/brightgreen"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/dialogshort"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/veil2"
android:gravity="center"
android:text="@string/Function_Menu"
android:textSize="10sp">
</androidx.appcompat.widget.AppCompatTextView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_help" android:id="@+id/action_replay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="0dp"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_weight="1"
android:clickable="true" android:clickable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical" android:orientation="vertical"
...@@ -355,7 +376,7 @@ ...@@ -355,7 +376,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/help" /> android:src="@drawable/replay" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -363,17 +384,19 @@ ...@@ -363,17 +384,19 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/help" android:text="@string/replay"
android:textColor="@color/holo_blue_bright" android:textColor="@color/brightgreen"
android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/nav_webpage" android:id="@+id/action_download_ex"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="0dp"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_weight="1"
android:clickable="true" android:clickable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical" android:orientation="vertical"
...@@ -396,7 +419,7 @@ ...@@ -396,7 +419,7 @@
android:layout_marginRight="-20dp" android:layout_marginRight="-20dp"
android:layout_marginBottom="-10dp" android:layout_marginBottom="-10dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="@drawable/about" /> android:src="@drawable/downloadimages" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -404,8 +427,8 @@ ...@@ -404,8 +427,8 @@
android:background="@drawable/dialogcube" android:background="@drawable/dialogcube"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:paddingTop="13dp" android:paddingTop="13dp"
android:text="@string/donation" android:text="@string/action_download_expansions"
android:textColor="@color/holo_blue_bright" android:textColor="@color/brightgreen"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
......
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