fully working navigation

apoleon33 · Jan 4, 2024 · 867b689 · 867b689
1 parent 0dca6c0
commit 867b689
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,8 @@
-import 'package:cradle/albumCard/albumCard.dart';
+import 'package:cradle/route/albumCard.dart';
 import 'package:cradle/theme_manager.dart';
 import 'package:flutter/material.dart';
 
-import 'home.dart';
+import 'route/home.dart';
 
 void main() async {
   runApp(const MyApp());

diff --git a/lib/navigation.dart b/lib/navigation.dart
@@ -4,7 +4,7 @@ class Navigation extends StatefulWidget {
   int currentPageIndex = 0;
   final Function callBack;
 
-  Navigation({super.key, required this.callBack});
+  Navigation({super.key, required this.callBack, this.currentPageIndex = 0});
 
   @override
   State<Navigation> createState() => _Navigation();
@@ -19,8 +19,8 @@ class _Navigation extends State<Navigation> {
       onDestinationSelected: (int index) {
         setState(() {
           widget.currentPageIndex = index;
-          widget.callBack(index);
         });
+        widget.callBack(index);
       },
       destinations: const <Widget>[
         NavigationDestination(

diff --git a/lib/albumCard/albumCard.dart → lib/route/albumCard.dart b/lib/albumCard/albumCard.dart → lib/route/albumCard.dart
@@ -2,8 +2,8 @@ import 'package:cradle/album.dart';
 import 'package:flutter/material.dart';
 import 'package:dio/dio.dart';
 
-import 'display_as_card.dart';
-import 'display_as_list.dart';
+import '../albumCard/display_as_card.dart';
+import '../albumCard/display_as_list.dart';
 
 class AlbumCard extends StatefulWidget {
   late DateTime date;

diff --git a/lib/home.dart → lib/route/home.dart b/lib/home.dart → lib/route/home.dart
@@ -1,7 +1,8 @@
 import 'package:cradle/navigation.dart';
+import 'package:cradle/route/settings.dart';
 import 'package:flutter/material.dart';
 
-import 'albumCard/albumCard.dart';
+import 'albumCard.dart';
 
 class MyHomePage extends StatefulWidget {
   const MyHomePage({super.key, required this.title});
@@ -101,10 +102,14 @@ class _MyHomePageState extends State<MyHomePage> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
-          children: [albumCards, albumCards][indexPage],
+          children: [
+            albumCards,
+            [Settings()]
+          ][indexPage],
         ),
       ),
-      bottomNavigationBar: Navigation(callBack: callBack),
+      bottomNavigationBar:
+          Navigation(callBack: callBack, currentPageIndex: indexPage),
     );
   }
 }