Merge branch 'development_sikander' into 'master'

Development sikander

See merge request mirza.shafique/mohem_flutter_app!72
merge-requests/1/merge
Sikander Saleem 3 years ago
commit 4a5df86ca8

@ -271,6 +271,7 @@
"performance": "تقييم الاداء", "performance": "تقييم الاداء",
"performanceEvaluation": "تقييم الأداء في", "performanceEvaluation": "تقييم الأداء في",
"performanceEvaluationIn": "تقييم أدائك في", "performanceEvaluationIn": "تقييم أدائك في",
"valuationIn": "تقييم الأداء في",
"amount": "مقدار", "amount": "مقدار",
"correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية", "correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية",
"selectType": " حدد نوع التغيير الذي تريد القيام به", "selectType": " حدد نوع التغيير الذي تريد القيام به",
@ -372,6 +373,20 @@
"offerAndDiscounts": "العروض والخصومات", "offerAndDiscounts": "العروض والخصومات",
"offerValid": "العرض صالح", "offerValid": "العرض صالح",
"offerExpired": "انتهى العرض", "offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
"inProgress": "في تَقَدم",
"locked": "مقفل",
"addDetails": "أضف التفاصيل",
"reviewAndSell": "مراجعة وبيع",
"itemTitle": "عنوان البند",
"itemCondition": "حالة السلعة",
"used": "تستخدم",
"region": "منطقة",
"selectRegion": "اختر المنطقة",
"itemPrice": "سعر السلعة",
"itemPhotos": "صور البند",
"itemInfo": "معلومات العنصر",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -316,7 +316,8 @@
"regular": "Regular", "regular": "Regular",
"mark": "Mark", "mark": "Mark",
"performance": "Performance Evaluation", "performance": "Performance Evaluation",
"performanceEvaluationIn": "Your performance Evaluation in ", "performanceEvaluationIn": "Your performance Evaluation in",
"valuationIn": "Performance Evaluation in",
"viewBusinessCard": "View Business Card", "viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation", "performanceEvaluation": "Performance Evaluation",
"logout": "Logout", "logout": "Logout",
@ -372,6 +373,20 @@
"offerAndDiscounts": "Offer & Discounts", "offerAndDiscounts": "Offer & Discounts",
"offerValid": "Offer Valid", "offerValid": "Offer Valid",
"offerExpired": "Offer Expired", "offerExpired": "Offer Expired",
"whatAreYouOffering": "What are you offering?",
"selectCategory": "Select Category",
"inProgress": "InProgress",
"locked": "Locked",
"addDetails": "Add Details",
"reviewAndSell": "Review & Sell",
"itemTitle": "Item Title",
"itemCondition": "Item Condition",
"used": "Used",
"region": "Region",
"selectRegion": "Select Region",
"itemPrice": "Item Price",
"itemPhotos": "Item Photos",
"itemInfo": "Item Info",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:mohem_flutter_app/api/api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
import 'package:mohem_flutter_app/models/generic_response_model.dart'; import 'package:mohem_flutter_app/models/generic_response_model.dart';
@ -11,21 +12,17 @@ import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart'; import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart';
import 'package:mohem_flutter_app/models/get_employee_phones_model.dart'; import 'package:mohem_flutter_app/models/get_employee_phones_model.dart';
import 'package:mohem_flutter_app/models/performance.dart'; import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_clos_structure_list.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_details_list.dart';
import 'package:mohem_flutter_app/models/profile/get_countries_list_model.dart'; import 'package:mohem_flutter_app/models/profile/get_countries_list_model.dart';
import 'package:mohem_flutter_app/models/profile/phone_number_types_model.dart'; import 'package:mohem_flutter_app/models/profile/phone_number_types_model.dart';
import 'package:mohem_flutter_app/models/profile/start_address_approval_process_model.dart'; import 'package:mohem_flutter_app/models/profile/start_address_approval_process_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_address_transaction.dart'; import 'package:mohem_flutter_app/models/profile/submit_address_transaction.dart';
import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_clos_structure_list.dart';
import 'package:mohem_flutter_app/models/profile/get_contact_details_list.dart';
import 'package:mohem_flutter_app/models/profile/submit_basic_details_transaction_model.dart'; import 'package:mohem_flutter_app/models/profile/submit_basic_details_transaction_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart'; import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart'; import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
import 'package:mohem_flutter_app/models/start_phone_approval_process_model.dart'; import 'package:mohem_flutter_app/models/start_phone_approval_process_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
import 'package:mohem_flutter_app/models/start_eit_approval_process_model.dart';
import 'package:mohem_flutter_app/api/api_client.dart';
class ProfileApiClient { class ProfileApiClient {
static final ProfileApiClient _instance = ProfileApiClient._internal(); static final ProfileApiClient _instance = ProfileApiClient._internal();
@ -397,14 +394,14 @@ class ProfileApiClient {
}, url, postParams); }, url, postParams);
} }
Future<List<GetPerformanceAppraisalList>?> getPerformanceAppraisal() async { Future<List<GetPerformanceAppraisalList>> getPerformanceAppraisal() async {
String url = "${ApiConsts.erpRest}GET_Performance_Appraisal"; String url = "${ApiConsts.erpRest}GET_Performance_Appraisal";
Map<String, dynamic> postParams = {}; Map<String, dynamic> postParams = {};
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {
GenericResponseModel? responseData = GenericResponseModel.fromJson(json); GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
return responseData.getPerformanceAppraisalList; return responseData.getPerformanceAppraisalList ?? [];
}, url, postParams); }, url, postParams);
} }
} }

