Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[video_player] Updated Pigeon version #4726

Merged
merged 6 commits into from
Feb 15, 2022
Merged

[video_player] Updated Pigeon version #4726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84f0aad
[video_player] Updated Pigeon version
gaaclarke Feb 3, 2022
ee7ce00
updated android
gaaclarke Feb 3, 2022
d9a9307
updated the changelog messages
gaaclarke Feb 3, 2022
c702665
[video_player] updated nullability in pigeon files
gaaclarke Feb 4, 2022
32bb3f8
made httpheaders not null
gaaclarke Feb 14, 2022
df6a66a
removed nil check and switched away from init
gaaclarke Feb 14, 2022
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
Prev Previous commit
Next Next commit
[video_player] updated nullability in pigeon files
  • Loading branch information
@gaaclarke
gaaclarke committed Feb 14, 2022
commit c702665eacd399b1a2b987ea62d7c51ed97766fc
129 changes: 89 additions & 40 deletions ...r/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,29 @@
/** Generated class from Pigeon. */
@SuppressWarnings({"unused", "unchecked", "CodeBlock2Expr", "RedundantSuppression"})
public class Messages {

/** Generated class from Pigeon that represents data sent in messages. */
public static class TextureMessage {
private @Nullable Long textureId;
private @NonNull Long textureId;

public @Nullable Long getTextureId() {
public @NonNull Long getTextureId() {
return textureId;
}

public void setTextureId(@Nullable Long setterArg) {
public void setTextureId(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"textureId\" is null.");
}
this.textureId = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private TextureMessage() {}

public static class Builder {
private @Nullable Long textureId;

public @NonNull Builder setTextureId(@Nullable Long setterArg) {
public @NonNull Builder setTextureId(@NonNull Long setterArg) {
this.textureId = setterArg;
return this;
}
Expand Down Expand Up @@ -69,37 +76,46 @@ Map<String, Object> toMap() {

/** Generated class from Pigeon that represents data sent in messages. */
public static class LoopingMessage {
private @Nullable Long textureId;
private @NonNull Long textureId;

public @Nullable Long getTextureId() {
public @NonNull Long getTextureId() {
return textureId;
}

public void setTextureId(@Nullable Long setterArg) {
public void setTextureId(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"textureId\" is null.");
}
this.textureId = setterArg;
}

private @Nullable Boolean isLooping;
private @NonNull Boolean isLooping;

public @Nullable Boolean getIsLooping() {
public @NonNull Boolean getIsLooping() {
return isLooping;
}

public void setIsLooping(@Nullable Boolean setterArg) {
public void setIsLooping(@NonNull Boolean setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"isLooping\" is null.");
}
this.isLooping = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private LoopingMessage() {}

public static class Builder {
private @Nullable Long textureId;

public @NonNull Builder setTextureId(@Nullable Long setterArg) {
public @NonNull Builder setTextureId(@NonNull Long setterArg) {
this.textureId = setterArg;
return this;
}

private @Nullable Boolean isLooping;

public @NonNull Builder setIsLooping(@Nullable Boolean setterArg) {
public @NonNull Builder setIsLooping(@NonNull Boolean setterArg) {
this.isLooping = setterArg;
return this;
}
Expand Down Expand Up @@ -135,37 +151,46 @@ Map<String, Object> toMap() {

/** Generated class from Pigeon that represents data sent in messages. */
public static class VolumeMessage {
private @Nullable Long textureId;
private @NonNull Long textureId;

public @Nullable Long getTextureId() {
public @NonNull Long getTextureId() {
return textureId;
}

public void setTextureId(@Nullable Long setterArg) {
public void setTextureId(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"textureId\" is null.");
}
this.textureId = setterArg;
}

private @Nullable Double volume;
private @NonNull Double volume;

public @Nullable Double getVolume() {
public @NonNull Double getVolume() {
return volume;
}

public void setVolume(@Nullable Double setterArg) {
public void setVolume(@NonNull Double setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"volume\" is null.");
}
this.volume = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private VolumeMessage() {}

public static class Builder {
private @Nullable Long textureId;

public @NonNull Builder setTextureId(@Nullable Long setterArg) {
public @NonNull Builder setTextureId(@NonNull Long setterArg) {
this.textureId = setterArg;
return this;
}

private @Nullable Double volume;

public @NonNull Builder setVolume(@Nullable Double setterArg) {
public @NonNull Builder setVolume(@NonNull Double setterArg) {
this.volume = setterArg;
return this;
}
Expand Down Expand Up @@ -201,37 +226,46 @@ Map<String, Object> toMap() {

/** Generated class from Pigeon that represents data sent in messages. */
public static class PlaybackSpeedMessage {
private @Nullable Long textureId;
private @NonNull Long textureId;

public @Nullable Long getTextureId() {
public @NonNull Long getTextureId() {
return textureId;
}

public void setTextureId(@Nullable Long setterArg) {
public void setTextureId(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"textureId\" is null.");
}
this.textureId = setterArg;
}

private @Nullable Double speed;
private @NonNull Double speed;

public @Nullable Double getSpeed() {
public @NonNull Double getSpeed() {
return speed;
}

public void setSpeed(@Nullable Double setterArg) {
public void setSpeed(@NonNull Double setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"speed\" is null.");
}
this.speed = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private PlaybackSpeedMessage() {}

public static class Builder {
private @Nullable Long textureId;

public @NonNull Builder setTextureId(@Nullable Long setterArg) {
public @NonNull Builder setTextureId(@NonNull Long setterArg) {
this.textureId = setterArg;
return this;
}

private @Nullable Double speed;

public @NonNull Builder setSpeed(@Nullable Double setterArg) {
public @NonNull Builder setSpeed(@NonNull Double setterArg) {
this.speed = setterArg;
return this;
}
Expand Down Expand Up @@ -267,37 +301,46 @@ Map<String, Object> toMap() {

/** Generated class from Pigeon that represents data sent in messages. */
public static class PositionMessage {
private @Nullable Long textureId;
private @NonNull Long textureId;

public @Nullable Long getTextureId() {
public @NonNull Long getTextureId() {
return textureId;
}

public void setTextureId(@Nullable Long setterArg) {
public void setTextureId(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"textureId\" is null.");
}
this.textureId = setterArg;
}

private @Nullable Long position;
private @NonNull Long position;

public @Nullable Long getPosition() {
public @NonNull Long getPosition() {
return position;
}

public void setPosition(@Nullable Long setterArg) {
public void setPosition(@NonNull Long setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"position\" is null.");
}
this.position = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private PositionMessage() {}

public static class Builder {
private @Nullable Long textureId;

public @NonNull Builder setTextureId(@Nullable Long setterArg) {
public @NonNull Builder setTextureId(@NonNull Long setterArg) {
this.textureId = setterArg;
return this;
}

private @Nullable Long position;

public @NonNull Builder setPosition(@Nullable Long setterArg) {
public @NonNull Builder setPosition(@NonNull Long setterArg) {
this.position = setterArg;
return this;
}
Expand Down Expand Up @@ -462,20 +505,26 @@ Map<String, Object> toMap() {

/** Generated class from Pigeon that represents data sent in messages. */
public static class MixWithOthersMessage {
private @Nullable Boolean mixWithOthers;
private @NonNull Boolean mixWithOthers;

public @Nullable Boolean getMixWithOthers() {
public @NonNull Boolean getMixWithOthers() {
return mixWithOthers;
}

public void setMixWithOthers(@Nullable Boolean setterArg) {
public void setMixWithOthers(@NonNull Boolean setterArg) {
if (setterArg == null) {
throw new IllegalStateException("Nonnull field \"mixWithOthers\" is null.");
}
this.mixWithOthers = setterArg;
}

/** Constructor is private to enforce null safety; use Builder. */
private MixWithOthersMessage() {}

public static class Builder {
private @Nullable Boolean mixWithOthers;

public @NonNull Builder setMixWithOthers(@Nullable Boolean setterArg) {
public @NonNull Builder setMixWithOthers(@NonNull Boolean setterArg) {
this.mixWithOthers = setterArg;
return this;
}
Expand Down
10 changes: 6 additions & 4 deletions ...layer_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ public TextureMessage create(CreateMessage arg) {
}
videoPlayers.put(handle.id(), player);

TextureMessage result = new TextureMessage();
result.setTextureId(handle.id());
TextureMessage result = new TextureMessage.Builder().setTextureId(handle.id()).build();
return result;
}

Expand Down Expand Up @@ -189,8 +188,11 @@ public void play(TextureMessage arg) {

public PositionMessage position(TextureMessage arg) {
VideoPlayer player = videoPlayers.get(arg.getTextureId());
PositionMessage result = new PositionMessage();
result.setPosition(player.getPosition());
PositionMessage result =
new PositionMessage.Builder()
.setPosition(player.getPosition())
.setTextureId(arg.getTextureId())
.build();
player.sendBufferingUpdate();
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/lib/src/android_video_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class AndroidVideoPlayer extends VideoPlayerPlatform {
Future<Duration> getPosition(int textureId) async {
final PositionMessage response =
await _api.position(TextureMessage(textureId: textureId));
return Duration(milliseconds: response.position!);
return Duration(milliseconds: response.position);
}

@override
Expand Down
Loading