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

icon direction bug fixes

Browse Source
merge-requests/7/head
Sikander Saleem 3 years ago
parent ef96f9703f
commit e8c8c225c7
3 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,8 +18,6 @@ import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart'; import 'package:mohem_flutter_app/ui/landing/widget/app_drawer.dart';
import 'package:mohem_flutter_app/ui/landing/widget/menus_widget.dart'; import 'package:mohem_flutter_app/ui/landing/widget/menus_widget.dart';
import 'package:mohem_flutter_app/ui/landing/widget/services_widget.dart'; import 'package:mohem_flutter_app/ui/landing/widget/services_widget.dart';
import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
import 'package:mohem_flutter_app/widgets/mark_attendance_widget.dart';
import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart'; import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart';
import 'package:mohem_flutter_app/widgets/shimmer/offers_shimmer_widget.dart'; import 'package:mohem_flutter_app/widgets/shimmer/offers_shimmer_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -218,7 +216,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/play.svg" : "assets/images/stop.svg"), child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/play.svg" : "assets/images/stop.svg"),
).onPress(() { ).onPress(() {
showMyBottomSheet(context, child: MarkAttendanceWidget(model)); if (AppState().isArabic(context)) {
context.setLocale(const Locale("en", "US"));
} else {
context.setLocale(const Locale("ar", "SA"));
}
//showMyBottomSheet(context, child: MarkAttendanceWidget(model));
}), }),
], ],
), ),

77
lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
Unescape Escape View File

@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:mohem_flutter_app/api/mowadhafhi/mowadhafhi_api_client.dart'; import 'package:mohem_flutter_app/api/mowadhafhi/mowadhafhi_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.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/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
@ -53,44 +54,44 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
body: Column( body: Column(
children: [ children: [
(getTicketsByEmployeeList == null (getTicketsByEmployeeList == null
? const SizedBox() ? const SizedBox()
: (getTicketsByEmployeeList!.isEmpty) : (getTicketsByEmployeeList!.isEmpty)
? Utils.getNoDataWidget(context) ? Utils.getNoDataWidget(context)
: ListView.separated( : ListView.separated(
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.all(21), padding: const EdgeInsets.all(21),
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pushNamed(context, AppRoutes.mowadhafhiDetails, arguments: getTicketsByEmployeeList![index].ticketId); Navigator.pushNamed(context, AppRoutes.mowadhafhiDetails, arguments: getTicketsByEmployeeList![index].ticketId);
}, },
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
getTicketsByEmployeeList![index].ticketTypeName!.toText14(color: MyColors.darkTextColor).expanded, getTicketsByEmployeeList![index].ticketTypeName!.toText14(color: MyColors.darkTextColor).expanded,
getTicketsByEmployeeList![index].created!.split(" ")[0].toText12(color: MyColors.grey70Color), getTicketsByEmployeeList![index].created!.split(" ")[0].toText12(color: MyColors.grey70Color),
], ],
), ),
getTicketsByEmployeeList![index].description!.toText12(color: MyColors.grey57Color), getTicketsByEmployeeList![index].description!.toText12(color: MyColors.grey57Color),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
getTicketsByEmployeeList![index].ticketStatusInternalName!.toText14(color: MyColors.textMixColor), getTicketsByEmployeeList![index].ticketStatusInternalName!.toText14(color: MyColors.textMixColor),
SvgPicture.asset( RotatedBox(
"assets/images/arrow_next.svg", quarterTurns: AppState().isArabic(context) ? 2 : 4,
color: MyColors.darkIconColor, child: SvgPicture.asset("assets/images/arrow_next.svg", color: MyColors.darkIconColor),
) ),
], ],
), ),
], ],
).objectContainerView(), ).objectContainerView(),
); );
}, },
separatorBuilder: (BuildContext context, int index) => 12.height, separatorBuilder: (BuildContext context, int index) => 12.height,
itemCount: getTicketsByEmployeeList!.length)) itemCount: getTicketsByEmployeeList!.length))
.expanded, .expanded,
DefaultButton(LocaleKeys.createRequest.tr(), () async { DefaultButton(LocaleKeys.createRequest.tr(), () async {
await Navigator.pushNamed(context, AppRoutes.mowadhafhiHRRequest); await Navigator.pushNamed(context, AppRoutes.mowadhafhiHRRequest);

17
lib/ui/work_list/work_list_screen.dart
Unescape Escape View File

@ -292,10 +292,10 @@ class _WorkListScreenState extends State<WorkListScreen> {
Row( Row(
children: [ children: [
DateUtil.formatDateToDate(DateUtil.convertStringToDate(requestDetails.modifiedDate!), false).toText10(color: MyColors.lightTextColor).expanded, DateUtil.formatDateToDate(DateUtil.convertStringToDate(requestDetails.modifiedDate!), false).toText10(color: MyColors.lightTextColor).expanded,
SvgPicture.asset( RotatedBox(
"assets/images/arrow_next.svg", quarterTurns: AppState().isArabic(context) ? 2:4,
color: MyColors.darkIconColor, child: SvgPicture.asset("assets/images/arrow_next.svg", color:MyColors.darkIconColor)
) ),
], ],
), ),
], ],
@ -374,10 +374,11 @@ class _WorkListScreenState extends State<WorkListScreen> {
Row( Row(
children: [ children: [
DateUtil.formatDateToDate(DateUtil.convertSimpleStringDateToDate(workData.bEGINDATE!), false).toText10(color: MyColors.lightTextColor).expanded, DateUtil.formatDateToDate(DateUtil.convertSimpleStringDateToDate(workData.bEGINDATE!), false).toText10(color: MyColors.lightTextColor).expanded,
SvgPicture.asset( RotatedBox(
"assets/images/arrow_next.svg", quarterTurns: AppState().isArabic(context) ? 2:4,
color: MyColors.darkIconColor, child: SvgPicture.asset("assets/images/arrow_next.svg", color:MyColors.darkIconColor)
) ),
], ],
), ),
], ],

Write Preview
Loading…
Cancel
Save