不跟随系统字体大小变化

mobile/assets/changelog.html

@@ -20,17 +20,9 @@
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡LGB1+20PP+JF20+VJ；
-    3.添加无效化音效；
-    4.本地人机可选大师规则2020；
-    5.我太帅了加入本地人机；
+    2.新卡1012；
     变更：
-    1.功能菜单与萌卡按钮移到右下角；
-    2.安卓10可使用决斗助手
-    ·不需要通知，悬浮窗权限；
-    ·需复制后打开本app才能检测；
-    3.同一召唤曲结束前不会重复播放；
-    4.微调UI；
+    1.适配不同系统字体大小
     </pre>
 <h3 style="color:#ff0000">注意</h3>
 <pre>

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 360100107
-        versionName "3.6.1"
+        versionCode 360200119
+        versionName "3.6.2"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
         ndk {

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java

@@ -5,6 +5,8 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -75,6 +77,14 @@ public class BaseActivity extends AppCompatActivity {
         }
     }
 
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration config=new Configuration();
+        config.setToDefaults();
+        res.updateConfiguration(config,res.getDisplayMetrics());
+        return res;
+    }
+
     public Activity getActivity() {
         return this;
     }

mobile/src/main/res/layout/activity_deck_cards.xml

@@ -37,39 +37,39 @@
                 android:weightSum="1">
 
                 <LinearLayout
-                    android:padding="5dp"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/item_and_text_height"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="vertical"
-                    android:layout_weight="1"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/item_and_text_height">
+                    android:padding="5dp">
 
                     <TextView
-                    android:textSize="12sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/deck_name"
                         android:textColor="@color/holo_blue_light" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:maxLines="1"
-                        android:ellipsize="end"
+                        android:id="@+id/tv_deck"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         android:layout_marginTop="2dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/select_deck"
                         android:textColor="@color/white"
                         android:textStyle="bold"
-                        android:text="@string/select_deck"
-                        android:textSize="18sp"
-                        android:id="@+id/tv_deck"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+                        android:textSize="18sp"/>
 
                 </LinearLayout>
+
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/toolbar_list"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/item_height"
-                    android:visibility="gone"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:visibility="gone" />
 
                 <LinearLayout
                     android:layout_width="60dp"
@@ -88,8 +88,7 @@
                         android:layout_width="60dp"
                         android:layout_height="20dp"
                         android:gravity="bottom|center_horizontal"
-                        android:text="@string/searchresult"
-                        android:textSize="30px" />
+                        android:text="@string/searchresult" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -109,8 +108,7 @@
                         android:layout_width="60dp"
                         android:layout_height="20dp"
                         android:gravity="bottom|center_horizontal"
-                        android:text="@string/card_search"
-                        android:textSize="30px"/>
+                        android:text="@string/card_search" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -144,8 +142,7 @@
                         android:layout_width="60dp"
                         android:layout_height="20dp"
                         android:gravity="bottom|center_horizontal"
-                        android:text="@string/Function_Menu"
-                        android:textSize="30px" />
+                        android:text="@string/Function_Menu" />
                 </LinearLayout>
             </LinearLayout>
         </FrameLayout>

mobile/src/main/res/layout/activity_home.xml

@@ -37,7 +37,6 @@
             android:gravity="center"
             android:text="@string/return_to_duel"
             android:textColor="@color/item_title"
-            android:textSize="50px"
             android:visibility="visible" />
 
         <LinearLayout
@@ -68,8 +67,7 @@
                     android:layout_height="20dp"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:text="@string/mycard"
-                    android:textSize="30px" />
+                    android:text="@string/mycard" />
             </LinearLayout>
 
             <LinearLayout
@@ -103,8 +101,7 @@
                     android:layout_height="20dp"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:text="@string/Function_Menu"
-                    android:textSize="30px" />
+                    android:text="@string/Function_Menu" />
             </LinearLayout>
         </LinearLayout>
     </RelativeLayout>

mobile/src/main/res/layout/dialog_server_edit.xml

@@ -13,7 +13,6 @@
             android:layout_width="@dimen/label_width_middle"
             android:layout_height="wrap_content"
             android:text="@string/server_name"
-            android:textSize="38px"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@color/gold" />
 
@@ -26,7 +25,6 @@
             android:inputType="textNoSuggestions"
             android:maxLines="1"
             android:singleLine="true"
