Merge pull request #6 from aninarafath6/notice

drawer avatar removed
aninarafath6 · Sep 4, 2022 · 9a926c5 · 9a926c5
2 parents a5a51a5 + fd6ebbd
commit 9a926c5
Show file tree

Hide file tree

Showing 13 changed files with 228 additions and 16 deletions.
diff --git a/arnhss-app/lib/common/constants/color_constants.dart b/arnhss-app/lib/common/constants/color_constants.dart
@@ -6,4 +6,5 @@ class CustomColors {
   static const white = Colors.white;
   static const light = Colors.grey;
   static Color lightBgOverlay = Colors.grey.shade300.withOpacity(.3);
+  static Color bgOverlay = Colors.grey.shade300.withOpacity(.5);
 }
diff --git a/arnhss-app/lib/common/routes/app_routes.dart b/arnhss-app/lib/common/routes/app_routes.dart
@@ -1,3 +1,4 @@
+import 'package:arnhss/features/attendance/view/attendance_view.dart';
 import 'package:arnhss/features/authentication/account/view/select_account.dart';
 import 'package:arnhss/features/authentication/login/view/login.dart';
 import 'package:arnhss/features/authentication/login/widgets/country_select.dart';
@@ -31,14 +32,16 @@ class AppRoutes {
       case SelectAccount.routeName:
         return MaterialPageRoute(builder: (_) => const SelectAccount());
       case HomeView.routeName:
-        return MaterialPageRoute(builder: (_) => HomeView());
+        return MaterialPageRoute(builder: (_) => const HomeView());
       case NoticeView.routeName:
         final NoticeModel args = settings.arguments as NoticeModel;
         return MaterialPageRoute(
           builder: (_) => NoticeView(
             notice: args,
           ),
         );
+      case AttendanceView.routeName:
+        return MaterialPageRoute(builder: (_) => AttendanceView());
       default:
         return MaterialPageRoute(builder: (_) => const Scaffold());
     }

