Merge branch 'development_sikander' into 'master'

Development sikander

See merge request Cloud_Solution/mohemm-flutter-app!7
merge-requests/8/merge
Sikander Saleem 3 years ago
commit c603d18a1f

@ -218,6 +218,12 @@ 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(() {
// if (AppState().isArabic(context)) {
// context.setLocale(const Locale("en", "US"));
// } else {
// context.setLocale(const Locale("ar", "SA"));
// }
showMyBottomSheet(context, child: MarkAttendanceWidget(model)); showMyBottomSheet(context, child: MarkAttendanceWidget(model));
}), }),
], ],

@ -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';
@ -79,10 +80,10 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
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),
) ),
], ],
), ),
], ],

@ -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)
) ),
], ],
), ),
], ],

Loading…
Cancel
Save