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

Merge branch 'development_sikander' into 'master'

Browse Source 
improvements.

See merge request mirza.shafique/mohem_flutter_app!53
faiz_marathon_signalR_critical
Sikander Saleem 2 years ago
parent 6d4aa8051d 11bd7a7085
commit 5339fe11cb
2 changed files with 79 additions and 115 deletions
Show Stats Download Patch File Download Diff File

64
lib/ui/screens/announcements/announcement_details.dart
Unescape Escape View File

@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.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/extensions/widget_extensions.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/widgets/app_bar_widget.dart';
@ -37,47 +38,30 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
context,
title: LocaleKeys.announcements.tr(),
),
body: SingleChildScrollView(
child: Container(
width: double.infinity,
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(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: double.infinity,
height: 150.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(getAnnouncementDetailsObj?.bannerImage)),
fit: BoxFit.cover,
body: getAnnouncementDetailsObj == null
? const SizedBox()
: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: double.infinity,
height: 150.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(getAnnouncementDetailsObj?.bannerImage)),
fit: BoxFit.cover,
),
),
),
),
),
Container(
margin: const EdgeInsets.only(top: 12.0),
child: Html(
data: getAnnouncementDetailsObj?.bodyEN,
),
),
],
),
),
),
Html(
data: getAnnouncementDetailsObj?.bodyEN,
).paddingOnly(top: 12),
],
).objectContainerView().paddingAll(21),
),
);
}

130
lib/ui/screens/announcements/announcements.dart
Unescape Escape View File

@ -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/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/get_announcements.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@ -44,18 +45,15 @@ class _AnnouncementsState extends State<Announcements> {
context,
title: LocaleKeys.announcements.tr(),
),
body: getAnnouncementsObject.isNotEmpty
? Container(
margin: const EdgeInsets.only(top: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
12.height,
Container(
margin: const EdgeInsets.fromLTRB(12.0, 0.0, 12.0, 0.0),
child: DynamicTextFieldWidget(
"Search",
body: jsonResponse.isEmpty
? const SizedBox()
: getAnnouncementsObject.isNotEmpty
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
DynamicTextFieldWidget(
LocaleKeys.search.tr(),
LocaleKeys.searchAnnouncements.tr(),
isEnable: true,
suffixIconData: Icons.search,
@ -66,72 +64,52 @@ class _AnnouncementsState extends State<Announcements> {
onChange: (String value) {
_runFilter(value);
},
),
),
12.height,
Expanded(
child: ListView.separated(
physics: const BouncingScrollPhysics(),
shrinkWrap: true,
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
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(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 80.0,
height: 80.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(_foundAnnouncements[index].bannerImage)),
fit: BoxFit.cover,
),
),
),
12.width,
SizedBox(
height: 80.0,
width: 200.0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppState().isArabic(context) ? _foundAnnouncements[index].titleAR!.toText13() : getAnnouncementsObject[index].titleEN!.toText13(),
8.height,
_foundAnnouncements[index].created!.toText10(color: MyColors.grey98Color)
],
),
).paddingOnly(left: 21, right: 21),
ListView.separated(
physics: const BouncingScrollPhysics(),
shrinkWrap: true,
padding: EdgeInsets.all(21),
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
openAnnouncementsDetails(int.parse(_foundAnnouncements[index].rowID!));
},
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 80.0,
child: AspectRatio(
aspectRatio: 1 / 1,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(_foundAnnouncements[index].bannerImage)),
fit: BoxFit.cover,
),
],
),
),
),
);
},
separatorBuilder: (BuildContext context, int index) => 1.height,
itemCount: _foundAnnouncements.length ?? 0))
],
),
)
: Utils.getNoDataWidget(context),
12.width,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
(AppState().isArabic(context) ? _foundAnnouncements[index].titleAR! : getAnnouncementsObject[index].titleEN!).toText13(),
8.height,
_foundAnnouncements[index].created!.toText10(color: MyColors.grey98Color)
],
).expanded,
],
).objectContainerView(),
);
},
separatorBuilder: (BuildContext context, int index) => 12.height,
itemCount: _foundAnnouncements.length,
).expanded
],
)
: Utils.getNoDataWidget(context),
);
}
@ -151,6 +129,8 @@ class _AnnouncementsState extends State<Announcements> {
try {
Utils.showLoading(context);
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']);
for (int i = 0; i < jsonDecodedData.length; i++) {
getAnnouncementsObject.add(GetAnnouncementsObject.fromJson(jsonDecodedData[i]));

Write Preview
Loading…
Cancel
Save