From 95bb880e23377f0438bc24051b8936c3a7665d7b Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Mon, 24 Jul 2023 03:48:41 +0800 Subject: [PATCH] Fixed rename package of base convert tool. --- app/src/main/AndroidManifest.xml | 2 +- .../tools/baseconverter/MainActivity.java | 16 +++---- ....xml => ic_tool_baseconverter_convert.xml} | 0 ...er.xml => activity_tool_baseconverter.xml} | 42 +++++++++---------- app/src/main/res/values-zh-rCN/strings.xml | 10 ++--- app/src/main/res/values-zh-rHK/strings.xml | 10 ++--- app/src/main/res/values-zh-rTW/strings.xml | 10 ++--- app/src/main/res/values/dimens.xml | 12 +++--- app/src/main/res/values/strings.xml | 18 ++++---- 9 files changed, 60 insertions(+), 60 deletions(-) rename app/src/main/res/drawable/{ic_tool_converter_convert.xml => ic_tool_baseconverter_convert.xml} (100%) rename app/src/main/res/layout/{activity_tool_converter.xml => activity_tool_baseconverter.xml} (70%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1593da1..c39b002 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:exported="false" android:theme="@style/Theme.OxygenToolbox.Default"> - + diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java index 68bd8e8..471ecde 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/tools/baseconverter/MainActivity.java @@ -27,10 +27,10 @@ public class MainActivity extends BaseActivityNormal { { for (int i = 0; i < 35; i++) { switch (i + 2) { - case 2 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_2); - case 8 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_8); - case 10 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_10); - case 16 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_16); + case 2 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_2); + case 8 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_8); + case 10 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_10); + case 16 -> BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_baseconverter_base_16); default -> BASE_ITEMS[i] = String.valueOf(i + 2); } } @@ -58,7 +58,7 @@ public class MainActivity extends BaseActivityNormal { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - super.loadView(this, R.layout.activity_tool_converter); + super.loadView(this, R.layout.activity_tool_baseconverter); initView(); initBaseChoose(); @@ -67,7 +67,7 @@ public class MainActivity extends BaseActivityNormal { private void initBaseChoose() { textViewBaseFrom.setOnClickListener(view -> new MaterialAlertDialogBuilder(this) - .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base)) + .setTitle(ResourceUtil.getString(R.string.tool_baseconverter_choose_base)) .setItems(BASE_ITEMS, (dialogInterface, i) -> { textViewBaseFrom.setText(BASE_ITEMS[i]); baseFrom = i + 2; @@ -77,7 +77,7 @@ public class MainActivity extends BaseActivityNormal { .show()); textViewBaseTo.setOnClickListener(view -> new MaterialAlertDialogBuilder(this) - .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base)) + .setTitle(ResourceUtil.getString(R.string.tool_baseconverter_choose_base)) .setItems(BASE_ITEMS, (dialogInterface, i) -> { textViewBaseTo.setText(BASE_ITEMS[i]); baseTo = i + 2; @@ -146,7 +146,7 @@ public class MainActivity extends BaseActivityNormal { textViewTo.setText(result); } catch (Exception e) { textViewTo.setText(ResourceUtil.getString(R.string.base_nan)); - Snackbar.make(getConstraintLayoutRoot(), ResourceUtil.getString(R.string.tool_converter_illegal_number), Snackbar.LENGTH_LONG).show(); + Snackbar.make(getConstraintLayoutRoot(), ResourceUtil.getString(R.string.tool_baseconverter_illegal_number), Snackbar.LENGTH_LONG).show(); } } } diff --git a/app/src/main/res/drawable/ic_tool_converter_convert.xml b/app/src/main/res/drawable/ic_tool_baseconverter_convert.xml similarity index 100% rename from app/src/main/res/drawable/ic_tool_converter_convert.xml rename to app/src/main/res/drawable/ic_tool_baseconverter_convert.xml diff --git a/app/src/main/res/layout/activity_tool_converter.xml b/app/src/main/res/layout/activity_tool_baseconverter.xml similarity index 70% rename from app/src/main/res/layout/activity_tool_converter.xml rename to app/src/main/res/layout/activity_tool_baseconverter.xml index 546f28e..e17cfea 100644 --- a/app/src/main/res/layout/activity_tool_converter.xml +++ b/app/src/main/res/layout/activity_tool_baseconverter.xml @@ -10,7 +10,7 @@ android:id="@+id/linear_layout_base" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/tool_converter_layout_margin" + android:layout_margin="@dimen/tool_baseconverter_layout_margin" android:background="@drawable/background_radius" android:gravity="center" android:orientation="horizontal" @@ -22,16 +22,16 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="@string/tool_converter_base_10" + android:text="@string/tool_baseconverter_base_10" android:textColor="?attr/app_theme" - android:textSize="@dimen/tool_converter_text_size" /> + android:textSize="@dimen/tool_baseconverter_text_size" /> + android:textSize="@dimen/tool_baseconverter_text_size" /> 请输入内容…… 翻译失败，请检查网络连接。 - 选择进制 - 源进制 - 目标进制 - 请输入内容…… - 非法数字 + 选择进制 + 源进制 + 目标进制 + 请输入内容…… + 非法数字 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e636db8..5e69d02 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -78,9 +78,9 @@ 请输入内容…… 翻译失败，请检查网络连接。 - 选择进制 - 源进制 - 目标进制 - 请输入内容…… - 非法数字 + 选择进制 + 源进制 + 目标进制 + 请输入内容…… + 非法数字 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e636db8..5e69d02 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -78,9 +78,9 @@ 请输入内容…… 翻译失败，请检查网络连接。 - 选择进制 - 源进制 - 目标进制 - 请输入内容…… - 非法数字 + 选择进制 + 源进制 + 目标进制 + 请输入内容…… + 非法数字 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bcc3635..078479b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -45,10 +45,10 @@ @dimen/common_layout_margin 200dp - 16sp - 5dp - @dimen/common_layout_margin - 200dp - 15dp - 30dp + 16sp + 5dp + @dimen/common_layout_margin + 200dp + 15dp + 30dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5e1aa3c..35c1e25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,13 +116,13 @@ Please enter text… Translation failed, please check network connection. - 2 (binary) - 8 (octal) - 10 (decimal) - 16 (hex) - Choose base - From Base - To Base - Please enter text… - Illegal Number + 2 (binary) + 8 (octal) + 10 (decimal) + 16 (hex) + Choose base + From Base + To Base + Please enter text… + Illegal Number \ No newline at end of file