From 8ea11021d8cd78e9e26e68bf102f351867bc51c2 Mon Sep 17 00:00:00 2001 From: tehcneko <88844448+tehcneko@users.noreply.github.com> Date: Thu, 9 Sep 2021 20:56:19 +0800 Subject: [PATCH] [app] Fix preload HTMLs (#1088) --- .../manager/ui/fragment/HomeFragment.java | 6 +----- .../manager/ui/fragment/RepoFragment.java | 10 +++++----- .../manager/ui/fragment/SettingsFragment.java | 20 +++++++++++++++++++ .../res/drawable/ic_baseline_translate_24.xml | 6 +++--- .../res/drawable/ic_round_assignment_24.xml | 6 +++--- .../res/drawable/ic_round_bug_report_24.xml | 6 +++--- .../res/drawable/ic_round_check_circle_24.xml | 6 +++--- .../drawable/ic_round_error_outline_24.xml | 6 +++--- .../res/drawable/ic_round_settings_24.xml | 6 +++--- .../main/res/drawable/ic_round_warning_24.xml | 6 +++--- app/src/main/res/values-af-rZA/strings.xml | 3 +-- app/src/main/res/values-ar-rSA/strings.xml | 3 +-- app/src/main/res/values-ca-rES/strings.xml | 3 +-- app/src/main/res/values-cs-rCZ/strings.xml | 3 +-- app/src/main/res/values-da-rDK/strings.xml | 3 +-- app/src/main/res/values-de-rDE/strings.xml | 3 +-- app/src/main/res/values-el-rGR/strings.xml | 3 +-- app/src/main/res/values-es-rES/strings.xml | 3 +-- app/src/main/res/values-fi-rFI/strings.xml | 3 +-- app/src/main/res/values-fr-rFR/strings.xml | 3 +-- app/src/main/res/values-hu-rHU/strings.xml | 3 +-- app/src/main/res/values-it-rIT/strings.xml | 3 +-- app/src/main/res/values-iw-rIL/strings.xml | 3 +-- app/src/main/res/values-ja-rJP/strings.xml | 3 +-- app/src/main/res/values-ko-rKR/strings.xml | 3 +-- app/src/main/res/values-nl-rNL/strings.xml | 3 +-- app/src/main/res/values-no-rNO/strings.xml | 3 +-- app/src/main/res/values-pl-rPL/strings.xml | 3 +-- app/src/main/res/values-pt-rBR/strings.xml | 3 +-- app/src/main/res/values-pt-rPT/strings.xml | 3 +-- app/src/main/res/values-ro-rRO/strings.xml | 3 +-- app/src/main/res/values-ru-rRU/strings.xml | 3 +-- app/src/main/res/values-sv-rSE/strings.xml | 3 +-- app/src/main/res/values-tr-rTR/strings.xml | 3 +-- app/src/main/res/values-uk-rUA/strings.xml | 3 +-- app/src/main/res/values-vi-rVN/strings.xml | 3 +-- app/src/main/res/values-zh-rCN/strings.xml | 4 +--- app/src/main/res/values-zh-rHK/strings.xml | 3 +-- app/src/main/res/values-zh-rTW/strings.xml | 3 +-- app/src/main/res/values/strings.xml | 6 +++++- app/src/main/res/xml/prefs.xml | 9 +++++++++ 41 files changed, 90 insertions(+), 91 deletions(-) diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java index d35a615b..1e59e590 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java @@ -22,7 +22,6 @@ package org.lsposed.manager.ui.fragment; import android.app.Activity; import android.os.Build; import android.os.Bundle; -import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.MenuItem; @@ -98,13 +97,10 @@ public class HomeFragment extends BaseFragment { binding.designAboutTitle.setText(R.string.app_name); binding.designAboutInfo.setMovementMethod(LinkMovementMethod.getInstance()); binding.designAboutInfo.setTransformationMethod(new LinkTransformationMethod(activity)); - SpannableStringBuilder sb = new SpannableStringBuilder(HtmlCompat.fromHtml(getString( + binding.designAboutInfo.setText(HtmlCompat.fromHtml(getString( R.string.about_view_source_code, "GitHub", "Telegram"), HtmlCompat.FROM_HTML_MODE_LEGACY)); - sb.append("\n\n"); - sb.append(HtmlCompat.fromHtml(getString(R.string.about_translators, getString(R.string.translators)), HtmlCompat.FROM_HTML_MODE_LEGACY)); - binding.designAboutInfo.setText(sb); binding.designAboutVersion.setText(String.format(Locale.US, "%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); new BlurBehindDialogBuilder(activity) .setView(binding.getRoot()) diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java index da1fafc5..2067aaec 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java @@ -104,6 +104,11 @@ public class RepoFragment extends BaseFragment implements RepoLoader.Listener { @Override public void onCreate(@Nullable Bundle savedInstanceState) { + if (ResourceUtils.isNightMode(getResources().getConfiguration())) { + runAsync(HTML_TEMPLATE_DARK); + } else { + runAsync(HTML_TEMPLATE); + } mSearchListener = new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextSubmit(String query) { @@ -166,11 +171,6 @@ public class RepoFragment extends BaseFragment implements RepoLoader.Listener { if (preLoadWebview) { mHandler.postDelayed(() -> { new WebView(requireContext()); - if (ResourceUtils.isNightMode(getResources().getConfiguration())) { - HTML_TEMPLATE_DARK.run(); - } else { - HTML_TEMPLATE.run(); - } }, 500); preLoadWebview = false; } diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java index 3751e725..7b483a92 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java @@ -48,6 +48,7 @@ import org.lsposed.manager.R; import org.lsposed.manager.databinding.FragmentSettingsBinding; import org.lsposed.manager.ui.activity.MainActivity; import org.lsposed.manager.util.BackupUtils; +import org.lsposed.manager.util.NavUtil; import org.lsposed.manager.util.theme.ThemeUtil; import java.time.LocalDateTime; @@ -269,6 +270,25 @@ public class SettingsFragment extends BaseFragment { language.setSummary(!TextUtils.isEmpty(locale.getScript()) ? locale.getDisplayScript(userLocale) : locale.getDisplayName(userLocale)); } } + + Preference translation = findPreference("translation"); + if (translation != null) { + translation.setOnPreferenceClickListener(preference -> { + NavUtil.startURL(requireActivity(), "https://lsposed.crowdin.com/lsposed"); + return true; + }); + translation.setSummary(getString(R.string.settings_translation_summary, getString(R.string.app_name))); + } + + Preference translation_contributors = findPreference("translation_contributors"); + if (translation_contributors != null) { + var translators = HtmlCompat.fromHtml(getString(R.string.translators), HtmlCompat.FROM_HTML_MODE_LEGACY); + if (TextUtils.isEmpty(translators)) { + translation_contributors.setVisible(false); + } else { + translation_contributors.setSummary(translators); + } + } } @Override diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/app/src/main/res/drawable/ic_baseline_translate_24.xml index 4965aafa..fa113af2 100644 --- a/app/src/main/res/drawable/ic_baseline_translate_24.xml +++ b/app/src/main/res/drawable/ic_baseline_translate_24.xml @@ -23,7 +23,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_round_assignment_24.xml b/app/src/main/res/drawable/ic_round_assignment_24.xml index 9bdd9efa..669f4eff 100644 --- a/app/src/main/res/drawable/ic_round_assignment_24.xml +++ b/app/src/main/res/drawable/ic_round_assignment_24.xml @@ -5,7 +5,7 @@ android:viewportHeight="24" android:tint="?attr/colorControlNormal" android:autoMirrored="true"> - + diff --git a/app/src/main/res/drawable/ic_round_bug_report_24.xml b/app/src/main/res/drawable/ic_round_bug_report_24.xml index c0ee0011..34e9ecdb 100644 --- a/app/src/main/res/drawable/ic_round_bug_report_24.xml +++ b/app/src/main/res/drawable/ic_round_bug_report_24.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_round_check_circle_24.xml b/app/src/main/res/drawable/ic_round_check_circle_24.xml index 1f3ee6e6..4245a4b9 100644 --- a/app/src/main/res/drawable/ic_round_check_circle_24.xml +++ b/app/src/main/res/drawable/ic_round_check_circle_24.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_round_error_outline_24.xml b/app/src/main/res/drawable/ic_round_error_outline_24.xml index 53237a2f..777e4187 100644 --- a/app/src/main/res/drawable/ic_round_error_outline_24.xml +++ b/app/src/main/res/drawable/ic_round_error_outline_24.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_round_settings_24.xml b/app/src/main/res/drawable/ic_round_settings_24.xml index 6da10fa3..791f1b9e 100644 --- a/app/src/main/res/drawable/ic_round_settings_24.xml +++ b/app/src/main/res/drawable/ic_round_settings_24.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/drawable/ic_round_warning_24.xml b/app/src/main/res/drawable/ic_round_warning_24.xml index 506d0586..659345f4 100644 --- a/app/src/main/res/drawable/ic_round_warning_24.xml +++ b/app/src/main/res/drawable/ic_round_warning_24.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal"> - + diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 9831094d..e224b8bf 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -1,5 +1,4 @@ - - Readme diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index 3adf8159..33aa66c1 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -40,6 +40,15 @@ android:summary="%s" android:key="language" android:title="@string/settings_language" /> + + + +