Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[293] Fix back button for the labels page #346

Merged
merged 1 commit into from
Dec 27, 2024
Merged

[293] Fix back button for the labels page #346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions lib/common/navigation/side_navigation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../constants/constants.dart';
import '../constants/paddings.dart';
import '../constants/sizes.dart';
import '../preferences/preference_key.dart';
import '../widgets/placeholders/error_placeholder.dart';
import 'package:material_symbols_icons/material_symbols_icons.dart';

import '../../models/label/label.dart';
import '../../navigation/navigation_routes.dart';
import '../../navigation/navigator_utils.dart';
Expand All @@ -16,7 +13,11 @@ import '../../providers/labels/labels_navigation/labels_navigation_provider.dart
import '../../providers/notifiers/notifiers.dart';
import '../../utils/asset.dart';
import '../../utils/keys.dart';
import 'package:material_symbols_icons/material_symbols_icons.dart';
import '../constants/constants.dart';
import '../constants/paddings.dart';
import '../constants/sizes.dart';
import '../preferences/preference_key.dart';
import '../widgets/placeholders/error_placeholder.dart';

/// Side navigation with the drawer.
class SideNavigation extends ConsumerStatefulWidget {
Expand All @@ -32,7 +33,7 @@ class _SideNavigationState extends ConsumerState<SideNavigation> {
late int _index;

/// Returns whether the [route] is the home page.
bool isHomeRoute(String route) => route == '/' || route == NavigationRoute.notes.name;
bool isHomeRoute(String route) => route == '/';

/// Returns whether the [route] is the home page.
bool isLabelRoute(String route) => route.startsWith('label-');
Expand Down Expand Up @@ -114,30 +115,29 @@ class _SideNavigationState extends ConsumerState<SideNavigation> {
}

if (index == 0) {
// If in a label route, go to the notes page
if (isLabelRoute(route)) {
NavigationRoute.notes.go(context, NotesPage());
}
// If not in a label route, pop to the notes page
else {
Navigator.pop(context);
}
Navigator.popUntil(context, ModalRoute.withName('/'));
} else if (isNewRouteLabelRoute) {
final label = labels[index - 1];

NavigatorUtils.go(
context,
'${NavigationRoute.label.name}-${label.name}',
NotesPage(label: label),
);
isHomeRoute(route)
? NavigatorUtils.push(
context,
'${NavigationRoute.label.name}-${label.name}',
NotesPage(label: label),
)
: NavigatorUtils.go(
context,
'${NavigationRoute.label.name}-${label.name}',
NotesPage(label: label),
);
} else if (index == labels.length + 1) {
NavigationRoute.manageLabels.pushOrGo(context, isHomeRoute(route), LabelsPage());
} else if (index == labels.length + 2) {
NavigationRoute.bin.pushOrGo(context, isHomeRoute(route), BinPage());
} else if (index == labels.length + 3) {
NavigationRoute.settings.pushOrGo(context, isHomeRoute(route), SettingsMainPage());
} else {
throw Exception('Invalid drawer indexes while navigating to a new route: $index');
throw Exception('Invalid drawer index while navigating to a new route: $index');
}
}

Expand All @@ -151,7 +151,7 @@ class _SideNavigationState extends ConsumerState<SideNavigation> {
case 2:
NavigationRoute.settings.pushOrGo(context, isHomeRoute(route), SettingsMainPage());
default:
throw Exception('Unknown index while navigating: $index');
throw Exception('Invalid drawer index while navigating to a new route: $index');
}
}

Expand Down
Loading