From 2e7cbb7d914dbca01274a7ce61daba1ae0512d9f Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Tue, 5 Nov 2024 13:56:34 +0000 Subject: [PATCH 1/2] Use a translatable trouble shoot page --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6cd00689..bbfc866f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -123,7 +123,7 @@ System app Additional file for %s Having troubles? - https://doc.e.foundation/support-topics/app_lounge_troubleshooting + https://e.foundation/get-e-os/#applounge Share [%1$s] Restricted App You are too young to be able to install %1$s. Please check with your parent your age group is correct or disable parental control to be able to install it. -- GitLab From f2128f47cc1065359f61473d0734a11d98324329 Mon Sep 17 00:00:00 2001 From: Fahim Masud Choudhury Date: Mon, 11 Nov 2024 12:38:56 +0600 Subject: [PATCH 2/2] feat: update troubleshooting URL to load in system language on browser --- .../e/apps/ui/parentFragment/TimeoutFragment.kt | 3 ++- .../e/apps/ui/settings/SettingsFragment.kt | 13 +++++++++++-- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/settings_preferences.xml | 5 +---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt index b720fca17..42c17f976 100644 --- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt @@ -46,6 +46,7 @@ import foundation.e.apps.databinding.DialogErrorLogBinding import foundation.e.apps.ui.LoginViewModel import foundation.e.apps.ui.MainActivityViewModel import timber.log.Timber +import java.util.Locale /** * Parent class of all fragments. @@ -233,7 +234,7 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { } private fun openTroubleshootingPage() { - val troubleshootUrl = getString(R.string.troubleshootURL) + val troubleshootUrl = getString(R.string.troubleshootURL, Locale.getDefault().language) val openUrlIntent = Intent(Intent.ACTION_VIEW) openUrlIntent.data = Uri.parse(troubleshootUrl) startActivity(openUrlIntent) diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt index 760e0ee49..29f8f7f85 100644 --- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt @@ -20,6 +20,8 @@ package foundation.e.apps.ui.settings import android.content.ClipData import android.content.ClipboardManager +import android.content.Intent +import android.net.Uri import android.os.Bundle import android.view.View import android.widget.Toast @@ -39,14 +41,15 @@ import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.BuildConfig import foundation.e.apps.R -import foundation.e.apps.data.enums.User import foundation.e.apps.data.application.UpdatesDao -import foundation.e.apps.ui.LoginViewModel +import foundation.e.apps.data.enums.User import foundation.e.apps.databinding.CustomPreferenceBinding import foundation.e.apps.install.updates.UpdatesWorkManager +import foundation.e.apps.ui.LoginViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.utils.SystemInfoProvider import timber.log.Timber +import java.util.Locale import javax.inject.Inject @AndroidEntryPoint @@ -58,6 +61,7 @@ class SettingsFragment : PreferenceFragmentCompat() { private var showAllApplications: CheckBoxPreference? = null private var showFOSSApplications: CheckBoxPreference? = null private var showPWAApplications: CheckBoxPreference? = null + private var troubleShootPreference: Preference? = null val loginViewModel: LoginViewModel by lazy { ViewModelProvider(requireActivity())[LoginViewModel::class.java] @@ -86,6 +90,8 @@ class SettingsFragment : PreferenceFragmentCompat() { showAllApplications = findPreference("showAllApplications") showFOSSApplications = findPreference("showFOSSApplications") showPWAApplications = findPreference("showPWAApplications") + troubleShootPreference = findPreference(getString(R.string.having_troubles)) + val updateCheckInterval = preferenceManager.findPreference(getString(R.string.update_check_intervals)) updateCheckInterval?.setOnPreferenceChangeListener { _, newValue -> @@ -126,6 +132,9 @@ class SettingsFragment : PreferenceFragmentCompat() { allSourceCheckboxes.forEach { it?.onPreferenceChangeListener = sourceCheckboxListener } + + val troubleshootUrl = getString(R.string.troubleshootURL, Locale.getDefault().language) + troubleShootPreference?.intent = Intent(Intent.ACTION_VIEW, Uri.parse(troubleshootUrl)) } /** diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbfc866f2..97b7df512 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -123,7 +123,7 @@ System app Additional file for %s Having troubles? - https://e.foundation/get-e-os/#applounge + https://e.foundation/%1$s/get-e-os/#applounge Share [%1$s] Restricted App You are too young to be able to install %1$s. Please check with your parent your age group is correct or disable parental control to be able to install it. diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml index 6eeb9c06a..e00efe484 100644 --- a/app/src/main/res/xml/settings_preferences.xml +++ b/app/src/main/res/xml/settings_preferences.xml @@ -27,9 +27,6 @@ - - \ No newline at end of file + -- GitLab