diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 4f77090..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 12fb862..ff801a6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..22bb350 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,5 +1,13 @@ + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9752b7a..99f9dff 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ + android:theme="@style/Theme.OxygenToolbox.Default"> @@ -38,7 +38,7 @@ + android:theme="@style/Theme.OxygenToolbox.Default"> diff --git a/app/src/main/assets/json/BasicTools.json b/app/src/main/assets/json/BasicTools.json index 29a9d7a..d52b3ff 100644 --- a/app/src/main/assets/json/BasicTools.json +++ b/app/src/main/assets/json/BasicTools.json @@ -21,14 +21,14 @@ "cn": "\u65f6\u95f4\u5c4f\u5e55", "en": "Time Screen" }, - "activity": 0 + "activity": "com.fatapp.oxygentoolbox.tools.TimeScreenActivity" }, { "text": { "cn": "\u7ffb\u8bd1", "en": "Translation" }, - "activity": 1 + "activity": "" } ] } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java index 062eecd..893b2ce 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java @@ -1,13 +1,10 @@ package com.fatapp.oxygentoolbox; -import android.content.Intent; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; -import android.graphics.drawable.Icon; import android.os.Bundle; import android.view.View; import android.view.Menu; +import com.fatapp.oxygentoolbox.util.ResourceUtil; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.navigation.NavigationView; @@ -20,7 +17,6 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import java.util.Collections; import java.util.Objects; public class MainActivity extends AppCompatActivity { @@ -39,6 +35,7 @@ public class MainActivity extends AppCompatActivity { drawer = findViewById(R.id.drawer_layout); navigationView = findViewById(R.id.nav_view); mainActivity = this; + ResourceUtil.init(getApplication()); } @Override diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java b/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java index 48bc945..e1dfb62 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/layout/FoldLayout.java @@ -97,7 +97,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { public void onAnimationStart(Animator animation) { super.onAnimationStart(animation); LinearLayout linearLayout = defaultView.findViewById(R.id.fold_layout_linear_layout); - linearLayout.setBackground(getResources().getDrawable(R.drawable.top_radius_background)); + linearLayout.setBackground(getContext().getDrawable(R.drawable.top_radius_background)); } }); @@ -114,7 +114,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { super.onAnimationEnd(animation); if (!isShow) { LinearLayout linearLayout = defaultView.findViewById(R.id.fold_layout_linear_layout); - linearLayout.setBackground(getResources().getDrawable(R.drawable.top_bottom_radius_background)); + linearLayout.setBackground(getContext().getDrawable(R.drawable.top_bottom_radius_background)); } } }); @@ -144,7 +144,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { isShow = true; showAnimator.start(); ImageView imageView = defaultView.findViewById(R.id.arrow_icon); - imageView.setImageDrawable(getResources().getDrawable(R.drawable.right_to_down_arrow)); + imageView.setImageDrawable(getContext().getDrawable(R.drawable.right_to_down_arrow)); AnimatedVectorDrawable animatedVectorDrawable = (AnimatedVectorDrawable) imageView.getDrawable(); animatedVectorDrawable.start(); } @@ -154,7 +154,7 @@ public class FoldLayout extends LinearLayout implements View.OnClickListener { isShow = false; hideAnimator.start(); ImageView imageView = defaultView.findViewById(R.id.arrow_icon); - imageView.setImageDrawable(getResources().getDrawable(R.drawable.down_to_right_arrow)); + imageView.setImageDrawable(getContext().getDrawable(R.drawable.down_to_right_arrow)); AnimatedVectorDrawable animatedVectorDrawable = (AnimatedVectorDrawable) imageView.getDrawable(); animatedVectorDrawable.start(); } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java index c9f1be9..a98675f 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java @@ -16,7 +16,7 @@ import androidx.lifecycle.ViewModelProvider; import com.fatapp.oxygentoolbox.R; import com.fatapp.oxygentoolbox.layout.FoldLayout; -import com.fatapp.oxygentoolbox.util.BasicToolsLauncher; +import com.fatapp.oxygentoolbox.util.ToolsLauncher; import com.fatapp.oxygentoolbox.util.ToolsList; import java.io.IOException; @@ -66,10 +66,9 @@ public class HomeFragment extends Fragment { for (ToolsList.Button button : tool.getButtonList()) { View toolButtonLayout = getLayoutInflater().inflate(R.layout.tool_button, null); - Button toolButton = toolButtonLayout.findViewById(R.id.tool_button); toolButton.setText(button.getText()); - toolButton.setOnClickListener(v -> BasicToolsLauncher.launch(button.getActivity(), getContext())); + toolButton.setOnClickListener(v -> ToolsLauncher.launch(getContext(), button.getActivity())); autoLinefeedLayout.addView(toolButtonLayout); } @@ -90,28 +89,29 @@ public class HomeFragment extends Fragment { foldLayoutsLinearLayout.addView(foldLayoutHead); } - /*for (int i = 0; i < 10; i++) { +/* + for (int i = 0; i < 10; i++) { View toolButton = getLayoutInflater().inflate(R.layout.tool_button, null); - ((Button) toolButton.findViewById(R.id.toolButton)).setText("Button"); - toolButton.findViewById(R.id.toolButton).setOnClickListener(v -> { + ((Button) toolButton.findViewById(R.id.tool_button)).setText("Button"); + toolButton.findViewById(R.id.tool_button).setOnClickListener(v -> { BasicToolsLauncher.launch(0, getContext()); }); View foldLayoutBody = getLayoutInflater().inflate(R.layout.fold_layout_body, null); - ViewGroup layout_item_AutoLinefeedLayout = foldLayoutBody.findViewById(R.id.layout_item_AutoLinefeedLayout); + ViewGroup layout_item_AutoLinefeedLayout = foldLayoutBody.findViewById(R.id.auto_linefeed_layout); layout_item_AutoLinefeedLayout.addView(toolButton); List viewList = new ArrayList<>(); viewList.add(foldLayoutBody); View foldLayoutHead = getLayoutInflater().inflate(R.layout.fold_layout, null); - FoldLayout foldLayout = foldLayoutHead.findViewById(R.id.foldLayout); - ((TextView) foldLayout.findViewById(R.id.foldLayoutTextView)).setText("FoldLayout_" + i); + FoldLayout foldLayout = foldLayoutHead.findViewById(R.id.fold_layout); + ((TextView) foldLayout.findViewById(R.id.fold_layout_text_view)).setText("FoldLayout_" + i); foldLayout.addItemView(viewList); - foldLayoutsLinearLayout = root.findViewById(R.id.foldLayoutsLinearLayout); foldLayoutsLinearLayout.addView(foldLayoutHead); - }*/ + } +*/ } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/BasicToolsLauncher.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/BasicToolsLauncher.java deleted file mode 100644 index 8fe6922..0000000 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/BasicToolsLauncher.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fatapp.oxygentoolbox.util; - -import static androidx.core.content.ContextCompat.startActivity; - -import android.content.Context; -import android.content.Intent; - -import com.fatapp.oxygentoolbox.tools.TimeScreenActivity; - -public class BasicToolsLauncher { - public static void launch(int activity, Context context) { - switch (activity) { - case 0: - startActivity(context, new Intent(context, TimeScreenActivity.class), null); - break; - case 1: - break; - } - } -} diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ResourceUtil.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ResourceUtil.java new file mode 100644 index 0000000..763ff25 --- /dev/null +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ResourceUtil.java @@ -0,0 +1,31 @@ +package com.fatapp.oxygentoolbox.util; + +import android.app.Application; +import android.content.res.Resources; + +public final class ResourceUtil { + + private static Application sApp; + private static Resources sRes; + + public static void init(Application app) { + sApp = app; + sRes = app.getResources(); + } + + public static Application getApplication() { + return sApp; + } + + public static Resources getResources() { + return sRes; + } + + public static String getString(int resId) { + return sRes.getString(resId); + } + + public static int getColor(int resId) { + return sRes.getColor(resId); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java index 28394c5..4c0c5aa 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java @@ -166,7 +166,7 @@ public class ToolsJson { @SerializedName("text") private Text text; @SerializedName("activity") - private Integer activity; + private String activity; public Text getText() { return text; @@ -176,11 +176,11 @@ public class ToolsJson { this.text = text; } - public Integer getActivity() { + public String getActivity() { return activity; } - public void setActivity(Integer activity) { + public void setActivity(String activity) { this.activity = activity; } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsLauncher.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsLauncher.java new file mode 100644 index 0000000..cf94915 --- /dev/null +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsLauncher.java @@ -0,0 +1,20 @@ +package com.fatapp.oxygentoolbox.util; + +import static androidx.core.content.ContextCompat.startActivity; + +import android.content.Context; +import android.content.Intent; +import android.widget.Toast; + +import com.fatapp.oxygentoolbox.R; +import com.fatapp.oxygentoolbox.tools.TimeScreenActivity; + +public class ToolsLauncher { + public static void launch(Context context, String activity) { + try { + startActivity(context, new Intent(context, Class.forName(activity)), null); + } catch (ClassNotFoundException e) { + Toast.makeText(context, R.string.activity_class_not_found, Toast.LENGTH_LONG).show(); + } + } +} diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java index 74e0d6f..50a75dc 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java @@ -46,9 +46,9 @@ public class ToolsList { private static String getLocale(Locales strings) { String language; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - language = MainActivity.mainActivity.getResources().getConfiguration().getLocales().get(0).getLanguage(); + language = ResourceUtil.getResources().getConfiguration().getLocales().get(0).getLanguage(); } else { - language = MainActivity.mainActivity.getResources().getConfiguration().locale.getLanguage(); + language = ResourceUtil.getResources().getConfiguration().locale.getLanguage(); } if (language.equals("zh")) { return strings.getCn(); @@ -105,7 +105,7 @@ public class ToolsList { public static class Button { private String text; - private Integer activity; + private String activity; public String getText() { return text; @@ -115,11 +115,11 @@ public class ToolsList { this.text = text; } - public Integer getActivity() { + public String getActivity() { return activity; } - public void setActivity(Integer activity) { + public void setActivity(String activity) { this.activity = activity; } } diff --git a/app/src/main/res/drawable-v21/ripple_foreground.xml b/app/src/main/res/drawable-v21/ripple_foreground.xml index 3104a7c..e255d6f 100644 --- a/app/src/main/res/drawable-v21/ripple_foreground.xml +++ b/app/src/main/res/drawable-v21/ripple_foreground.xml @@ -1,8 +1,8 @@ - + - + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index e1ac80f..0ee4f6a 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -23,7 +23,7 @@ - + diff --git a/app/src/main/res/drawable/button_radius_shape.xml b/app/src/main/res/drawable/button_radius_shape.xml index c05d950..d362b1f 100644 --- a/app/src/main/res/drawable/button_radius_shape.xml +++ b/app/src/main/res/drawable/button_radius_shape.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/down_to_right_arrow.xml b/app/src/main/res/drawable/down_to_right_arrow.xml index 526f2f0..f0ac3e1 100644 --- a/app/src/main/res/drawable/down_to_right_arrow.xml +++ b/app/src/main/res/drawable/down_to_right_arrow.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml index 8380873..b52f40d 100644 --- a/app/src/main/res/drawable/ic_launcher.xml +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -23,7 +23,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_exit.xml b/app/src/main/res/drawable/ic_menu_exit.xml index 1ea086d..237ce80 100644 --- a/app/src/main/res/drawable/ic_menu_exit.xml +++ b/app/src/main/res/drawable/ic_menu_exit.xml @@ -6,12 +6,12 @@ android:viewportHeight="1024"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_home.xml b/app/src/main/res/drawable/ic_menu_home.xml index 1ad264e..2d291f4 100644 --- a/app/src/main/res/drawable/ic_menu_home.xml +++ b/app/src/main/res/drawable/ic_menu_home.xml @@ -6,6 +6,6 @@ android:viewportHeight="1024"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_setting.xml b/app/src/main/res/drawable/ic_menu_setting.xml index d8b43fb..2b07feb 100644 --- a/app/src/main/res/drawable/ic_menu_setting.xml +++ b/app/src/main/res/drawable/ic_menu_setting.xml @@ -6,6 +6,6 @@ android:viewportHeight="1024"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_theme.xml b/app/src/main/res/drawable/ic_menu_theme.xml index 2c2fbe1..f034f86 100644 --- a/app/src/main/res/drawable/ic_menu_theme.xml +++ b/app/src/main/res/drawable/ic_menu_theme.xml @@ -6,6 +6,6 @@ android:viewportHeight="1024"> \ No newline at end of file diff --git a/app/src/main/res/drawable/right_to_down_arrow.xml b/app/src/main/res/drawable/right_to_down_arrow.xml index 9e8553b..077bd57 100644 --- a/app/src/main/res/drawable/right_to_down_arrow.xml +++ b/app/src/main/res/drawable/right_to_down_arrow.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml index 2a9219e..d4f9832 100644 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ b/app/src/main/res/drawable/side_nav_bar.xml @@ -4,6 +4,6 @@ android:angle="270" android:startColor="?attr/colorPrimary" android:centerColor="?attr/colorPrimary" - android:endColor="@color/app_background" + android:endColor="?attr/app_background" android:type="linear" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/top_bottom_radius_background.xml b/app/src/main/res/drawable/top_bottom_radius_background.xml index 7332e02..fb71ec4 100644 --- a/app/src/main/res/drawable/top_bottom_radius_background.xml +++ b/app/src/main/res/drawable/top_bottom_radius_background.xml @@ -1,6 +1,6 @@ - + - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e6a55cf..629a447 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,5 +18,5 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - android:background="@color/app_background"/> + android:background="?attr/app_background"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fold_layout_body.xml b/app/src/main/res/layout/fold_layout_body.xml index ef57369..260ab0e 100644 --- a/app/src/main/res/layout/fold_layout_body.xml +++ b/app/src/main/res/layout/fold_layout_body.xml @@ -13,6 +13,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" + android:paddingHorizontal="5dp" + android:paddingBottom="2dp" android:background="@drawable/bottom_radius_background" android:gravity="center_vertical"> diff --git a/app/src/main/res/layout/fold_layout_head.xml b/app/src/main/res/layout/fold_layout_head.xml index b31372f..b56319a 100644 --- a/app/src/main/res/layout/fold_layout_head.xml +++ b/app/src/main/res/layout/fold_layout_head.xml @@ -5,10 +5,10 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" android:layout_marginTop="10dp" + android:layout_marginRight="10dp" android:background="@drawable/top_bottom_radius_background" - android:gravity="center_vertical" > + android:gravity="center_vertical"> + android:textColor="?attr/app_theme" + android:textSize="20sp" /> + android:contentDescription="@string/arrow_icon" + app:srcCompat="@drawable/right_to_down_arrow" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e6cf674..74e5043 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -4,7 +4,7 @@ android:id="@+id/fragment_home" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/app_background" + android:background="?attr/app_background" android:orientation="vertical" tools:context=".ui.home.HomeFragment"> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index edb7269..412d5f8 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -5,5 +5,5 @@ android:id="@+id/action_settings" android:orderInCategory="100" android:title="@string/action_settings" - app:showAsAction="ifRoom" /> + app:showAsAction="never" /> \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 5ea1479..4a87726 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -8,14 +8,17 @@ #FF000000 #FFFFFFFF - #FFBB86FC - @color/white - @color/white - #FF202020 + @color/purple_200 + @color/white + @color/white + #FF202020 - #FF303030 - #FF666666 - @color/app_background - #FFFAFAFA - #88cccccc + @color/teal_700 + @color/black + + #FF303030 + #FF666666 + @color/default_app_background + #FFFAFAFA + #88CCCCCC \ No newline at end of file diff --git a/app/src/main/res/values-za-rCN/strings.xml b/app/src/main/res/values-za-rCN/strings.xml deleted file mode 100644 index ea8b47a..0000000 --- a/app/src/main/res/values-za-rCN/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - Oxygen - 打开导航抽屉 - 关闭导航抽屉 - 氧工具 - All in One - 氧工具 - 设置 - 主页 - 主题 - 设置 - 关于 - 退出 - 禁用 - 氧工具 - 氧工具 - 浮动按钮 - 初始化工具集失败 - \ No newline at end of file diff --git a/app/src/main/res/values-za/strings.xml b/app/src/main/res/values-za/strings.xml deleted file mode 100644 index ea8b47a..0000000 --- a/app/src/main/res/values-za/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - Oxygen - 打开导航抽屉 - 关闭导航抽屉 - 氧工具 - All in One - 氧工具 - 设置 - 主页 - 主题 - 设置 - 关于 - 退出 - 禁用 - 氧工具 - 氧工具 - 浮动按钮 - 初始化工具集失败 - \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 77b8b30..acdf998 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,20 +1,24 @@ - Oxygen - 主页 - 主题 - 氧工具 - 氧工具 + 氧工具 打开导航抽屉 关闭导航抽屉 + 氧工具 All in One + 氧工具 设置 + + 主页 + 主题 设置 关于 退出 + 禁用 - 氧工具 氧工具 + 氧工具 + 浮动按钮 初始化工具集失败 + 无法加载工具，该工具可能已损坏 \ 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 ea8b47a..acdf998 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,20 +1,24 @@ - Oxygen + 氧工具 打开导航抽屉 关闭导航抽屉 氧工具 All in One 氧工具 设置 + 主页 主题 设置 关于 退出 + 禁用 - 氧工具 氧工具 + 氧工具 + 浮动按钮 初始化工具集失败 + 无法加载工具，该工具可能已损坏 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml deleted file mode 100644 index ea8b47a..0000000 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - Oxygen - 打开导航抽屉 - 关闭导航抽屉 - 氧工具 - All in One - 氧工具 - 设置 - 主页 - 主题 - 设置 - 关于 - 退出 - 禁用 - 氧工具 - 氧工具 - 浮动按钮 - 初始化工具集失败 - \ No newline at end of file diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml deleted file mode 100644 index ea8b47a..0000000 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - Oxygen - 打开导航抽屉 - 关闭导航抽屉 - 氧工具 - All in One - 氧工具 - 设置 - 主页 - 主题 - 设置 - 关于 - 退出 - 禁用 - 氧工具 - 氧工具 - 浮动按钮 - 初始化工具集失败 - \ 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 ea8b47a..acdf998 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,20 +1,24 @@ - Oxygen + 氧工具 打开导航抽屉 关闭导航抽屉 氧工具 All in One 氧工具 设置 + 主页 主题 设置 关于 退出 + 禁用 - 氧工具 氧工具 + 氧工具 + 浮动按钮 初始化工具集失败 + 无法加载工具，该工具可能已损坏 \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml deleted file mode 100644 index 86cef11..0000000 --- a/app/src/main/res/values-zh/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 氧工具 - 打开导航抽屉 - 关闭导航抽屉 - 氧工具 - All in One - 氧工具 - 设置 - 主页 - 主题 - 设置 - 关于 - 退出 - 禁用 - 氧工具 - 氧工具 - 初始化工具集失败 - 浮动按钮 - \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7071c50..cddb866 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,20 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 56e2b48..6afadc5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,14 +8,17 @@ #FF000000 #FFFFFFFF - #FF6200EE - @color/white - #FF444444 - #FFF5F5F5 + @color/purple_500 + @color/white + #FF444444 + #FFF5F5F5 - #FFFFFFFF - #FF666666 - @color/app_background - #FF434343 - #88cccccc + @color/teal_200 + @color/black + + @color/white + #FF666666 + @color/default_app_background + #FF434343 + #88CCCCCC \ 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 4b93aea..1e539a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,9 @@ Oxygen Toolbox Oxygen Toolbox - Fab ]]> + + Fab Failed to initialize tools + Can not load tool, it may be damaged \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4ad0d77..c1d96b1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,7 +13,7 @@ @drawable/button_radius_shape @drawable/ripple_foreground @null - @color/tools_button_text + @color/default_tools_button_text -