@ -18,6 +18,7 @@ class MyColors {
static const Color grey98Color = Color(0xff989898); static const Color grey98Color = Color(0xff989898);
static const Color lightGreyEFColor = Color(0xffEFEFEF); static const Color lightGreyEFColor = Color(0xffEFEFEF);
static const Color lightGreyEDColor = Color(0xffEDEDED); static const Color lightGreyEDColor = Color(0xffEDEDED);
static const Color lightGreyDeColor = Color(0xffDEDEDE);
static const Color lightGreyE3Color = Color(0xffE3E3E3); static const Color lightGreyE3Color = Color(0xffE3E3E3);
static const Color lightGreyE6Color = Color(0xffE6E6E6); static const Color lightGreyE6Color = Color(0xffE6E6E6);
static const Color lightGreyEAColor = Color(0xffEAEAEA); static const Color lightGreyEAColor = Color(0xffEAEAEA);
@ -29,7 +30,6 @@ class MyColors {
static const Color backgroundBlackColor = Color(0xff202529); static const Color backgroundBlackColor = Color(0xff202529);
static const Color black = Color(0xff000000); static const Color black = Color(0xff000000);
static const Color white = Color(0xffffffff); static const Color white = Color(0xffffffff);
static const Color green = Color(0xffffffff);
static const Color borderColor = Color(0xffE8E8E8); static const Color borderColor = Color(0xffE8E8E8);
static const Color borderE3Color = Color(0xffE3E3E3); static const Color borderE3Color = Color(0xffE3E3E3);
static const Color borderCEColor = Color(0xffCECECE); static const Color borderCEColor = Color(0xffCECECE);

@ -25,7 +25,7 @@ import 'package:mohem_flutter_app/ui/my_team/subordinate_leave.dart';
import 'package:mohem_flutter_app/ui/my_team/team_members.dart'; import 'package:mohem_flutter_app/ui/my_team/team_members.dart';
import 'package:mohem_flutter_app/ui/my_team/view_attendance.dart'; import 'package:mohem_flutter_app/ui/my_team/view_attendance.dart';
import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart'; import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart';
import 'package:mohem_flutter_app/ui/performance/performance.dart'; import 'package:mohem_flutter_app/ui/performance/performance_appraisal_screen.dart';
import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart'; import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart';
import 'package:mohem_flutter_app/ui/profile/basic_details.dart'; import 'package:mohem_flutter_app/ui/profile/basic_details.dart';
import 'package:mohem_flutter_app/ui/profile/contact_details.dart'; import 'package:mohem_flutter_app/ui/profile/contact_details.dart';

@ -42,12 +42,12 @@ extension WidgetExtensions on Widget {
child: this, child: this,
); );
Widget objectContainerView({String title = "", String note = ""}) { Widget objectContainerView({String title = "", String note = "", bool disablePadding = false,double radius =15}) {
return Container( return Container(
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14), padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(radius),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: const Color(0xff000000).withOpacity(.05), color: const Color(0xff000000).withOpacity(.05),

@ -287,6 +287,7 @@ class CodegenLoader extends AssetLoader{
"performance": "تقييم الاداء", "performance": "تقييم الاداء",
"performanceEvaluation": "تقييم الأداء في", "performanceEvaluation": "تقييم الأداء في",
"performanceEvaluationIn": "تقييم أدائك في", "performanceEvaluationIn": "تقييم أدائك في",
"valuationIn": "تقييم الأداء في",
"amount": "مقدار", "amount": "مقدار",
"correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية", "correctCurrentDatails": "تعديل او اكمال التفاصيل الحالية",
"selectType": " حدد نوع التغيير الذي تريد القيام به", "selectType": " حدد نوع التغيير الذي تريد القيام به",
@ -388,6 +389,20 @@ class CodegenLoader extends AssetLoader{
"offerAndDiscounts": "العروض والخصومات", "offerAndDiscounts": "العروض والخصومات",
"offerValid": "العرض صالح", "offerValid": "العرض صالح",
"offerExpired": "انتهى العرض", "offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
"inProgress": "في تَقَدم",
"locked": "مقفل",
"addDetails": "أضف التفاصيل",
"reviewAndSell": "مراجعة وبيع",
"itemTitle": "عنوان البند",
"itemCondition": "حالة السلعة",
"used": "تستخدم",
"region": "منطقة",
"selectRegion": "اختر المنطقة",
"itemPrice": "سعر السلعة",
"itemPhotos": "صور البند",
"itemInfo": "معلومات العنصر",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",
@ -740,7 +755,8 @@ static const Map<String,dynamic> en_US = {
"regular": "Regular", "regular": "Regular",
"mark": "Mark", "mark": "Mark",
"performance": "Performance Evaluation", "performance": "Performance Evaluation",
"performanceEvaluationIn": "Your performance Evaluation in ", "performanceEvaluationIn": "Your performance Evaluation in",
"valuationIn": "Performance Evaluation in",
"viewBusinessCard": "View Business Card", "viewBusinessCard": "View Business Card",
"performanceEvaluation": "Performance Evaluation", "performanceEvaluation": "Performance Evaluation",
"logout": "Logout", "logout": "Logout",
@ -796,6 +812,20 @@ static const Map<String,dynamic> en_US = {
"offerAndDiscounts": "Offer & Discounts", "offerAndDiscounts": "Offer & Discounts",
"offerValid": "Offer Valid", "offerValid": "Offer Valid",
"offerExpired": "Offer Expired", "offerExpired": "Offer Expired",
"whatAreYouOffering": "What are you offering?",
"selectCategory": "Select Category",
"inProgress": "InProgress",
"locked": "Locked",
"addDetails": "Add Details",
"reviewAndSell": "Review & Sell",
"itemTitle": "Item Title",
"itemCondition": "Item Condition",
"used": "Used",
"region": "Region",
"selectRegion": "Select Region",
"itemPrice": "Item Price",
"itemPhotos": "Item Photos",
"itemInfo": "Item Info",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -272,6 +272,7 @@ abstract class LocaleKeys {
static const performance = 'performance'; static const performance = 'performance';
static const performanceEvaluation = 'performanceEvaluation'; static const performanceEvaluation = 'performanceEvaluation';
static const performanceEvaluationIn = 'performanceEvaluationIn'; static const performanceEvaluationIn = 'performanceEvaluationIn';
static const valuationIn = 'valuationIn';
static const amount = 'amount'; static const amount = 'amount';
static const correctCurrentDatails = 'correctCurrentDatails'; static const correctCurrentDatails = 'correctCurrentDatails';
static const selectType = 'selectType'; static const selectType = 'selectType';
@ -373,6 +374,20 @@ abstract class LocaleKeys {
static const offerAndDiscounts = 'offerAndDiscounts'; static const offerAndDiscounts = 'offerAndDiscounts';
static const offerValid = 'offerValid'; static const offerValid = 'offerValid';
static const offerExpired = 'offerExpired'; static const offerExpired = 'offerExpired';
static const whatAreYouOffering = 'whatAreYouOffering';
static const selectCategory = 'selectCategory';
static const inProgress = 'inProgress';
static const locked = 'locked';
static const addDetails = 'addDetails';
static const reviewAndSell = 'reviewAndSell';
static const itemTitle = 'itemTitle';
static const itemCondition = 'itemCondition';
static const used = 'used';
static const region = 'region';
static const selectRegion = 'selectRegion';
static const itemPrice = 'itemPrice';
static const itemPhotos = 'itemPhotos';
static const itemInfo = 'itemInfo';
static const profile_reset_password_label = 'profile.reset_password.label'; static const profile_reset_password_label = 'profile.reset_password.label';
static const profile_reset_password_username = 'profile.reset_password.username'; static const profile_reset_password_username = 'profile.reset_password.username';
static const profile_reset_password_password = 'profile.reset_password.password'; static const profile_reset_password_password = 'profile.reset_password.password';

@ -240,7 +240,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
).paddingOnly(left: 21, right: 21, top: 7), ).paddingOnly(left: 21, right: 21, top: 7),
ServicesWidget(), ServicesWidget(),
8.height, // 8.height,
Container( Container(
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.only(top: 31), padding: const EdgeInsets.only(top: 31),

@ -33,69 +33,68 @@ class ServicesWidget extends StatelessWidget {
return data.isServicesMenusLoading return data.isServicesMenusLoading
? whileLoading() ? whileLoading()
: ListView.separated( : ListView.separated(
padding: const EdgeInsets.only(top: 21),
itemBuilder: (context, parentIndex) { itemBuilder: (context, parentIndex) {
return Container( return Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, children: [
children: [ Row(
Row( crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ data.homeMenus![parentIndex].menuEntry.prompt!.toSectionHeading().expanded,
data.homeMenus![parentIndex].menuEntry.prompt!.toSectionHeading().expanded, LocaleKeys.viewAllServices.tr().toText12(isUnderLine: true),
LocaleKeys.viewAllServices.tr().toText12(isUnderLine: true), ],
], ).paddingOnly(left: 21, right: 21),
).paddingOnly(left: 21, right: 21), SizedBox(
SizedBox( height: 105 + 26,
height: 105 + 26, child: ListView.separated(
child: ListView.separated( shrinkWrap: true,
shrinkWrap: true, physics: const BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(), padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13),
padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13), scrollDirection: Axis.horizontal,
scrollDirection: Axis.horizontal, itemBuilder: (cxt, index) {
itemBuilder: (cxt, index) { return AspectRatio(
return AspectRatio( aspectRatio: 105 / 105,
aspectRatio: 105 / 105, child: data.isServicesMenusLoading
child: data.isServicesMenusLoading ? ServicesMenuShimmer()
? ServicesMenuShimmer() : Container(
: Container( decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: BorderRadius.circular(15),
borderRadius: BorderRadius.circular(15), boxShadow: [
boxShadow: [ BoxShadow(
BoxShadow( color: const Color(0xff000000).withOpacity(.05),
color: const Color(0xff000000).withOpacity(.05), blurRadius: 26,
blurRadius: 26, offset: const Offset(0, -3),
offset: const Offset(0, -3), ),
), ],
], ),
), child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SvgPicture.asset(iconT[index]),
SvgPicture.asset(iconT[index]), Row(
Row( crossAxisAlignment: CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end, children: [
children: [ Expanded(
Expanded( child: data.homeMenus![parentIndex].menuEntiesList[index].prompt!.toText11(isBold: true),
child: data.homeMenus![parentIndex].menuEntiesList[index].prompt!.toText11(isBold: true), ),
), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)
SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4) ],
], )
) ],
], ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12), ).onPress(() {
).onPress(() { handleOnPress(context, data.homeMenus![parentIndex].menuEntiesList[index]);
handleOnPress(context, data.homeMenus![parentIndex].menuEntiesList[index]); }),
}), );
); },
}, separatorBuilder: (cxt, index) => 9.width,
separatorBuilder: (cxt, index) => 9.width, itemCount: data.homeMenus![parentIndex].menuEntiesList.length),
itemCount: data.homeMenus![parentIndex].menuEntiesList.length), ),
), ],
],
),
); );
}, },
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
@ -152,7 +151,7 @@ class ServicesWidget extends StatelessWidget {
Widget whileLoading() { Widget whileLoading() {
return Column( return Column(
children: [ children: [
ServicesHeaderShimmer().paddingOnly(left: 21, right: 21), ServicesHeaderShimmer().paddingOnly(left: 21, right: 21, top: 21),
SizedBox( SizedBox(
height: 105 + 26, height: 105 + 26,
child: ListView.separated( child: ListView.separated(

@ -1,114 +0,0 @@
import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/profile_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class PerformanceAppraisal extends StatefulWidget {
const PerformanceAppraisal({Key? key}) : super(key: key);
@override
_PerformanceAppraisalState createState() => _PerformanceAppraisalState();
}
class _PerformanceAppraisalState extends State<PerformanceAppraisal> {
List<GetPerformanceAppraisalList> performance = [];
@override
void initState() {
getPerformanceAppraisal();
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: MyColors.backgroundColor,
appBar: AppBarWidget(
context,
title: LocaleKeys.performance.tr(),
),
body: performance.isNotEmpty
? SingleChildScrollView(
child: Container(
width: double.infinity,
padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
child: Column(children: [
Row(children: [Expanded(flex: 1, child: getPerformanceCard(performance.first))]),
GridView.count(
crossAxisCount: 2,
shrinkWrap: true,
childAspectRatio:1.3,
children: performance
.where((GetPerformanceAppraisalList el) => performance.indexOf(el) != 0)
.map(
(GetPerformanceAppraisalList item) => getPerformanceCard(item),
)
.toList(),
)
])))
: Utils.getNoDataWidget(context),
);
}
Widget getPerformanceCard(GetPerformanceAppraisalList performance) {
return Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
child: Padding(
padding: const EdgeInsets.all(15),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
LocaleKeys.performanceEvaluationIn.tr() + performance.aPPRAISALYEAR.toString(),
style: const TextStyle(fontWeight: FontWeight.bold),
),
const SizedBox(
height: 10,
),
SliderTheme(
data: SliderThemeData(trackHeight: 3, thumbShape: SliderComponentShape.noThumb, overlayShape: SliderComponentShape.noOverlay),
child: Slider(
max: 100,
min: 0,
inactiveColor: Colors.grey.withOpacity(.4),
activeColor: Colors.green,
value: double.parse(performance.aPPRAISALSCORE!),
onChanged: (value) {},
semanticFormatterCallback: (double newValue) {
return '${newValue.round()}';
})),
const SizedBox(
height: 10,
),
Text(
performance.aPPRAISALSCORE.toString() + '%',
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 18,
color: Colors.green,
),
),
],
)));
}
void getPerformanceAppraisal() async {
try {
Utils.showLoading(context);
performance = (await ProfileApiClient().getPerformanceAppraisal())!;
setState(() {});
Utils.hideLoading(context);
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
}
}

@ -0,0 +1,97 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/profile_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/performance.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class PerformanceAppraisal extends StatelessWidget {
PerformanceAppraisal({Key? key}) : super(key: key);
Future<List<GetPerformanceAppraisalList>> getPerformanceAppraisal(context) async {
List<GetPerformanceAppraisalList> performance = [];
try {
Utils.showLoading(context);
performance = await ProfileApiClient().getPerformanceAppraisal();
Utils.hideLoading(context);
} catch (ex) {
performance = [];
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
return performance;
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: MyColors.backgroundColor,
appBar: AppBarWidget(context, title: LocaleKeys.performance.tr()),
body: FutureBuilder(
future: getPerformanceAppraisal(context),
builder: (cxt, snapShot) {
if (snapShot.connectionState == ConnectionState.done) {
if (snapShot.hasData) {
List<GetPerformanceAppraisalList> performance = snapShot.data as List<GetPerformanceAppraisalList>;
if (performance.isNotEmpty) {
return ListView(
padding: const EdgeInsets.all(0),
children: [
getPerformanceCard(performance.first).paddingOnly(left: 21, right: 21, top: 21),
GridView.count(
physics: const NeverScrollableScrollPhysics(),
crossAxisCount: 2,
mainAxisSpacing: 13,
crossAxisSpacing: 13,
shrinkWrap: true,
childAspectRatio: 160 / 125,
padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 14),
children: performance
.where((GetPerformanceAppraisalList el) => performance.indexOf(el) != 0)
.map(
(GetPerformanceAppraisalList item) => getPerformanceCard(item, isGrid: true),
)
.toList(),
),
],
);
}
}
return Utils.getNoDataWidget(context);
}
return const SizedBox();
},
),
);
}
Widget getPerformanceCard(GetPerformanceAppraisalList performance, {bool isGrid = false}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 2, bottom: 2),
decoration: Utils.containerRadius(MyColors.greenColor, 5),
child: "Excellent".toText10(color: Colors.white),
),
(isGrid ? 8 : 4).height,
isGrid ? "${LocaleKeys.performanceEvaluationIn.tr()} ${performance.aPPRAISALYEAR}".toText13() : "${LocaleKeys.performanceEvaluationIn.tr()} ${performance.aPPRAISALYEAR}".toText18(),
4.height,
LinearProgressIndicator(
minHeight: 4,
backgroundColor: MyColors.lightGreyDeColor,
valueColor: const AlwaysStoppedAnimation<Color>(MyColors.greenColor),
value: double.parse(performance.aPPRAISALSCORE!) / 100,
),
4.height,
isGrid ? "${performance.aPPRAISALSCORE}%".toText13(color: MyColors.greenColor) : "${performance.aPPRAISALSCORE}%".toText20(color: MyColors.greenColor),
],
).objectContainerView(radius: 10);
}
}

@ -1,8 +1,11 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart'; import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
import 'package:mohem_flutter_app/models/items_for_sale/item_review_model.dart'; import 'package:mohem_flutter_app/models/items_for_sale/item_review_model.dart';
import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/add_details_fragment.dart'; import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/add_details_fragment.dart';
@ -43,91 +46,52 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
getRequestID(); getRequestID();
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
context,
// title: LocaleKeys.mowadhafhiRequest.tr(),
title: "Items for sale",
showHomeButton: true,
),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AspectRatio( Row(
aspectRatio: 335 / 118, children: [
child: Container( showProgress(
decoration: BoxDecoration( title: LocaleKeys.selectCategory.tr(),
color: Colors.white, status: _currentIndex == 0 ? LocaleKeys.inProgress.tr() : (_currentIndex > 0 ? LocaleKeys.completed.tr() : LocaleKeys.locked.tr()),
borderRadius: BorderRadius.circular(20), color: _currentIndex == 0 ? MyColors.orange : MyColors.greenColor,
boxShadow: [ pageIndex: 0,
BoxShadow( ).expanded,
color: const Color(0xff000000).withOpacity(.05), showProgress(
blurRadius: 26, title: LocaleKeys.addDetails.tr(),
offset: const Offset(0, -3), status: _currentIndex == 1 ? LocaleKeys.inProgress.tr() : (_currentIndex > 1 ? LocaleKeys.completed.tr() : LocaleKeys.locked.tr()),
), color: _currentIndex == 1 ? MyColors.orange : (_currentIndex > 1 ? MyColors.greenColor : MyColors.lightGrayColor),
], pageIndex: 1,
).expanded,
showProgress(
title: LocaleKeys.reviewAndSell.tr(),
status: _currentIndex == 2 ? LocaleKeys.inProgress.tr() : LocaleKeys.locked.tr(),
color: _currentIndex == 2
? MyColors.orange
: _currentIndex > 3
? MyColors.greenColor
: MyColors.lightGrayColor,
isNeedBorder: false,
pageIndex: 2,
), ),
child: Row( ],
children: [ ).paddingAll(21).objectContainerView(disablePadding: true).paddingAll(21),
Expanded( PageView(
child: showProgress( physics: const NeverScrollableScrollPhysics(),
title: "Select Category", controller: _controller,
status: _currentIndex == 0 onPageChanged: (index) {
? "InProgress" setState(() {
: _currentIndex > 0 _currentIndex = index;
? "Completed" });
: "Locked", },
color: _currentIndex == 0 ? MyColors.orange : MyColors.greenColor, scrollDirection: Axis.horizontal,
pageIndex: 0, children: [
), getSaleCategoriesList.isNotEmpty ? SelectCategoryFragment(changePageViewIndex: changePageViewIndex, getSaleCategoriesList: getSaleCategoriesList) : Container(),
), getSaleCategoriesList.isNotEmpty ? AddItemDetailsFragment(changePageViewIndex: changePageViewIndex, selectedSaleCategory: getSaleCategoriesList[0]) : Container(),
Expanded( ItemReviewFragment(changePageViewIndex: changePageViewIndex),
child: showProgress( ],
title: "Add Details", ).expanded,
status: _currentIndex == 1
? "InProgress"
: _currentIndex > 1
? "Completed"
: "Locked",
color: _currentIndex == 1
? MyColors.orange
: _currentIndex > 1
? MyColors.greenColor
: MyColors.lightGrayColor,
pageIndex: 1,
),
),
showProgress(
title: "Review & Sell",
status: _currentIndex == 2 ? "InProgress" : "Locked",
color: _currentIndex == 2
? MyColors.orange
: _currentIndex > 3
? MyColors.greenColor
: MyColors.lightGrayColor,
isNeedBorder: false,
pageIndex: 2,
),
],
).paddingAll(21),
).paddingOnly(left: 21, right: 21, top: 21),
),
Expanded(
child: PageView(
physics: NeverScrollableScrollPhysics(),
controller: _controller,
onPageChanged: (index) {
setState(() {
_currentIndex = index;
});
},
scrollDirection: Axis.horizontal,
children: [
getSaleCategoriesList.isNotEmpty ? SelectCategoryFragment(changePageViewIndex: changePageViewIndex, getSaleCategoriesList: getSaleCategoriesList) : Container(),
getSaleCategoriesList.isNotEmpty ? AddItemDetailsFragment(changePageViewIndex: changePageViewIndex, selectedSaleCategory: getSaleCategoriesList[0]) : Container(),
ItemReviewFragment(changePageViewIndex: changePageViewIndex),
],
),
),
], ],
), ),
); );
@ -141,54 +105,43 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Container(
children: [ width: 26,
Container( height: 26,
width: 26, decoration: Utils.containerRadius(color!, 200),
height: 26, child: const Icon(
decoration: Utils.containerRadius(color!, 200), Icons.done,
child: const Icon( color: Colors.white,
Icons.done, size: 16,
color: Colors.white,
size: 16,
),
),
if (isNeedBorder)
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Utils.mDivider(Colors.grey),
)),
],
),
Utils.mHeight(8),
Text(
title!,
style: const TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
letterSpacing: -0.44,
), ),
), ),
Utils.mHeight(2), if (isNeedBorder)
Container( Expanded(
padding: EdgeInsets.all(5), child: Padding(
decoration: Utils.containerRadius(color.withOpacity(0.2), 4), padding: const EdgeInsets.all(8.0),
child: Text( child: Utils.mDivider(Colors.grey),
status!,
style: TextStyle(
fontSize: 8,
fontWeight: FontWeight.w600,
letterSpacing: -0.32,
color: color,
), ),
), ),
),
], ],
) ),
Utils.mHeight(8),
title!.toText11(),
Utils.mHeight(2),
Container(
padding: const EdgeInsets.only(left: 8, right: 8, top: 4, bottom: 4),
decoration: Utils.containerRadius(color.withOpacity(0.2), 4),
child: Text(
status!,
style: TextStyle(
fontSize: 8,
fontWeight: FontWeight.w600,
letterSpacing: -0.32,
color: color,
),
),
),
], ],
), ),
); );

