Merge remote-tracking branch 'up-10/dev' into 10-feature-request-change-font

This commit is contained in:
Aliberk Sandıkçı 2024-12-06 18:48:39 +03:00
commit caaab12372
Signed by: asandikci
GPG key ID: A3B47D76845BEDF3
4 changed files with 8 additions and 2 deletions

View file

@ -204,6 +204,7 @@ public class MainActivity extends AppCompatActivity {
return preferences.getString("preferred_font", getString(R.string.default_font_key));
}
// build the relevant font TypeFace
public void setUpFont(final String preferredFont) {
switch (preferredFont) {
case "Arial":

View file

@ -39,6 +39,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
initialSelectedContentCountry = org.schabi.newpipe.util.Localization
.getPreferredContentCountry(requireContext());
initialLanguage = defaultPreferences.getString(getString(R.string.app_language_key), "en");
//saving the initial font as system default
initialSelectedFont = defaultPreferences
.getString(getString(R.string.app_font_key), getString(R.string.default_font_key));
final Preference imageQualityPreference = requirePreference(R.string.image_quality_key);
@ -82,6 +83,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
.getPreferredContentCountry(requireContext());
final String selectedLanguage =
defaultPreferences.getString(getString(R.string.app_language_key), "en");
// getting the selectedFont from SharedPreference
final String selectedFont =
defaultPreferences.getString(getString(R.string.app_font_key), "Arial");
if (!selectedLocalization.equals(initialSelectedLocalization)
@ -91,9 +93,13 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
Toast.LENGTH_LONG).show();
NewPipe.setupLocalization(selectedLocalization, selectedContentCountry);
// checking if the font is changed from the initial
} else if ((!selectedFont.equals(initialSelectedFont))) {
// showing toast to prompt restarting app
Toast.makeText(requireContext(), R.string.font_changes_requires_app_restart,
Toast.LENGTH_LONG).show();
// saving the font selected into SharedPreference
final SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(requireContext());
final SharedPreferences.Editor editor = preferences.edit();

View file

@ -34,7 +34,7 @@
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="@string/default_localization_key"
android:defaultValue="@string/default_font_key"
android:entries="@array/app_font_name"
android:entryValues="@array/app_font_code"
android:key="@string/app_font_key"

View file

@ -1,6 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
// the kotlin version might be different from NewPipe main
buildscript {
ext.kotlin_version = '1.9.25'
repositories {