From c4b153f60cd84026713c62df5a2832109c320988 Mon Sep 17 00:00:00 2001 From: Moustapha Kodjo Amadou <107993382+kodjodevf@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:57:43 +0100 Subject: [PATCH] refactor: replace Container with Badge for item count display and move hide items in appearance settings --- lib/modules/library/library_screen.dart | 5 ++-- .../download_queue/download_queue_screen.dart | 26 +++++++++---------- .../appearance/appearance_screen.dart | 22 ++++++++++++++++ .../more/settings/player/player_screen.dart | 9 +------ .../more/settings/reader/reader_screen.dart | 15 +---------- rust_builder/cargokit/run_build_tool.sh | 0 6 files changed, 38 insertions(+), 39 deletions(-) mode change 100644 => 100755 rust_builder/cargokit/run_build_tool.sh diff --git a/lib/modules/library/library_screen.dart b/lib/modules/library/library_screen.dart index 6970661..cda2088 100644 --- a/lib/modules/library/library_screen.dart +++ b/lib/modules/library/library_screen.dart @@ -1731,10 +1731,9 @@ class _LibraryScreenState extends ConsumerState if (showNumbersOfItems) Padding( padding: const EdgeInsets.only(bottom: 3), - child: CircleAvatar( + child: Badge( backgroundColor: Theme.of(context).focusColor, - radius: 10, - child: Text( + label: Text( numberOfItems.toString(), style: TextStyle( fontSize: 12, diff --git a/lib/modules/more/download_queue/download_queue_screen.dart b/lib/modules/more/download_queue/download_queue_screen.dart index 7699096..d868e7f 100644 --- a/lib/modules/more/download_queue/download_queue_screen.dart +++ b/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), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - color: Theme.of(context).focusColor), - child: Text( - allQueueLength.toString(), - style: TextStyle( - fontSize: 12, - color: - Theme.of(context).textTheme.bodySmall!.color), - ), - ), - ), + padding: const EdgeInsets.only(bottom: 3), + child: Badge( + backgroundColor: Theme.of(context).focusColor, + label: Text( + allQueueLength.toString(), + style: TextStyle( + fontSize: 12, + color: Theme.of(context) + .textTheme + .bodySmall! + .color), + ))), ], ), ), diff --git a/lib/modules/more/settings/appearance/appearance_screen.dart b/lib/modules/more/settings/appearance/appearance_screen.dart index bf19ca4..ab56575 100644 --- a/lib/modules/more/settings/appearance/appearance_screen.dart +++ b/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); + }), ], ), ), diff --git a/lib/modules/more/settings/player/player_screen.dart b/lib/modules/more/settings/player/player_screen.dart index 2da1666..c94918d 100644 --- a/lib/modules/more/settings/player/player_screen.dart +++ b/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]; diff --git a/lib/modules/more/settings/reader/reader_screen.dart b/lib/modules/more/settings/reader/reader_screen.dart index b96a196..be890e8 100644 --- a/lib/modules/more/settings/reader/reader_screen.dart +++ b/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), diff --git a/rust_builder/cargokit/run_build_tool.sh b/rust_builder/cargokit/run_build_tool.sh old mode 100644 new mode 100755