Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/refactor #58

Merged
merged 8 commits into from
Oct 31, 2022
Merged

Feature/refactor #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e19524b
edit search item
devsadeq Oct 31, 2022
adac632
edit custom avatar
devsadeq Oct 31, 2022
cb139ca
edit drawer edge drag width
devsadeq Oct 31, 2022
edf5f2f
fix saved jobs animation
devsadeq Oct 31, 2022
fb0f0ba
edit similar job card
devsadeq Oct 31, 2022
76a74b0
refactor
devsadeq Oct 31, 2022
eb72938
refactor
devsadeq Oct 31, 2022
6428b9a
remove delay from saved jobs
devsadeq Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/app/modules/JobDetails/views/widgets/description.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
),
),
),
);
Expand Down
1 change: 1 addition & 0 deletions lib/app/modules/JobDetails/views/widgets/slimilar_job_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion lib/app/modules/auth/views/register/register_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
1 change: 1 addition & 0 deletions lib/app/modules/root/views/root_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
66 changes: 36 additions & 30 deletions lib/app/modules/search/views/widgets/items_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand All @@ -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),
),
)
],
),
)
],
),
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/app/modules/search/views/widgets/search_items.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!,
Expand Down
4 changes: 4 additions & 0 deletions lib/app/widgets/custom_avatar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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],
Expand Down