Merge branch 'development_sikander' into 'master'

improvements.

See merge request mirza.shafique/mohem_flutter_app!53
merge-requests/1/merge
Sikander Saleem 4 years ago
commit 5339fe11cb

@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html/flutter_html.dart';
import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart'; import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.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';
import 'package:mohem_flutter_app/models/get_announcement_details.dart'; import 'package:mohem_flutter_app/models/get_announcement_details.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -37,22 +38,9 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
context, context,
title: LocaleKeys.announcements.tr(), title: LocaleKeys.announcements.tr(),
), ),
body: SingleChildScrollView( body: getAnnouncementDetailsObj == null
child: Container( ? const SizedBox()
width: double.infinity, : SingleChildScrollView(
padding: const EdgeInsets.all(10.0),
margin: const EdgeInsets.all(12.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,
@ -68,15 +56,11 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
), ),
), ),
), ),
Container( Html(
margin: const EdgeInsets.only(top: 12.0),
child: Html(
data: getAnnouncementDetailsObj?.bodyEN, data: getAnnouncementDetailsObj?.bodyEN,
), ).paddingOnly(top: 12),
),
], ],
), ).objectContainerView().paddingAll(21),
),
), ),
); );
} }

@ -9,6 +9,7 @@ import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.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/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/get_announcements.dart'; import 'package:mohem_flutter_app/models/get_announcements.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -44,18 +45,15 @@ class _AnnouncementsState extends State<Announcements> {
context, context,
title: LocaleKeys.announcements.tr(), title: LocaleKeys.announcements.tr(),
), ),
body: getAnnouncementsObject.isNotEmpty body: jsonResponse.isEmpty
? Container( ? const SizedBox()
margin: const EdgeInsets.only(top: 10.0), : getAnnouncementsObject.isNotEmpty
child: Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
12.height, DynamicTextFieldWidget(
Container( LocaleKeys.search.tr(),
margin: const EdgeInsets.fromLTRB(12.0, 0.0, 12.0, 0.0),
child: DynamicTextFieldWidget(
"Search",
LocaleKeys.searchAnnouncements.tr(), LocaleKeys.searchAnnouncements.tr(),
isEnable: true, isEnable: true,
suffixIconData: Icons.search, suffixIconData: Icons.search,
@ -66,40 +64,24 @@ class _AnnouncementsState extends State<Announcements> {
onChange: (String value) { onChange: (String value) {
_runFilter(value); _runFilter(value);
}, },
), ).paddingOnly(left: 21, right: 21),
), ListView.separated(
12.height,
Expanded(
child: ListView.separated(
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.all(21),
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
onTap: () { onTap: () {
openAnnouncementsDetails(int.parse(_foundAnnouncements[index].rowID!)); openAnnouncementsDetails(int.parse(_foundAnnouncements[index].rowID!));
}, },
child: Container(
width: double.infinity,
padding: const EdgeInsets.all(10.0),
margin: const EdgeInsets.only(left: 12, right: 12, top: 10),
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: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
width: 80.0, width: 80.0,
height: 80.0, child: AspectRatio(
aspectRatio: 1 / 1,
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
child: Image.memory( child: Image.memory(
@ -108,28 +90,24 @@ class _AnnouncementsState extends State<Announcements> {
), ),
), ),
), ),
),
12.width, 12.width,
SizedBox( Column(
height: 80.0,
width: 200.0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppState().isArabic(context) ? _foundAnnouncements[index].titleAR!.toText13() : getAnnouncementsObject[index].titleEN!.toText13(), (AppState().isArabic(context) ? _foundAnnouncements[index].titleAR! : getAnnouncementsObject[index].titleEN!).toText13(),
8.height, 8.height,
_foundAnnouncements[index].created!.toText10(color: MyColors.grey98Color) _foundAnnouncements[index].created!.toText10(color: MyColors.grey98Color)
], ],
), ).expanded,
),
], ],
), ).objectContainerView(),
),
); );
}, },
separatorBuilder: (BuildContext context, int index) => 1.height, separatorBuilder: (BuildContext context, int index) => 12.height,
itemCount: _foundAnnouncements.length ?? 0)) itemCount: _foundAnnouncements.length,
).expanded
], ],
),
) )
: Utils.getNoDataWidget(context), : Utils.getNoDataWidget(context),
); );
@ -151,6 +129,8 @@ class _AnnouncementsState extends State<Announcements> {
try { try {
Utils.showLoading(context); Utils.showLoading(context);
jsonResponse = await PendingTransactionsApiClient().getAnnouncements(itgAwarenessID, currentPageNo, itgRowID); jsonResponse = await PendingTransactionsApiClient().getAnnouncements(itgAwarenessID, currentPageNo, itgRowID);
// todo '@haroon' move below post processing code to above method and get exact model which you need,
var jsonDecodedData = jsonDecode(jsonDecode(jsonResponse)['result']['data']); var jsonDecodedData = jsonDecode(jsonDecode(jsonResponse)['result']['data']);
for (int i = 0; i < jsonDecodedData.length; i++) { for (int i = 0; i < jsonDecodedData.length; i++) {
getAnnouncementsObject.add(GetAnnouncementsObject.fromJson(jsonDecodedData[i])); getAnnouncementsObject.add(GetAnnouncementsObject.fromJson(jsonDecodedData[i]));

Loading…
Cancel
Save