Skip to content

Y
YGOMobile
Commit 26e30000 authored by fallenstardust's avatar fallenstardust
Browse files
Options

允许跟随系统屏幕旋转

parent 66ec3716
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 78 deletions
mobile/src/main/AndroidManifest.xml
View file @ 26e30000
......@@ -41,9 +41,9 @@
<activity
android:name="cn.garymb.ygomobile.ui.home.MainActivity"
android:configChanges="orientation|keyboardHidden|navigation|screenSize"
android:configChanges="keyboardHidden|navigation"
android:exported="true"
android:screenOrientation="portrait"
android:screenOrientation="unspecified"
android:launchMode="singleTop"
android:theme="@style/AppTheme"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
......@@ -136,9 +136,9 @@
tools:replace="android:theme" />
<activity
android:name="cn.garymb.ygomobile.ui.file.FileActivity"
android:configChanges="orientation|keyboardHidden|navigation|screenSize"
android:configChanges="orientation|keyboardHidden|navigation"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:screenOrientation="unspecified"
android:theme="@style/AppTheme"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
<activity
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java
View file @ 26e30000
......@@ -21,8 +21,8 @@ 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.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
......@@ -97,7 +97,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
private static final String ARG_MC_NEWS_LIST = "mcNewsList";
private boolean isMcNewsLoadException = false;
private RelativeLayout ll_back;
private LinearLayout ll_back;
ShimmerTextView tv;
ShimmerTextView tv2;
Shimmer shimmer;
......@@ -275,7 +275,8 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
findExPansionsDataVer();
Log.i(BuildConfig.VERSION_NAME, WebActivity.dataVer);
if (!TextUtils.isEmpty(WebActivity.dataVer) && !WebActivity.dataVer.equals(oldVer)) {
ll_new_notice.setVisibility(View.VISIBLE);
findExPansionsDataVer();
ll_new_notice.setVisibility(View.VISIBLE);
} else {
ll_new_notice.setVisibility(View.GONE);
}
......
mobile/src/main/res/layout/fragment_home.xml
View file @ 26e30000
......@@ -100,34 +100,29 @@
android:layout_height="wrap_content"
android:scrollbars="none" />
<RelativeLayout
<LinearLayout
android:id="@+id/return_to_duel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/window3"
android:orientation="vertical">
<ImageView
android:id="@+id/logo_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:src="@drawable/ic_launcher3" />
<ImageView
android:id="@+id/logo_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_launcher3" />
<cn.garymb.ygomobile.ui.widget.ShimmerTextView
android:id="@+id/shimmer_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginStart="-263dp"
android:layout_marginLeft="1dp"
android:layout_toEndOf="@id/logo_small"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title" />
</RelativeLayout>
</LinearLayout>
</FrameLayout>
</LinearLayout>
......
mobile/src/main/res/layout/fragment_home_horizontal.xml
View file @ 26e30000
......@@ -36,10 +36,11 @@
android:layout_height="wrap_content"
android:scrollbars="none" />
<RelativeLayout
<LinearLayout
android:id="@+id/return_to_duel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/window3"
android:orientation="vertical">
......@@ -47,21 +48,17 @@
android:id="@+id/logo_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_gravity="center"
android:src="@drawable/ic_launcher3" />
<cn.garymb.ygomobile.ui.widget.ShimmerTextView
android:id="@+id/shimmer_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginStart="-263dp"
android:layout_marginLeft="1dp"
android:layout_toEndOf="@id/logo_small"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title" />
</RelativeLayout>
</LinearLayout>
</FrameLayout>
</LinearLayout>
......@@ -183,24 +180,21 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/start" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="YGOPro"
android:textColor="@color/brightgreen"
android:textSize="@dimen/dp_40"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
......@@ -224,24 +218,21 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/bot" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/bot_mode"
android:textColor="@color/brightgreen"
android:textSize="30dp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
......@@ -273,24 +264,21 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/replay" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/replay"
android:textColor="@color/brightgreen"
android:textSize="30dp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
......@@ -314,24 +302,21 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/downloadimages" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/action_download_expansions"
android:textColor="@color/brightgreen"
android:textSize="30dp"
android:textStyle="bold" />
</RelativeLayout>
......@@ -402,23 +387,20 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/help" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/help"
android:textSize="30dp"
android:textColor="@color/holo_blue_bright"
android:textStyle="bold" />
</RelativeLayout>
......@@ -443,24 +425,21 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="-30dp"
android:layout_marginBottom="-30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:scaleType="fitEnd"
android:src="@drawable/about" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/dialogcube"
android:paddingLeft="13dp"
android:paddingTop="13dp"
android:text="@string/donation"
android:textColor="@color/holo_blue_bright"
android:textSize="30dp"
android:textStyle="bold" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
......
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