@ -51,112 +51,116 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return Column(
child: Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, ListView(
children: [ padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21),
"Add details".toText20(isBold: true).paddingOnly(top: 24, left: 21, right: 21), children: [
Column( LocaleKeys.addDetails.tr().toText20(),
crossAxisAlignment: CrossAxisAlignment.start, 12.height,
children: [ Column(
DynamicTextFieldWidget( crossAxisAlignment: CrossAxisAlignment.start,
"Title", children: [
itemTitle.isEmpty ? "Item title" : itemTitle, DynamicTextFieldWidget(
isEnable: true, LocaleKeys.title.tr(),
suffixIconData: Icons.search, itemTitle.isEmpty ? LocaleKeys.itemTitle.tr() : itemTitle,
isPopup: false, isEnable: true,
lines: 1, suffixIconData: Icons.search,
isInputTypeNum: false, isPopup: false,
isReadOnly: false, lines: 1,
onChange: (String value) { isInputTypeNum: false,
itemTitle = value; isReadOnly: false,
}, onChange: (String value) {
).paddingOnly(), itemTitle = value;
DynamicTextFieldWidget( },
"Description", ),
itemDescription.isEmpty ? "Item description" : itemDescription, DynamicTextFieldWidget(
isEnable: true, LocaleKeys.description.tr(),
suffixIconData: Icons.search, itemDescription.isEmpty ? LocaleKeys.itemDescription.tr() : itemDescription,
isPopup: false, isEnable: true,
lines: 4, suffixIconData: Icons.search,
isInputTypeNum: false, isPopup: false,
isReadOnly: false, lines: 4,
onChange: (String value) { isInputTypeNum: false,
itemDescription = value; isReadOnly: false,
}, onChange: (String value) {
).paddingOnly(top: 12), itemDescription = value;
"Item Condition".toText14(isBold: true).paddingOnly(top: 21), },
Row( ).paddingOnly(top: 12),
children: [ LocaleKeys.itemCondition.tr().toText14().paddingOnly(top: 21),
ShowRadio(title: "New", value: "new", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() { Row(
selectedItemCondition = "new"; children: [
setState(() {}); ShowRadio(title: LocaleKeys.newString.tr(), value: "new", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() {
}), selectedItemCondition = "new";
12.width, setState(() {});
ShowRadio(title: "Used", value: "used", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() { }),
selectedItemCondition = "used"; 12.width,
ShowRadio(title: LocaleKeys.used.tr(), value: "used", groupValue: selectedItemCondition, selectedColor: MyColors.gradiantStartColor).onPress(() {
selectedItemCondition = "used";
setState(() {});
}),
],
).paddingOnly(top: 12),
PopupMenuButton(
child: DynamicTextFieldWidget(
LocaleKeys.region.tr(),
selectedRegion.regionName ?? LocaleKeys.selectRegion.tr(),
isEnable: false,
isPopup: true,
isInputTypeNum: true,
isReadOnly: false,
),
itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < getRegionsList!.length; i++) PopupMenuItem<int>(child: Text(getRegionsList[i].regionName!), value: i),
],
onSelected: (int popupIndex) {
selectedRegion = getRegionsList![popupIndex];
setState(() {}); setState(() {});
}), },
], ).paddingOnly(top: 21),
).paddingOnly(top: 12), DynamicTextFieldWidget(
PopupMenuButton( LocaleKeys.itemPrice.tr(),
child: DynamicTextFieldWidget( itemPrice == 0 ? LocaleKeys.price.tr() : itemPrice.toString(),
"Region", isEnable: true,
selectedRegion.regionName ?? "Select Region", suffixIconData: Icons.search,
isEnable: false, isPopup: false,
isPopup: true, lines: 1,
isInputTypeNum: true, isInputTypeNum: true,
isReadOnly: false, isReadOnly: false,
), onChange: (String value) {
itemBuilder: (_) => <PopupMenuItem<int>>[ itemPrice = num.parse(value);
for (int i = 0; i < getRegionsList!.length; i++) PopupMenuItem<int>(child: Text(getRegionsList[i].regionName!), value: i), },
], ).paddingOnly(top: 12),
onSelected: (int popupIndex) { LocaleKeys.itemPhotos.tr().toText14().paddingOnly(top: 21),
selectedRegion = getRegionsList![popupIndex]; attachmentView(LocaleKeys.attachments.tr()).paddingOnly(top: 12),
setState(() {}); ],
}, ).objectContainerView(title: LocaleKeys.itemInfo.tr()),
).paddingOnly(top: 21), ],
DynamicTextFieldWidget( ).expanded,
"Item Price", 1.divider,
itemPrice == 0 ? "Price" : itemPrice.toString(), Row(
isEnable: true, children: [
suffixIconData: Icons.search, DefaultButton(
isPopup: false, LocaleKeys.cancel.tr(),
lines: 1, () async {
isInputTypeNum: true, Navigator.of(context).pop();
isReadOnly: false, },
onChange: (String value) { colors: const [Color(0xffD02127), Color(0xffD02127)],
itemPrice = num.parse(value); ).expanded,
}, 8.width,
).paddingOnly(top: 12), DefaultButton(
"Item Photos".toText14(isBold: true).paddingOnly(top: 16), LocaleKeys.next.tr(),
attachmentView("Attachments").paddingOnly(top: 12), isButtonDisabled()
Row( ? null
children: [ : () async {
DefaultButton( AddItemDetailsFragment.itemReviewModel = getItemReviewObject();
LocaleKeys.cancel.tr(), widget.changePageViewIndex(2);
() async {
Navigator.of(context).pop();
}, },
colors: const [Color(0xffD02127), Color(0xffD02127)], disabledColor: MyColors.lightGrayColor,
).expanded, ).expanded
12.width, ],
DefaultButton( ).insideContainer
LocaleKeys.next.tr(), ],
isButtonDisabled()
? null
: () async {
AddItemDetailsFragment.itemReviewModel = getItemReviewObject();
widget.changePageViewIndex(2);
},
disabledColor: MyColors.lightGrayColor,
).expanded
],
).paddingOnly(top: 21),
],
).objectContainerView(title: "Item Info").paddingAll(21),
],
),
); );
} }
@ -174,82 +178,70 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
} }
Widget attachmentView(String title) { Widget attachmentView(String title) {
return Container( return Column(
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14), crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( mainAxisSize: MainAxisSize.min,
color: Colors.white, children: [
borderRadius: BorderRadius.circular(15), Row(
boxShadow: [ mainAxisSize: MainAxisSize.min,
BoxShadow( crossAxisAlignment: CrossAxisAlignment.center,
color: const Color(0xff000000).withOpacity(.05), children: [
blurRadius: 26, title.toText16().expanded,
offset: const Offset(0, -3), 6.width,
), SimpleButton(LocaleKeys.add.tr(), () async {
], ImageOptions.showImageOptions(context, (String image, File file) {
), setState(() {
child: Column( images.add(image);
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
title.toText16().expanded,
6.width,
SimpleButton(LocaleKeys.add.tr(), () async {
ImageOptions.showImageOptions(context, (String image, File file) {
setState(() {
images.add(image);
});
}); });
}, fontSize: 14), });
], }, fontSize: 14),
), ],
if (images.isNotEmpty) 12.height, ),
if (images.isNotEmpty) if (images.isNotEmpty) 12.height,
ListView.separated( if (images.isNotEmpty)
shrinkWrap: true, ListView.separated(
physics: const NeverScrollableScrollPhysics(), shrinkWrap: true,
itemBuilder: (cxt, index) { physics: const NeverScrollableScrollPhysics(),
return Container( itemBuilder: (cxt, index) {
margin: const EdgeInsets.all(10), return Container(
padding: const EdgeInsets.all(8.0), margin: const EdgeInsets.all(10),
child: Row( padding: const EdgeInsets.all(8.0),
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Row( children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Row(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.start,
const Icon(Icons.attach_file_sharp), children: <Widget>[
const SizedBox( const Icon(Icons.attach_file_sharp),
width: 8, const SizedBox(
), width: 8,
'image ${index + 1}.png'.toText16(), ),
], 'image ${index + 1}.png'.toText16(),
],
),
InkWell(
onTap: () {
setState(() {
images.remove(images[index]);
});
},
child: Icon(
Icons.delete_sharp,
color: Colors.red[300],
), ),
InkWell( )
onTap: () { ],
setState(() { ),
images.remove(images[index]); );
}); },
}, separatorBuilder: (cxt, index) => 6.height,
child: Icon( itemCount: images.length),
Icons.delete_sharp, ],
color: Colors.red[300], ).objectContainerView();
))
],
),
);
},
separatorBuilder: (cxt, index) => 6.height,
itemCount: images.length),
],
),
);
} }
void getAdDetails() async { Future<void> getAdDetails() async {
// todo need to change this method later , its not a good approach to do it like this.
String details = await Utils.getStringFromPrefs(SharedPrefsConsts.editItemForSale); String details = await Utils.getStringFromPrefs(SharedPrefsConsts.editItemForSale);
var body = json.decode(details); var body = json.decode(details);
@ -274,17 +266,15 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
AddItemDetailsFragment.itemReviewModel = itemReviewModel; AddItemDetailsFragment.itemReviewModel = itemReviewModel;
SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd; SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd;
setState(() {});
} }
void getRegions() async { void getRegions() async {
try { try {
Utils.showLoading(context); Utils.showLoading(context);
getRegionsList = await ItemsForSaleApiClient().getRegions(); getRegionsList = await ItemsForSaleApiClient().getRegions();
await getAdDetails();
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
getAdDetails();
} catch (ex) { } catch (ex) {
Utils.hideLoading(context); Utils.hideLoading(context);
Utils.handleException(ex, context, null); Utils.handleException(ex, context, null);

@ -95,34 +95,21 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
getItemsForSale(currentPageNo, currentCategoryID); getItemsForSale(currentPageNo, currentCategoryID);
}); });
}, },
child: Container( child: Column(
decoration: BoxDecoration( mainAxisAlignment: MainAxisAlignment.spaceBetween,
color: Colors.white, crossAxisAlignment: CrossAxisAlignment.start,
borderRadius: BorderRadius.circular(15), children: [
boxShadow: [ Row(
BoxShadow( mainAxisAlignment: MainAxisAlignment.spaceBetween,
color: const Color(0xff000000).withOpacity(.05), crossAxisAlignment: CrossAxisAlignment.start,
blurRadius: 26, children: [
offset: const Offset(0, -3), SvgPicture.string(getSaleCategoriesList[index].content!, fit: BoxFit.contain),
), currentCategoryID == getSaleCategoriesList[index].categoryID ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
], ],
), ).expanded,
child: Column( getSaleCategoriesList[index].title!.toText10()
mainAxisAlignment: MainAxisAlignment.spaceBetween, ],
crossAxisAlignment: CrossAxisAlignment.start, ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12).expanded.objectContainerView(disablePadding: true),
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SvgPicture.string(getSaleCategoriesList[index].content!, fit: BoxFit.contain),
currentCategoryID == getSaleCategoriesList[index].categoryID ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
],
).expanded,
getSaleCategoriesList[index].title!.toText10()
],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
),
), ),
); );
}, },
@ -133,7 +120,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
getItemsForSaleList.isNotEmpty getItemsForSaleList.isNotEmpty
? GridView( ? GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12),
padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 21), padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 12),
shrinkWrap: true, shrinkWrap: true,
primary: false, primary: false,
physics: const ScrollPhysics(), physics: const ScrollPhysics(),
@ -160,49 +147,36 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
onTap: () { onTap: () {
Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList); Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList);
}, },
child: Container( child: Column(
padding: const EdgeInsets.all(10.0), crossAxisAlignment: CrossAxisAlignment.start,
decoration: BoxDecoration( // mainAxisSize: MainAxisSize.min,
color: Colors.white, children: [
borderRadius: BorderRadius.circular(10), Hero(
boxShadow: [ tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
BoxShadow( transitionOnUserGestures: true,
color: const Color(0xff000000).withOpacity(.05), child: AspectRatio(
blurRadius: 26, aspectRatio: 148 / 127,
offset: const Offset(0, -3), child: ClipRRect(
), borderRadius: BorderRadius.circular(6),
], child: Image.memory(
), base64Decode(getItemsForSaleList.itemAttachments![0].content!),
child: Column( fit: BoxFit.cover,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Hero(
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
transitionOnUserGestures: true,
child: AspectRatio(
aspectRatio: 148 / 127,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
), ),
), ),
), ),
10.height, ),
getItemsForSaleList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1), 10.height,
getItemsForSaleList.description!.toText12(maxLine: 2, color: const Color(0xff535353)), getItemsForSaleList.title!.toText16(maxlines: 1),
16.height, getItemsForSaleList.description!.toText12(maxLine: 3, color: MyColors.grey57Color).expanded,
getItemsForSaleList.status!.toText14(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor), // 8.height,
Row( getItemsForSaleList.status!.toText14(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
mainAxisAlignment: MainAxisAlignment.spaceBetween, Row(
children: ["${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText14(isBold: true), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)], mainAxisAlignment: MainAxisAlignment.spaceBetween,
), children: ["${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText16(isBold: true), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)],
], ),
), 6.height
), ],
).paddingAll(8).expanded.objectContainerView(disablePadding: true),
); );
} }

