Merge pull request #58 from devsadeq/feature/refactor

Feature/refactor
devsadeq · Oct 31, 2022 · 760b774 · 760b774
2 parents 34eb1f1 + 6428b9a
commit 760b774
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 33 deletions.
diff --git a/lib/app/modules/JobDetails/views/widgets/description.dart b/lib/app/modules/JobDetails/views/widgets/description.dart
@@ -3,7 +3,8 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:jobs_flutter_app/app/data/remote/dto/job/job_out_dto.dart';
+
+import '../../../../data/remote/dto/job/job_out_dto.dart';
 
 class Description extends StatelessWidget {
   const Description({Key? key, required this.job}) : super(key: key);
@@ -28,6 +29,11 @@ class Description extends StatelessWidget {
             fontWeight: FontWeight.w400,
             color: Get.theme.colorScheme.onBackground,
           ),
+          h2: GoogleFonts.poppins(
+            fontSize: 14.sp,
+            fontWeight: FontWeight.w700,
+            color: Get.theme.colorScheme.onBackground,
+          ),
         ),
       ),
     );

diff --git a/lib/app/modules/JobDetails/views/widgets/slimilar_job_card.dart b/lib/app/modules/JobDetails/views/widgets/slimilar_job_card.dart
@@ -40,6 +40,7 @@ class SimilarJobCard extends StatelessWidget {
       onTap: onTap ?? () {},
       child: Container(
         width: 0.80.sw,
+        height: 165.h,
         padding: EdgeInsets.all(20.w),
         margin: EdgeInsets.only(left: 16.w, top: 16.h, bottom: 30.h),
         decoration: BoxDecoration(

diff --git a/lib/app/modules/auth/views/register/register_view.dart b/lib/app/modules/auth/views/register/register_view.dart
@@ -11,11 +11,12 @@ class RegisterView extends GetView {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Get.theme.backgroundColor,
       resizeToAvoidBottomInset: true,
       body: AnnotatedRegion<SystemUiOverlayStyle>(
         value: SystemUiOverlayStyle(
           statusBarColor: Get.theme.backgroundColor,
-          statusBarIconBrightness: Brightness.light,
+          statusBarIconBrightness: Brightness.dark,
           systemNavigationBarColor: Colors.white,
           systemNavigationBarIconBrightness: Brightness.dark,
         ),

diff --git a/lib/app/modules/root/views/root_view.dart b/lib/app/modules/root/views/root_view.dart
@@ -22,6 +22,7 @@ class RootView extends GetView<RootController> {
         width: 0.65.sw,
         child: const MenuView(),
       ),
+      drawerEdgeDragWidth: 0.0,
       body: AnnotatedRegion<SystemUiOverlayStyle>(
         value: SystemUiOverlayStyle(
           statusBarColor: Get.theme.backgroundColor,

diff --git a/lib/app/modules/search/views/widgets/items_card.dart b/lib/app/modules/search/views/widgets/items_card.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:jobs_flutter_app/app/widgets/custom_avatar.dart';
 
 class SearchItem extends StatelessWidget {
   const SearchItem({
@@ -19,38 +21,42 @@ class SearchItem extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: onTap,
-      child: Row(
-        children: [
-          SizedBox(
-            width: 35.w,
-            height: 35.h,
-            child: CircleAvatar(
-              backgroundImage: NetworkImage(avatar),
+      child: Container(
+        padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 8.h),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(14.r),
+        ),
+        child: Row(
+          children: [
+            CustomAvatar(
+              imageUrl: avatar,
+              height: 35.h,
             ),
-          ),
-          Padding(
-            padding: EdgeInsets.only(left: 10.w),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  title,
-                  style: GoogleFonts.poppins(
-                    fontSize: 14.sp,
-                    fontWeight: FontWeight.w400,
+            Padding(
+              padding: EdgeInsets.only(left: 10.w),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    title,
+                    style: GoogleFonts.poppins(
+                      fontSize: 14.sp,
+                      fontWeight: FontWeight.w400,
+                    ),
                   ),
-                ),
-                Text(
-                  subtitle,
-                  style: GoogleFonts.poppins(
-                    fontSize: 13.sp,
-                    color: const Color(0xffAAA6B9),
-                  ),
-                )
-              ],
-            ),
-          )
-        ],
+                  Text(
+                    subtitle,
+                    style: GoogleFonts.poppins(
+                      fontSize: 13.sp,
+                      color: Get.theme.colorScheme.secondary.withOpacity(0.75),
+                    ),
+                  )
+                ],
+              ),
+            )
+          ],
+        ),
       ),
     );
   }

diff --git a/lib/app/modules/search/views/widgets/search_items.dart b/lib/app/modules/search/views/widgets/search_items.dart
@@ -31,7 +31,7 @@ class SearchResults extends GetView<SearchController> {
                 scrollDirection: Axis.vertical,
                 physics: const BouncingScrollPhysics(),
                 itemBuilder: (context, index) => Padding(
-                  padding: EdgeInsets.only(bottom: 22.h),
+                  padding: EdgeInsets.only(bottom: 16.h),
                   child: SearchItem(
                     avatar: "${ApiRoutes.BASE_URL}${results[index].image}",
                     title: results[index].name!,

diff --git a/lib/app/widgets/custom_avatar.dart b/lib/app/widgets/custom_avatar.dart
@@ -34,6 +34,8 @@ class CustomAvatar extends StatelessWidget {
         ),
       ),
       placeholder: (context, url) => Container(
+        height: height ?? 80.h,
+        width: height ?? 80.h,
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           color: Colors.grey[300],
@@ -43,6 +45,8 @@ class CustomAvatar extends StatelessWidget {
         ),
       ),
       errorWidget: (context, url, error) => Container(
+        height: height ?? 80.h,
+        width: height ?? 80.h,
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           color: Colors.grey[300],