diff --git a/arnhss-app/lib/features/attendance/view/attendance_view.dart b/arnhss-app/lib/features/attendance/view/attendance_view.dart
@@ -0,0 +1,37 @@
+import 'package:arnhss/common/constants/color_constants.dart';
+import 'package:arnhss/features/attendance/widgets/attendance_calendar.dart';
+import 'package:arnhss/features/authentication/login/view/index.dart';
+
+class AttendanceView extends StatelessWidget {
+  const AttendanceView({Key? key}) : super(key: key);
+  static const routeName = "/attendance";
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Colors.white,
+        elevation: 0,
+        leadingWidth: 72,
+        centerTitle: true,
+        leading: IconButton(
+            splashRadius: 25,
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            icon: const Icon(Icons.arrow_back_ios, color: CustomColors.dark)),
+        title: const Text("Attendance",
+            style: TextStyle(
+                color: CustomColors.dark, fontWeight: FontWeight.bold)),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(24),
+        child: Column(
+          children: const [
+            AttendanceCalendar(),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/arnhss-app/lib/features/attendance/widgets/attendance_calendar.dart b/arnhss-app/lib/features/attendance/widgets/attendance_calendar.dart
@@ -0,0 +1,48 @@
+import 'dart:math';
+
+import 'package:arnhss/common/constants/color_constants.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:table_calendar/table_calendar.dart';
+
+class AttendanceCalendar extends StatefulWidget {
+  const AttendanceCalendar({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<AttendanceCalendar> createState() => _AttendanceCalendarState();
+}
+
+class _AttendanceCalendarState extends State<AttendanceCalendar> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(borderRadius: BorderRadius.circular(5)),
+      child: TableCalendar(
+        firstDay: DateTime.utc(2010, 10, 16),
+        lastDay: DateTime.utc(DateTime.now().year, DateTime.now().month, 30),
+        focusedDay: DateTime.now(),
+        calendarStyle: const CalendarStyle(
+          weekendTextStyle: TextStyle(
+            color: Colors.red,
+          ),
+          isTodayHighlighted: false,
+        ),
+        headerStyle: HeaderStyle(
+          leftChevronVisible: false,
+          rightChevronVisible: false,
+          formatButtonVisible: false,
+          headerPadding: const EdgeInsets.all(18),
+          titleTextStyle: const TextStyle(color: Colors.black),
+          decoration: BoxDecoration(
+            color: CustomColors.lightBgOverlay,
+            borderRadius: BorderRadius.circular(5),
+          ),
+        ),
+        daysOfWeekHeight: 50,
+        headerVisible: true,
+      ),
+    );
+  }
+}
diff --git a/arnhss-app/lib/features/home/view/home_view.dart b/arnhss-app/lib/features/home/view/home_view.dart
@@ -29,7 +29,7 @@ class HomeView extends StatelessWidget {
           children: const [
             NoticeList(),
             HomeGrid(),
-            SizedBox(height: 10),
+            SizedBox(height: 0),
           ],
         ),
       ),

diff --git a/arnhss-app/lib/features/home/widgets/app_drawer.dart b/arnhss-app/lib/features/home/widgets/app_drawer.dart
@@ -1,14 +1,17 @@
 import 'package:arnhss/common/constants/color_constants.dart';
 import 'package:arnhss/common/theme/text_theme.dart';
 import 'package:arnhss/utils/dimensions.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:remixicon/remixicon.dart';
 
 class AppDrawer extends StatelessWidget {
-  const AppDrawer({
-    Key? key,
-  }) : super(key: key);
+  const AppDrawer(
+      {Key? key,
+      this.image = "assets/images/icons/home-and-living-badge.png.webp"})
+      : super(key: key);
 
+  final String? image;
   @override
   Widget build(BuildContext context) {
     return Drawer(
@@ -21,6 +24,7 @@ class AppDrawer extends StatelessWidget {
               children: [
                 DrawerHeader(
                   padding: const EdgeInsets.all(15.0),
+                  curve: Curves.easeInOutBack,
                   decoration: BoxDecoration(
                     color: CustomColors.light.withOpacity(.1),
                   ),
@@ -32,18 +36,19 @@ class AppDrawer extends StatelessWidget {
                         left: 190,
                         bottom: -30,
                         // alignment: Alignment.bottomRight,
-                        child: Image.asset(
-                            "assets/images/icons/home-and-living-badge.png.webp"),
+                        child: Image.asset(image!),
                       ),
                       Row(
                         mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
-                          const CircleAvatar(
-                            radius: 35,
-                            backgroundImage: NetworkImage(
-                                "https://aninarafath.me/images/about-1.jpeg"),
-                          ),
+                          // const CircleAvatar(
+                          //   radius: 35,
+                          //   backgroundImage:
+
+                          //    NetworkImage(
+                          //       "https://ichef.bbci.co.uk/news/976/cpsprodpb/14B1D/production/_125556748_gettyimages-1240422158.jpg"),
+                          // ),
                           const SizedBox(width: 10),
                           Column(
                             crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/arnhss-app/lib/features/home/widgets/home_grid.dart b/arnhss-app/lib/features/home/widgets/home_grid.dart
@@ -1,4 +1,5 @@
 import 'package:arnhss/common/constants/color_constants.dart';
+import 'package:arnhss/features/attendance/view/attendance_view.dart';
 import 'package:arnhss/features/home/widgets/tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
@@ -17,13 +18,16 @@ class HomeGrid extends StatelessWidget {
         mainAxisSpacing: 10,
         crossAxisSpacing: 8,
         children: [
-          const StaggeredGridTile.count(
+          StaggeredGridTile.count(
             crossAxisCellCount: 3,
             mainAxisCellCount: 3.8,
             child: Tile(
               index: 0,
               image: "assets/images/icons/nt-to-do-list-removebg-preview.png",
               label: "Attendance",
+              onTap: () {
+                Navigator.pushNamed(context, AttendanceView.routeName);
+              },
             ),
           ),
           const StaggeredGridTile.count(

diff --git a/arnhss-app/lib/features/home/widgets/notice_item.dart b/arnhss-app/lib/features/home/widgets/notice_item.dart
@@ -24,7 +24,7 @@ class NoticeItem extends StatelessWidget {
           height: 180,
           padding: const EdgeInsets.all(18),
           decoration: BoxDecoration(
-            color: CustomColors.lightBgOverlay,
+            color: CustomColors.bgOverlay,
             borderRadius: BorderRadius.circular(5),
           ),
           child: Stack(

diff --git a/arnhss-app/lib/features/home/widgets/tile.dart b/arnhss-app/lib/features/home/widgets/tile.dart
@@ -9,16 +9,18 @@ class Tile extends StatelessWidget {
     this.label = "label",
     this.isSmall = true,
     this.count = 0,
+    this.onTap,
   }) : super(key: key);
   final int? index;
   final String? image;
   final String? label;
   final bool? isSmall;
   final int? count;
+  final Function()? onTap;
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: () {},
+      onTap: onTap,
       child: Stack(
         children: [
           Container(

diff --git a/arnhss-app/lib/main.dart b/arnhss-app/lib/main.dart
@@ -8,11 +8,12 @@ import 'package:arnhss/features/home/view_models/home_view_mdoel.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
+import 'package:intl/date_symbol_data_local.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  runApp(const MyApp());
+  initializeDateFormatting().then((_) => runApp(MyApp()));
 }
 
 class MyApp extends StatelessWidget {

diff --git a/arnhss-app/macos/Flutter/GeneratedPluginRegistrant.swift b/arnhss-app/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,9 @@ import FlutterMacOS
 import Foundation
 
 import path_provider_macos
+import sqflite
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
 }