commit ac24f870c555ec997939b4eeb2a87aa2ca2eb7df
parent cd2c717d14b122d25b38c46653920d40c7fd85fa
Author: Sanjeebani Parida <83271316+sanjeebani14@users.noreply.github.com>
Date: Sun, 30 Nov 2025 20:59:11 +0530
Merge pull request #24 from nilotpal-n7/sanjeebani
Added bottom bar to file page
Diffstat:
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/ui/pages/project_file_page.dart b/lib/ui/pages/project_file_page.dart
@@ -4,7 +4,8 @@ import 'package:image_picker/image_picker.dart';
import 'package:intl/intl.dart';
import '../../data/models/file_model.dart';
import '../../services/file_service.dart';
-import 'create_file_page.dart'; // 1. Add this import
+import '../widgets/bottom_bar.dart'; // Import BottomBar
+import 'create_file_page.dart';
class ProjectFilePage extends StatefulWidget {
final int projectId;
@@ -163,7 +164,6 @@ class _ProjectFilePageState extends State<ProjectFilePage> {
}
}
- // 2. Navigation method for blank canvas
void _navigateToCreateFile() {
Navigator.push(
context,
@@ -185,7 +185,6 @@ class _ProjectFilePageState extends State<ProjectFilePage> {
title: const Text("Project Files"),
backgroundColor: theme.appBarTheme.backgroundColor,
actions: [
- // 3. The + button on top right
IconButton(
icon: const Icon(Icons.add),
tooltip: "Create New File",
@@ -193,11 +192,14 @@ class _ProjectFilePageState extends State<ProjectFilePage> {
),
],
),
+ // Added BottomBar here
+ bottomNavigationBar: BottomBar(
+ currentTab: BottomBarItem.files,
+ projectId: widget.projectId,
+ ),
floatingActionButton: FloatingActionButton(
onPressed: _pickAndAddFile,
- child: const Icon(
- Icons.upload_file,
- ), // Changed to distinguish from top +
+ child: const Icon(Icons.upload_file),
),
body:
_isLoading
diff --git a/lib/ui/widgets/bottom_bar.dart b/lib/ui/widgets/bottom_bar.dart
@@ -4,6 +4,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:adobe/ui/styles/variables.dart';
import 'package:adobe/ui/pages/project_board_page.dart';
import 'package:adobe/ui/pages/stylesheet_page.dart';
+import 'package:adobe/ui/pages/project_file_page.dart';
enum BottomBarItem { moodboard, stylesheet, files }
@@ -29,11 +30,8 @@ class BottomBar extends StatelessWidget {
nextPage = StylesheetPage(projectId: projectId);
break;
case BottomBarItem.files:
- // TODO
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(content: Text("Files page not implemented yet")),
- );
- return;
+ nextPage = ProjectFilePage(projectId: projectId);
+ break;
}
Navigator.pushReplacement(