Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: localized audio track names

Browse source
This commit is contained in:
ThetaDev 2023-03-19 03:06:29 +01:00
parent 366c39d4c6
commit 87a88e4df7
6 changed files with 76 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
View file

@ -5,6 +5,7 @@ import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
@ -48,7 +49,6 @@ import org.schabi.newpipe.util.ServiceHelper;
import org.schabi.newpipe.util.ThemeHelper;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
public final class PlayQueueActivity extends AppCompatActivity
@ -618,14 +618,17 @@ public final class PlayQueueActivity extends AppCompatActivity
return;
}
final Context context = player.getContext();
final MenuItem audioTrackSelector = menu.findItem(R.id.action_audio_track);
final List<AudioStream> availableStreams =
Optional.ofNullable(player.getCurrentMetadata())
.flatMap(MediaItemTag::getMaybeAudioTrack)
.map(MediaItemTag.AudioTrack::getAudioStreams)
.orElse(null);
final Optional<AudioStream> selectedAudioStream = player.getSelectedAudioStream();
if (availableStreams == null || availableStreams.size() < 2) {
if (availableStreams == null || availableStreams.size() < 2
|| selectedAudioStream.isEmpty()) {
audioTrackSelector.setVisible(false);
} else {
final SubMenu audioTrackMenu = audioTrackSelector.getSubMenu();
@ -633,25 +636,20 @@ public final class PlayQueueActivity extends AppCompatActivity
for (int i = 0; i < availableStreams.size(); i++) {
final AudioStream audioStream = availableStreams.get(i);
if (audioStream.getAudioTrackName() == null) {
continue;
}
audioTrackMenu.add(MENU_ID_AUDIO_TRACK, i, Menu.NONE,
audioStream.getAudioTrackName());
Localization.audioTrackName(context, audioStream));
}
player.getSelectedAudioStream().ifPresent(s -> {
final String trackName = Objects.toString(s.getAudioTrackName(), "");
audioTrackSelector.setTitle(getString(R.string.play_queue_audio_track) + trackName);
final String shortName = s.getAudioLocale() != null
? s.getAudioLocale().getLanguage() : trackName;
audioTrackSelector.setTitleCondensed(
shortName.substring(0, Math.min(shortName.length(), 2)));
audioTrackSelector.setVisible(true);
});
final AudioStream s = selectedAudioStream.get();
final String trackName = Localization.audioTrackName(context, s);
audioTrackSelector.setTitle(
context.getString(R.string.play_queue_audio_track, trackName));
final String shortName = s.getAudioLocale() != null
? s.getAudioLocale().getLanguage() : trackName;
audioTrackSelector.setTitleCondensed(
shortName.substring(0, Math.min(shortName.length(), 2)));
audioTrackSelector.setVisible(true);
}
}

13
app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
View file

@ -79,6 +79,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper;
import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHolder;
import org.schabi.newpipe.util.DeviceUtils;
import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.external_communication.KoreUtils;
import org.schabi.newpipe.util.external_communication.ShareUtils;
@ -1093,15 +1094,13 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
for (int i = 0; i < availableStreams.size(); i++) {
final AudioStream audioStream = availableStreams.get(i);
if (audioStream.getAudioTrackName() == null) {
continue;
}
audioTrackPopupMenu.getMenu().add(POPUP_MENU_ID_AUDIO_TRACK, i, Menu.NONE,
audioStream.getAudioTrackName());
Localization.audioTrackName(context, audioStream));
}
player.getSelectedAudioStream()
.ifPresent(s -> binding.audioTrackTextView.setText(s.getAudioTrackName()));
.ifPresent(s -> binding.audioTrackTextView.setText(
Localization.audioTrackName(context, s)));
binding.audioTrackTextView.setVisibility(View.VISIBLE);
audioTrackPopupMenu.setOnMenuItemClickListener(this);
audioTrackPopupMenu.setOnDismissListener(this);
@ -1218,10 +1217,6 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
private void onAudioTracksClicked() {
audioTrackPopupMenu.show();
isSomePopupMenuVisible = true;
player.getSelectedAudioStream()
.map(AudioStream::getAudioTrackName)
.ifPresent(binding.audioTrackTextView::setText);
}
/**