loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Align spelling of fullScreen to fullscreen

Browse Source 
Currently most of the public APIs use `fullscreen` (apart from the deprecated `PlayerControlView.OnFullScreenModeChangedListener` which will have to remain as is). This code changes mostly private variable naming.

PiperOrigin-RevId: 688559509
(cherry picked from commit ee4f0c40bc2575f55f89c4a22f26dabcdc75775a)
This commit is contained in:
jbibik 2024-10-22 08:27:01 -07:00 committed by Iván Budnik
parent 8fdb233a7d
commit e6849e082c
3 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
demos/surface/src/main/java/androidx/media3/demo/surface/MainActivity.java
View File

@ -62,8 +62,8 @@ public final class MainActivity extends Activity {
private boolean isOwner; private boolean isOwner;
@Nullable private LegacyPlayerControlView playerControlView; @Nullable private LegacyPlayerControlView playerControlView;
@Nullable private SurfaceView fullScreenView; @Nullable private SurfaceView fullscreenView;
@Nullable private SurfaceView nonFullScreenView; @Nullable private SurfaceView nonFullscreenView;
@Nullable private SurfaceView currentOutputView; @Nullable private SurfaceView currentOutputView;
@Nullable private static ExoPlayer player; @Nullable private static ExoPlayer player;
@ -75,13 +75,13 @@ public final class MainActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.main_activity); setContentView(R.layout.main_activity);
playerControlView = findViewById(R.id.player_control_view); playerControlView = findViewById(R.id.player_control_view);
fullScreenView = findViewById(R.id.full_screen_view); fullscreenView = findViewById(R.id.full_screen_view);
fullScreenView.setOnClickListener( fullscreenView.setOnClickListener(
v -> { v -> {
setCurrentOutputView(nonFullScreenView); setCurrentOutputView(nonFullscreenView);
Assertions.checkNotNull(fullScreenView).setVisibility(View.GONE); Assertions.checkNotNull(fullscreenView).setVisibility(View.GONE);
}); });
attachSurfaceListener(fullScreenView); attachSurfaceListener(fullscreenView);
isOwner = getIntent().getBooleanExtra(OWNER_EXTRA, /* defaultValue= */ true); isOwner = getIntent().getBooleanExtra(OWNER_EXTRA, /* defaultValue= */ true);
GridLayout gridLayout = findViewById(R.id.grid_layout); GridLayout gridLayout = findViewById(R.id.grid_layout);
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
@ -97,8 +97,8 @@ public final class MainActivity extends Activity {
button.setText(getString(R.string.full_screen_label)); button.setText(getString(R.string.full_screen_label));
button.setOnClickListener( button.setOnClickListener(
v -> { v -> {
setCurrentOutputView(fullScreenView); setCurrentOutputView(fullscreenView);
Assertions.checkNotNull(fullScreenView).setVisibility(View.VISIBLE); Assertions.checkNotNull(fullscreenView).setVisibility(View.VISIBLE);
}); });
} else if (i == 2) { } else if (i == 2) {
Button button = new Button(/* context= */ this); Button button = new Button(/* context= */ this);
@ -116,10 +116,10 @@ public final class MainActivity extends Activity {
surfaceView.setOnClickListener( surfaceView.setOnClickListener(
v -> { v -> {
setCurrentOutputView(surfaceView); setCurrentOutputView(surfaceView);
nonFullScreenView = surfaceView; nonFullscreenView = surfaceView;
}); });
if (nonFullScreenView == null) { if (nonFullscreenView == null) {
nonFullScreenView = surfaceView; nonFullscreenView = surfaceView;
} }
} }
gridLayout.addView(view); gridLayout.addView(view);
@ -144,7 +144,7 @@ public final class MainActivity extends Activity {
initializePlayer(); initializePlayer();
} }
setCurrentOutputView(nonFullScreenView); setCurrentOutputView(nonFullscreenView);
LegacyPlayerControlView playerControlView = Assertions.checkNotNull(this.playerControlView); LegacyPlayerControlView playerControlView = Assertions.checkNotNull(this.playerControlView);
playerControlView.setPlayer(player); playerControlView.setPlayer(player);

92
libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java
View File

