update pr template

handles upcoming videos revamp video models to only have one instead of 3 fix #610
lamarios · Oct 5, 2024 · a9bd1a1 · a9bd1a1
1 parent 0ac88f7
commit a9bd1a1
Show file tree

Hide file tree

Showing 99 changed files with 3,285 additions and 1,692 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,9 +1,9 @@
-[ ] I have updated the version and build number accordingly
+- [ ] I have updated the version and build number accordingly
 
 ## Tests
 
 These are things that are most likely to break when making changes unrelated changes
 
-[ ] Can play video
-[ ] New user experience, the set up wizard should show up if the user has no data
+- [ ] Can play video
+- [ ] New user experience, the set up wizard should show up if the user has no data
 
diff --git a/lib/channels/models/channel.dart b/lib/channels/models/channel.dart
@@ -1,6 +1,6 @@
 import 'package:clipious/settings/models/db/server.dart';
 import 'package:clipious/utils/models/sharelink.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/image_object.dart';
@@ -22,7 +22,7 @@ class Channel implements ShareLinks {
   String description;
 
   List<String>? allowedRegions;
-  List<VideoInList>? latestVideos;
+  List<Video>? latestVideos;
 
   Channel(
       this.author,

diff --git a/lib/channels/models/channel.g.dart b/lib/channels/models/channel.g.dart
diff --git a/lib/channels/models/channel_videos.dart b/lib/channels/models/channel_videos.dart
@@ -1,13 +1,13 @@
-import 'package:clipious/videos/models/video_in_list.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/item_with_continuation.dart';
 
 part 'channel_videos.g.dart';
 
 @JsonSerializable()
-class VideosWithContinuation extends ItemtWithContinuation<VideoInList> {
-  List<VideoInList> videos;
+class VideosWithContinuation extends ItemtWithContinuation<Video> {
+  List<Video> videos;
 
   VideosWithContinuation(this.videos, String? continuation)
       : super(continuation);
@@ -18,7 +18,7 @@ class VideosWithContinuation extends ItemtWithContinuation<VideoInList> {
   Map<String, dynamic> toJson() => _$VideosWithContinuationToJson(this);
 
   @override
-  List<VideoInList> getItems() {
+  List<Video> getItems() {
     return videos;
   }
 }
diff --git a/lib/channels/models/channel_videos.g.dart b/lib/channels/models/channel_videos.g.dart
diff --git a/lib/channels/views/components/info.dart b/lib/channels/views/components/info.dart
@@ -8,7 +8,6 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../../subscription_management/view/components/subscribe_button.dart';
 import '../../../utils/models/image_object.dart';
-import '../../../videos/models/video_in_list.dart';
 import '../../../videos/views/components/video_in_list.dart';
 import '../../../videos/views/components/video_thumbnail.dart';
 
@@ -85,22 +84,8 @@ class ChannelInfo extends StatelessWidget {
         mainAxisSpacing: 5,
         childAspectRatio: getGridAspectRatio(context),
         children: channel.latestVideos?.map((e) {
-              VideoInList videoInList = VideoInList(
-                  e.title,
-                  e.videoId,
-                  e.lengthSeconds,
-                  0,
-                  e.author,
-                  channel.authorId,
-                  channel.authorId,
-                  0,
-                  '',
-                  e.videoThumbnails)
-                ..deArrowThumbnailUrl = e.deArrowThumbnailUrl;
-              videoInList.filtered = e.filtered;
-              videoInList.matchedFilters = e.matchedFilters;
               return VideoListItem(
-                video: videoInList,
+                video: e,
               );
             }).toList() ??
             []));

diff --git a/lib/channels/views/components/videos.dart b/lib/channels/views/components/videos.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:clipious/channels/models/channel_videos.dart';
 import 'package:clipious/globals.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 import 'package:clipious/videos/views/components/video_list.dart';
 
 import '../../../utils/models/paginated_list.dart';
@@ -25,7 +25,7 @@ class ChannelVideosView extends StatelessWidget {
       child: Container(
         color: colorScheme.surface,
         child: VideoList(
-          paginatedVideoList: ContinuationList<VideoInList>(
+          paginatedVideoList: ContinuationList<Video>(
               (continuation) => getVideos(channel.authorId, continuation)),
           // tags: 'channel-video-list-${(key as ValueKey<String>).value}'
         ),

diff --git a/lib/channels/views/tv/screens/channel.dart b/lib/channels/views/tv/screens/channel.dart
@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:auto_route/annotations.dart';
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -15,7 +16,6 @@ import 'package:clipious/utils/views/components/placeholders.dart';
 import 'package:clipious/utils/views/tv/components/tv_expandable_text.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
-import 'package:clipious/videos/models/video_in_list.dart';
 
 import '../../../../playlists/models/playlist.dart';
 import '../../../../playlists/views/components/playlist_in_list.dart';
@@ -181,26 +181,21 @@ class TvChannelScreen extends StatelessWidget {
                                             TvHorizontalVideoList(
                                                 onItemFocus:
                                                     (video, index, focus) =>
-                                                        tvCubit
-                                                            .scrollTo(
-                                                                tvCubit
-                                                                    .videosTitle,
-                                                                focus),
+                                                        tvCubit.scrollTo(
+                                                            tvCubit.videosTitle,
+                                                            focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
-                                                    (continuation) =>
-                                                        service
-                                                            .getChannelVideos(
-                                                                channel.channel
-                                                                        ?.authorId ??
-                                                                    '',
-                                                                continuation)
-                                                            .then((value) {
-                                                          tvCubit.setHasVideos(
-                                                              value.videos
-                                                                  .isNotEmpty);
-                                                          return value;
-                                                        }))),
+                                                    Video>((continuation) => service
+                                                        .getChannelVideos(
+                                                            channel.channel
+                                                                    ?.authorId ??
+                                                                '',
+                                                            continuation)
+                                                        .then((value) {
+                                                      tvCubit.setHasVideos(value
+                                                          .videos.isNotEmpty);
+                                                      return value;
+                                                    }))),
                                             tv.hasShorts
                                                 ? Padding(
                                                     key: tvCubit.shortTitle,
@@ -217,26 +212,21 @@ class TvChannelScreen extends StatelessWidget {
                                             TvHorizontalVideoList(
                                                 onItemFocus:
                                                     (video, index, focus) =>
-                                                        tvCubit
-                                                            .scrollTo(
-                                                                tvCubit
-                                                                    .shortTitle,
-                                                                focus),
+                                                        tvCubit.scrollTo(
+                                                            tvCubit.shortTitle,
+                                                            focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
-                                                    (continuation) =>
-                                                        service
-                                                            .getChannelShorts(
-                                                                channel.channel
-                                                                        ?.authorId ??
-                                                                    '',
-                                                                continuation)
-                                                            .then((value) {
-                                                          tvCubit.setHasShorts(
-                                                              value.videos
-                                                                  .isNotEmpty);
-                                                          return value;
-                                                        }))),
+                                                    Video>((continuation) => service
+                                                        .getChannelShorts(
+                                                            channel.channel
+                                                                    ?.authorId ??
+                                                                '',
+                                                            continuation)
+                                                        .then((value) {
+                                                      tvCubit.setHasShorts(value
+                                                          .videos.isNotEmpty);
+                                                      return value;
+                                                    }))),
                                             tv.hasStreams
                                                 ? Padding(
                                                     key: tvCubit.streamTitle,
@@ -251,13 +241,14 @@ class TvChannelScreen extends StatelessWidget {
                                                   )
                                                 : const SizedBox.shrink(),
                                             TvHorizontalVideoList(
-                                                onItemFocus:
-                                                    (video, index, focus) =>
-                                                        tvCubit.scrollTo(
+                                                onItemFocus: (video, index,
+                                                        focus) =>
+                                                    tvCubit
+                                                        .scrollTo(
                                                             tvCubit.streamTitle,
                                                             focus),
                                                 paginatedVideoList: ContinuationList<
-                                                        VideoInList>(
+                                                        Video>(
                                                     (continuation) => service
                                                             .getChannelStreams(
                                                                 channel.channel

diff --git a/lib/comments/states/comments.dart b/lib/comments/states/comments.dart
@@ -1,7 +1,7 @@
 import 'package:bloc/bloc.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:clipious/comments/models/video_comments.dart';
-import 'package:clipious/videos/models/base_video.dart';
 
 import '../../globals.dart';
 import '../../settings/models/errors/invidious_service_error.dart';
@@ -66,7 +66,7 @@ class CommentsCubit extends Cubit<CommentsState> {
 @freezed
 class CommentsState with _$CommentsState {
   const factory CommentsState(
-      {required BaseVideo video,
+      {required Video video,
       @Default(true) bool loadingComments,
       String? continuation,
       @Default(false) bool continuationLoaded,
@@ -76,7 +76,7 @@ class CommentsState with _$CommentsState {
       String? sortBy}) = _CommentsState;
 
   static CommentsState init(
-      {required BaseVideo video,
+      {required Video video,
       bool? loadingComments,
       String? continuation,
       bool? continuationLoaded,

diff --git a/lib/comments/states/comments.freezed.dart b/lib/comments/states/comments.freezed.dart
@@ -16,7 +16,7 @@ final _privateConstructorUsedError = UnsupportedError(
 
 /// @nodoc
 mixin _$CommentsState {
-  BaseVideo get video => throw _privateConstructorUsedError;
+  Video get video => throw _privateConstructorUsedError;
   bool get loadingComments => throw _privateConstructorUsedError;
   String? get continuation => throw _privateConstructorUsedError;
   bool get continuationLoaded => throw _privateConstructorUsedError;
@@ -39,14 +39,16 @@ abstract class $CommentsStateCopyWith<$Res> {
       _$CommentsStateCopyWithImpl<$Res, CommentsState>;
   @useResult
   $Res call(
-      {BaseVideo video,
+      {Video video,
       bool loadingComments,
       String? continuation,
       bool continuationLoaded,
       VideoComments comments,
       String error,
       String? source,
       String? sortBy});
+
+  $VideoCopyWith<$Res> get video;
 }
 
 /// @nodoc
@@ -77,7 +79,7 @@ class _$CommentsStateCopyWithImpl<$Res, $Val extends CommentsState>
       video: null == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo,
+              as Video,
       loadingComments: null == loadingComments
           ? _value.loadingComments
           : loadingComments // ignore: cast_nullable_to_non_nullable
@@ -108,6 +110,16 @@ class _$CommentsStateCopyWithImpl<$Res, $Val extends CommentsState>
               as String?,
     ) as $Val);
   }
+
+  /// Create a copy of CommentsState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $VideoCopyWith<$Res> get video {
+    return $VideoCopyWith<$Res>(_value.video, (value) {
+      return _then(_value.copyWith(video: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -119,14 +131,17 @@ abstract class _$$CommentsStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call(
-      {BaseVideo video,
+      {Video video,
       bool loadingComments,
       String? continuation,
       bool continuationLoaded,
       VideoComments comments,
       String error,
       String? source,
       String? sortBy});
+
+  @override
+  $VideoCopyWith<$Res> get video;
 }
 
 /// @nodoc
@@ -155,7 +170,7 @@ class __$$CommentsStateImplCopyWithImpl<$Res>
       video: null == video
           ? _value.video
           : video // ignore: cast_nullable_to_non_nullable
-              as BaseVideo,
+              as Video,
       loadingComments: null == loadingComments
           ? _value.loadingComments
           : loadingComments // ignore: cast_nullable_to_non_nullable
@@ -202,7 +217,7 @@ class _$CommentsStateImpl implements _CommentsState {
       this.sortBy});
 
   @override
-  final BaseVideo video;
+  final Video video;
   @override
   @JsonKey()
   final bool loadingComments;
@@ -260,7 +275,7 @@ class _$CommentsStateImpl implements _CommentsState {
 
 abstract class _CommentsState implements CommentsState {
   const factory _CommentsState(
-      {required final BaseVideo video,
+      {required final Video video,
       final bool loadingComments,
       final String? continuation,
       final bool continuationLoaded,
@@ -270,7 +285,7 @@ abstract class _CommentsState implements CommentsState {
       final String? sortBy}) = _$CommentsStateImpl;
 
   @override
-  BaseVideo get video;
+  Video get video;
   @override
   bool get loadingComments;
   @override

diff --git a/lib/comments/views/components/comment.dart b/lib/comments/views/components/comment.dart
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -10,12 +11,11 @@ import 'package:clipious/videos/views/components/video_thumbnail.dart';
 
 import '../../../player/states/player.dart';
 import '../../../utils/models/image_object.dart';
-import '../../../videos/models/base_video.dart';
 import '../../models/comment.dart';
 
 class SingleCommentView extends StatelessWidget {
   final Comment comment;
-  final BaseVideo video;
+  final Video video;
 
   const SingleCommentView(
       {super.key, required this.comment, required this.video});