@ -1,7 +1,9 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart'; import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
class SelectCategoryFragment extends StatelessWidget { class SelectCategoryFragment extends StatelessWidget {
@ -18,11 +20,11 @@ class SelectCategoryFragment extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
"What are you offering".toText20(isBold: true).paddingOnly(top: 24, left: 21, right: 21), LocaleKeys.whatAreYouOffering.tr().toText20().paddingOnly(top: 0, left: 21, right: 21),
getSaleCategoriesList.isNotEmpty getSaleCategoriesList.isNotEmpty
? GridView( ? GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 105 / 105, crossAxisSpacing: 12, mainAxisSpacing: 12), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 105 / 105, crossAxisSpacing: 12, mainAxisSpacing: 12),
padding: const EdgeInsets.only(top: 15, bottom: 15, left: 21, right: 21), padding: const EdgeInsets.only(top: 15, bottom: 21, left: 21, right: 21),
shrinkWrap: true, shrinkWrap: true,
primary: false, primary: false,
physics: const ScrollPhysics(), physics: const ScrollPhysics(),
@ -37,41 +39,32 @@ class SelectCategoryFragment extends StatelessWidget {
List<Widget> getItemsForSaleWidgets() { List<Widget> getItemsForSaleWidgets() {
List<Widget> itemsList = []; List<Widget> itemsList = [];
getSaleCategoriesList.forEach((element) { getSaleCategoriesList.forEach(
itemsList.add(InkWell( (element) {
onTap: () { itemsList.add(
selectedSaleCategory = element; InkWell(
changePageViewIndex(1); onTap: () {
}, selectedSaleCategory = element;
child: Container( changePageViewIndex(1);
decoration: BoxDecoration( },
color: Colors.white, child: Column(
borderRadius: BorderRadius.circular(15), mainAxisAlignment: MainAxisAlignment.spaceBetween,
boxShadow: [ crossAxisAlignment: CrossAxisAlignment.start,
BoxShadow( children: [
color: const Color(0xff000000).withOpacity(.05), Row(
blurRadius: 26, mainAxisAlignment: MainAxisAlignment.spaceBetween,
offset: const Offset(0, -3), crossAxisAlignment: CrossAxisAlignment.start,
), children: [
], SvgPicture.string(element.content!, fit: BoxFit.contain, width: 32, height: 32),
],
).expanded,
element.title!.toText12()
],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 16).expanded.objectContainerView(disablePadding: true),
), ),
child: Column( );
mainAxisAlignment: MainAxisAlignment.spaceBetween, },
crossAxisAlignment: CrossAxisAlignment.start, );
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SvgPicture.string(element.content!, fit: BoxFit.contain, width: 32, height: 32),
],
).expanded,
element.title!.toText12()
],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
),
));
});
return itemsList; return itemsList;
} }

