Added dummy screens to represent the final app state

lib/main.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-
-import 'screens/home/home_page.dart';
-
+import 'package:time_table_app/screens/wrapper.dart';
 
 void main() {
   runApp(const App());
@@ -14,9 +12,9 @@ class App extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return const MaterialApp(
       title: _title,
-      home: Home(title: _title,),
+      home: Wrapper(),
     );
   }
 }

lib/screens/add_time_table/add_time_table_page.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class AddTimeTablePage extends StatelessWidget {
+  const AddTimeTablePage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return const Text("Add a timetable");
+  }
+}

lib/screens/authenticate/authenticate_page.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+
+class Authenticate extends StatelessWidget {
+  const Authenticate({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return const Text("Authenticate page");
+  }
+}

lib/screens/edit_time_table/edit_page.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class EditPage extends StatelessWidget {
+  const EditPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return const Text("Edit time table page");
+  }
+}

lib/screens/home/home_page.dart

@@ -1,23 +1,38 @@
 import 'package:flutter/material.dart';
-
+import 'package:time_table_app/screens/edit_time_table/edit_page.dart';
 import 'day.dart';
 import 'package:time_table_app/model/days.dart';
 import 'package:time_table_app/widgets/tasks_button.dart';
 import '../new_time_table/new_time_table_page.dart';
+import 'package:time_table_app/screens/add_time_table/add_time_table_page.dart';
 
 class Home extends StatelessWidget {
-  final String title;
+  static const String title = "Your Time Table";
   final List<Widget> tabs = <Widget>[
-    Tab(text: Days.Monday.name,),
-    Tab(text: Days.Tuesday.name,),
-    Tab(text: Days.Wednesday.name,),
-    Tab(text: Days.Thursday.name,),
-    Tab(text: Days.Friday.name,),
-    Tab(text: Days.Saturday.name,),
-    Tab(text: Days.Sunday.name,)
+    Tab(
+      text: Days.Monday.name,
+    ),
+    Tab(
+      text: Days.Tuesday.name,
+    ),
+    Tab(
+      text: Days.Wednesday.name,
+    ),
+    Tab(
+      text: Days.Thursday.name,
+    ),
+    Tab(
+      text: Days.Friday.name,
+    ),
+    Tab(
+      text: Days.Saturday.name,
+    ),
+    Tab(
+      text: Days.Sunday.name,
+    )
   ];
 
-  Home({Key? key, required this.title}) : super(key: key);
+  Home({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -26,7 +41,7 @@ class Home extends StatelessWidget {
       initialIndex: DateTime.now().weekday - 1,
       child: Scaffold(
         appBar: AppBar(
-          title: Text(title),
+          title: const Text(title),
           bottom: TabBar(
             tabs: tabs,
             isScrollable: true,
@@ -68,21 +83,44 @@ class HomeDrawer extends StatelessWidget {
             ),
             child: Text("Welcome back user"),
           ),
-          ListTile(
-            title: const Text(
-              "Create a new timetable",
-              style: TextStyle(
-                fontSize: 18.0
-              ),
-            ),
-            onTap: (){
-              Navigator.push(context, MaterialPageRoute(
-                  builder: (context) => NewTimeTablePage()
-              ));
-            },
+          DrawerItem(
+            title: "Create a new timetable",
+            createPage: () => NewTimeTablePage(),
+          ),
+          DrawerItem(
+            title: "Edit your timetables",
+            createPage: () => const EditPage(),
+          ),
+          DrawerItem(
+            title: "Add a time table",
+            createPage: () => const AddTimeTablePage(),
           )
         ],
       ),
     );
   }
 }
+
+class DrawerItem extends StatelessWidget {
+  final String title;
+  final Widget Function() createPage;
+  const DrawerItem({Key? key, required this.title, required this.createPage})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      title: Text(
+        title,
+        style: const TextStyle(fontSize: 18.0),
+      ),
+      onTap: () {
+        Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => createPage(),
+            ));
+      },
+    );
+  }
+}

lib/screens/wrapper.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:time_table_app/screens/home/home_page.dart';
+import 'package:time_table_app/screens/authenticate/authenticate_page.dart';
+
+
+class Wrapper extends StatefulWidget {
+  const Wrapper({Key? key}) : super(key: key);
+
+  @override
+  State<Wrapper> createState() => _WrapperState();
+}
+
+class _WrapperState extends State<Wrapper> {
+  bool isAuthenticated = true;
+
+  @override
+  Widget build(BuildContext context) {
+    return isAuthenticated ? Home() : const Authenticate();
+  }
+}

