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

Merge branch 'refs/heads/master' into master-Api2.0

Browse Source 
# Conflicts:
#	lib/classes/consts.dart
master-Api2.0
Sikander Saleem 9 months ago
parent ce81ee62c2 a33da491f9
commit 3418472c1d
4 changed files with 163 additions and 131 deletions
Show Stats Download Patch File Download Diff File

4
lib/provider/dashboard_provider_model.dart
Unescape Escape View File

@ -253,8 +253,10 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
notifyListeners(); notifyListeners();
} catch (ex) { } catch (ex) {
// Utils.hideLoading(context); // Utils.hideLoading(context);
getOffersList=[];
isOffersLoading = false;
notifyListeners(); notifyListeners();
Utils.handleException(ex, context, null); // Utils.handleException(ex, context, null);
} }
} }

188
lib/ui/landing/dashboard_screen.dart
Unescape Escape View File

@ -3,7 +3,6 @@ import 'dart:io';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_countdown_timer/flutter_countdown_timer.dart'; import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@ -421,103 +420,108 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
), ),
], ],
).paddingOnly(left: 21, right: 21, top: 7, bottom: 21), ).paddingOnly(left: 21, right: 21, top: 7, bottom: 21),
Column( Consumer<DashboardProviderModel>(builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
mainAxisSize: MainAxisSize.min, if (!model.isOffersLoading && model.getOffersList.isEmpty) {
crossAxisAlignment: CrossAxisAlignment.start, return const SizedBox();
children: [ }
Row( return Column(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.min,
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Expanded( children: [
child: Column( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min, children: [
children: [ Expanded(
LocaleKeys.offers.tr().toText12(), child: Column(
Row( crossAxisAlignment: CrossAxisAlignment.start,
children: [ mainAxisSize: MainAxisSize.min,
LocaleKeys.discounts.tr().toText24(isBold: true), children: [
6.width, LocaleKeys.offers.tr().toText12(),
Container( Row(
padding: const EdgeInsets.only(left: 8, right: 8), children: [
decoration: BoxDecoration( LocaleKeys.discounts.tr().toText24(isBold: true),
color: MyColors.yellowColor, 6.width,
borderRadius: BorderRadius.circular(10), Container(
), padding: const EdgeInsets.only(left: 8, right: 8),
child: LocaleKeys.newString.tr().toText10(isBold: true)), decoration: BoxDecoration(
], color: MyColors.yellowColor,
), borderRadius: BorderRadius.circular(10),
], ),
child: LocaleKeys.newString.tr().toText10(isBold: true)),
],
),
],
),
), ),
), LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() { Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
Navigator.pushNamed(context, AppRoutes.offersAndDiscounts); })
}) ],
], ).paddingOnly(left: 21, right: 21),
).paddingOnly(left: 21, right: 21), Consumer<DashboardProviderModel>(
Consumer<DashboardProviderModel>( builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
builder: (BuildContext context, DashboardProviderModel model, Widget? child) { return SizedBox(
return SizedBox( height: 103 + 33,
height: 103 + 33, 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),
padding: const EdgeInsets.only(left: 21, right: 21, top: 13), scrollDirection: Axis.horizontal,
scrollDirection: Axis.horizontal, itemBuilder: (BuildContext cxt, int index) {
itemBuilder: (BuildContext cxt, int index) { return model.isOffersLoading
return model.isOffersLoading ? const OffersShimmerWidget()
? const OffersShimmerWidget() : InkWell(
: InkWell( onTap: () {
onTap: () { navigateToDetails(data.getOffersList[index]);
navigateToDetails(data.getOffersList[index]); },
}, child: SizedBox(
child: SizedBox( width: 73,
width: 73, child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ Container(
Container( width: 73,
width: 73, height: 73,
height: 73, decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: const BorderRadius.all(
borderRadius: const BorderRadius.all( Radius.circular(100),
Radius.circular(100), ),
), border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
),
child: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(50),
), ),
child: Hero( child: ClipRRect(
tag: "ItemImage" + data.getOffersList[index].offersDiscountId.toString()!, borderRadius: const BorderRadius.all(
transitionOnUserGestures: true, Radius.circular(50),
child: Image.network( ),
data.getOffersList[index].logo ?? "", child: Hero(
fit: BoxFit.contain, tag: "ItemImage" + data.getOffersList[index].offersDiscountId.toString()!,
transitionOnUserGestures: true,
child: Image.network(
data.getOffersList[index].logo ?? "",
fit: BoxFit.contain,
),
), ),
), ),
), ),
), 4.height,
4.height, Expanded(
Expanded( child: AppState().isArabic(context)
child: AppState().isArabic(context) ? data.getOffersList[index].titleAr!.toText12(isCenter: true, maxLine: 1)
? data.getOffersList[index].titleAr!.toText12(isCenter: true, maxLine: 1) : data.getOffersList[index].titleEn!.toText12(isCenter: true, maxLine: 1),
: data.getOffersList[index].titleEn!.toText12(isCenter: true, maxLine: 1), ),
), ],
], ),
), ),
), );
); },
}, separatorBuilder: (BuildContext cxt, int index) => 8.width,
separatorBuilder: (BuildContext cxt, int index) => 8.width, itemCount: 9),
itemCount: 9), );
); },
}, ),
), ],
], );
), }),
Container( Container(
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.only(top: 31), padding: const EdgeInsets.only(top: 31),

94
lib/ui/work_list/itg_fragments/request_detail_fragment.dart
Unescape Escape View File

@ -69,46 +69,70 @@ class RequestDetailFragment extends StatelessWidget {
); );
} }
Widget detailView(List<Fields> fields) { Widget detailView(List<Fields> fieldsF) {
List<Fields> fields = List.from(fieldsF);
bool isOdd = false; bool isOdd = false;
if (fields.length % 2 != 0) { if (fields.length % 2 != 0) {
isOdd = true; isOdd = true;
fields.add(new Fields()); fields.add(new Fields());
} }
return GridView.builder(
itemCount: fields.length, int descriptionFormatIndex = fields.indexWhere((element) => element.title == "Description Format" || element.title == "Description Format"); // todo add arabic in future
shrinkWrap: true, Widget? descriptionFormatView;
physics: const NeverScrollableScrollPhysics(), if (descriptionFormatIndex >= 0) {
itemBuilder: (context, index) { Fields descriptionFormat = fields[descriptionFormatIndex];
if (fields[index].value == null) { fields.removeAt(descriptionFormatIndex);
return ItemDetailViewGridItem(
index, descriptionFormatView = ItemDetailViewGridItem(
fields[index].title, 2,
fields[index].multipleValue?.join(", ") ?? "", descriptionFormat.title,
isNeedToShowEmptyDivider: (fields.length == index + 1) descriptionFormat.value == null ? (descriptionFormat.multipleValue?.join(", ") ?? "") : descriptionFormat.value ?? "",
? isOdd type: descriptionFormat.type,
? true maxLine: 0,
: false );
: false, }
type: fields[index].type,
); return Column(
} mainAxisSize: MainAxisSize.min,
return ItemDetailViewGridItem( children: [
index, GridView.builder(
fields[index].title, itemCount: fields.length,
fields[index].value ?? "", shrinkWrap: true,
isNeedToShowEmptyDivider: (fields.length == index + 1) physics: const NeverScrollableScrollPhysics(),
? isOdd itemBuilder: (context, index) {
? true if (fields[index].value == null) {
: false return ItemDetailViewGridItem(
: false, index,
type: fields[index].type, fields[index].title,
); fields[index].multipleValue?.join(", ") ?? "",
}, isNeedToShowEmptyDivider: (fields.length == index + 1)
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( ? isOdd
crossAxisCount: 2, ? true
childAspectRatio: (itemWidth / itemHeight), : false
), : false,
type: fields[index].type,
);
}
return ItemDetailViewGridItem(
index,
fields[index].title,
fields[index].value ?? "",
isNeedToShowEmptyDivider: (fields.length == index + 1)
? isOdd
? true
: false
: false,
type: fields[index].type,
);
},
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: (itemWidth / itemHeight),
),
),
if (descriptionFormatView != null) descriptionFormatView,
],
).objectContainerView(); ).objectContainerView();
return ListView.separated( return ListView.separated(
shrinkWrap: true, shrinkWrap: true,

8
lib/widgets/item_detail_view_widget.dart
Unescape Escape View File

@ -52,8 +52,9 @@ class ItemDetailViewGridItem extends StatelessWidget {
final String? value; final String? value;
final String? type; final String? type;
final bool isNeedToShowEmptyDivider; final bool isNeedToShowEmptyDivider;
final int maxLine;
ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.type = ""}) : super(key: key); ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.type = "", this.maxLine = 6}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -76,10 +77,11 @@ class ItemDetailViewGridItem extends StatelessWidget {
), ),
), ),
child: isNeedToShowEmptyDivider child: isNeedToShowEmptyDivider
? Container() ? SizedBox()
: Column( : Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [ children: [
title != null ? Flexible(child: "$title:".toText12Auto(isBold: true, color: const Color(0xff2BB8A6))) : Container(), title != null ? Flexible(child: "$title:".toText12Auto(isBold: true, color: const Color(0xff2BB8A6))) : Container(),
4.width, 4.width,
@ -87,7 +89,7 @@ class ItemDetailViewGridItem extends StatelessWidget {
? type!.toLowerCase() == "table" ? type!.toLowerCase() == "table"
? getStringFromJSON(value!) ? getStringFromJSON(value!)
// : Flexible(child: (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: 5)) // : Flexible(child: (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: 5))
: (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: 6) : (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: maxLine)
: Container(), : Container(),
], ],
), ),

Write Preview
Loading…
Cancel
Save