refactor: replace Container with Badge for item count display and move hide items in appearance settings

lib/modules/library/library_screen.dart

@@ -1731,10 +1731,9 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
                           if (showNumbersOfItems)
                             Padding(
                               padding: const EdgeInsets.only(bottom: 3),
-                              child: CircleAvatar(
+                              child: Badge(
                                 backgroundColor: Theme.of(context).focusColor,
-                                radius: 10,
+                                label: Text(
-                                child: Text(
                                   numberOfItems.toString(),
                                   style: TextStyle(
                                       fontSize: 12,

lib/modules/more/download_queue/download_queue_screen.dart

@@ -36,20 +36,18 @@ class DownloadQueueScreen extends ConsumerWidget {
                     width: 10,
                   ),
                   Padding(
-                    padding: const EdgeInsets.only(bottom: 3),
+                      padding: const EdgeInsets.only(bottom: 3),
-                    child: Container(
+                      child: Badge(
-                      decoration: BoxDecoration(
+                          backgroundColor: Theme.of(context).focusColor,
-                          borderRadius: BorderRadius.circular(20),
+                          label: Text(
-                          color: Theme.of(context).focusColor),
+                            allQueueLength.toString(),
-                      child: Text(
+                            style: TextStyle(
-                        allQueueLength.toString(),
+                                fontSize: 12,
-                        style: TextStyle(
+                                color: Theme.of(context)
-                            fontSize: 12,
+                                    .textTheme
-                            color:
+                                    .bodySmall!
-                                Theme.of(context).textTheme.bodySmall!.color),
+                                    .color),
-                      ),
+                          ))),
-                    ),
-                  ),
                 ],
               ),
             ),

lib/modules/more/settings/appearance/appearance_screen.dart

@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:mangayomi/modules/more/settings/appearance/providers/app_font_family.dart';
 import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart';
+import 'package:mangayomi/modules/more/settings/reader/providers/reader_state_provider.dart';
 import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:mangayomi/utils/extensions/build_context_extensions.dart';
 import 'package:mangayomi/utils/date.dart';
@@ -27,6 +28,9 @@ class AppearanceScreen extends ConsumerWidget {
     final isDarkTheme = ref.watch(themeModeStateProvider);
     final l10nLocale = ref.watch(l10nLocaleStateProvider);
     final appFontFamily = ref.watch(appFontFamilyProvider);
+    final hideAnime = ref.watch(hideAnimeStateProvider);
+    final hideManga = ref.watch(hideMangaStateProvider);
+    final hideNovel = ref.watch(hideNovelStateProvider);
     final appFontFamilySub = appFontFamily == null
         ? context.l10n.default0
         : GoogleFonts.asMap()
@@ -295,6 +299,24 @@ class AppearanceScreen extends ConsumerWidget {
                           fontSize: 11, color: context.secondaryColor),
                     ),
                   ),
+                  SwitchListTile(
+                      value: hideAnime,
+                      title: Text(context.l10n.hide_anime),
+                      onChanged: (value) {
+                        ref.read(hideAnimeStateProvider.notifier).set(value);
+                      }),
+                  SwitchListTile(
+                      value: hideManga,
+                      title: Text(context.l10n.hide_manga),
+                      onChanged: (value) {
+                        ref.read(hideMangaStateProvider.notifier).set(value);
+                      }),
+                  SwitchListTile(
+                      value: hideNovel,
+                      title: Text(context.l10n.hide_novel),
+                      onChanged: (value) {
+                        ref.read(hideNovelStateProvider.notifier).set(value);
+                      }),
                 ],
               ),
             ),

lib/modules/more/settings/player/player_screen.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mangayomi/modules/more/settings/player/providers/player_state_provider.dart';
-import 'package:mangayomi/modules/more/settings/reader/providers/reader_state_provider.dart';
 import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:mangayomi/utils/extensions/build_context_extensions.dart';
 import 'package:numberpicker/numberpicker.dart';
@@ -21,7 +20,7 @@ class PlayerScreen extends ConsumerWidget {
     final enableAutoSkip = ref.watch(enableAutoSkipStateProvider);
     final aniSkipTimeoutLength = ref.watch(aniSkipTimeoutLengthStateProvider);
     final useLibass = ref.watch(useLibassStateProvider);
-    final hideAnime = ref.watch(hideAnimeStateProvider);
+
     final fullScreenPlayer = ref.watch(fullScreenPlayerStateProvider);
     return Scaffold(
       appBar: AppBar(
@@ -30,12 +29,6 @@ class PlayerScreen extends ConsumerWidget {
       body: SingleChildScrollView(
         child: Column(
           children: [
-            SwitchListTile(
-                value: hideAnime,
-                title: Text(context.l10n.hide_anime),
-                onChanged: (value) {
-                  ref.read(hideAnimeStateProvider.notifier).set(value);
-                }),
             ListTile(
               onTap: () {
                 final values = [100, 95, 90, 85, 80, 75, 70];

lib/modules/more/settings/reader/reader_screen.dart

@@ -20,8 +20,7 @@ class ReaderScreen extends ConsumerWidget {
     final backgroundColor = ref.watch(backgroundColorStateProvider);
     final usePageTapZones = ref.watch(usePageTapZonesStateProvider);
     final fullScreenReader = ref.watch(fullScreenReaderStateProvider);
-    final hideManga = ref.watch(hideMangaStateProvider);
+
-    final hideNovel = ref.watch(hideNovelStateProvider);
     final cropBorders = ref.watch(cropBordersStateProvider);
     return Scaffold(
       appBar: AppBar(
@@ -330,18 +329,6 @@ class ReaderScreen extends ConsumerWidget {
                 style: TextStyle(fontSize: 11, color: context.secondaryColor),
               ),
             ),
-            SwitchListTile(
-                value: hideManga,
-                title: Text(context.l10n.hide_manga),
-                onChanged: (value) {
-                  ref.read(hideMangaStateProvider.notifier).set(value);
-                }),
-            SwitchListTile(
-                value: hideNovel,
-                title: Text(context.l10n.hide_novel),
-                onChanged: (value) {
-                  ref.read(hideNovelStateProvider.notifier).set(value);
-                }),
             SwitchListTile(
                 value: fullScreenReader,
                 title: Text(context.l10n.fullscreen),