lib/widgets/popup_subject_card.dart

@@ -12,7 +12,7 @@ class PopupSubjectCard extends StatelessWidget {
     return Center(
       child: Material(
         borderRadius: BorderRadius.circular(16.0),
-        color: Color.fromARGB(0, 0, 0, 0),
+        color: const Color.fromARGB(0, 0, 0, 0),
         child: Padding(
           padding: const EdgeInsets.all(4.0),
           child: IntrinsicHeight(
@@ -22,12 +22,13 @@ class PopupSubjectCard extends StatelessWidget {
               children: [
                 Expanded(
                   child: Hero(
-                    tag: subject.hashCode,
-                    child: Material(
-                      borderRadius: BorderRadius.circular(16.0),
-                      child: SubjectInfoBox(subject: subject, color: this.subject.color,)
-                    )
-                  ),
+                      tag: subject.hashCode,
+                      child: Material(
+                          borderRadius: BorderRadius.circular(16.0),
+                          child: SubjectInfoBox(
+                            subject: subject,
+                            color: subject.color,
+                          ))),
                 ),
               ],
             ),
@@ -38,7 +39,6 @@ class PopupSubjectCard extends StatelessWidget {
   }
 }
 
-
 class SubjectInfoBox extends StatelessWidget {
   const SubjectInfoBox({
     Key? key,
@@ -48,6 +48,7 @@ class SubjectInfoBox extends StatelessWidget {
 
   final Subject subject;
   final Color color;
+  final bool isOwned = false;
 
   Color lighten(Color c, [int percent = 10]) {
     assert(1 <= percent && percent <= 100);
@@ -56,54 +57,64 @@ class SubjectInfoBox extends StatelessWidget {
         c.alpha,
         c.red + ((255 - c.red) * p).round(),
         c.green + ((255 - c.green) * p).round(),
-        c.blue + ((255 - c.blue) * p).round()
-    );
+        c.blue + ((255 - c.blue) * p).round());
   }
 
-
-
   @override
   Widget build(BuildContext context) {
     DateTime finishTime = subject.startTime.add(subject.duration);
 
     return Container(
-      padding: EdgeInsets.all(8.0),
+      padding: const EdgeInsets.all(8.0),
       decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(8.0)),
-          color: this.color
-      ),
+          borderRadius: const BorderRadius.all(Radius.circular(8.0)),
+          color: color),
       child: SingleChildScrollView(
         child: Column(
-          //mainAxisSize: MainAxisSize.min,
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
               subject.name,
               overflow: TextOverflow.ellipsis,
-              style: TextStyle(
-                  fontSize: 24,
-                  fontWeight: FontWeight.bold
-              ),
+              style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
+            ),
+            Text(
+                """${subject.startTime.hour.toString().padLeft(2, '0')}:${subject.startTime.minute.toString().padLeft(2, '0')} - ${finishTime.hour.toString().padLeft(2, '0')}:${finishTime.minute.toString().padLeft(2, '0')}"""),
+            const SizedBox(
+              height: 8.0,
             ),
-            Text("""${subject.startTime.hour.toString().padLeft(2, '0')}:${subject.startTime.minute.toString().padLeft(2, '0')} - ${finishTime.hour.toString().padLeft(2, '0')}:${finishTime.minute.toString().padLeft(2, '0')}"""),
-            SizedBox(height: 8.0,),
             Visibility(
               visible: subject.description.isNotEmpty,
               child: Container(
-                child: Text(subject.description,),
                 decoration: BoxDecoration(
                   color: lighten(color, 30),
                   borderRadius: BorderRadius.circular(8.0),
                 ),
                 width: double.maxFinite,
-                padding: EdgeInsets.all(4.0),
-
+                padding: const EdgeInsets.all(4.0),
+                child: Text(
+                  subject.description,
+                ),
+              ),
+            ),
+            const SizedBox(
+              height: 4.0,
+            ),
+            TextButton.icon(
+              style: ButtonStyle(
+                  backgroundColor:
+                      MaterialStateProperty.all(lighten(color, 30))),
+              onPressed: () {},
+              icon: const Icon(Icons.edit, color: Colors.black, size: 16.0),
+              label: Text(
+                isOwned ? "Edit" : "Request Edit",
+                style: const TextStyle(color: Colors.black),
               ),
             )
           ],
         ),
       ),
     );
   }
-}
+}