@ -390,8 +390,8 @@ public class PlayerControlView extends FrameLayout {
@Nullable private final ImageView shuffleButton; @Nullable private final ImageView shuffleButton;
@Nullable private final ImageView vrButton; @Nullable private final ImageView vrButton;
@Nullable private final ImageView subtitleButton; @Nullable private final ImageView subtitleButton;
@Nullable private final ImageView fullScreenButton; @Nullable private final ImageView fullscreenButton;
@Nullable private final ImageView minimalFullScreenButton; @Nullable private final ImageView minimalFullscreenButton;
@Nullable private final View settingsButton; @Nullable private final View settingsButton;
@Nullable private final View playbackSpeedButton; @Nullable private final View playbackSpeedButton;
@Nullable private final View audioTrackButton; @Nullable private final View audioTrackButton;
@ -422,10 +422,10 @@ public class PlayerControlView extends FrameLayout {
private final Drawable subtitleOffButtonDrawable; private final Drawable subtitleOffButtonDrawable;
private final String subtitleOnContentDescription; private final String subtitleOnContentDescription;
private final String subtitleOffContentDescription; private final String subtitleOffContentDescription;
private final Drawable fullScreenExitDrawable; private final Drawable fullscreenExitDrawable;
private final Drawable fullScreenEnterDrawable; private final Drawable fullscreenEnterDrawable;
private final String fullScreenExitContentDescription; private final String fullscreenExitContentDescription;
private final String fullScreenEnterContentDescription; private final String fullscreenEnterContentDescription;
@Nullable private Player player; @Nullable private Player player;
@Nullable private ProgressUpdateListener progressUpdateListener; @Nullable private ProgressUpdateListener progressUpdateListener;
@ -434,7 +434,7 @@ public class PlayerControlView extends FrameLayout {
@Nullable @Nullable
private OnFullScreenModeChangedListener onFullScreenModeChangedListener; private OnFullScreenModeChangedListener onFullScreenModeChangedListener;
private boolean isFullScreen; private boolean isFullscreen;
private boolean isAttachedToWindow; private boolean isAttachedToWindow;
private boolean showMultiWindowTimeBar; private boolean showMultiWindowTimeBar;
private boolean showPlayButtonIfSuppressed; private boolean showPlayButtonIfSuppressed;
@ -485,8 +485,8 @@ public class PlayerControlView extends FrameLayout {
int fastForwardDrawableResId = R.drawable.exo_styled_controls_simple_fastforward; int fastForwardDrawableResId = R.drawable.exo_styled_controls_simple_fastforward;
int previousDrawableResId = R.drawable.exo_styled_controls_previous; int previousDrawableResId = R.drawable.exo_styled_controls_previous;
int rewindDrawableResId = R.drawable.exo_styled_controls_simple_rewind; int rewindDrawableResId = R.drawable.exo_styled_controls_simple_rewind;
int fullScreenExitDrawableResId = R.drawable.exo_styled_controls_fullscreen_exit; int fullscreenExitDrawableResId = R.drawable.exo_styled_controls_fullscreen_exit;
int fullScreenEnterDrawableResId = R.drawable.exo_styled_controls_fullscreen_enter; int fullscreenEnterDrawableResId = R.drawable.exo_styled_controls_fullscreen_enter;
int repeatOffDrawableResId = R.drawable.exo_styled_controls_repeat_off; int repeatOffDrawableResId = R.drawable.exo_styled_controls_repeat_off;
int repeatOneDrawableResId = R.drawable.exo_styled_controls_repeat_one; int repeatOneDrawableResId = R.drawable.exo_styled_controls_repeat_one;
int repeatAllDrawableResId = R.drawable.exo_styled_controls_repeat_all; int repeatAllDrawableResId = R.drawable.exo_styled_controls_repeat_all;
@ -531,12 +531,12 @@ public class PlayerControlView extends FrameLayout {
a.getResourceId(R.styleable.PlayerControlView_previous_icon, previousDrawableResId); a.getResourceId(R.styleable.PlayerControlView_previous_icon, previousDrawableResId);
rewindDrawableResId = rewindDrawableResId =
a.getResourceId(R.styleable.PlayerControlView_rewind_icon, rewindDrawableResId); a.getResourceId(R.styleable.PlayerControlView_rewind_icon, rewindDrawableResId);
fullScreenExitDrawableResId = fullscreenExitDrawableResId =
a.getResourceId( a.getResourceId(
R.styleable.PlayerControlView_fullscreen_exit_icon, fullScreenExitDrawableResId); R.styleable.PlayerControlView_fullscreen_exit_icon, fullscreenExitDrawableResId);
fullScreenEnterDrawableResId = fullscreenEnterDrawableResId =
a.getResourceId( a.getResourceId(
R.styleable.PlayerControlView_fullscreen_enter_icon, fullScreenEnterDrawableResId); R.styleable.PlayerControlView_fullscreen_enter_icon, fullscreenEnterDrawableResId);
repeatOffDrawableResId = repeatOffDrawableResId =
a.getResourceId(R.styleable.PlayerControlView_repeat_off_icon, repeatOffDrawableResId); a.getResourceId(R.styleable.PlayerControlView_repeat_off_icon, repeatOffDrawableResId);
repeatOneDrawableResId = repeatOneDrawableResId =
@ -605,10 +605,10 @@ public class PlayerControlView extends FrameLayout {
subtitleButton.setOnClickListener(componentListener); subtitleButton.setOnClickListener(componentListener);
} }
fullScreenButton = findViewById(R.id.exo_fullscreen); fullscreenButton = findViewById(R.id.exo_fullscreen);
initializeFullScreenButton(fullScreenButton, this::onFullScreenButtonClicked); initializeFullscreenButton(fullscreenButton, this::onFullscreenButtonClicked);
minimalFullScreenButton = findViewById(R.id.exo_minimal_fullscreen); minimalFullscreenButton = findViewById(R.id.exo_minimal_fullscreen);
initializeFullScreenButton(minimalFullScreenButton, this::onFullScreenButtonClicked); initializeFullscreenButton(minimalFullscreenButton, this::onFullscreenButtonClicked);
settingsButton = findViewById(R.id.exo_settings); settingsButton = findViewById(R.id.exo_settings);
if (settingsButton != null) { if (settingsButton != null) {
@ -768,16 +768,16 @@ public class PlayerControlView extends FrameLayout {
playButtonDrawable = getDrawable(context, resources, playDrawableResId); playButtonDrawable = getDrawable(context, resources, playDrawableResId);
pauseButtonDrawable = getDrawable(context, resources, pauseDrawableResId); pauseButtonDrawable = getDrawable(context, resources, pauseDrawableResId);
fullScreenExitDrawable = getDrawable(context, resources, fullScreenExitDrawableResId); fullscreenExitDrawable = getDrawable(context, resources, fullscreenExitDrawableResId);
fullScreenEnterDrawable = getDrawable(context, resources, fullScreenEnterDrawableResId); fullscreenEnterDrawable = getDrawable(context, resources, fullscreenEnterDrawableResId);
repeatOffButtonDrawable = getDrawable(context, resources, repeatOffDrawableResId); repeatOffButtonDrawable = getDrawable(context, resources, repeatOffDrawableResId);
repeatOneButtonDrawable = getDrawable(context, resources, repeatOneDrawableResId); repeatOneButtonDrawable = getDrawable(context, resources, repeatOneDrawableResId);
repeatAllButtonDrawable = getDrawable(context, resources, repeatAllDrawableResId); repeatAllButtonDrawable = getDrawable(context, resources, repeatAllDrawableResId);
shuffleOnButtonDrawable = getDrawable(context, resources, shuffleOnDrawableResId); shuffleOnButtonDrawable = getDrawable(context, resources, shuffleOnDrawableResId);
shuffleOffButtonDrawable = getDrawable(context, resources, shuffleOffDrawableResId); shuffleOffButtonDrawable = getDrawable(context, resources, shuffleOffDrawableResId);
fullScreenExitContentDescription = fullscreenExitContentDescription =
resources.getString(R.string.exo_controls_fullscreen_exit_description); resources.getString(R.string.exo_controls_fullscreen_exit_description);
fullScreenEnterContentDescription = fullscreenEnterContentDescription =
resources.getString(R.string.exo_controls_fullscreen_enter_description); resources.getString(R.string.exo_controls_fullscreen_enter_description);
repeatOffButtonContentDescription = repeatOffButtonContentDescription =
resources.getString(R.string.exo_controls_repeat_off_description); resources.getString(R.string.exo_controls_repeat_off_description);
@ -1114,8 +1114,8 @@ public class PlayerControlView extends FrameLayout {
public void setOnFullScreenModeChangedListener( public void setOnFullScreenModeChangedListener(
@Nullable OnFullScreenModeChangedListener listener) { @Nullable OnFullScreenModeChangedListener listener) {
onFullScreenModeChangedListener = listener; onFullScreenModeChangedListener = listener;
updateFullScreenButtonVisibility(fullScreenButton, listener != null); updateFullscreenButtonVisibility(fullscreenButton, listener != null);
updateFullScreenButtonVisibility(minimalFullScreenButton, listener != null); updateFullscreenButtonVisibility(minimalFullscreenButton, listener != null);
} }
/** /**
@ -1574,8 +1574,8 @@ public class PlayerControlView extends FrameLayout {
updateProgress(); updateProgress();
} }
private void onFullScreenButtonClicked(View v) { private void onFullscreenButtonClicked(View v) {
updateIsFullscreen(!isFullScreen); updateIsFullscreen(!isFullscreen);
} }
/** /**
@ -1589,30 +1589,30 @@ public class PlayerControlView extends FrameLayout {
* @param isFullscreen If the view is in full screen. * @param isFullscreen If the view is in full screen.
*/ */
public void updateIsFullscreen(boolean isFullscreen) { public void updateIsFullscreen(boolean isFullscreen) {
if (this.isFullScreen == isFullscreen) { if (this.isFullscreen == isFullscreen) {
return; return;
} }
this.isFullScreen = isFullscreen; this.isFullscreen = isFullscreen;
updateFullScreenButtonForState(fullScreenButton, isFullscreen); updateFullscreenButtonForState(fullscreenButton, isFullscreen);
updateFullScreenButtonForState(minimalFullScreenButton, isFullscreen); updateFullscreenButtonForState(minimalFullscreenButton, isFullscreen);
if (onFullScreenModeChangedListener != null) { if (onFullScreenModeChangedListener != null) {
onFullScreenModeChangedListener.onFullScreenModeChanged(isFullscreen); onFullScreenModeChangedListener.onFullScreenModeChanged(isFullscreen);
} }
} }
private void updateFullScreenButtonForState( private void updateFullscreenButtonForState(
@Nullable ImageView fullScreenButton, boolean isFullScreen) { @Nullable ImageView fullscreenButton, boolean isFullscreen) {
if (fullScreenButton == null) { if (fullscreenButton == null) {
return; return;
} }
if (isFullScreen) { if (isFullscreen) {
fullScreenButton.setImageDrawable(fullScreenExitDrawable); fullscreenButton.setImageDrawable(fullscreenExitDrawable);
fullScreenButton.setContentDescription(fullScreenExitContentDescription); fullscreenButton.setContentDescription(fullscreenExitContentDescription);
} else { } else {
fullScreenButton.setImageDrawable(fullScreenEnterDrawable); fullscreenButton.setImageDrawable(fullscreenEnterDrawable);
fullScreenButton.setContentDescription(fullScreenEnterContentDescription); fullscreenButton.setContentDescription(fullscreenEnterContentDescription);
} }
} }
@ -1775,23 +1775,23 @@ public class PlayerControlView extends FrameLayout {
return true; return true;
} }
private static void initializeFullScreenButton(View fullScreenButton, OnClickListener listener) { private static void initializeFullscreenButton(View fullscreenButton, OnClickListener listener) {
if (fullScreenButton == null) { if (fullscreenButton == null) {
return; return;
} }
fullScreenButton.setVisibility(GONE); fullscreenButton.setVisibility(GONE);
fullScreenButton.setOnClickListener(listener); fullscreenButton.setOnClickListener(listener);
} }
private static void updateFullScreenButtonVisibility( private static void updateFullscreenButtonVisibility(
@Nullable View fullScreenButton, boolean visible) { @Nullable View fullscreenButton, boolean visible) {
if (fullScreenButton == null) { if (fullscreenButton == null) {
return; return;
} }
if (visible) { if (visible) {
fullScreenButton.setVisibility(VISIBLE); fullscreenButton.setVisibility(VISIBLE);
} else { } else {
fullScreenButton.setVisibility(GONE); fullscreenButton.setVisibility(GONE);
} }
} }

8
libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
View File

@ -208,10 +208,10 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
/** /**
* Called when the fullscreen button is clicked. * Called when the fullscreen button is clicked.
* *
* @param isFullScreen {@code true} if the video rendering surface should be fullscreen, {@code * @param isFullscreen {@code true} if the video rendering surface should be fullscreen, {@code
* false} otherwise. * false} otherwise.
*/ */
void onFullscreenButtonClick(boolean isFullScreen); void onFullscreenButtonClick(boolean isFullscreen);
} }
/** /**
@ -1957,9 +1957,9 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
// PlayerControlView.OnFullScreenModeChangedListener implementation // PlayerControlView.OnFullScreenModeChangedListener implementation
@Override @Override
public void onFullScreenModeChanged(boolean isFullScreen) { public void onFullScreenModeChanged(boolean isFullscreen) {
if (fullscreenButtonClickListener != null) { if (fullscreenButtonClickListener != null) {
fullscreenButtonClickListener.onFullscreenButtonClick(isFullScreen); fullscreenButtonClickListener.onFullscreenButtonClick(isFullscreen);
} }
} }
} }