Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small improvements to code quality and readability #7562

Merged
merged 3 commits into from
Dec 23, 2021
Merged

Small improvements to code quality and readability #7562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a163d54
Make PlayerHolder.bound private
TobiGr Dec 20, 2021
d71af9a
Introduce constants for some Strings that indicate no data in Tab class
TobiGr Dec 21, 2021
37b8a93
Small improvements to code quality and readability
TobiGr Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public boolean onRequestChildRectangleOnScreen(
return consumed == dy;
}

@Override
public boolean onInterceptTouchEvent(@NonNull final CoordinatorLayout parent,
@NonNull final AppBarLayout child,
@NonNull final MotionEvent ev) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ protected void initListeners() {
});

setupBottomPlayer();
if (!playerHolder.bound) {
if (!playerHolder.isBound()) {
setHeightThumbnail();
} else {
playerHolder.startService(false, this);
Expand Down Expand Up @@ -1434,7 +1434,7 @@ public void onReceive(final Context context, final Intent intent) {
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
}
// Rebound to the service if it was closed via notification or mini player
if (!playerHolder.bound) {
if (!playerHolder.isBound()) {
playerHolder.startService(
false, VideoDetailFragment.this);
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ private void showDeleteSuggestionDialog(final SuggestionItem item) {
@Override
public boolean onBackPressed() {
if (suggestionsPanelVisible
&& infoListAdapter.getItemsList().size() > 0
&& !infoListAdapter.getItemsList().isEmpty()
&& !isLoading.get()) {
hideSuggestionsPanel();
hideKeyboardSearch();
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ class ChannelItem(
context.getString(R.string.subscribers_count_not_available)
}

if (itemVersion == ItemVersion.NORMAL) {
if (infoItem.streamCount >= 0) {
val formattedVideoAmount = Localization.localizeStreamCount(context, infoItem.streamCount)
details = Localization.concatenateStrings(details, formattedVideoAmount)
}
if (itemVersion == ItemVersion.NORMAL && infoItem.streamCount >= 0) {
val formattedVideoAmount = Localization.localizeStreamCount(context, infoItem.streamCount)
details = Localization.concatenateStrings(details, formattedVideoAmount)
}
return details
}
Expand Down
26 changes: 14 additions & 12 deletions app/src/main/java/org/schabi/newpipe/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,7 +2348,8 @@ private void onShuffleOrRepeatModeChanged() {
NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
}

private void setRepeatModeButton(final AppCompatImageButton imageButton, final int repeatMode) {
private void setRepeatModeButton(final AppCompatImageButton imageButton,
@RepeatMode final int repeatMode) {
switch (repeatMode) {
case REPEAT_MODE_OFF:
imageButton.setImageResource(R.drawable.exo_controls_repeat_off);
Expand All @@ -2362,7 +2363,7 @@ private void setRepeatModeButton(final AppCompatImageButton imageButton, final i
}
}

private void setShuffleButton(final ImageButton button, final boolean shuffled) {
private void setShuffleButton(@NonNull final ImageButton button, final boolean shuffled) {
button.setImageAlpha(shuffled ? 255 : 77);
}
//endregion
Expand All @@ -2387,7 +2388,7 @@ boolean isMuted() {
return !exoPlayerIsNull() && simpleExoPlayer.getVolume() == 0;
}

private void setMuteButton(final ImageButton button, final boolean isMuted) {
private void setMuteButton(@NonNull final ImageButton button, final boolean isMuted) {
button.setImageDrawable(AppCompatResources.getDrawable(context, isMuted
? R.drawable.ic_volume_off : R.drawable.ic_volume_up));
}
Expand Down Expand Up @@ -2876,7 +2877,7 @@ private void saveStreamProgressState(final long progressMillis) {
databaseUpdateDisposable
.add(recordManager.saveStreamState(currentMetadata.getMetadata(), progressMillis)
.observeOn(AndroidSchedulers.mainThread())
.doOnError((e) -> {
.doOnError(e -> {
if (DEBUG) {
e.printStackTrace();
}
Expand Down Expand Up @@ -3386,7 +3387,7 @@ private void buildPlaybackSpeedMenu() {
playbackSpeedPopupMenu.setOnDismissListener(this);
}

private void buildCaptionMenu(final List<String> availableLanguages) {
private void buildCaptionMenu(@NonNull final List<String> availableLanguages) {
if (captionPopupMenu == null) {
return;
}
Expand Down Expand Up @@ -3454,7 +3455,7 @@ private void buildCaptionMenu(final List<String> availableLanguages) {
* Called when an item of the quality selector or the playback speed selector is selected.
*/
@Override
public boolean onMenuItemClick(final MenuItem menuItem) {
public boolean onMenuItemClick(@NonNull final MenuItem menuItem) {
if (DEBUG) {
Log.d(TAG, "onMenuItemClick() called with: "
+ "menuItem = [" + menuItem + "], "
Expand Down Expand Up @@ -3491,7 +3492,7 @@ public boolean onMenuItemClick(final MenuItem menuItem) {
* Called when some popup menu is dismissed.
*/
@Override
public void onDismiss(final PopupMenu menu) {
public void onDismiss(@Nullable final PopupMenu menu) {
if (DEBUG) {
Log.d(TAG, "onDismiss() called with: menu = [" + menu + "]");
}
Expand Down Expand Up @@ -3544,7 +3545,7 @@ private void onCaptionClicked() {
isSomePopupMenuVisible = true;
}

private void setPlaybackQuality(final String quality) {
private void setPlaybackQuality(@Nullable final String quality) {
videoResolver.setPlaybackQuality(quality);
}
//endregion
Expand All @@ -3568,7 +3569,7 @@ private void setupSubtitleView() {
final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels);
final float captionRatioInverse = 20f + 4f * (1.0f - captionScale);
binding.subtitleView.setFixedTextSize(
TypedValue.COMPLEX_UNIT_PX, (float) minimumLength / captionRatioInverse);
TypedValue.COMPLEX_UNIT_PX, minimumLength / captionRatioInverse);
}
binding.subtitleView.setApplyEmbeddedStyles(captionStyle == CaptionStyleCompat.DEFAULT);
binding.subtitleView.setStyle(captionStyle);
Expand Down Expand Up @@ -3845,7 +3846,7 @@ void onResizeClicked() {
}

@Override // exoplayer listener
public void onVideoSizeChanged(final VideoSize videoSize) {
public void onVideoSizeChanged(@NonNull final VideoSize videoSize) {
if (DEBUG) {
Log.d(TAG, "onVideoSizeChanged() called with: "
+ "width / height = [" + videoSize.width + " / " + videoSize.height
Expand Down Expand Up @@ -3959,7 +3960,7 @@ private void setInitialGestureValues() {
}
}

private int distanceFromCloseButton(final MotionEvent popupMotionEvent) {
private int distanceFromCloseButton(@NonNull final MotionEvent popupMotionEvent) {
final int closeOverlayButtonX = closeOverlayBinding.closeButton.getLeft()
+ closeOverlayBinding.closeButton.getWidth() / 2;
final int closeOverlayButtonY = closeOverlayBinding.closeButton.getTop()
Expand All @@ -3978,7 +3979,7 @@ private float getClosingRadius() {
return buttonRadius * 1.2f;
}

public boolean isInsideClosingRadius(final MotionEvent popupMotionEvent) {
public boolean isInsideClosingRadius(@NonNull final MotionEvent popupMotionEvent) {
return distanceFromCloseButton(popupMotionEvent) <= getClosingRadius();
}
//endregion
Expand Down Expand Up @@ -4098,6 +4099,7 @@ private void notifyProgressUpdateToListeners(final int currentProgress,
}
}

@Nullable
public AppCompatActivity getParentActivity() {
// ! instanceof ViewGroup means that view was added via windowManager for Popup
if (binding == null || !(binding.getRoot().getParent() instanceof ViewGroup)) {
Expand Down
34 changes: 17 additions & 17 deletions app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package org.schabi.newpipe.player.event;

import static org.schabi.newpipe.ktx.AnimationType.ALPHA;
import static org.schabi.newpipe.ktx.AnimationType.SCALE_AND_ALPHA;
import static org.schabi.newpipe.ktx.ViewUtils.animate;
import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_DURATION;
import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_HIDE_TIME;
import static org.schabi.newpipe.player.Player.STATE_PLAYING;

import android.app.Activity;
import android.util.Log;
import android.view.MotionEvent;
Expand All @@ -8,22 +15,15 @@
import android.view.WindowManager;
import android.widget.ProgressBar;

import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;

import org.jetbrains.annotations.NotNull;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
import org.schabi.newpipe.player.MainPlayer;
import org.schabi.newpipe.player.Player;
import org.schabi.newpipe.player.helper.PlayerHelper;

import static org.schabi.newpipe.ktx.AnimationType.ALPHA;
import static org.schabi.newpipe.ktx.AnimationType.SCALE_AND_ALPHA;
import static org.schabi.newpipe.ktx.ViewUtils.animate;
import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_DURATION;
import static org.schabi.newpipe.player.Player.DEFAULT_CONTROLS_HIDE_TIME;
import static org.schabi.newpipe.player.Player.STATE_PLAYING;

/**
* GestureListener for the player
*
Expand All @@ -45,8 +45,8 @@ public PlayerGestureListener(final Player player, final MainPlayer service) {
}

@Override
public void onDoubleTap(@NotNull final MotionEvent event,
@NotNull final DisplayPortion portion) {
public void onDoubleTap(@NonNull final MotionEvent event,
@NonNull final DisplayPortion portion) {
if (DEBUG) {
Log.d(TAG, "onDoubleTap called with playerType = ["
+ player.getPlayerType() + "], portion = [" + portion + "]");
Expand All @@ -65,7 +65,7 @@ public void onDoubleTap(@NotNull final MotionEvent event,
}

@Override
public void onSingleTap(@NotNull final MainPlayer.PlayerType playerType) {
public void onSingleTap(@NonNull final MainPlayer.PlayerType playerType) {
if (DEBUG) {
Log.d(TAG, "onSingleTap called with playerType = [" + player.getPlayerType() + "]");
}
Expand All @@ -85,10 +85,10 @@ public void onSingleTap(@NotNull final MainPlayer.PlayerType playerType) {
}

@Override
public void onScroll(@NotNull final MainPlayer.PlayerType playerType,
@NotNull final DisplayPortion portion,
@NotNull final MotionEvent initialEvent,
@NotNull final MotionEvent movingEvent,
public void onScroll(@NonNull final MainPlayer.PlayerType playerType,
@NonNull final DisplayPortion portion,
@NonNull final MotionEvent initialEvent,
@NonNull final MotionEvent movingEvent,
final float distanceX, final float distanceY) {
if (DEBUG) {
Log.d(TAG, "onScroll called with playerType = ["
Expand Down Expand Up @@ -197,8 +197,8 @@ private void onScrollMainBrightness(final float distanceX, final float distanceY
}

@Override
public void onScrollEnd(@NotNull final MainPlayer.PlayerType playerType,
@NotNull final MotionEvent event) {
public void onScrollEnd(@NonNull final MainPlayer.PlayerType playerType,
@NonNull final MotionEvent event) {
if (DEBUG) {
Log.d(TAG, "onScrollEnd called with playerType = ["
+ player.getPlayerType() + "]");
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public static synchronized PlayerHolder getInstance() {
return PlayerHolder.instance;
}

private final boolean DEBUG = MainActivity.DEBUG;
private final String TAG = PlayerHolder.class.getSimpleName();
private static final boolean DEBUG = MainActivity.DEBUG;
private static final String TAG = PlayerHolder.class.getSimpleName();

private PlayerServiceExtendedEventListener listener;

private final PlayerServiceConnection serviceConnection = new PlayerServiceConnection();
public boolean bound;
private boolean bound;
private MainPlayer playerService;
private Player player;

Expand Down Expand Up @@ -70,6 +70,10 @@ public boolean isPlayerOpen() {
return player != null;
}

public boolean isBound() {
return bound;
}

public int getQueueSize() {
return isPlayerOpen() ? player.getPlayQueue().size() : 0;
}
Expand Down Expand Up @@ -148,7 +152,7 @@ public void onServiceConnected(final ComponentName compName, final IBinder servi
}
startPlayerListener();
}
};
}

private void bind(final Context context) {
if (DEBUG) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
protected final boolean DEBUG = MainActivity.DEBUG;
protected static final boolean DEBUG = MainActivity.DEBUG;

SharedPreferences defaultPreferences;

Expand Down
26 changes: 16 additions & 10 deletions app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
public abstract class Tab {
private static final String JSON_TAB_ID_KEY = "tab_id";

private static final String NO_NAME = "<no-name>";
private static final String NO_ID = "<no-id>";
private static final String NO_URL = "<no-url>";

Tab() {
}

Expand Down Expand Up @@ -185,7 +189,9 @@ public int getTabId() {

@Override
public String getTabName(final Context context) {
return "NewPipe"; //context.getString(R.string.blank_page_summary);
// TODO: find a better name for the blank tab (maybe "blank_tab") or replace it with
// context.getString(R.string.app_name);
return "NewPipe"; // context.getString(R.string.blank_page_summary);
}

@DrawableRes
Expand Down Expand Up @@ -309,7 +315,7 @@ public static class KioskTab extends Tab {
private String kioskId;

private KioskTab() {
this(-1, "<no-id>");
this(-1, NO_ID);
}

public KioskTab(final int kioskServiceId, final String kioskId) {
Expand Down Expand Up @@ -357,7 +363,7 @@ protected void writeDataToJson(final JsonSink writerSink) {
@Override
protected void readDataFromJson(final JsonObject jsonObject) {
kioskServiceId = jsonObject.getInt(JSON_KIOSK_SERVICE_ID_KEY, -1);
kioskId = jsonObject.getString(JSON_KIOSK_ID_KEY, "<no-id>");
kioskId = jsonObject.getString(JSON_KIOSK_ID_KEY, NO_ID);
}

@Override
Expand Down Expand Up @@ -395,7 +401,7 @@ public static class ChannelTab extends Tab {
private String channelName;

private ChannelTab() {
this(-1, "<no-url>", "<no-name>");
this(-1, NO_URL, NO_NAME);
}

public ChannelTab(final int channelServiceId, final String channelUrl,
Expand Down Expand Up @@ -440,8 +446,8 @@ protected void writeDataToJson(final JsonSink writerSink) {
@Override
protected void readDataFromJson(final JsonObject jsonObject) {
channelServiceId = jsonObject.getInt(JSON_CHANNEL_SERVICE_ID_KEY, -1);
channelUrl = jsonObject.getString(JSON_CHANNEL_URL_KEY, "<no-url>");
channelName = jsonObject.getString(JSON_CHANNEL_NAME_KEY, "<no-name>");
channelUrl = jsonObject.getString(JSON_CHANNEL_URL_KEY, NO_URL);
channelName = jsonObject.getString(JSON_CHANNEL_NAME_KEY, NO_NAME);
}

@Override
Expand Down Expand Up @@ -527,15 +533,15 @@ public static class PlaylistTab extends Tab {
private LocalItemType playlistType;

private PlaylistTab() {
this(-1, "<no-name>");
this(-1, NO_NAME);
}

public PlaylistTab(final long playlistId, final String playlistName) {
this.playlistName = playlistName;
this.playlistId = playlistId;
this.playlistType = LocalItemType.PLAYLIST_LOCAL_ITEM;
this.playlistServiceId = -1;
this.playlistUrl = "<no-url>";
this.playlistUrl = NO_URL;
}

public PlaylistTab(final int playlistServiceId, final String playlistUrl,
Expand Down Expand Up @@ -589,8 +595,8 @@ protected void writeDataToJson(final JsonSink writerSink) {
@Override
protected void readDataFromJson(final JsonObject jsonObject) {
playlistServiceId = jsonObject.getInt(JSON_PLAYLIST_SERVICE_ID_KEY, -1);
playlistUrl = jsonObject.getString(JSON_PLAYLIST_URL_KEY, "<no-url>");
playlistName = jsonObject.getString(JSON_PLAYLIST_NAME_KEY, "<no-name>");
playlistUrl = jsonObject.getString(JSON_PLAYLIST_URL_KEY, NO_URL);
playlistName = jsonObject.getString(JSON_PLAYLIST_NAME_KEY, NO_NAME);
playlistId = jsonObject.getInt(JSON_PLAYLIST_ID_KEY, -1);
playlistType = LocalItemType.valueOf(
jsonObject.getString(JSON_PLAYLIST_TYPE_KEY,
Expand Down
Loading