Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

item for sale improvement.

Browse Source
merge-requests/1/merge
Sikander Saleem 2 years ago
parent 07fe434473
commit f647b32c65
3 changed files with 119 additions and 170 deletions
Show Stats Download Patch File Download Diff File

4
lib/extensions/widget_extensions.dart
Unescape Escape View File

@ -42,9 +42,9 @@ extension WidgetExtensions on Widget {
child: this, child: this,
); );
Widget objectContainerView({String title = "", String note = ""}) { Widget objectContainerView({String title = "", String note = "", bool disablePadding = false}) {
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(15),

46
lib/ui/screens/items_for_sale/fragments/items_for_sale.dart
Unescape Escape View File

@ -95,18 +95,6 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
getItemsForSale(currentPageNo, currentCategoryID); getItemsForSale(currentPageNo, currentCategoryID);
}); });
}, },
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(15),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -121,8 +109,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
).expanded, ).expanded,
getSaleCategoriesList[index].title!.toText10() getSaleCategoriesList[index].title!.toText10()
], ],
).paddingOnly(left: 10, right: 10, bottom: 10, top: 12), ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12).expanded.objectContainerView(disablePadding: true),
),
), ),
); );
}, },
@ -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,22 +147,9 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
onTap: () { onTap: () {
Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList); Navigator.pushNamed(context, AppRoutes.itemsForSaleDetail, arguments: getItemsForSaleList);
}, },
child: Container(
padding: const EdgeInsets.all(10.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ children: [
Hero( Hero(
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(), tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
@ -192,17 +166,17 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
), ),
), ),
10.height, 10.height,
getItemsForSaleList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1), getItemsForSaleList.title!.toText16(maxlines: 1),
getItemsForSaleList.description!.toText12(maxLine: 2, color: const Color(0xff535353)), getItemsForSaleList.description!.toText12(maxLine: 3, color: MyColors.grey57Color).expanded,
16.height, // 8.height,
getItemsForSaleList.status!.toText14(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor), getItemsForSaleList.status!.toText14(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: ["${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText14(isBold: true), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)], 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),
),
); );
} }

95
lib/ui/screens/items_for_sale/item_for_sale_detail.dart
Unescape Escape View File

@ -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,46 +28,24 @@ 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: [
AspectRatio( ListView(
aspectRatio: 336 / 554, padding: const EdgeInsets.all(21),
child: Container( children: [
decoration: BoxDecoration( Column(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
// color: Colors.red,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Container( Hero(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: const Color(0xffEBEBEB).withOpacity(1.0),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Hero(
tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(), tag: "ItemImage" + getItemsForSaleList.itemSaleID.toString(),
transitionOnUserGestures: true, transitionOnUserGestures: true,
child: AspectRatio( child: AspectRatio(
aspectRatio: 148 / 127, aspectRatio: 322 / 261,
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
child: Image.memory( child: Image.memory(
@ -73,42 +53,40 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
).paddingAll(8),
),
), ),
getItemsForSaleList.title!.toText20(isBold: true, color: const Color(0xff2B353E)).paddingOnly(left: 21, right: 21), ).paddingAll(8),
getItemsForSaleList.description!.toText12(maxLine: 5, color: const Color(0xff535353)).paddingOnly(left: 21, right: 21, bottom: 21), Column(
getItemsForSaleList.status!.toText16(isBold: true, color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor).paddingOnly(left: 21, right: 21), mainAxisSize: MainAxisSize.min,
"${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true).paddingOnly(left: 21, right: 21, bottom: 15), crossAxisAlignment: CrossAxisAlignment.start,
const Divider().paddingOnly(left: 21, right: 21), children: [
getItemsForSaleList.title!.toText20(),
getItemsForSaleList.description!.toText12(maxLine: 5, color: MyColors.grey57Color),
21.height,
getItemsForSaleList.status!.toText16(color: getItemsForSaleList.status == 'Approved' ? MyColors.greenColor : MyColors.yellowColor),
"${getItemsForSaleList.quotePrice} ${getItemsForSaleList.currencyCode!}".toText20(isBold: true),
1.divider.paddingOnly(top: 16, bottom: 16),
Row( Row(
children: [ children: [
CircularAvatar( CircularAvatar(
height: 40, url: getItemsForSaleList.profilePicture,
width: 40, height: 34,
).paddingOnly(left: 21, top: 21), width: 34,
),
7.width,
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [getItemsForSaleList.fullName!.toText14(), ItemDetailView("Posted on", DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false))],
getItemsForSaleList.fullName!.toText14(isBold: true).paddingOnly(left: 7, right: 7), ).expanded,
"Posted on: ${DateUtil.formatDateToDate(DateTime.parse(getItemsForSaleList.created!), false)}".toText12().paddingOnly(left: 7, right: 7),
],
).paddingOnly(top: 18),
], ],
), ),
], ],
), ).paddingOnly(right: 16, left: 16, top: 6, bottom: 16)
).paddingAll(21),
),
Container(
decoration: const BoxDecoration(
color: MyColors.white,
boxShadow: [
BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 1),
], ],
), ).objectContainerView(disablePadding: true),
child: Row( ],
).expanded,
Row(
children: [ children: [
DefaultButton("Email", () async { DefaultButton("Email", () async {
Uri emailLaunchUri = Uri( Uri emailLaunchUri = Uri(
@ -117,8 +95,8 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
); );
launchUrl(emailLaunchUri); launchUrl(emailLaunchUri);
}, iconData: Icons.email_sharp, isTextExpanded: false) }, iconData: Icons.email_sharp, isTextExpanded: false)
.insideContainer
.expanded, .expanded,
8.width,
DefaultButton("Call", () async { DefaultButton("Call", () async {
Uri callLaunchUri = Uri( Uri callLaunchUri = Uri(
scheme: 'tel', scheme: 'tel',
@ -126,14 +104,11 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
); );
launchUrl(callLaunchUri); launchUrl(callLaunchUri);
}, iconData: Icons.call_sharp, isTextExpanded: false) }, iconData: Icons.call_sharp, isTextExpanded: false)
.insideContainer
.expanded, .expanded,
], ],
), ).insideContainer,
),
], ],
), ),
),
); );
} }
} }

Write Preview
Loading…
Cancel
Save