@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/date_uitl.dart'; import 'package:mohem_flutter_app/classes/date_uitl.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
@ -11,6 +12,7 @@ import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/circular_avatar.dart'; import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class ItemForSaleDetailPage extends StatefulWidget { class ItemForSaleDetailPage extends StatefulWidget {
@ -26,113 +28,86 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getItemsForSaleList = ModalRoute.of(context)?.settings.arguments as GetItemsForSaleList; getItemsForSaleList = ModalRoute.of(context)?.settings.arguments as GetItemsForSaleList;
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true), appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
body: SingleChildScrollView( body: Column(
child: Column( children: [
children: [ ListView(
AspectRatio( padding: const EdgeInsets.all(21),
aspectRatio: 336 / 554, children: [
child: Container( Column(
decoration: BoxDecoration( crossAxisAlignment: CrossAxisAlignment.start,
color: Colors.white, mainAxisSize: MainAxisSize.min,
borderRadius: BorderRadius.circular(10), children: [
boxShadow: [ Hero(
BoxShadow( tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
color: const Color(0xff000000).withOpacity(.05), transitionOnUserGestures: true,
blurRadius: 26, child: AspectRatio(
offset: const Offset(0, -3), aspectRatio: 322 / 261,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
),
), ),
], ).paddingAll(8),
), Column(
// color: Colors.red, mainAxisSize: MainAxisSize.min,
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisSize: MainAxisSize.min, getItemsForSaleList.title!.toText20(),
children: [ getItemsForSaleList.description!.toText12(maxLine: 5, color: MyColors.grey57Color),
Container( 21.height,
decoration: BoxDecoration( getItemsForSaleList.status!.toText16(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
boxShadow: [ "${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true),
BoxShadow( 1.divider.paddingOnly(top: 16, bottom: 16),
color: const Color(0xffEBEBEB).withOpacity(1.0), Row(
blurRadius: 26, children: [
offset: const Offset(0, -3), CircularAvatar(
url: getItemsForSaleList.profilePicture,
height: 34,
width: 34,
), ),
7.width,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [getItemsForSaleList.fullName!.toText14(), ItemDetailView("Posted on", DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false))],
).expanded,
], ],
), ),
child: Hero( ],
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(), ).paddingOnly(right: 16, left: 16, top: 6, bottom: 16)
transitionOnUserGestures: true,
child: AspectRatio(
aspectRatio: 148 / 127,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.memory(
base64Decode(getItemsForSaleList.itemAttachments![0].content!),
fit: BoxFit.cover,
),
),
).paddingAll(8),
),
),
getItemsForSaleList.title!.toText20(isBold: true, color: const Color(0xff2B353E)).paddingOnly(left: 21, right: 21),
getItemsForSaleList.description!.toText12(maxLine: 5, color: const Color(0xff535353)).paddingOnly(left: 21, right: 21, bottom: 21),
getItemsForSaleList.status!.toText16(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor).paddingOnly(left: 21, right: 21),
"${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true).paddingOnly(left: 21, right: 21, bottom: 15),
const Divider().paddingOnly(left: 21, right: 21),
Row(
children: [
CircularAvatar(
height: 40,
width: 40,
).paddingOnly(left: 21, top: 21),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
getItemsForSaleList.fullName!.toText14(isBold: true).paddingOnly(left: 7, right: 7),
"Posted on: ${DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false)}".toText12().paddingOnly(left: 7, right: 7),
],
).paddingOnly(top: 18),
],
),
],
),
).paddingAll(21),
),
Container(
decoration: const BoxDecoration(
color: MyColors.white,
boxShadow: [
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 1),
],
),
child: Row(
children: [
DefaultButton("Email", () async {
Uri emailLaunchUri = Uri(
scheme: 'mailto',
path: getItemsForSaleList.emailAddress,
);
launchUrl(emailLaunchUri);
}, iconData: Icons.email_sharp, isTextExpanded: false)
.insideContainer
.expanded,
DefaultButton("Call", () async {
Uri callLaunchUri = Uri(
scheme: 'tel',
path: getItemsForSaleList.mobileNumber,
);
launchUrl(callLaunchUri);
}, iconData: Icons.call_sharp, isTextExpanded: false)
.insideContainer
.expanded,
], ],
), ).objectContainerView(disablePadding: true),
), ],
], ).expanded,
), Row(
children: [
DefaultButton("Email", () async {
Uri emailLaunchUri = Uri(
scheme: 'mailto',
path: getItemsForSaleList.emailAddress,
);
launchUrl(emailLaunchUri);
}, iconData: Icons.email_sharp, isTextExpanded: false)
.expanded,
8.width,
DefaultButton("Call", () async {
Uri callLaunchUri = Uri(
scheme: 'tel',
path: getItemsForSaleList.mobileNumber,
);
launchUrl(callLaunchUri);
}, iconData: Icons.call_sharp, isTextExpanded: false)
.expanded,
],
).insideContainer,
],
), ),
); );
} }

@ -46,7 +46,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
), ),
), ),
child: Row( child: Row(
children: [myTab(LocaleKeys.itemsForSale.tr(), 0), myTab("My posted ads", 1)], children: [myTab(LocaleKeys.itemsForSale.tr(), 0), myTab(LocaleKeys.myPostedAds.tr(), 1)],
), ),
), ),
PageView( PageView(

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
class ShowRadio extends StatelessWidget { class ShowRadio extends StatelessWidget {
String title, value, groupValue; String title, value, groupValue;
@ -39,7 +38,7 @@ class ShowRadio extends StatelessWidget {
), ),
), ),
12.width, 12.width,
title.toText12(isBold: true, maxLine: 2) title.toText12(maxLine: 2)
], ],
); );
} }

Loading…
Cancel
Save