Merge pull request #13 from jdk-21/development

Add library screen

.github/workflows/deploy.yml

@@ -261,15 +261,20 @@ jobs:
         with:
           name: jellyflix-windows
           path: jellyflix-windows
-
+
+      - uses: johnyherangi/create-release-notes@main
+        id: create-release-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Release
         id: create_release
         uses: ncipollo/release-action@v1
         with:
           artifacts: |
             jellyflix-apk/*.apk
-            jellyflix-linux/*.tar.gz
+            jellyflix-linux/*
             jellyflix-windows/*.exe
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.version.outputs.content }}
           commit: ${{ github.sha }}
+          body: ${{ steps.create-release-notes.outputs.release-notes }}

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "jellyflix",
+            "request": "launch",
+            "type": "dart"
+            ""
+        },
+        {
+            "name": "jellyflix (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "jellyflix (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        }
+    ]
+}

lib/components/item_carousel.dart

@@ -1,4 +1,4 @@
-import 'package:jellyflix/models/carousel_media_type.dart';
+import 'package:jellyflix/models/poster_type.dart';
 import 'package:jellyflix/providers/api_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -10,7 +10,7 @@ class ItemCarousel extends HookConsumerWidget {
   final List titleList;
   final List imageList;
   final List subtitleList;
-  final CarouselMediaType mediaType;
+  final PosterType posterType;
   final Function(int)? onTap;
   late final double width;
   late final double height;
@@ -21,19 +21,19 @@ class ItemCarousel extends HookConsumerWidget {
       required this.titleList,
       this.title,
       subtitleList,
-      this.mediaType = CarouselMediaType.vertical,
+      this.posterType = PosterType.vertical,
       super.key})
       : subtitleList = subtitleList ?? [];
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final ScrollController scrollController = useScrollController();
-    switch (mediaType) {
-      case CarouselMediaType.horizontal:
+    switch (posterType) {
+      case PosterType.horizontal:
         width = 250;
         height = 150;
         break;
-      case CarouselMediaType.square:
+      case PosterType.square:
         width = 150;
         height = 150;
         break;
@@ -65,6 +65,7 @@ class ItemCarousel extends HookConsumerWidget {
                 child: Padding(
                   padding: const EdgeInsets.only(right: 12.0),
                   child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       SizedBox(
                         width: width,

lib/models/poster_type.dart

@@ -0,0 +1 @@
+enum PosterType { vertical, horizontal, square }

lib/models/sort_type.dart

@@ -0,0 +1,5 @@
+enum SortType {
+  name,
+  premiereDate,
+  random,
+}

lib/screens/detail_screen.dart

@@ -203,8 +203,7 @@ class DetailScreen extends HookConsumerWidget {
                               Navigator.of(context).push(
                                 MaterialPageRoute(
                                     builder: (context) => PlayerSreen(
-                                          url:
-                                              'http://192.168.179.21:8096/videos/$itemId/master.m3u8?MediaSourceId=$itemId',
+                                          itemId: itemId,
                                           headers:
                                               ref.read(apiProvider).headers,
                                         )),
@@ -448,8 +447,7 @@ class DetailScreen extends HookConsumerWidget {
                                                       MaterialPageRoute(
                                                         builder: (context) =>
                                                             PlayerSreen(
-                                                          url:
-                                                              'http://192.168.179.21:8096/videos/${item.id}/master.m3u8?MediaSourceId=${item.id}',
+                                                          itemId: item.id!,
                                                           headers: ref
                                                               .read(apiProvider)
                                                               .headers,

lib/screens/filter_type.dart

@@ -0,0 +1 @@
+enum FilterType { unplayed, played, favorites, liked }

lib/screens/home_screen.dart

@@ -1,9 +1,10 @@
 import 'package:jellyflix/components/item_carousel.dart';
-import 'package:jellyflix/models/carousel_media_type.dart';
+import 'package:jellyflix/models/poster_type.dart';
 import 'package:jellyflix/providers/api_provider.dart';
 import 'package:jellyflix/screens/detail_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:jellyflix/screens/library_screen.dart';
 import 'package:jellyflix/screens/profile_screen.dart';
 
 class HomeScreen extends HookConsumerWidget {
@@ -12,8 +13,18 @@ class HomeScreen extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return Scaffold(
+      extendBodyBehindAppBar: true,
       appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        leading: IconButton(
+          onPressed: () {
+            Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => const LibraryScreen()));
+          },
+          icon: const Icon(Icons.video_library_outlined),
+        ),
         actions: [
+          IconButton(onPressed: () {}, icon: const Icon(Icons.search_rounded)),
           IconButton(
               onPressed: () {
                 Navigator.of(context).push(MaterialPageRoute(
@@ -23,84 +34,106 @@ class HomeScreen extends HookConsumerWidget {
         ],
       ),
       body: SingleChildScrollView(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 20.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              // Continue carousel
-              FutureBuilder(
-                  future: ref.read(apiProvider).getContinueWatching(),
-                  builder: (context, snapshot) {
-                    if (snapshot.hasData) {
-                      return ItemCarousel(
-                          onTap: (index) {
-                            Navigator.of(context).push(MaterialPageRoute(
-                                builder: (context) => DetailScreen(
-                                      itemId: snapshot.data!.items[index].id!,
-                                    )));
-                          },
-                          imageList: snapshot.data!.items.map((e) {
-                            return e.id!;
-                          }).toList(),
-                          titleList: snapshot.data!.items.map((e) {
-                            return e.name!;
-                          }).toList(),
-                          title: "Continue Watching");
-                    } else {
-                      return const CircularProgressIndicator();
-                    }
-                  }),
-              FutureBuilder(
-                  future: ref.read(apiProvider).getLatestItems("movies"),
-                  builder: (context, snapshot) {
-                    if (snapshot.hasData) {
-                      return ItemCarousel(
-                          onTap: (index) {
-                            Navigator.of(context).push(MaterialPageRoute(
-                                builder: (context) => DetailScreen(
-                                      itemId: snapshot.data![index].id!,
-                                    )));
-                          },
-                          imageList: snapshot.data!.map((e) {
-                            return e.id!;
-                          }).toList(),
-                          titleList: snapshot.data!.map((e) {
-                            return e.name!;
-                          }).toList(),
-                          title: "Recently Added Movies",
-                          mediaType: CarouselMediaType.vertical);
-                    } else {
-                      return const CircularProgressIndicator();
-                    }
-                  }),
-              FutureBuilder(
-                  future: ref.read(apiProvider).getLatestItems("tvshows"),
-                  builder: (context, snapshot) {
-                    if (snapshot.hasData) {
-                      return ItemCarousel(
-                          onTap: (index) {
-                            Navigator.of(context).push(MaterialPageRoute(
-                                builder: (context) => DetailScreen(
-                                      itemId: snapshot.data![index].id!,
-                                    )));
-                          },
-                          imageList: snapshot.data!.map((e) {
-                            return e.id!;
-                          }).toList(),
-                          titleList: snapshot.data!.map((e) {
-                            return e.name!;
-                          }).toList(),
-                          title: "Recently Added Shows",
-                          mediaType: CarouselMediaType.vertical);
-                    } else {
-                      return const CircularProgressIndicator();
-                    }
-                  }),
-            ],
-          ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              height: 100,
+              width: double.infinity,
+              color: Colors.blueGrey,
+              child: const Text("Header"),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 20.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                //mainAxisSize: MainAxisSize.min,
+                children: [
+                  // Continue carousel
+                  FutureBuilder(
+                      future: ref.read(apiProvider).getContinueWatching(),
+                      builder: (context, snapshot) {
+                        if (snapshot.hasData) {
+                          return ItemCarousel(
+                              onTap: (index) {
+                                Navigator.of(context).push(MaterialPageRoute(
+                                    builder: (context) => DetailScreen(
+                                          itemId:
+                                              snapshot.data!.items[index].id!,
+                                        )));
+                              },
+                              imageList: snapshot.data!.items.map((e) {
+                                return e.id!;
+                              }).toList(),
+                              titleList: snapshot.data!.items.map((e) {
+                                return e.name!;
+                              }).toList(),
+                              subtitleList: snapshot.data!.items.map((e) {
+                                return e.productionYear.toString();
+                              }).toList(),
+                              title: "Continue Watching");
+                        } else {
+                          return const CircularProgressIndicator();
+                        }
+                      }),
+                  FutureBuilder(
+                      future: ref.read(apiProvider).getLatestItems("movies"),
+                      builder: (context, snapshot) {
+                        if (snapshot.hasData) {
+                          return ItemCarousel(
+                              onTap: (index) {
+                                Navigator.of(context).push(MaterialPageRoute(
+                                    builder: (context) => DetailScreen(
+                                          itemId: snapshot.data![index].id!,
+                                        )));
+                              },
+                              imageList: snapshot.data!.map((e) {
+                                return e.id!;
+                              }).toList(),
+                              titleList: snapshot.data!.map((e) {
+                                return e.name!;
+                              }).toList(),
+                              title: "Recently Added Movies",
+                              subtitleList: snapshot.data!.map((e) {
+                                return e.productionYear.toString();
+                              }).toList(),
+                              posterType: PosterType.vertical);
+                        } else {
+                          return const CircularProgressIndicator();
+                        }
+                      }),
+                  FutureBuilder(
+                      future: ref.read(apiProvider).getLatestItems("tvshows"),
+                      builder: (context, snapshot) {
+                        if (snapshot.hasData) {
+                          return ItemCarousel(
+                              onTap: (index) {
+                                Navigator.of(context).push(MaterialPageRoute(
+                                    builder: (context) => DetailScreen(
+                                          itemId: snapshot.data![index].id!,
+                                        )));
+                              },
+                              imageList: snapshot.data!.map((e) {
+                                return e.id!;
+                              }).toList(),
+                              titleList: snapshot.data!.map((e) {
+                                return e.name!;
+                              }).toList(),
+                              subtitleList: snapshot.data!.map((e) {
+                                return e.productionYear.toString();
+                              }).toList(),
+                              title: "Recently Added Shows",
+                              posterType: PosterType.vertical);
+                        } else {
+                          return const CircularProgressIndicator();
+                        }
+                      }),
+                ],
+              ),
+            ),
+          ],
         ),
       ),
     );