Creepso/mangayomi-mirror
1
0
Fork 0
mirror of https://github.com/kodjodevf/mangayomi.git synced 2026-04-20 19:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added new navigation for library

Browse source 
fixed router hidden routes
This commit is contained in:
Schnitzel5 2025-06-28 23:05:38 +02:00
parent 2c6e9439e9
commit dc5cc20d0c
2 changed files with 78 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
lib/modules/main_view/main_screen.dart
View file

@ -26,6 +26,8 @@ import 'package:mangayomi/utils/extensions/build_context_extensions.dart';
import 'package:mangayomi/modules/library/providers/library_state_provider.dart';
import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart';
final libLocationRegex = RegExp(r"^/(Manga|Anime|Novel)Library$");
class MainScreen extends ConsumerStatefulWidget {
const MainScreen({super.key, required this.child});
@ -151,6 +153,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
}
int currentIndex = 0;
bool isLibSwitch = false;
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
@ -165,13 +168,51 @@ class _MainScreenState extends ConsumerState<MainScreen> {
data: (_) => Consumer(
builder: (context, ref, child) {
final isReadingScreen = _isReadingScreen(location);
final dest = navigationOrder
.where((nav) => !hideItems.contains(nav))
.toList();
bool uniqueSwitch = false;
final dest = !context.isTablet && isLibSwitch
? [
"_disableLibSwitch",
"/MangaLibrary",
"/AnimeLibrary",
"/NovelLibrary",
]
: navigationOrder
.where((nav) => !hideItems.contains(nav))
.map((nav) {
if (!context.isTablet &&
!isLibSwitch &&
[
"/MangaLibrary",
"/AnimeLibrary",
"/NovelLibrary",
].contains(nav)) {
if (uniqueSwitch) return null;
uniqueSwitch = true;
return "_enableLibSwitch";
}
return nav;
})
.nonNulls
.toList();
int currentIdx = dest.indexOf(location ?? _defaultLocation);
if (currentIdx != -1) {
currentIndex = currentIdx;
if (isLibSwitch &&
(currentIndex >= dest.length ||
!libLocationRegex.hasMatch(location ?? ""))) {
currentIndex = 0;
} else {
String? libLocation;
if (!context.isTablet && !isLibSwitch) {
libLocation = location?.replaceAll(
libLocationRegex,
"_enableLibSwitch",
);
}
int currentIdx = dest.indexOf(
libLocation ?? location ?? _defaultLocation,
);
if (currentIdx != -1) {
currentIndex = currentIdx;
}
}
final incognitoMode = ref.watch(incognitoModeStateProvider);
@ -207,6 +248,19 @@ class _MainScreenState extends ConsumerState<MainScreen> {
ref: ref,
buildNavigationWidgetsMobile:
_buildNavigationWidgetsMobile,
onDestinationSelected: (destination) {
if (destination == "_enableLibSwitch") {
setState(() {
isLibSwitch = true;
});
} else if (destination == "_disableLibSwitch") {
setState(() {
isLibSwitch = false;
});
} else {
route.go(destination);
}
},
),
),
),
@ -361,6 +415,20 @@ class _MainScreenState extends ConsumerState<MainScreen> {
const SizedBox.shrink(),
);
if (dest.contains("_disableLibSwitch")) {
destinations[dest.indexOf("_disableLibSwitch")] = NavigationDestination(
selectedIcon: const Icon(Icons.arrow_back),
icon: const Icon(Icons.arrow_back),
label: "",
);
}
if (dest.contains("_enableLibSwitch")) {
destinations[dest.indexOf("_enableLibSwitch")] = NavigationDestination(
selectedIcon: const Icon(Icons.collections_bookmark),
icon: const Icon(Icons.collections_bookmark_outlined),
label: l10n.library,
);
}
if (dest.contains("/MangaLibrary")) {
destinations[dest.indexOf("/MangaLibrary")] = NavigationDestination(
selectedIcon: const Icon(Icons.collections_bookmark),
@ -564,6 +632,7 @@ class _MobileBottomNavigation extends StatelessWidget {
required this.route,
required this.ref,
required this.buildNavigationWidgetsMobile,
required this.onDestinationSelected,
});
final bool isLongPressed;
@ -574,6 +643,7 @@ class _MobileBottomNavigation extends StatelessWidget {
final WidgetRef ref;
final List<Widget> Function(WidgetRef, List<String>, BuildContext)
buildNavigationWidgetsMobile;
final Function(String) onDestinationSelected;
@override
Widget build(BuildContext context) {
@ -595,7 +665,7 @@ class _MobileBottomNavigation extends StatelessWidget {
selectedIndex: currentIndex,
destinations: buildNavigationWidgetsMobile(ref, dest, context),
onDestinationSelected: (newIndex) {
route.go(dest[newIndex]);
onDestinationSelected(dest[newIndex]);
},
),
),

2
lib/router/router.dart
View file

@ -55,7 +55,7 @@ final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
@riverpod
GoRouter router(Ref ref) {
final router = RouterNotifier();
final hiddenItems = ref.watch(hideItemsStateProvider);
final hiddenItems = ref.read(hideItemsStateProvider);
final initLocation = ref
.watch(navigationOrderStateProvider)
.where((e) => !hiddenItems.contains(e))