fix: dcm issues

Shikkanime · Sep 10, 2024 · f299582 · f299582
1 parent 5215f7f
commit f299582
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 23 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -26,3 +26,8 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+dart_code_metrics:
+  extends:
+    - package:dart_code_metrics_presets/flutter_all.yaml
+    - package:dart_code_metrics_presets/firebase_analytics.yaml
+    - package:dart_code_metrics_presets/intl.yaml
diff --git a/lib/components/account_card.dart b/lib/components/account_card.dart
@@ -16,7 +16,8 @@ class AccountCard extends StatelessWidget {
     return DecoratedBox(
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.secondary.withOpacity(0.125),
-        borderRadius: BorderRadius.circular(Constant.borderRadius),
+        borderRadius:
+            const BorderRadius.all(Radius.circular(Constant.borderRadius)),
       ),
       child: Padding(
         padding: const EdgeInsets.all(16),

diff --git a/lib/components/animes/followed_anime_component.dart b/lib/components/animes/followed_anime_component.dart
@@ -38,7 +38,8 @@ class FollowedAnimeComponent extends StatelessWidget {
               height: 640 / _ratio,
               child: ImageComponent(
                 uuid: anime.uuid,
-                borderRadius: BorderRadius.circular(Constant.borderRadius),
+                borderRadius: const BorderRadius.all(
+                    Radius.circular(Constant.borderRadius)),
               ),
             ),
             const SizedBox(height: 4),

diff --git a/lib/components/animes/missed_anime_component.dart b/lib/components/animes/missed_anime_component.dart
@@ -46,7 +46,7 @@ class MissedAnimeComponent extends StatelessWidget {
                   ImageComponent(
                     uuid: missedAnime.anime.uuid,
                     fit: BoxFit.cover,
-                    borderRadius: BorderRadius.circular(360),
+                    borderRadius: const BorderRadius.all(Radius.circular(360)),
                   ),
                   Positioned(
                     top: 0,

diff --git a/lib/components/card_component.dart b/lib/components/card_component.dart
@@ -53,7 +53,8 @@ class _CustomCardState extends State<CustomCard> {
                 height: 100,
                 child: DecoratedBox(
                   decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(Constant.borderRadius),
+                    borderRadius: const BorderRadius.all(
+                        Radius.circular(Constant.borderRadius)),
                     color: widget.layerColor!.withOpacity(0.5),
                   ),
                 ),
@@ -65,15 +66,17 @@ class _CustomCardState extends State<CustomCard> {
                 height: 100,
                 child: DecoratedBox(
                   decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(Constant.borderRadius),
+                    borderRadius: const BorderRadius.all(
+                        Radius.circular(Constant.borderRadius)),
                     color: widget.layerColor!,
                   ),
                 ),
               ),
             ],
             DecoratedBox(
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(Constant.borderRadius),
+                borderRadius: const BorderRadius.all(
+                    Radius.circular(Constant.borderRadius)),
                 color: widget.backgroundColor ?? withOpacity,
               ),
               child: GestureDetector(

diff --git a/lib/components/episodes/episode_image.dart b/lib/components/episodes/episode_image.dart
@@ -43,7 +43,8 @@ class EpisodeImage extends StatelessWidget {
                 bottom: 5,
                 right: 5,
                 child: ClipRRect(
-                  borderRadius: BorderRadius.circular(Constant.borderRadius),
+                  borderRadius: const BorderRadius.all(
+                      Radius.circular(Constant.borderRadius)),
                   child: ColoredBox(
                     color: Colors.black.withOpacity(0.5),
                     child: Padding(

diff --git a/lib/components/episodes/followed_episode_component.dart b/lib/components/episodes/followed_episode_component.dart
@@ -41,7 +41,8 @@ class FollowedEpisodeComponent extends StatelessWidget {
               child: EpisodeImage(
                 episode: episode,
                 fit: BoxFit.fill,
-                borderRadius: BorderRadius.circular(Constant.borderRadius),
+                borderRadius: const BorderRadius.all(
+                    Radius.circular(Constant.borderRadius)),
                 showDuration: false,
               ),
             ),

diff --git a/lib/components/member_image.dart b/lib/components/member_image.dart
@@ -31,14 +31,19 @@ class MemberImage extends StatelessWidget {
 
     return Container(
       decoration: hasBorder
-          ? BoxDecoration(
+          ? const BoxDecoration(
               shape: BoxShape.circle,
-              border: Border.all(color: Colors.white, width: 2),
+              border: Border.fromBorderSide(
+                BorderSide(
+                  color: Colors.white,
+                  width: 2,
+                ),
+              ),
             )
           : null,
       padding: const EdgeInsets.all(1),
       child: ClipRRect(
-        borderRadius: BorderRadius.circular(360),
+        borderRadius: const BorderRadius.all(Radius.circular(360)),
         child: showDefaultImage
             ? defaultImage
             : CachedNetworkImage(

diff --git a/lib/components/platforms/platform_component.dart b/lib/components/platforms/platform_component.dart
@@ -11,7 +11,7 @@ class PlatformComponent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ClipRRect(
-      borderRadius: BorderRadius.circular(360),
+      borderRadius: const BorderRadius.all(Radius.circular(360)),
       child: CachedNetworkImage(
         imageUrl: '${Constant.baseUrl}/assets/img/platforms/${platform.image}',
         filterQuality: FilterQuality.high,

diff --git a/lib/controllers/followed_anime_controller.dart b/lib/controllers/followed_anime_controller.dart
@@ -35,6 +35,15 @@ class FollowedAnimeController {
     });
   }
 
+  void dispose() {
+    animes.clear();
+
+    page = 1;
+    isLoading = false;
+    canLoadMore = true;
+    nextPage();
+  }
+
   Future<void> nextPage() async {
     if (isLoading) {
       return;

diff --git a/lib/controllers/followed_episode_controller.dart b/lib/controllers/followed_episode_controller.dart
@@ -36,6 +36,15 @@ class FollowedEpisodeController {
     });
   }
 
+  void dispose() {
+    episodes.clear();
+
+    page = 1;
+    isLoading = false;
+    canLoadMore = true;
+    nextPage();
+  }
+
   Future<void> nextPage() async {
     if (isLoading) {
       return;

diff --git a/lib/views/account_view.dart b/lib/views/account_view.dart
@@ -300,7 +300,6 @@ class FollowedAnimesRow extends StatelessWidget {
                                   scrollDirection: Axis.horizontal,
                                   addAutomaticKeepAlives: false,
                                   addRepaintBoundaries: false,
-                                  shrinkWrap: true,
                                   itemCount: snapshot.data!.length,
                                   itemBuilder: (context, index) =>
                                       FollowedAnimeComponent(
@@ -419,7 +418,6 @@ class FollowedEpisodesRow extends StatelessWidget {
                                   scrollDirection: Axis.horizontal,
                                   addAutomaticKeepAlives: false,
                                   addRepaintBoundaries: false,
-                                  shrinkWrap: true,
                                   itemCount: snapshot.data!.length,
                                   itemBuilder: (context, index) =>
                                       FollowedEpisodeComponent(

diff --git a/lib/views/calendar_view.dart b/lib/views/calendar_view.dart
@@ -112,7 +112,6 @@ class _CalendarViewState extends State<CalendarView> {
           child: ListView.builder(
             addAutomaticKeepAlives: false,
             addRepaintBoundaries: false,
-            shrinkWrap: true,
             controller: AnimeWeeklyController.instance.scrollController,
             itemCount: children.length,
             itemBuilder: (context, index) => children[index],

diff --git a/lib/views/followed_animes_view.dart b/lib/views/followed_animes_view.dart
@@ -19,7 +19,7 @@ class _FollowedAnimesViewState extends State<FollowedAnimesView> {
 
   @override
   void dispose() {
-    FollowedAnimeController.instance.init();
+    FollowedAnimeController.instance.dispose();
     super.dispose();
   }
 
@@ -62,7 +62,6 @@ class _FollowedAnimesViewState extends State<FollowedAnimesView> {
             return ListView.builder(
               addAutomaticKeepAlives: false,
               addRepaintBoundaries: false,
-              shrinkWrap: true,
               controller: FollowedAnimeController.instance.scrollController,
               itemCount: list.length,
               itemBuilder: (context, index) => list[index],

diff --git a/lib/views/followed_episodes_view.dart b/lib/views/followed_episodes_view.dart
@@ -19,7 +19,7 @@ class _FollowedEpisodesViewState extends State<FollowedEpisodesView> {
 
   @override
   void dispose() {
-    FollowedEpisodeController.instance.init();
+    FollowedEpisodeController.instance.dispose();
     super.dispose();
   }
 
@@ -40,7 +40,6 @@ class _FollowedEpisodesViewState extends State<FollowedEpisodesView> {
             return ListView.builder(
               addAutomaticKeepAlives: false,
               addRepaintBoundaries: false,
-              shrinkWrap: true,
               controller: FollowedEpisodeController.instance.scrollController,
               itemCount: snapshot.data!.length,
               itemBuilder: (context, index) =>

diff --git a/lib/views/home_view.dart b/lib/views/home_view.dart
@@ -27,7 +27,6 @@ class HomeView extends StatelessWidget {
           child: ListView.builder(
             addAutomaticKeepAlives: false,
             addRepaintBoundaries: false,
-            shrinkWrap: true,
             controller: EpisodeController.instance.scrollController,
             itemCount: snapshot.data!.length + 1,
             itemBuilder: (context, index) => index == 0
@@ -86,7 +85,6 @@ class MissedAnimesRow extends StatelessWidget {
                         scrollDirection: Axis.horizontal,
                         addAutomaticKeepAlives: false,
                         addRepaintBoundaries: false,
-                        shrinkWrap: true,
                         controller:
                             MissedAnimeController.instance.scrollController,
                         itemCount: snapshot.data!.length,

diff --git a/lib/views/search_view.dart b/lib/views/search_view.dart
@@ -114,7 +114,6 @@ class _SearchViewState extends State<SearchView> {
             return ListView.builder(
               addAutomaticKeepAlives: false,
               addRepaintBoundaries: false,
-              shrinkWrap: true,
               controller: AnimeSearchController.instance.scrollController,
               itemCount: list.length,
               itemBuilder: (context, index) => list[index],

diff --git a/lib/views/simulcast_view.dart b/lib/views/simulcast_view.dart
@@ -47,7 +47,6 @@ class SimulcastView extends StatelessWidget {
           child: ListView.builder(
             addAutomaticKeepAlives: false,
             addRepaintBoundaries: false,
-            shrinkWrap: true,
             controller: AnimeController.instance.scrollController,
             itemCount: list.length + 1,
             itemBuilder: (context, index) => index == 0

diff --git a/pubspec.lock b/pubspec.lock
@@ -246,6 +246,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  dart_code_metrics_presets:
+    dependency: "direct dev"
+    description:
+      name: dart_code_metrics_presets
+      sha256: "2a889a92995fadaf770ee9d08792dd04ae0259029600be55554b6790f1b5da38"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.16.0"
   dart_style:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -35,6 +35,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.12
+  dart_code_metrics_presets: ^2.16.0
   flutter_launcher_icons: ^0.13.1
   flutter_lints: ^4.0.0
   flutter_native_splash: ^2.4.1