diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 1472170..4f77090 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,27 @@ - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 94e3584..12fb862 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,10 +13,16 @@ + + + + + + @@ -25,6 +31,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index b9e881c..ef0cfd1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' - implementation 'androidx.core:core-splashscreen:1.0.0-beta01' + implementation 'androidx.core:core-splashscreen:1.0.0-beta02' implementation 'com.google.code.gson:gson:2.9.0' // 请务必使用@aar结尾，以中断依赖传递 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dae0322..9752b7a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,35 +8,37 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.OxygenToolbox"> - + + android:theme="@style/Theme.OxygenToolbox"> - + + + android:exported="false" + android:theme="@style/Theme.OxygenToolbox"> diff --git a/app/src/main/assets/json/BasicTools.json b/app/src/main/assets/json/BasicTools.json index 422138b..29a9d7a 100644 --- a/app/src/main/assets/json/BasicTools.json +++ b/app/src/main/assets/json/BasicTools.json @@ -9,19 +9,16 @@ "icon": "\uE6AE", "title": { "cn": "\u57fa\u7840\u5de5\u5177", - "tc": "\u57fa\u790e\u5de5\u5177", "en": "Basic Tools" }, "desc": { "cn": "\u4e00\u4e9b\u57fa\u7840\u7684\u5de5\u5177\uff0c\u0041\u0050\u0050\u4e3b\u4f53\u81ea\u5e26", - "tc": "\u4e00\u4e9b\u57fa\u790e\u7684\u5de5\u5177\uff0c\u0041\u0050\u0050\u4e3b\u9ad4\u81ea\u5e36", "en": "Some basic tools, the main body of the APP comes with it" }, "buttons": [ { "text": { "cn": "\u65f6\u95f4\u5c4f\u5e55", - "tc": "\u6642\u9593\u5c4f\u5e55", "en": "Time Screen" }, "activity": 0 @@ -29,7 +26,6 @@ { "text": { "cn": "\u7ffb\u8bd1", - "tc": "\u7ffb\u8b6f", "en": "Translation" }, "activity": 1 diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java index df6052a..062eecd 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java @@ -7,14 +7,13 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.view.View; import android.view.Menu; -import android.widget.Toast; -import com.fatapp.oxygentoolbox.util.ToolsList; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.navigation.NavigationView; import androidx.navigation.NavController; import androidx.navigation.Navigation; +import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; import androidx.drawerlayout.widget.DrawerLayout; @@ -22,21 +21,24 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import java.util.Collections; +import java.util.Objects; public class MainActivity extends AppCompatActivity { + public static AppCompatActivity mainActivity; + private AppBarConfiguration mAppBarConfiguration; private Toolbar toolbar; private FloatingActionButton fab; private DrawerLayout drawer; private NavigationView navigationView; - private void initView() { toolbar = findViewById(R.id.toolbar); fab = findViewById(R.id.fab); drawer = findViewById(R.id.drawer_layout); navigationView = findViewById(R.id.nav_view); + mainActivity = this; } @Override @@ -48,7 +50,7 @@ public class MainActivity extends AppCompatActivity { initView(); initLayout(); - shortCutCreateTest(); +// shortCutCreateTest(); } private void initLayout() { @@ -73,17 +75,18 @@ public class MainActivity extends AppCompatActivity { mAppBarConfiguration = new AppBarConfiguration.Builder(R.id.nav_home) .setOpenableLayout(drawer) .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + NavController navController = ((NavHostFragment) Objects.requireNonNull(getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment))).getNavController(); NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); NavigationUI.setupWithNavController(navigationView, navController); } +/* private void shortCutCreateTest() { if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N_MR1) { return; } Intent intent = new Intent(); - intent.setAction("android.intent.action.VIEW"); + intent.setAction("android.intent.action.MAIN"); intent.setClassName("com.fatapp.oxygentoolbox", "com.fatapp.oxygentoolbox.MainActivity"); ShortcutInfo.Builder builder; @@ -97,6 +100,7 @@ public class MainActivity extends AppCompatActivity { ShortcutManager shortcutManager = getSystemService(ShortcutManager.class); shortcutManager.addDynamicShortcuts(Collections.singletonList(builder.build())); } +*/ @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java index 63a4022..b9ec2ee 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/SplashActivity.java @@ -1,14 +1,24 @@ package com.fatapp.oxygentoolbox; +import android.annotation.SuppressLint; +import android.content.Intent; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.splashscreen.SplashScreen; +@SuppressLint("CustomSplashScreen") public class SplashActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + // Handle the splash screen transition. + SplashScreen splashScreen = SplashScreen.installSplashScreen(this); + super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); + + startActivity(new Intent(getApplicationContext(), MainActivity.class)); + finish(); } } \ No newline at end of file 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 92525db..c9f1be9 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 @@ -22,7 +22,6 @@ import com.fatapp.oxygentoolbox.util.ToolsList; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Objects; public class HomeFragment extends Fragment { @@ -57,7 +56,7 @@ public class HomeFragment extends Fragment { ToolsList.init(getResources().getAssets().open("json/BasicTools.json")); } catch (IOException e) { e.printStackTrace(); - Toast.makeText(getContext(), "初始化工具集失败", Toast.LENGTH_LONG).show(); + Toast.makeText(getContext(), R.string.init_tools_failed, Toast.LENGTH_LONG).show(); return; } @@ -70,9 +69,7 @@ public class HomeFragment extends Fragment { Button toolButton = toolButtonLayout.findViewById(R.id.tool_button); toolButton.setText(button.getText()); - toolButton.setOnClickListener(v -> { - BasicToolsLauncher.launch(button.getActivity(), getContext()); - }); + toolButton.setOnClickListener(v -> BasicToolsLauncher.launch(button.getActivity(), getContext())); autoLinefeedLayout.addView(toolButtonLayout); } @@ -84,7 +81,7 @@ public class HomeFragment extends Fragment { ((TextView) foldLayout.findViewById(R.id.fold_layout_text_view)).setText(tool.getFoldLayoutTitle()); TextView foldLayoutIcon = foldLayout.findViewById(R.id.fold_layout_icon); - foldLayoutIcon.setTypeface(Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), tool.getFont())); + foldLayoutIcon.setTypeface(Typeface.createFromAsset(requireContext().getAssets(), tool.getFont())); foldLayoutIcon.setText(tool.getIcon()); foldLayout.addItemView(viewList); diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/Locales.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/Locales.java new file mode 100644 index 0000000..3e3aa1c --- /dev/null +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/Locales.java @@ -0,0 +1,11 @@ +package com.fatapp.oxygentoolbox.util; + +public interface Locales { + String getCn(); + + void setCn(String cn); + + String getEn(); + + void setEn(String en); +} 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 b7a6baf..28394c5 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsJson.java @@ -108,67 +108,55 @@ public class ToolsJson { this.buttons = buttons; } - public static class Title { + public static class Title implements Locales { @SerializedName("cn") private String cn; - @SerializedName("tc") - private String tc; @SerializedName("en") private String en; + @Override public String getCn() { return cn; } + @Override public void setCn(String cn) { this.cn = cn; } - public String getTc() { - return tc; - } - - public void setTc(String tc) { - this.tc = tc; - } - + @Override public String getEn() { return en; } + @Override public void setEn(String en) { this.en = en; } } - public static class Desc { + public static class Desc implements Locales { @SerializedName("cn") private String cn; - @SerializedName("tc") - private String tc; @SerializedName("en") private String en; + @Override public String getCn() { return cn; } + @Override public void setCn(String cn) { this.cn = cn; } - public String getTc() { - return tc; - } - - public void setTc(String tc) { - this.tc = tc; - } - + @Override public String getEn() { return en; } + @Override public void setEn(String en) { this.en = en; } @@ -196,34 +184,28 @@ public class ToolsJson { this.activity = activity; } - public static class Text { + public static class Text implements Locales { @SerializedName("cn") private String cn; - @SerializedName("tc") - private String tc; @SerializedName("en") private String en; + @Override public String getCn() { return cn; } + @Override public void setCn(String cn) { this.cn = cn; } - public String getTc() { - return tc; - } - - public void setTc(String tc) { - this.tc = tc; - } - + @Override public String getEn() { return en; } + @Override public void setEn(String en) { this.en = en; } 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 38fc5ee..74e0d6f 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/ToolsList.java @@ -1,5 +1,10 @@ package com.fatapp.oxygentoolbox.util; +import android.os.Build; +import android.widget.Toast; + +import com.fatapp.oxygentoolbox.MainActivity; +import com.fatapp.oxygentoolbox.ui.home.HomeFragment; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -7,6 +12,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import java.util.Locale; public class ToolsList { private static List toolList = new ArrayList<>(); @@ -19,16 +25,17 @@ public class ToolsList { jsonStringBuilder.append((char) i); } file.close(); - List toolsJsonList = new Gson().fromJson(jsonStringBuilder.toString(), new TypeToken>(){}.getType()); + List toolsJsonList = new Gson().fromJson(jsonStringBuilder.toString(), new TypeToken>() { + }.getType()); for (ToolsJson toolsJson : toolsJsonList) { Tool tool = new Tool(); tool.setFont(toolsJson.getContent().getFont()); tool.setIcon(toolsJson.getContent().getIcon()); - tool.setFoldLayoutTitle(toolsJson.getContent().getTitle().getCn()); + tool.setFoldLayoutTitle(getLocale(toolsJson.getContent().getTitle())); for (ToolsJson.Content.Buttons cButton : toolsJson.getContent().getButtons()) { Button button = new Button(); - button.setText(cButton.getText().getCn()); + button.setText(getLocale(cButton.getText())); button.setActivity(cButton.getActivity()); tool.buttonList.add(button); } @@ -36,6 +43,19 @@ 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(); + } else { + language = MainActivity.mainActivity.getResources().getConfiguration().locale.getLanguage(); + } + if (language.equals("zh")) { + return strings.getCn(); + } + return strings.getEn(); + } + public static List getToolList() { return toolList; } 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 2b068d1..e1ac80f 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,3 +1,4 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_about.xml index bf287d4..d34e7e0 100644 --- a/app/src/main/res/drawable/ic_menu_about.xml +++ b/app/src/main/res/drawable/ic_menu_about.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/ic_menu_exit.xml b/app/src/main/res/drawable/ic_menu_exit.xml index 638d372..1ea086d 100644 --- a/app/src/main/res/drawable/ic_menu_exit.xml +++ b/app/src/main/res/drawable/ic_menu_exit.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/ic_menu_home.xml b/app/src/main/res/drawable/ic_menu_home.xml index 144853f..1ad264e 100644 --- a/app/src/main/res/drawable/ic_menu_home.xml +++ b/app/src/main/res/drawable/ic_menu_home.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/ic_menu_setting.xml b/app/src/main/res/drawable/ic_menu_setting.xml index 6aaaa4a..d8b43fb 100644 --- a/app/src/main/res/drawable/ic_menu_setting.xml +++ b/app/src/main/res/drawable/ic_menu_setting.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/drawable/ic_menu_theme.xml b/app/src/main/res/drawable/ic_menu_theme.xml index 984bb26..2c2fbe1 100644 --- a/app/src/main/res/drawable/ic_menu_theme.xml +++ b/app/src/main/res/drawable/ic_menu_theme.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index d337e6f..77d9ef6 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,8 +1,6 @@ + android:layout_height="match_parent"> \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index c13f41d..72a7f6b 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -29,6 +29,6 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_dialog_email" - android:contentDescription="TODO" /> + android:contentDescription="@string/fab" /> \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index dde07e5..09ce5bd 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -7,7 +7,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/app_bar_main"> - @@ -25,7 +26,7 @@ android:layout_height="40dp" android:layout_weight="6" android:gravity="center_vertical" - android:textColor="@color/black" + android:textColor="@color/app_text_theme" android:textSize="18sp" /> + app:srcCompat="@drawable/right_to_down_arrow" + android:contentDescription="@string/arrow_icon" /> \ 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 8bf9dd6..e6cf674 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,6 +12,7 @@ android:id="@+id/fold_layouts_linear_layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="10dp" android:paddingBottom="10dp" android:orientation="vertical"> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 2175eae..5ea1479 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -7,11 +7,15 @@ #FF018786 #FF000000 #FFFFFFFF + #FFBB86FC + @color/white + @color/white #FF202020 + #FF303030 - #FFFAFAFA - #FFF5F5F5 #FF666666 + @color/app_background + #FFFAFAFA #88cccccc \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 42c5f9f..0000000 --- a/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 4243f7b..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-za-rCN/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-za/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..77b8b30 --- /dev/null +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..ea8b47a --- /dev/null +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,20 @@ + + + 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 new file mode 100644 index 0000000..86cef11 --- /dev/null +++ b/app/src/main/res/values-zh/strings.xml @@ -0,0 +1,20 @@ + + + 氧工具 + 打开导航抽屉 + 关闭导航抽屉 + 氧工具 + All in One + 氧工具 + 设置 + 主页 + 主题 + 设置 + 关于 + 退出 + 禁用 + 氧工具 + 氧工具 + 初始化工具集失败 + 浮动按钮 + \ 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 0395769..56e2b48 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,11 +7,15 @@ #FF018786 #FF000000 #FFFFFFFF + #FF6200EE + @color/white + #FF444444 #FFF5F5F5 + #FFFFFFFF - #FF434343 - #FFF5F5F5 #FF666666 + @color/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 8692bf7..4b93aea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,4 +17,8 @@ Disable Oxygen Toolbox Oxygen Toolbox + + Fab + ]]> + Failed to initialize tools \ 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 37aec40..4ad0d77 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,8 +8,8 @@ 5dp 5dp 5dp - 10dp - 10dp + 15dp + 15dp @drawable/button_radius_shape @drawable/ripple_foreground @null diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index c76a8b9..eb8090d 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -13,14 +13,18 @@ ?attr/colorPrimaryVariant - - - - + + diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml index a2c2dc3..5024992 100644 --- a/app/src/main/res/xml-v25/shortcuts.xml +++ b/app/src/main/res/xml-v25/shortcuts.xml @@ -10,7 +10,7 @@ + android:targetPackage="com.fatapp.oxygentoolbox" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index a85370e..efa1b41 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c136caf..112884a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip