Merge pull request #133 from dherediat97/devDavid

Dev david
dherediat97 · Oct 3, 2023 · 89dd180 · 89dd180
2 parents ee7edfc + fa9b6d2
commit 89dd180
Show file tree

Hide file tree

Showing 14 changed files with 155 additions and 196 deletions.
diff --git a/.github/workflows/dart_api.yml b/.github/workflows/dart_api.yml
@@ -5,29 +5,14 @@ on:
     branches: [api]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        node-version: [10]
-        dart-version: [stable, dev]
-        # for now, code-version will mirror dart-version to reduce number of bots
-        # code-version: [stable] #, insiders]
-        bot: [flutter_debug, flutter_debug_chrome, flutter_test_debug, dart_web_debug, flutter_repo, dart_debug, dart, flutter, misc]
-        include:
-          - dart-version: stable
-            flutter-version: beta
-            code-version: stable
-          - dart-version: dev
-            flutter-version: dev
-            code-version: insiders
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup Dart ${{ matrix.dart-version }}
-        uses: DanTup/gh-actions/setup-dart@master
-        with:
-          channel: ${{ matrix.dart-version }}
+      - uses: actions/checkout@v3
+      - uses: dart-lang/setup-dart@v1
+
+      - run: dart pub get
+      - run: dart format --output=none --set-exit-if-changed .
+      - run: dart analyze
+      - run: dart test
       - run: dart run ./lib/network/server_api.dart
diff --git a/.github/workflows/flutter_android.yml b/.github/workflows/flutter_android.yml
@@ -50,8 +50,8 @@ jobs:
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
           with:
-            tag_name: 0.0.7
-            release_name: Version Release 0.0.7
+            tag_name: 0.0.8
+            release_name: Version Release 0.0.8
             draft: false
             prerelease: true
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,6 @@
 //Core Packages
+import 'package:FilmFlu/ui/util/utilScroll.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:flutter/material.dart';
@@ -13,7 +15,6 @@ import 'package:FilmFlu/ui/theme/colors.dart';
 import 'package:FilmFlu/ui/pages/main/main_screen.dart';
 import 'package:FilmFlu/ui/pages/personDetails/actor_details.dart';
 import 'package:FilmFlu/ui/pages/settings/settings_screen.dart';