-            android:textSize="38px"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@color/holo_blue_bright" />
     </LinearLayout>
@@ -47,7 +45,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/server_ip"
-                android:textSize="38px"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@color/gold" />
 
@@ -58,7 +55,6 @@
                 android:hint="@string/must_info"
                 android:inputType="textNoSuggestions"
                 android:maxLines="1"
-                android:textSize="38px"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@color/holo_blue_bright" />
@@ -72,7 +68,6 @@
                 android:layout_width="41dp"
                 android:layout_height="wrap_content"
                 android:text="@string/server_port"
-                android:textSize="38px"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@color/gold" />
 
@@ -82,7 +77,6 @@
                 android:layout_height="wrap_content"
                 android:digits="1234567890"
                 android:maxLines="1"
-                android:textSize="38px"
                 android:singleLine="true"
                 android:text="0"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
@@ -100,7 +94,6 @@
             android:layout_width="@dimen/label_width_middle"
             android:layout_height="wrap_content"
             android:text="@string/server_user"
-            android:textSize="38px"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@color/gold" />
 
@@ -112,7 +105,6 @@
             android:hint="@string/must_info"
             android:inputType="textNoSuggestions"
             android:maxLines="1"
-            android:textSize="38px"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@android:color/holo_green_light" />

mobile/src/main/res/layout/item_server_info_swipe.xml

@@ -68,7 +68,6 @@
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
                     android:textColor="@color/brightgreen"
-                    android:textSize="50px"
                     tools:text="233正式服务器" />
 
             </LinearLayout>
@@ -92,8 +91,7 @@
                         android:gravity="center_vertical"
                         android:text="@string/server_ip"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                        android:textColor="@color/item_title"
-                        android:textSize="38px" />
+                        android:textColor="@color/item_title" />
 
                     <TextView
                         android:id="@+id/text_ip"
@@ -103,7 +101,6 @@
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         android:textColor="@color/holo_blue_bright"
-                        android:textSize="38px"
                         tools:text="127.0.0.1" />
                 </LinearLayout>
 
@@ -118,7 +115,7 @@
                         android:text="@string/server_port"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         android:textColor="@color/item_title"
-                        android:textSize="38px" />
+                        />
 
                     <TextView
                         android:id="@+id/text_port"
@@ -129,7 +126,6 @@
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         android:textColor="@color/holo_blue_bright"
-                        android:textSize="38px"
                         tools:text="233" />
                 </LinearLayout>
             </LinearLayout>
@@ -147,7 +143,6 @@
                     android:gravity="center_vertical"
                     android:text="@string/server_user"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                    android:textSize="38px"
                     android:textColor="@color/item_title" />
 
                 <TextView
@@ -159,7 +154,6 @@
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:textColor="@color/holo_blue_bright"
-                    android:textSize="38px"
                     tools:text="player" />
 
                 <ImageView

mobile/src/main/res/layout/nav_card_search.xml

@@ -90,7 +90,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -99,13 +98,16 @@
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_ot"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:textSize="12sp" />
 
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_scale"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1"
@@ -119,12 +121,14 @@
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_limit_list"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_limit"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
@@ -138,11 +142,12 @@
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_category"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_linkmarker"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -155,6 +160,7 @@
 
             <cn.garymb.ygomobile.ui.widget.SearchableSpinner
                 android:id="@+id/sp_setcode"
+                style="@style/itemSpinnerStyle"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/label_width_small"
                 app:searchTitle="@string/label_set" />
@@ -167,6 +173,7 @@
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_type_card"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1" />
@@ -180,6 +187,7 @@
 
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_type_st"
+                    style="@style/itemSpinnerStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1"
@@ -199,12 +207,14 @@
 
                     <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_level"
+                        style="@style/itemSpinnerStyle"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
 
                     <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_attribute"
+                        style="@style/itemSpinnerStyle"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
@@ -217,12 +227,14 @@
 
                     <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_type_monster"
+                        style="@style/itemSpinnerStyle"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
 
                     <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_type_monster2"
+                        style="@style/itemSpinnerStyle"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />

mobile/src/main/res/values/styles.xml

@@ -117,4 +117,8 @@
         <item name="android:backgroundDimEnabled">true</item>
     </style>
 
+    <style name="itemSpinnerStyle" parent="Widget.AppCompat.DropDownItem.Spinner">
+
+    </style>
+
 </resources>
\ No newline at end of file