Fix Minor UI (#68)

canopas · Mar 7, 2024 · d845ed7 · d845ed7
1 parent 6e3dad3
commit d845ed7
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 23 deletions.
diff --git a/lib/data/configs/theme.dart b/lib/data/configs/theme.dart
@@ -27,10 +27,12 @@ class AppTheme {
 
   static DaysOfWeekStyle daysOfWeekStyle(BuildContext context) =>
       DaysOfWeekStyle(
-        weekdayStyle: AppTextStyle.style16
-            .copyWith(color: context.colorScheme.textSecondary),
-        weekendStyle: AppTextStyle.style16
-            .copyWith(color: context.colorScheme.textDisable),
+        weekdayStyle: AppTextStyle.style16.copyWith(
+            color: context.colorScheme.textPrimary,
+            fontWeight: FontWeight.w600),
+        weekendStyle: AppTextStyle.style16.copyWith(
+            color: context.colorScheme.textDisable,
+            fontWeight: FontWeight.w600),
       );
 
   static List<BoxShadow> commonBoxShadow(BuildContext context) => [

diff --git a/lib/data/core/extensions/widget_extension.dart b/lib/data/core/extensions/widget_extension.dart
@@ -1,14 +1,17 @@
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 extension GestureExtension on Widget {
   Widget onTapGesture(VoidCallback onTap) {
-    return Container(
-      decoration: BoxDecoration(
+    return InkWell(
+      borderRadius: BorderRadius.circular(12),
+      onTap: onTap,
+      child: Material(
         borderRadius: BorderRadius.circular(12),
-      ),
-      child: GestureDetector(
-        onTap: onTap,
-        child: this,
+        color: Colors.transparent,
+        child: Container(
+            padding: const EdgeInsets.all(10),
+            decoration: BoxDecoration(borderRadius: BorderRadius.circular(12)),
+            child: this),
       ),
     );
   }

diff --git a/lib/style/app_page.dart b/lib/style/app_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:projectunity/data/core/extensions/context_extension.dart';
 import 'package:projectunity/style/app_text_style.dart';
 
 class AppPage extends StatelessWidget {
@@ -36,7 +37,7 @@ class AppPage extends StatelessWidget {
           ? null
           : AppBar(
               backgroundColor: backGroundColor,
-              title: titleWidget ?? _title(),
+              title: titleWidget ?? _title(context),
               actions: actions,
               leading: leading,
               automaticallyImplyLeading: automaticallyImplyLeading,
@@ -47,10 +48,14 @@ class AppPage extends StatelessWidget {
     );
   }
 
-  Widget _title() => Text(
+  Widget _title(BuildContext context) => Text(
         title ?? '',
         maxLines: 1,
         overflow: TextOverflow.ellipsis,
-        style: const TextStyle(fontFamily: AppTextStyle.poppinsFontFamily),
+        style: TextStyle(
+            fontFamily: AppTextStyle.poppinsFontFamily,
+            fontSize: 22,
+            color: context.colorScheme.textPrimary,
+            fontWeight: FontWeight.w600),
       );
 }
diff --git a/lib/style/app_text_style.dart b/lib/style/app_text_style.dart
@@ -1,8 +1,14 @@
 import 'package:flutter/cupertino.dart';
+import 'package:projectunity/data/core/extensions/context_extension.dart';
 
 class AppTextStyle {
   static const String poppinsFontFamily = "Poppins";
 
+  static TextStyle headerStyle(BuildContext context) => TextStyle(
+      fontWeight: FontWeight.w600,
+      fontSize: 22,
+      color: context.colorScheme.textPrimary);
+
   static const TextStyle style24 =
       TextStyle(fontWeight: FontWeight.w600, fontSize: 24);
 

diff --git a/lib/ui/admin/home/home_screen/admin_home_screen.dart b/lib/ui/admin/home/home_screen/admin_home_screen.dart
@@ -69,9 +69,7 @@ class _AdminHomeScreenState extends State<AdminHomeScreen> {
           builder: (context) {
             final String name = SpaceNotifierWidget.of(context)?.name ?? "";
             return Text(name,
-                style: AppTextStyle.style20.copyWith(
-                  color: context.colorScheme.textPrimary,
-                ),
+                style: AppTextStyle.headerStyle(context),
                 overflow: TextOverflow.ellipsis);
           },
         ),

diff --git a/lib/ui/shared/appbar_drawer/appbar/dashboard_appbar.dart b/lib/ui/shared/appbar_drawer/appbar/dashboard_appbar.dart
@@ -47,8 +47,7 @@ class DashBoardAppBar extends StatelessWidget implements PreferredSize {
                       final String name =
                           SpaceNotifierWidget.of(context)?.name ?? "";
                       return Text(name,
-                          style: AppTextStyle.style20
-                              .copyWith(color: context.colorScheme.textPrimary),
+                          style: AppTextStyle.headerStyle(context),
                           overflow: TextOverflow.ellipsis);
                     },
                   ),

diff --git a/lib/ui/shared/profile/edit_profile/widget/profile_form.dart b/lib/ui/shared/profile/edit_profile/widget/profile_form.dart
@@ -73,6 +73,7 @@ class ProfileForm extends StatelessWidget {
         const GenderSelection(),
         FieldTitle(title: localization.employee_mobile_tag),
         FieldEntry(
+          keyboardType: TextInputType.phone,
           controller: phoneNumberController,
           hintText: localization.admin_home_add_member_mobile_number_hint_text,
         ),

diff --git a/lib/ui/user/home/home_screen/user_home_screen.dart b/lib/ui/user/home/home_screen/user_home_screen.dart
@@ -70,8 +70,7 @@ class _UserHomeScreenState extends State<UserHomeScreen> {
             builder: (context) {
               final String name = SpaceNotifierWidget.of(context)?.name ?? "";
               return Text(name,
-                  style: AppTextStyle.style20
-                      .copyWith(color: context.colorScheme.textPrimary),
+                  style: AppTextStyle.headerStyle(context),
                   overflow: TextOverflow.ellipsis);
             },
           ),

diff --git a/lib/ui/widget/employee_details_textfield.dart b/lib/ui/widget/employee_details_textfield.dart
@@ -53,8 +53,8 @@ class FieldEntry extends StatelessWidget {
       maxLength: maxLength,
       controller: controller,
       autocorrect: false,
-      style: AppTextStyle.style16
-          .copyWith(color: context.colorScheme.textSecondary),
+      style:
+          AppTextStyle.style16.copyWith(color: context.colorScheme.textPrimary),
       textAlignVertical: TextAlignVertical.center,
       decoration: InputDecoration(
         isCollapsed: true,