-import 'package:FilmFlu/ui/util/utilScroll.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
@@ -38,7 +39,7 @@ class FilmFlu extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
-      scrollBehavior: WebScrollBehavior(),
+      scrollBehavior: kIsWeb ? WebScrollBehavior() : MaterialScrollBehavior(),
       localizationsDelegates: [
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,

diff --git a/lib/network/client_api.dart b/lib/network/client_api.dart
@@ -1,7 +1,5 @@
 //Core Packages
 import 'dart:convert';
-import 'package:FilmFlu/dto/credit_person.dart';
-import 'package:FilmFlu/dto/credits_person.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 
@@ -11,6 +9,8 @@ import 'package:FilmFlu/dto/video.dart';
 import 'package:FilmFlu/dto/media_item.dart';
 import 'package:FilmFlu/constants.dart';
 import 'package:FilmFlu/dto/person.dart';
+import 'package:FilmFlu/dto/credit_person.dart';
+import 'package:FilmFlu/dto/credits_person.dart';
 
 class Api {
   MediaItem parseMovie(String responseBody) {

diff --git a/lib/ui/components/film_actor_cast_item.dart b/lib/ui/components/film_actor_cast_item.dart
@@ -1,3 +1,4 @@
+import 'package:FilmFlu/ui/util/extension.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -9,8 +10,8 @@ import 'package:FilmFlu/ui/pages/personDetails/actor_details.dart';
 
 class FilmActorItem extends StatefulWidget {
   FilmActorItem({super.key, required this.index, required this.cast});
-  int index;
-  List<Actor> cast;
+  final int index;
+  final List<Actor> cast;
 
   @override
   State<FilmActorItem> createState() => _FilmActorItemState();
@@ -35,34 +36,29 @@ class _FilmActorItemState extends State<FilmActorItem> {
               child: Image.network('$personImgBaseUrl${actor.profilePath}',
                   height: 160,
                   width: 150,
-                  fit: BoxFit.cover, loadingBuilder: (BuildContext context,
-                      Widget child, ImageChunkEvent? loadingProgress) {
-                if (loadingProgress == null) return child;
-                return Center(
-                  child: CircularProgressIndicator(
-                    value: loadingProgress.expectedTotalBytes != null
-                        ? loadingProgress.cumulativeBytesLoaded /
-                            loadingProgress.expectedTotalBytes!
-                        : null,
-                  ),
-                );
-              }, errorBuilder: (context, url, error) {
-                if (actor.gender == 2) {
-                  return SvgPicture.asset(
-                    "assets/icons/actor_icon.svg",
-                    height: 160,
-                    fit: BoxFit.cover,
-                    width: 150,
-                  );
-                } else {
-                  return SvgPicture.asset(
-                    "assets/icons/actress_icon.svg",
-                    height: 160,
-                    fit: BoxFit.cover,
-                    width: 150,
-                  );
-                }
-              }),
+                  fit: BoxFit.cover,
+                  loadingBuilder: (context, child, loadingProgress) =>
+                      DefaultAsyncLoading(
+                        child: child,
+                        loadingProgress: loadingProgress,
+                      ),
+                  errorBuilder: (context, url, error) {
+                    if (actor.gender == 2) {
+                      return SvgPicture.asset(
+                        "assets/icons/actor_icon.svg",
+                        height: 160,
+                        fit: BoxFit.cover,
+                        width: 150,
+                      );
+                    } else {
+                      return SvgPicture.asset(
+                        "assets/icons/actress_icon.svg",
+                        height: 160,
+                        fit: BoxFit.cover,
+                        width: 150,
+                      );
+                    }
+                  }),
             ),
           ),
           AutoSizeText(actor.name!,

diff --git a/lib/ui/components/film_worker_cast_item.dart b/lib/ui/components/film_worker_cast_item.dart
@@ -9,8 +9,8 @@ import 'package:FilmFlu/ui/pages/personDetails/actor_details.dart';
 
 class FilmWorkerItem extends StatefulWidget {
   FilmWorkerItem({super.key, required this.index, required this.crew});
-  int index;
-  List<FilmWorker> crew;
+  final int index;
+  final List<FilmWorker> crew;
 
   @override
   State<FilmWorkerItem> createState() => _FilmWorkerItemState();

diff --git a/lib/ui/components/movie_carrousel_item.dart b/lib/ui/components/movie_carrousel_item.dart
@@ -1,5 +1,5 @@
 //Core Packages
-import 'package:auto_size_text/auto_size_text.dart';
+import 'package:FilmFlu/ui/util/extension.dart';
 import 'package:flutter/material.dart';
 
 //My Packages
@@ -31,25 +31,19 @@ class MovieCarrouselItem extends StatelessWidget {
               );
             },
             child: Container(
-              width: 240,
+              width: 220,
               height: 300,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(62.0),
+                borderRadius: BorderRadius.all(Radius.circular(48)),
                 image: DecorationImage(
-                  fit: BoxFit.fill,
+                  fit: BoxFit.scaleDown,
                   image: Image.network(
                     '$movieImgBaseURL${movie.posterPath}',
-                    loadingBuilder: (context, child, loadingProgress) {
-                      if (loadingProgress == null) return child;
-                      return Center(
-                        child: CircularProgressIndicator(
-                          value: loadingProgress.expectedTotalBytes != null
-                              ? loadingProgress.cumulativeBytesLoaded /
-                                  loadingProgress.expectedTotalBytes!
-                              : null,
-                        ),
-                      );
-                    },
+                    loadingBuilder: (context, child, loadingProgress) =>
+                        DefaultAsyncLoading(
+                      child: child,
+                      loadingProgress: loadingProgress,
+                    ),
                   ).image,
                 ),
               ),

diff --git a/lib/ui/components/movie_list.dart b/lib/ui/components/movie_list.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 class MovieList extends StatelessWidget {
   MovieList({super.key, required this.items});
 
-  late List<MediaItem> items;
+  final List<MediaItem> items;
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/ui/pages/main/main_screen.dart b/lib/ui/pages/main/main_screen.dart
@@ -1,4 +1,5 @@
 //Core Packages
+import 'package:FilmFlu/ui/util/extension.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -45,10 +46,7 @@ class _MainPageState extends State<MainPage> {
                       return Scrollbar(
                           child: MovieList(items: snapshot.requireData));
                     } else {
-                      return Container(
-                          width: MediaQuery.of(context).size.width,
-                          height: MediaQuery.of(context).size.height,
-                          child: Center(child: CircularProgressIndicator()));
+                      return DefaultSyncLoading();
                     }
                   },
                 ),
@@ -72,10 +70,7 @@ class _MainPageState extends State<MainPage> {
                       return Scrollbar(
                           child: MovieList(items: snapshot.requireData));
                     } else {
-                      return Container(
-                          width: MediaQuery.of(context).size.width,
-                          height: MediaQuery.of(context).size.height,
-                          child: Center(child: CircularProgressIndicator()));
+                      return DefaultSyncLoading();
                     }
                   },
                 ),

