diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java index 19621593c..aedcdb791 100644 --- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java @@ -52,6 +52,7 @@ import android.widget.TextView; import android.widget.Toast; import com.google.android.exoplayer2.Player; +import com.google.android.exoplayer2.text.CaptionStyleCompat; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.SubtitleView; @@ -397,20 +398,15 @@ public final class MainVideoPlayer extends AppCompatActivity @Override protected void setupSubtitleView(@NonNull SubtitleView view, - @NonNull String captionSizeKey) { - final float captionRatioInverse; - if (captionSizeKey.equals(getString(R.string.smaller_caption_size_key))) { - captionRatioInverse = 22f; - } else if (captionSizeKey.equals(getString(R.string.larger_caption_size_key))) { - captionRatioInverse = 18f; - } else { - captionRatioInverse = 20f; - } - + final float captionScale, + @NonNull final CaptionStyleCompat captionStyle) { final DisplayMetrics metrics = context.getResources().getDisplayMetrics(); final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels); + final float captionRatioInverse = 20f + 4f * (1f - captionScale); view.setFixedTextSize(TypedValue.COMPLEX_UNIT_PX, (float) minimumLength / captionRatioInverse); + view.setApplyEmbeddedStyles(captionStyle.equals(CaptionStyleCompat.DEFAULT)); + view.setStyle(captionStyle); } @Override diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java index 20860d9c5..9528bf2bc 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java @@ -52,6 +52,7 @@ import android.widget.TextView; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; +import com.google.android.exoplayer2.text.CaptionStyleCompat; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.SubtitleView; @@ -397,14 +398,12 @@ public final class PopupVideoPlayer extends Service { @Override protected void setupSubtitleView(@NonNull SubtitleView view, - @NonNull String captionSizeKey) { - float captionRatio = SubtitleView.DEFAULT_TEXT_SIZE_FRACTION; - if (captionSizeKey.equals(getString(R.string.smaller_caption_size_key))) { - captionRatio *= 0.9; - } else if (captionSizeKey.equals(getString(R.string.larger_caption_size_key))) { - captionRatio *= 1.1; - } - view.setFractionalTextSize(captionRatio); + final float captionScale, + @NonNull final CaptionStyleCompat captionStyle) { + float captionRatio = (captionScale - 1f) / 5f + 1f; + view.setFractionalTextSize(SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionRatio); + view.setApplyEmbeddedStyles(captionStyle.equals(CaptionStyleCompat.DEFAULT)); + view.setStyle(captionStyle); } @Override diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java index 0e0dca983..6cf2076eb 100644 --- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java @@ -32,7 +32,6 @@ import android.graphics.PorterDuff; import android.net.Uri; import android.os.Build; import android.os.Handler; -import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; @@ -55,6 +54,7 @@ import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MergingMediaSource; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.text.CaptionStyleCompat; import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.SubtitleView; @@ -189,10 +189,10 @@ public abstract class VideoPlayer extends BasePlayer this.qualityTextView = rootView.findViewById(R.id.qualityTextView); this.subtitleView = rootView.findViewById(R.id.subtitleView); - final String captionSizeKey = PreferenceManager.getDefaultSharedPreferences(context) - .getString(context.getString(R.string.caption_size_key), - context.getString(R.string.caption_size_default)); - setupSubtitleView(subtitleView, captionSizeKey); + + final float captionScale = PlayerHelper.getCaptionScale(context); + final CaptionStyleCompat captionStyle = PlayerHelper.getCaptionStyle(context); + setupSubtitleView(subtitleView, captionScale, captionStyle); this.resizeView = rootView.findViewById(R.id.resizeTextView); resizeView.setText(PlayerHelper.resizeTypeOf(context, aspectRatioFrameLayout.getResizeMode())); @@ -214,7 +214,8 @@ public abstract class VideoPlayer extends BasePlayer } protected abstract void setupSubtitleView(@NonNull SubtitleView view, - @NonNull String captionSizeKey); + final float captionScale, + @NonNull final CaptionStyleCompat captionStyle); @Override public void initListeners() { diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java index 84c7a619b..7d3550c91 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java @@ -2,16 +2,18 @@ package org.schabi.newpipe.player.helper; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.view.accessibility.CaptioningManager; import com.google.android.exoplayer2.SeekParameters; import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; import com.google.android.exoplayer2.trackselection.TrackSelection; +import com.google.android.exoplayer2.text.CaptionStyleCompat; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.upstream.BandwidthMeter; -import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.MimeTypes; import org.schabi.newpipe.R; @@ -229,6 +231,35 @@ public class PlayerHelper { return 2500; } + @NonNull + public static CaptionStyleCompat getCaptionStyle(@NonNull final Context context) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return CaptionStyleCompat.DEFAULT; + + final CaptioningManager captioningManager = (CaptioningManager) + context.getSystemService(Context.CAPTIONING_SERVICE); + if (captioningManager == null || !captioningManager.isEnabled()) { + return CaptionStyleCompat.DEFAULT; + } + + return CaptionStyleCompat.createFromCaptionStyle(captioningManager.getUserStyle()); + } + + /** + * System font scaling: + * Very small - 0.25f, Small - 0.5f, Normal - 1.0f, Large - 1.5f, Very Large - 2.0f + * */ + @NonNull + public static float getCaptionScale(@NonNull final Context context) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return 1f; + + final CaptioningManager captioningManager = (CaptioningManager) + context.getSystemService(Context.CAPTIONING_SERVICE); + if (captioningManager == null || !captioningManager.isEnabled()) { + return 1f; + } + + return captioningManager.getFontScale(); + } //////////////////////////////////////////////////////////////////////////// // Private helpers //////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java index 70b6e25ed..806b30a5b 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java @@ -1,17 +1,25 @@ package org.schabi.newpipe.settings; +import android.content.Intent; +import android.os.Build; import android.os.Bundle; +import android.provider.Settings; import android.support.annotation.Nullable; import android.support.v7.preference.Preference; +import android.util.Log; import org.schabi.newpipe.R; import org.schabi.newpipe.util.Constants; public class AppearanceSettingsFragment extends BasePreferenceFragment { + private final static boolean CAPTIONING_SETTINGS_ACCESSIBLE = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + /** * Theme that was applied when the settings was opened (or recreated after a theme change) */ private String startThemeKey; + private String captionSettingsKey; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -19,6 +27,12 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment { String themeKey = getString(R.string.theme_key); startThemeKey = defaultPreferences.getString(themeKey, getString(R.string.default_theme_value)); findPreference(themeKey).setOnPreferenceChangeListener(themePreferenceChange); + + captionSettingsKey = getString(R.string.caption_settings_key); + if (!CAPTIONING_SETTINGS_ACCESSIBLE) { + final Preference captionSettings = findPreference(captionSettingsKey); + getPreferenceScreen().removePreference(captionSettings); + } } @Override @@ -26,13 +40,23 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment { addPreferencesFromResource(R.xml.appearance_settings); } + @Override + public boolean onPreferenceTreeClick(Preference preference) { + if (preference.getKey().equals(captionSettingsKey) && CAPTIONING_SETTINGS_ACCESSIBLE) { + startActivity(new Intent(Settings.ACTION_CAPTIONING_SETTINGS)); + } + + return super.onPreferenceTreeClick(preference); + } + private Preference.OnPreferenceChangeListener themePreferenceChange = new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply(); defaultPreferences.edit().putString(getString(R.string.theme_key), newValue.toString()).apply(); - if (!newValue.equals(startThemeKey)) { // If it's not the current theme + if (!newValue.equals(startThemeKey) && getActivity() != null) { + // If it's not the current theme getActivity().recreate(); } diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 68d75737a..befe17958 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -109,23 +109,7 @@ - caption_size_key - @string/normal_caption_size_key - - smaller_caption_size - normal_caption_size - larger_caption_size - - - @string/smaller_caption_font_size - @string/normal_caption_font_size - @string/larger_caption_font_size - - - @string/smaller_caption_size_key - @string/normal_caption_size_key - @string/larger_caption_size_key - + caption_settings_key show_search_suggestions diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 33ce46412..6f3dc7d0a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -426,10 +426,10 @@ ZOOM Auto-generated - Caption font size - Smaller font - Normal font - Larger font + + + Caption + Modify player caption text scale and background styles. Require player restart to take effect. Enable LeakCanary diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml index 3ffbd9d81..239f5f3b3 100644 --- a/app/src/main/res/xml/appearance_settings.xml +++ b/app/src/main/res/xml/appearance_settings.xml @@ -22,11 +22,8 @@ android:title="@string/show_hold_to_append_title" android:summary="@string/show_hold_to_append_summary"/> - +