瀑布屏添加自定义view测试

返回键处理改为onGameExit
移除process input
收藏列表改回存储到system.conf

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -74,6 +74,7 @@ import static cn.garymb.ygomobile.Constants.PREF_READ_EX;
 import static cn.garymb.ygomobile.Constants.PREF_SENSOR_REFRESH;
 import static cn.garymb.ygomobile.Constants.PREF_START_SERVICEDUELASSISTANT;
 import static cn.garymb.ygomobile.Constants.PREF_USE_EXTRA_CARD_CARDS;
+import static cn.garymb.ygomobile.Constants.PREF_WINDOW_TOP_BOTTOM;
 import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
 import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
 import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
@@ -138,6 +139,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
         bind(PREF_READ_EX, mSettings.isReadExpansions());
         bind(PREF_DEL_EX, getString(R.string.about_delete_ex));
         bind(PERF_TEST_REPLACE_KERNEL, "需root权限，请在开发者的指导下食用");
+        bind(PREF_WINDOW_TOP_BOTTOM, ""+mSettings.getScreenPadding());
         Preference preference = findPreference(PREF_READ_EX);
         if (preference != null) {
             preference.setSummary(mSettings.getExpansionsPath().getAbsolutePath());
@@ -435,7 +437,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
                         process.waitFor();
 
                         IOUtils.delete(soFile);
-                        FileUtils.copyFile(file, soFile.getAbsolutePath(), true);
+                        FileUtils.copyFile(file, soFile.getAbsolutePath());
                         me.what = COPY_SO_OK;
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -544,22 +546,22 @@ public class SettingFragment extends PreferenceFragmentPlus {
     private void setPendlumScale(boolean ok) {
         if (Constants.DEBUG)
             Log.i("kk", "setPendlumScale " + ok);
-        File file = new File(mSettings.getResourcePath(), Constants.CORE_SKIN_PENDULUM_PATH);
+        File dir = new File(mSettings.getResourcePath(), Constants.CORE_SKIN_PENDULUM_PATH);
         if (ok) {
             //rename
             Dialog dlg = DialogPlus.show(getActivity(), null, getString(R.string.coping_pendulum_image));
             VUiKit.defer().when(() -> {
                 try {
-                    IOUtils.createFolder(file);
+                    IOUtils.createFolder(dir);
                     IOUtils.copyFilesFromAssets(getActivity(), getDatapath(Constants.CORE_SKIN_PENDULUM_PATH),
-                            file.getAbsolutePath(), false);
+                            dir.getAbsolutePath(), false);
                 } catch (IOException e) {
                 }
             }).done((re) -> {
                 dlg.dismiss();
             });
         } else {
-            IOUtils.delete(file);
+            IOUtils.delete(dir);
         }
     }
 

mobile/src/main/java/cn/garymb/ygomobile/utils/DensityUtils.java

@@ -7,8 +7,11 @@ public class DensityUtils {
      * dp转px
      */
     public static int dp2px(Context ctx, float dp) {
+        if(dp == 0){
+            return 0;
+        }
         float density = ctx.getResources().getDisplayMetrics().density;
-        int px = (int) (dp * density + 0.5f);// 4.9->5 4.4->4
+        int px = Math.round(dp * density);// 4.9->5 4.4->4
         return px;
     }
 

mobile/src/main/res/values-ko/strings.xml

@@ -93,8 +93,7 @@
     <string name="search_open">필터</string>
     <string name="search_close">종료</string>
     <string name="reset">초기화</string>
-    <string name="hit_keyword1">검색어 1</string>
-    <string name="hit_keyword2">검색어 2</string>
+    <string name="hit_keyword1">검색어 </string>
     <string name="hit_atk">ATK</string>
     <string name="hit_def">DEF</string>
     <string name="label_race">종족</string>
@@ -318,4 +317,5 @@
     <string name="label_ot_All">모든 카드</string>
     <string name="label_ot_No_Exclusive">ID 없는 카드</string>
     <string name="label_ot_CUSTOM">커스텀 카드</string>
+    <string name="settings_screen_padding">曲面屏预留高度</string>
 </resources>

mobile/src/main/res/values-zh/strings.xml

@@ -93,8 +93,7 @@
     <string name="search_open">过滤</string>
     <string name="search_close">关闭</string>
     <string name="reset">重置</string>
-    <string name="hit_keyword1">关键词1</string>
-    <string name="hit_keyword2">关键词2</string>
+    <string name="hit_keyword1">关键词(空格隔开)</string>
     <string name="hit_atk">ATK</string>
     <string name="hit_def">DEF</string>
     <string name="label_race">种族</string>
@@ -318,4 +317,5 @@
     <string name="ask_delete_ex">点击确认以清空</string>
     <string name="about_delete_ex">如果遇到拓展卡包问题时删除是个不错的办法</string>
     <string name="file_installed">文件已导入</string>
+    <string name="settings_screen_padding">曲面屏预留高度</string>
 </resources>

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

@@ -9,6 +9,13 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+    <string-array name="screen_top_bottom_value"  translatable="false">
+        <item>0</item>
+        <item>5</item>
+        <item>8</item>
+        <item>10</item>
+        <item>15</item>
+    </string-array>
     <string-array name="tips" tools:ignore="InconsistentArrays">
         <item>Duel is One Thing, Kind is Everything</item>
         <item>Touching Inaccurately in Duelling? to Ephone「Settings」→「Display」→「NotchDisplay」→「Hide the notch area」</item>

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

@@ -83,6 +83,13 @@
         <item>Speed</item>
         <item>Quality</item>
     </string-array>
+    <string-array name="screen_top_bottom_desc"  translatable="false">
+        <item>Disable</item>
+        <item>5</item>
+        <item>8</item>
+        <item>10</item>
+        <item>15</item>
+    </string-array>
     <!-- settings -->
 
     <string name="server_name">Name:</string>
@@ -103,8 +110,7 @@
     <string name="search">Search</string>
     <string name="search_open">Select</string>
     <string name="search_close">Close</string>
-    <string name="hit_keyword1">prefix word</string>
-    <string name="hit_keyword2">suffix word</string>
+    <string name="hit_keyword1">keywords(separated by SPACE)</string>
     <string name="hit_atk">ATK</string>
     <string name="hit_def">DEF</string>
     <string name="reset">Reset</string>
@@ -321,4 +327,5 @@
     <string name="label_ot_CUSTOM">Custom</string>
     <string name="label_ot_No_Exclusive">No exclusive</string>
     <string name="label_ot_SC_OCG">SChinese OCG</string>
+    <string name="settings_screen_padding">Reserved height of curved screen</string>
 </resources>

mobile/src/main/res/xml/preference_game.xml

@@ -37,6 +37,12 @@
             android:key="pref_settings_keep_scale"
             android:persistent="false"
             android:title="@string/about_pref_settings_keep_scale" />
+        <ListPreference
+            android:entries="@array/screen_top_bottom_desc"
+            android:entryValues="@array/screen_top_bottom_value"
+            android:key="pref_settings_window_top_bottom"
+            android:persistent="true"
+            android:title="@string/settings_screen_padding" />
 
         <ListPreference
             android:entries="@array/opengl_version"