diff --git a/lib/ui/pages/movieDetails/movie_details.dart b/lib/ui/pages/movieDetails/movie_details.dart
@@ -1,8 +1,4 @@
 //Core Packages;
-import 'package:FilmFlu/dto/video.dart';
-import 'package:FilmFlu/ui/components/movie_cast.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:youtube_player_iframe/youtube_player_iframe.dart';
@@ -14,6 +10,10 @@ import 'package:FilmFlu/network/client_api.dart';
 import 'package:FilmFlu/ui/components/scaffold_page.dart';
 import 'package:FilmFlu/constants.dart';
 import 'package:FilmFlu/ui/theme/colors.dart';
+import 'package:FilmFlu/dto/video.dart';
+import 'package:FilmFlu/ui/components/movie_cast.dart';
+import 'package:FilmFlu/ui/util/extension.dart';
+import 'package:flutter/material.dart';
 
 class MovieDetailsPage extends StatefulWidget {
   const MovieDetailsPage(
@@ -181,24 +181,12 @@ class _MovieDetailsPageState extends State<MovieDetailsPage> {
                                     ),
                                     image: Image.network(
                                       "$movieLandscapeBaseUrl${movie.backdropPath}",
-                                      loadingBuilder: (BuildContext context,
-                                          Widget child,
-                                          ImageChunkEvent? loadingProgress) {
-                                        if (loadingProgress == null)
-                                          return child;
-                                        return Center(
-                                          child: CircularProgressIndicator(
-                                            value: loadingProgress
-                                                        .expectedTotalBytes !=
-                                                    null
-                                                ? loadingProgress
-                                                        .cumulativeBytesLoaded /
-                                                    loadingProgress
-                                                        .expectedTotalBytes!
-                                                : null,
-                                          ),
-                                        );
-                                      },
+                                      loadingBuilder:
+                                          (context, child, loadingProgress) =>
+                                              DefaultAsyncLoading(
+                                        child: child,
+                                        loadingProgress: loadingProgress,
+                                      ),
                                     ).image,
                                   ),
                                 ),
@@ -271,10 +259,7 @@ class _MovieDetailsPageState extends State<MovieDetailsPage> {
                           ],
                         );
                       } else {
-                        return Container(
-                            width: MediaQuery.of(context).size.width,
-                            height: MediaQuery.of(context).size.height,
-                            child: Center(child: CircularProgressIndicator()));
+                        return DefaultSyncLoading();
                       }
                     },
                   ),