diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 699b2b5..c04b259 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -12,26 +12,6 @@ - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/App.java b/app/src/main/java/com/fatapp/oxygentoolbox/App.java index a5c05bd..6337f82 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/App.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/App.java @@ -22,22 +22,15 @@ public class App extends Application { public void onCreate() { super.onCreate(); - try { - ToolsList.init(getResources().getAssets().open("json/BasicTools.json")); - } catch (IOException e) { - e.printStackTrace(); - Toast.makeText(getApplicationContext(), R.string.init_tools_failed, Toast.LENGTH_LONG).show(); - return; - } - registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { @Override public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) { - SharedPreferencesUtils.init(App.this); ResourceUtil.init(App.this); + SharedPreferencesUtils.init(App.this); ResourceUtil.setAppLocale(SharedPreferencesUtils.getPreferenceLocale()); ResourceUtil.loadAppTheme(activity); loadAppUiMode(); + loadTools(); } @Override @@ -95,4 +88,13 @@ public class App extends Application { ResourceUtil.setAppUiMode(ResourceUtil.getSystemUiMode()); } } + + private void loadTools() { + try { + ToolsList.init(getResources().getAssets().open("json/BasicTools.json")); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(getApplicationContext(), R.string.init_tools_failed, Toast.LENGTH_LONG).show(); + } + } } diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java index 1662a3b..ec21519 100644 --- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java +++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/util/LibrariesAdapter.java @@ -70,7 +70,8 @@ public class LibrariesAdapter extends RecyclerView.Adapter() { }.getType()); - new MaterialAlertDialogBuilder(context).setMessage(licenseObject.getContent()).show(); + new MaterialAlertDialogBuilder(context).setMessage(licenseObject.getContent()).show() + .getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); } catch (JSONException e) { new MaterialAlertDialogBuilder(context).setMessage(String.format("Could not load license \"%s\"", license)).show(); } diff --git a/app/src/main/res/layout/item_libraries.xml b/app/src/main/res/layout/item_libraries.xml index d8068ef..912187e 100644 --- a/app/src/main/res/layout/item_libraries.xml +++ b/app/src/main/res/layout/item_libraries.xml @@ -16,6 +16,7 @@ android:id="@+id/content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?attr/app_on_background_theme" android:orientation="vertical"> SYSTEM - ZH_CN - EN_US + zh_CN + en_US SYSTEM