Merge branch 'master' into development_mirza

# Conflicts:
#	lib/ui/my_team/view_attendance.dart
merge-requests/12/head
Sikander Saleem 3 years ago
commit 23bb226ae4

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.742" height="32.742" viewBox="0 0 32.742 32.742">
<path id="Path_4587" data-name="Path 4587" d="M16.371,0A16.371,16.371,0,1,0,32.742,16.371,16.39,16.39,0,0,0,16.371,0ZM8.186,12.278a2.046,2.046,0,1,1,2.046,2.046A2.05,2.05,0,0,1,8.186,12.278Zm15.42,12.63a1.028,1.028,0,0,1-1.449,0,8.379,8.379,0,0,0-11.576,0,1.023,1.023,0,0,1-1.447-1.447,10.232,10.232,0,0,1,14.472,0A1.024,1.024,0,0,1,23.605,24.909ZM22.51,14.325a2.046,2.046,0,1,1,2.046-2.046A2.05,2.05,0,0,1,22.51,14.325Z" fill="#d56e6d"/>
</svg>

After

Width:  |  Height:  |  Size: 548 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.742" height="32.742" viewBox="0 0 32.742 32.742">
<path id="Path_4589" data-name="Path 4589" d="M16.371,0A16.371,16.371,0,1,0,32.742,16.371,16.39,16.39,0,0,0,16.371,0ZM7.162,12.278a3.07,3.07,0,1,1,3.07,3.07A3.073,3.073,0,0,1,7.162,12.278ZM23.6,23.6a10.229,10.229,0,0,1-14.47,0,1.023,1.023,0,1,1,1.447-1.447,8.379,8.379,0,0,0,11.576,0A1.023,1.023,0,1,1,23.6,23.6ZM22.51,15.348a3.07,3.07,0,1,1,3.07-3.07A3.073,3.073,0,0,1,22.51,15.348Z" fill="#8ca742"/>
</svg>

After

Width:  |  Height:  |  Size: 511 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.742" height="32.742" viewBox="0 0 32.742 32.742">
<path id="Path_4588" data-name="Path 4588" d="M16.371,0A16.371,16.371,0,1,0,32.742,16.371,16.39,16.39,0,0,0,16.371,0ZM8.186,12.278a2.046,2.046,0,1,1,2.046,2.046A2.05,2.05,0,0,1,8.186,12.278Zm13.3,12.278H11.255a1.023,1.023,0,0,1,0-2.046H21.487a1.023,1.023,0,0,1,0,2.046ZM22.51,14.325a2.046,2.046,0,1,1,2.046-2.046A2.05,2.05,0,0,1,22.51,14.325Z" fill="#ca8432"/>
</svg>

After

Width:  |  Height:  |  Size: 470 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.742" height="32.742" viewBox="0 0 32.742 32.742">
<path id="Path_4586" data-name="Path 4586" d="M16.371,0A16.371,16.371,0,1,0,32.742,16.371,16.39,16.39,0,0,0,16.371,0ZM8.186,15.348a3.065,3.065,0,0,1,1.471-2.609L7.543,11.028A1.023,1.023,0,1,1,8.828,9.436l4.355,3.524a3.069,3.069,0,1,1-5,2.388ZM22.228,26.286a1.024,1.024,0,0,1-1.447.035,6.4,6.4,0,0,0-8.822,0,1.023,1.023,0,1,1-1.41-1.484,8.437,8.437,0,0,1,11.642,0A1.023,1.023,0,0,1,22.228,26.286ZM25.2,11.028l-2.116,1.711a3.059,3.059,0,1,1-3.526.221l4.357-3.524A1.023,1.023,0,1,1,25.2,11.028Z" fill="#ca3332"/>
</svg>

After

Width:  |  Height:  |  Size: 619 B

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.742" height="32.742" viewBox="0 0 32.742 32.742">
<path id="Path_4590" data-name="Path 4590" d="M16.371,0A16.371,16.371,0,1,0,32.742,16.371,16.39,16.39,0,0,0,16.371,0ZM22.51,10.232a2.046,2.046,0,1,1-2.046,2.046A2.05,2.05,0,0,1,22.51,10.232Zm-12.278,0a2.046,2.046,0,1,1-2.046,2.046A2.05,2.05,0,0,1,10.232,10.232Zm6.139,18.417a12.305,12.305,0,0,1-11.81-8.93,1.024,1.024,0,0,1,.984-1.3H27.2a1.02,1.02,0,0,1,.814.405,1.031,1.031,0,0,1,.17.9A12.305,12.305,0,0,1,16.371,28.649Z" fill="#20a16a"/>
</svg>

After

Width:  |  Height:  |  Size: 549 B

@ -403,6 +403,10 @@
"itemCreation": "أنشاء عنصر", "itemCreation": "أنشاء عنصر",
"stamp": "ختم", "stamp": "ختم",
"addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله", "addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله",
"feedbackUserExperience": "هذا للحصول على تعليقات حول تجربة المستخدم",
"rateUI": ".1 كيف تريد تقييم التطبيق",
"submitSurvey":"ارسال الاستبيان",
"typeHere": "اكتب هنا",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -403,6 +403,10 @@
"itemCreation": "Item Creation", "itemCreation": "Item Creation",
"stamp": "Stamp", "stamp": "Stamp",
"addFavoriteList": "Do you want to add {name} in your favorite list", "addFavoriteList": "Do you want to add {name} in your favorite list",
"feedbackUserExperience": "This is to get the feedback about the user experience",
"rateUI": "1. How would you rate this UI?",
"submitSurvey":"Submit Survey",
"typeHere": "Type here",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -4,6 +4,7 @@ import 'package:mohem_flutter_app/ui/attendance/monthly_attendance_screen.dart';
import 'package:mohem_flutter_app/ui/attendance/vacation_rule_screen.dart'; import 'package:mohem_flutter_app/ui/attendance/vacation_rule_screen.dart';
import 'package:mohem_flutter_app/ui/bottom_sheets/attendence_details_bottom_sheet.dart'; import 'package:mohem_flutter_app/ui/bottom_sheets/attendence_details_bottom_sheet.dart';
import 'package:mohem_flutter_app/ui/landing/dashboard_screen.dart'; import 'package:mohem_flutter_app/ui/landing/dashboard_screen.dart';
import 'package:mohem_flutter_app/ui/landing/survey_screen.dart';
import 'package:mohem_flutter_app/ui/landing/today_attendance_screen.dart'; import 'package:mohem_flutter_app/ui/landing/today_attendance_screen.dart';
import 'package:mohem_flutter_app/ui/leave_balance/add_leave_balance_screen.dart'; import 'package:mohem_flutter_app/ui/leave_balance/add_leave_balance_screen.dart';
import 'package:mohem_flutter_app/ui/leave_balance/leave_balance_screen.dart'; import 'package:mohem_flutter_app/ui/leave_balance/leave_balance_screen.dart';
@ -76,6 +77,7 @@ class AppRoutes {
static const String subMenuScreen = "/submenuScreen"; static const String subMenuScreen = "/submenuScreen";
static const String addEitScreen = "/addeitScreen"; static const String addEitScreen = "/addeitScreen";
static const String initialRoute = login; static const String initialRoute = login;
static const String survey = "/survey";
//Work List //Work List
static const String workList = "/workList"; static const String workList = "/workList";
@ -165,6 +167,7 @@ class AppRoutes {
verifyLogin: (context) => VerifyLoginScreen(), verifyLogin: (context) => VerifyLoginScreen(),
verifyLastLogin: (context) => VerifyLastLoginScreen(), verifyLastLogin: (context) => VerifyLastLoginScreen(),
dashboard: (context) => DashboardScreen(), dashboard: (context) => DashboardScreen(),
survey: (context) => SurveyScreen(),
subMenuScreen: (context) => SubMenuScreen(), subMenuScreen: (context) => SubMenuScreen(),
newPassword: (context) => NewPasswordScreen(), newPassword: (context) => NewPasswordScreen(),

@ -78,6 +78,11 @@ extension EmailValidator on String {
style: TextStyle(fontSize: 18, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -1.08), style: TextStyle(fontSize: 18, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -1.08),
); );
Widget toText19({Color? color, bool isBold = false}) => Text(
this,
style: TextStyle(fontSize: 19, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -1.14),
);
Widget toText20({Color? color, bool isBold = false}) => Text( Widget toText20({Color? color, bool isBold = false}) => Text(
this, this,
style: TextStyle(fontSize: 20, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4), style: TextStyle(fontSize: 20, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4),

@ -55,7 +55,7 @@ extension WidgetExtensions on Widget {
offset: const Offset(0, -3), offset: const Offset(0, -3),
), ),
], ],
), ),alignment: Alignment.center,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -69,7 +69,7 @@ extension WidgetExtensions on Widget {
); );
} }
Widget objectContainerBorderView({String title = "", String note = "", bool disablePadding = false, double radius = 15, Color? color, Color borderColor = MyColors.lightGreyEFColor}) { Widget objectContainerBorderView({String title = "", String note = "", bool disablePadding = false, double radius = 15, Color? color, Color borderColor = MyColors.lightGreyEFColor,bool disableWidth = false,bool isAlignment = false }) {
return Container( return Container(
padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14), padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -77,9 +77,10 @@ extension WidgetExtensions on Widget {
color: color, color: color,
border: Border.all( border: Border.all(
color: borderColor, color: borderColor,
width: 1, width: disableWidth ? 2 : 1,
), ),
), ),
alignment: isAlignment? Alignment.center : null,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

@ -418,6 +418,10 @@ class CodegenLoader extends AssetLoader{
"itemCreation": "أنشاء عنصر", "itemCreation": "أنشاء عنصر",
"stamp": "ختم", "stamp": "ختم",
"addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله", "addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله",
"feedbackUserExperience": "هذا للحصول على تعليقات حول تجربة المستخدم",
"rateUI": ".1 كيف تريد تقييم التطبيق",
"Submit Survey": "ارسال الاستبيان",
"typeHere": "اكتب هنا",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",
@ -856,6 +860,10 @@ static const Map<String,dynamic> en_US = {
"itemCreation": "Item Creation", "itemCreation": "Item Creation",
"stamp": "Stamp", "stamp": "Stamp",
"addFavoriteList": "Do you want to add {name} in your favorite list", "addFavoriteList": "Do you want to add {name} in your favorite list",
"feedbackUserExperience": "This is to get the feedback about the user experience",
"rateUI": "1. How would you rate this UI?",
"Submit Survey": "Submit Survey",
"typeHere": "Type here",
"profile": { "profile": {
"reset_password": { "reset_password": {
"label": "Reset Password", "label": "Reset Password",

@ -404,6 +404,10 @@ abstract class LocaleKeys {
static const itemCreation = 'itemCreation'; static const itemCreation = 'itemCreation';
static const stamp = 'stamp'; static const stamp = 'stamp';
static const addFavoriteList = 'addFavoriteList'; static const addFavoriteList = 'addFavoriteList';
static const feedbackUserExperience = 'feedbackUserExperience';
static const rateUI = 'rateUI';
static const submitSurvey = 'submitSurvey';
static const typeHere = 'typeHere';
static const profile_reset_password_label = 'profile.reset_password.label'; static const profile_reset_password_label = 'profile.reset_password.label';
static const profile_reset_password_username = 'profile.reset_password.username'; static const profile_reset_password_username = 'profile.reset_password.username';
static const profile_reset_password_password = 'profile.reset_password.password'; static const profile_reset_password_password = 'profile.reset_password.password';

@ -416,209 +416,214 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
} else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") { } else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
percentage = 0; percentage = 0;
} }
showModalBottomSheet( if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
context: context, int val = details.date!.day;
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)), getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
isScrollControlled: true, showModalBottomSheet(
backgroundColor: MyColors.backgroundBlackColor, context: context,
builder: (_) { shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
return DraggableScrollableSheet( isScrollControlled: true,
maxChildSize: 0.9, backgroundColor: MyColors.backgroundBlackColor,
expand: false, builder: (_) {
builder: (_, controller) { return DraggableScrollableSheet(
dynamic dmyString = getScheduleShiftsDetailsList!.sCHEDULEDATE; maxChildSize: 0.9,
DateTime dateTime1 = DateFormat("MM/dd/yyyy hh:mm:ss a").parse(dmyString); expand: false,
return Column( builder: (_, controller) {
children: [ dynamic dmyString = getScheduleShiftsDetailsList!.sCHEDULEDATE;
Container( DateTime dateTime1 = DateFormat("MM/dd/yyyy hh:mm:ss a").parse(dmyString);
width: 49, return Column(
height: 7, children: [
margin: const EdgeInsets.symmetric(vertical: 10), Container(
decoration: BoxDecoration( width: 49,
borderRadius: BorderRadius.circular(25), height: 7,
color: MyColors.darkGreyColor, margin: const EdgeInsets.symmetric(vertical: 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: MyColors.darkGreyColor,
),
), ),
), Expanded(
Expanded( child: ListView.builder(
child: ListView.builder( controller: controller,
controller: controller, itemCount: 1,
itemCount: 1, itemBuilder: (_, i) =>
itemBuilder: (_, i) => Container( Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(25.0), top: Radius.circular(25.0),
), ),
color: MyColors.backgroundBlackColor, color: MyColors.backgroundBlackColor,
), ),
child: Column( child: Column(
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [
"${DateFormat("MMMM-dd-yyyy").format(dateTime1).replaceAll('-', " ")}".toText24(isBold: true, color: Colors.white),
LocaleKeys.attendanceDetails.tr().toText16(color: MyColors.greyACColor),
12.height,
CircularStepProgressBar(
totalSteps: 16 * 4,
currentStep: percentage,
width: 224,
height: 236,
selectedColor: MyColors.gradiantEndColor,
unselectedColor: MyColors.grey70Color,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [ children: [
"${getScheduleShiftsDetailsList!.pERCENTAGE}".toText44(color: Colors.white, isBold: true), "${DateFormat("MMMM-dd-yyyy").format(dateTime1).replaceAll('-', " ")}".toText24(isBold: true, color: Colors.white),
LocaleKeys.completed.tr().toText11(color: MyColors.greyACColor), LocaleKeys.attendanceDetails.tr().toText16(color: MyColors.greyACColor),
28.height, 12.height,
LocaleKeys.shiftTime.tr().toText11(color: MyColors.greyACColor), CircularStepProgressBar(
"${getScheduleShiftsDetailsList!.sHTNAME}".toText22(color: Colors.white, isBold: true), totalSteps: 16 * 4,
currentStep: percentage,
width: 224,
height: 236,
selectedColor: MyColors.gradiantEndColor,
unselectedColor: MyColors.grey70Color,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
"${getScheduleShiftsDetailsList!.pERCENTAGE}".toText44(color: Colors.white, isBold: true),
LocaleKeys.completed.tr().toText11(color: MyColors.greyACColor),
28.height,
LocaleKeys.shiftTime.tr().toText11(color: MyColors.greyACColor),
"${getScheduleShiftsDetailsList!.sHTNAME}".toText22(color: Colors.white, isBold: true),
],
).center,
).center,
], ],
).center, ).paddingOnly(left: 21, right: 21, top: 27, bottom: 37),
).center, Stack(
],
).paddingOnly(left: 21, right: 21, top: 27, bottom: 37),
Stack(
children: [
Container(
width: double.infinity,
decoration: const BoxDecoration(borderRadius: BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)), color: Colors.white),
padding: const EdgeInsets.only(left: 31, right: 31, top: 30, bottom: 29),
child: Column(
children: [ children: [
Row( Container(
children: [ width: double.infinity,
Column( decoration: const BoxDecoration(borderRadius: BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)), color: Colors.white),
crossAxisAlignment: CrossAxisAlignment.start, padding: const EdgeInsets.only(left: 31, right: 31, top: 30, bottom: 29),
children: [ child: Column(
LocaleKeys.actualCheckIn.tr().toText11( children: [
color: MyColors.grey67Color, Row(
), children: [
"${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}" != "" Column(
? "${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}".toText22(color: Colors.black, isBold: true) crossAxisAlignment: CrossAxisAlignment.start,
: "__".toText22(color: Colors.black, isBold: true), children: [
], LocaleKeys.actualCheckIn.tr().toText11(
).expanded, color: MyColors.grey67Color,
Column( ),
crossAxisAlignment: CrossAxisAlignment.start, "${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}" != ""
children: [ ? "${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}".toText22(color: Colors.black, isBold: true)
LocaleKeys.actualCheckOut.tr().toText11( : "__".toText22(color: Colors.black, isBold: true),
color: MyColors.grey67Color, ],
), ).expanded,
"${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}" != "" Column(
? "${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}".toText22(color: Colors.black, isBold: true) crossAxisAlignment: CrossAxisAlignment.start,
: "__".toText22(color: Colors.black, isBold: true), children: [
], LocaleKeys.actualCheckOut.tr().toText11(
).expanded, color: MyColors.grey67Color,
], ),
), "${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}" != ""
25.height, ? "${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}".toText22(color: Colors.black, isBold: true)
const Divider( : "__".toText22(color: Colors.black, isBold: true),
height: 1, ],
thickness: 1, ).expanded,
color: MyColors.lightGreyEFColor, ],
), ),
25.height, 25.height,
Row( const Divider(
children: [ height: 1,
Column( thickness: 1,
crossAxisAlignment: CrossAxisAlignment.start, color: MyColors.lightGreyEFColor,
children: [ ),
LocaleKeys.approvedCheckIn.tr().toText11( 25.height,
color: MyColors.grey67Color, Row(
), children: [
"${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}" != "" Column(
? "${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}".toText22(color: MyColors.greenColor, isBold: true) crossAxisAlignment: CrossAxisAlignment.start,
: "__".toText22(color: MyColors.greenColor, isBold: true), children: [
], LocaleKeys.approvedCheckIn.tr().toText11(
).expanded, color: MyColors.grey67Color,
Column( ),
crossAxisAlignment: CrossAxisAlignment.start, "${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}" != ""
children: [ ? "${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}".toText22(color: MyColors.greenColor, isBold: true)
LocaleKeys.approvedCheckOut.tr().toText11( : "__".toText22(color: MyColors.greenColor, isBold: true),
color: MyColors.grey67Color, ],
), ).expanded,
"${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}" != "" Column(
? "${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}".toText22(color: MyColors.greenColor, isBold: true) crossAxisAlignment: CrossAxisAlignment.start,
: "__".toText22(color: MyColors.greenColor, isBold: true), children: [
], LocaleKeys.approvedCheckOut.tr().toText11(
).expanded, color: MyColors.grey67Color,
], ),
), "${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}" != ""
25.height, ? "${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}".toText22(color: MyColors.greenColor, isBold: true)
const Divider( : "__".toText22(color: MyColors.greenColor, isBold: true),
height: 1, ],
thickness: 1, ).expanded,
color: MyColors.lightGreyEFColor, ],
), ),
25.height, 25.height,
Row( const Divider(
children: [ height: 1,
Column( thickness: 1,
crossAxisAlignment: CrossAxisAlignment.start, color: MyColors.lightGreyEFColor,
children: [ ),
LocaleKeys.lateIn.tr().toText11( 25.height,
color: MyColors.grey67Color, Row(
), children: [
"${getDayHoursTypeDetailsList[index].lATEINHRS}".toText22(color: MyColors.redColor, isBold: true), Column(
], crossAxisAlignment: CrossAxisAlignment.start,
).expanded, children: [
Column( LocaleKeys.lateIn.tr().toText11(
crossAxisAlignment: CrossAxisAlignment.start, color: MyColors.grey67Color,
children: [ ),
LocaleKeys.excess.tr().toText11( "${getDayHoursTypeDetailsList[index].lATEINHRS}".toText22(color: MyColors.redColor, isBold: true),
color: MyColors.grey67Color, ],
), ).expanded,
"${getDayHoursTypeDetailsList[index].eXCESSHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true), Column(
], crossAxisAlignment: CrossAxisAlignment.start,
).expanded, children: [
], LocaleKeys.excess.tr().toText11(
), color: MyColors.grey67Color,
25.height, ),
const Divider( "${getDayHoursTypeDetailsList[index].eXCESSHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true),
height: 1, ],
thickness: 1, ).expanded,
color: MyColors.lightGreyEFColor, ],
), ),
25.height, 25.height,
Row( const Divider(
children: [ height: 1,
Column( thickness: 1,
crossAxisAlignment: CrossAxisAlignment.start, color: MyColors.lightGreyEFColor,
children: [ ),
LocaleKeys.shortage.tr().toText11( 25.height,
color: MyColors.grey67Color, Row(
), children: [
"${getDayHoursTypeDetailsList[index].sHORTAGEHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true), Column(
], crossAxisAlignment: CrossAxisAlignment.start,
).expanded, children: [
Column( LocaleKeys.shortage.tr().toText11(
crossAxisAlignment: CrossAxisAlignment.start, color: MyColors.grey67Color,
children: [ ),
LocaleKeys.earlyOut.tr().toText11( "${getDayHoursTypeDetailsList[index].sHORTAGEHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true),
color: MyColors.grey67Color, ],
), ).expanded,
"${getDayHoursTypeDetailsList[index].eARLYOUTHRS}".toText22(color: Colors.black, isBold: true), Column(
], crossAxisAlignment: CrossAxisAlignment.start,
).expanded, children: [
], LocaleKeys.earlyOut.tr().toText11(
color: MyColors.grey67Color,
),
"${getDayHoursTypeDetailsList[index].eARLYOUTHRS}".toText22(color: Colors.black, isBold: true),
],
).expanded,
],
),
],
),
), ),
], ],
), ),
), ],
], ),
), ),
],
),
), ),
), ),
), ],
], );
); },
}, );
); },
}, ):null;
); }
} }
List<Meeting> _getDataSource() { List<Meeting> _getDataSource() {

@ -0,0 +1,111 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/classes/colors.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/widgets/button/default_button.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
class SurveyScreen extends StatefulWidget {
const SurveyScreen({Key? key}) : super(key: key);
@override
_SurveyScreenState createState() => _SurveyScreenState();
}
class _SurveyScreenState extends State<SurveyScreen> {
String reviewText = "";
int _selectedIndex = -1;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: MyColors.backgroundColor,
body: Column(
children: [
Expanded(
child: ListView(
scrollDirection: Axis.vertical,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
124.height,
LocaleKeys.feedbackUserExperience.tr().toText19(),
27.height,
LocaleKeys.rateUI.tr().toText16(),
22.height,
Row(
children: [
RatingBar.builder(
initialRating: 3,
minRating: 1,
direction: Axis.horizontal,
allowHalfRating: true,
itemCount: 5,
itemPadding: EdgeInsets.symmetric(horizontal: 12),
itemBuilder: (context, _) => Icon(
Icons.star,
color: Colors.amber,
),
onRatingUpdate: (rating) {},
)
],
).paddingOnly(left: 22, right: 22, top: 12, bottom: 12).objectContainerView(disablePadding: true),
39.height,
LocaleKeys.rateUI.tr().toText16(),
10.height,
GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 5, crossAxisSpacing: 7, mainAxisSpacing: 7),
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.only(top: 0),
shrinkWrap: true,
children: [
optionUI("poor.svg", 0),
optionUI("bad.svg", 1),
optionUI("normal.svg", 2),
optionUI("good.svg", 3),
optionUI("xcellent.svg", 4),
],
),
27.height,
DynamicTextFieldWidget(
LocaleKeys.description.tr(),
LocaleKeys.typeHere.tr(),
lines: 3,
),
150.height
],
).paddingOnly(left: 21, right: 21),
],
)),
DefaultButton(LocaleKeys.submitSurvey.tr(), () async {}).insideContainer,
],
));
}
Widget optionUI(String icon, int index) {
return (_selectedIndex == index
? SvgPicture.asset(
'assets/images/' + icon,
height: 32,
width: 32,
).objectContainerBorderView(disablePadding: true, borderColor: MyColors.textMixColor, disableWidth: true, isAlignment: true)
: SvgPicture.asset(
'assets/images/' + icon,
height: 32,
width: 32,
).objectContainerView(
disablePadding: true,
))
.onPress(() {
_selectedIndex = index;
setState(() {});
});
}
}

@ -87,6 +87,7 @@ class _AppDrawerState extends State<AppDrawer> {
menuItem("assets/images/drawer/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())), menuItem("assets/images/drawer/employee_id.svg", LocaleKeys.employeeDigitalID.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: EmployeeDigitialIdDialog())),
menuItem("assets/images/drawer/view_business_card.svg", LocaleKeys.viewBusinessCard.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: BusinessCardDialog())), menuItem("assets/images/drawer/view_business_card.svg", LocaleKeys.viewBusinessCard.tr(), "", closeDrawer: false, onPress: () => showMDialog(context, child: BusinessCardDialog())),
menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: performLogout), menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: performLogout),
// menuItem("assets/images/drawer/logout.svg", LocaleKeys.logout.tr(), "", color: MyColors.redA3Color, closeDrawer: false, onPress: () {Navigator.pushNamed(context, AppRoutes.survey,);
], ],
).expanded, ).expanded,
const Divider( const Divider(

@ -91,7 +91,7 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
LocaleKeys.confirmPassword.tr(), LocaleKeys.confirmPassword.tr(),
"**********", "**********",
confirmPassword, confirmPassword,
isObscureText: true, isTextIsPassword: true,
onChange: (value) { onChange: (value) {
setState(() {}); setState(() {});
}, },

@ -179,7 +179,7 @@ class _LoginScreenState extends State<LoginScreen> {
16.height, 16.height,
InputWidget(LocaleKeys.username.tr(), "123456", username), InputWidget(LocaleKeys.username.tr(), "123456", username),
12.height, 12.height,
InputWidget(LocaleKeys.password.tr(), "xxxxxx", password, isObscureText: true), InputWidget(LocaleKeys.password.tr(), "xxxxxx", password, isTextIsPassword: true),
9.height, 9.height,
Align( Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,

@ -85,7 +85,7 @@ class _NewPasswordScreenState extends State<NewPasswordScreen> {
LocaleKeys.confirmPassword.tr(), LocaleKeys.confirmPassword.tr(),
"**********", "**********",
confirmPassword, confirmPassword,
isObscureText: true, isTextIsPassword: true,
onChange: (value) { onChange: (value) {
setState(() {}); setState(() {});
}, },

@ -1,5 +1,6 @@
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/monthly_attendance_api_client.dart';
import 'package:mohem_flutter_app/api/my_team/my_team_api_client.dart'; import 'package:mohem_flutter_app/api/my_team/my_team_api_client.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';
@ -9,10 +10,13 @@ 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/dashboard/get_attendance_tracking_list_model.dart'; import 'package:mohem_flutter_app/models/dashboard/get_attendance_tracking_list_model.dart';
import 'package:mohem_flutter_app/models/get_day_hours_type_details_list_model.dart'; import 'package:mohem_flutter_app/models/get_day_hours_type_details_list_model.dart';
import 'package:mohem_flutter_app/models/get_schedule_shifts_details_list_model.dart';
import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart'; import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart'; import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:month_picker_dialog_2/month_picker_dialog_2.dart'; import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
import 'package:month_picker_dialog/month_picker_dialog.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:syncfusion_flutter_calendar/calendar.dart'; import 'package:syncfusion_flutter_calendar/calendar.dart';
@ -44,6 +48,7 @@ class _ViewAttendanceState extends State<ViewAttendance> {
GetTimeCardSummaryList? getTimeCardSummaryList; GetTimeCardSummaryList? getTimeCardSummaryList;
GetAttendanceTracking? attendanceTracking; GetAttendanceTracking? attendanceTracking;
GetEmployeeSubordinatesList? getEmployeeSubordinates; GetEmployeeSubordinatesList? getEmployeeSubordinates;
GetScheduleShiftsDetailsList? getScheduleShiftsDetailsList;
@override @override
void initState() { void initState() {
@ -68,6 +73,18 @@ class _ViewAttendanceState extends State<ViewAttendance> {
} }
} }
Future getScheduleShiftsDetails(index, pRTPID) async {
try {
Utils.showLoading(context);
getScheduleShiftsDetailsList = await MonthlyAttendanceApiClient().getScheduleShiftsDetails(pRTPID);
Utils.hideLoading(context);
//setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
}
final CalendarController _calendarController = CalendarController(); final CalendarController _calendarController = CalendarController();
final List<Color> _colorList = [Color(0xff2AB2AB), Color(0xff202529)]; final List<Color> _colorList = [Color(0xff2AB2AB), Color(0xff202529)];
@ -269,6 +286,7 @@ class _ViewAttendanceState extends State<ViewAttendance> {
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
dataSource: MeetingDataSource(_getDataSource()), dataSource: MeetingDataSource(_getDataSource()),
onTap: calendarTapped,
monthViewSettings: const MonthViewSettings( monthViewSettings: const MonthViewSettings(
dayFormat: 'EEE', dayFormat: 'EEE',
showTrailingAndLeadingDates: false, showTrailingAndLeadingDates: false,
@ -388,6 +406,234 @@ class _ViewAttendanceState extends State<ViewAttendance> {
); );
} }
void calendarTapped(CalendarTapDetails details) async {
dynamic index = details.date?.day;
if (index != null) {
index = index - 1;
}
pRTPID = getDayHoursTypeDetailsList[index].rTPID;
await getScheduleShiftsDetails(index, pRTPID);
dynamic value = getScheduleShiftsDetailsList!.pERCENTAGE;
dynamic percentage;
if (value!.indexOf('%') == 3) {
percentage = int.parse(value!.substring(0, 3));
} else if (value!.indexOf('%') == 2) {
percentage = int.parse(value!.substring(0, 2));
} else if (value!.indexOf('%') == 1 && value!.indexOf('%') != 0 && value!.indexOf('%') != "") {
percentage = int.parse(value!.substring(0, 1));
} else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
percentage = 0;
}
if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
int val = details.date!.day;
getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
showModalBottomSheet(
context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
isScrollControlled: true,
backgroundColor: MyColors.backgroundBlackColor,
builder: (_) {
return DraggableScrollableSheet(
maxChildSize: 0.9,
expand: false,
builder: (_, controller) {
dynamic dmyString = getScheduleShiftsDetailsList!.sCHEDULEDATE;
DateTime dateTime1 = DateFormat("MM/dd/yyyy hh:mm:ss a").parse(dmyString);
return Column(
children: [
Container(
width: 49,
height: 7,
margin: const EdgeInsets.symmetric(vertical: 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: MyColors.darkGreyColor,
),
),
Expanded(
child: ListView.builder(
controller: controller,
itemCount: 1,
itemBuilder: (_, i) =>
Container(
decoration: const BoxDecoration(
borderRadius: BorderRadius.vertical(
top: Radius.circular(25.0),
),
color: MyColors.backgroundBlackColor,
),
child: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"${DateFormat("MMMM-dd-yyyy").format(dateTime1).replaceAll('-', " ")}".toText24(isBold: true, color: Colors.white),
LocaleKeys.attendanceDetails.tr().toText16(color: MyColors.greyACColor),
12.height,
CircularStepProgressBar(
totalSteps: 16 * 4,
currentStep: percentage,
width: 224,
height: 236,
selectedColor: MyColors.gradiantEndColor,
unselectedColor: MyColors.grey70Color,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
"${getScheduleShiftsDetailsList!.pERCENTAGE}".toText44(color: Colors.white, isBold: true),
LocaleKeys.completed.tr().toText11(color: MyColors.greyACColor),
28.height,
LocaleKeys.shiftTime.tr().toText11(color: MyColors.greyACColor),
"${getScheduleShiftsDetailsList!.sHTNAME}".toText22(color: Colors.white, isBold: true),
],
).center,
).center,
],
).paddingOnly(left: 21, right: 21, top: 27, bottom: 37),
Stack(
children: [
Container(
width: double.infinity,
decoration: const BoxDecoration(borderRadius: BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)), color: Colors.white),
padding: const EdgeInsets.only(left: 31, right: 31, top: 30, bottom: 29),
child: Column(
children: [
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.actualCheckIn.tr().toText11(
color: MyColors.grey67Color,
),
"${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}" != ""
? "${getScheduleShiftsDetailsList!.sHTACTUALSTARTTIME}".toText22(color: Colors.black, isBold: true)
: "__".toText22(color: Colors.black, isBold: true),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.actualCheckOut.tr().toText11(
color: MyColors.grey67Color,
),
"${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}" != ""
? "${getScheduleShiftsDetailsList!.sHTACTUALENDTIME}".toText22(color: Colors.black, isBold: true)
: "__".toText22(color: Colors.black, isBold: true),
],
).expanded,
],
),
25.height,
const Divider(
height: 1,
thickness: 1,
color: MyColors.lightGreyEFColor,
),
25.height,
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.approvedCheckIn.tr().toText11(
color: MyColors.grey67Color,
),
"${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}" != ""
? "${getScheduleShiftsDetailsList!.aPPROVEDSTARTTIME}".toText22(color: MyColors.greenColor, isBold: true)
: "__".toText22(color: MyColors.greenColor, isBold: true),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.approvedCheckOut.tr().toText11(
color: MyColors.grey67Color,
),
"${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}" != ""
? "${getScheduleShiftsDetailsList!.aPPROVEDENDTIME}".toText22(color: MyColors.greenColor, isBold: true)
: "__".toText22(color: MyColors.greenColor, isBold: true),
],
).expanded,
],
),
25.height,
const Divider(
height: 1,
thickness: 1,
color: MyColors.lightGreyEFColor,
),
25.height,
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.lateIn.tr().toText11(
color: MyColors.grey67Color,
),
"${getDayHoursTypeDetailsList[index].lATEINHRS}".toText22(color: MyColors.redColor, isBold: true),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.excess.tr().toText11(
color: MyColors.grey67Color,
),
"${getDayHoursTypeDetailsList[index].eXCESSHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true),
],
).expanded,
],
),
25.height,
const Divider(
height: 1,
thickness: 1,
color: MyColors.lightGreyEFColor,
),
25.height,
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.shortage.tr().toText11(
color: MyColors.grey67Color,
),
"${getDayHoursTypeDetailsList[index].sHORTAGEHRS}".toText22(color: MyColors.backgroundBlackColor, isBold: true),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocaleKeys.earlyOut.tr().toText11(
color: MyColors.grey67Color,
),
"${getDayHoursTypeDetailsList[index].eARLYOUTHRS}".toText22(color: Colors.black, isBold: true),
],
).expanded,
],
),
],
),
),
],
),
],
),
),
),
),
],
);
},
);
},
):null;
}
}
List<Meeting> _getDataSource() { List<Meeting> _getDataSource() {
List<Meeting> meetings = <Meeting>[]; List<Meeting> meetings = <Meeting>[];
return meetings; return meetings;

@ -1,7 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
class InputWidget extends StatelessWidget { class InputWidget extends StatefulWidget {
final String labelText; final String labelText;
final String hintText; final String hintText;
final TextEditingController controller; final TextEditingController controller;
@ -10,7 +12,7 @@ class InputWidget extends StatelessWidget {
final bool hasSelection; final bool hasSelection;
final int? lines; final int? lines;
final bool isInputTypeNum; final bool isInputTypeNum;
final bool isObscureText; final bool isTextIsPassword;
final bool isBackgroundEnable; final bool isBackgroundEnable;
final bool isEnableBorder; final bool isEnableBorder;
final double verticalPadding; final double verticalPadding;
@ -21,7 +23,8 @@ class InputWidget extends StatelessWidget {
this.labelText, this.labelText,
this.hintText, this.hintText,
this.controller, { this.controller, {
this.isObscureText = false, Key? key,
this.isTextIsPassword = false,
this.suffixTap, this.suffixTap,
this.isEnable = true, this.isEnable = true,
this.hasSelection = false, this.hasSelection = false,
@ -32,23 +35,43 @@ class InputWidget extends StatelessWidget {
this.isBackgroundEnable = false, this.isBackgroundEnable = false,
this.verticalPadding = 15, this.verticalPadding = 15,
this.horizontalPadding = 16, this.horizontalPadding = 16,
}); }) : super(key: key);
@override
_InputWidgetState createState() {
return _InputWidgetState();
}
}
class _InputWidgetState extends State<InputWidget> {
late bool isObscureText;
@override
void initState() {
super.initState();
isObscureText = widget.isTextIsPassword;
}
@override
void dispose() {
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: EdgeInsets.only(left: horizontalPadding, right: horizontalPadding, bottom: verticalPadding, top: verticalPadding), padding: EdgeInsets.only(left: widget.horizontalPadding, right: widget.horizontalPadding, bottom: widget.verticalPadding, top: widget.verticalPadding),
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
color: isBackgroundEnable ? Color(0xffF7F7F7) : Colors.white, color: widget.isBackgroundEnable ? Color(0xffF7F7F7) : Colors.white,
border: Border.all( border: Border.all(
color: isEnableBorder ? Color(0xffefefef) : Colors.transparent, color: widget.isEnableBorder ? Color(0xffefefef) : Colors.transparent,
width: 1, width: 1,
), ),
), ),
child: InkWell( child: InkWell(
onTap: hasSelection ? () {} : null, onTap: widget.hasSelection ? () {} : null,
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -57,7 +80,7 @@ class InputWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
labelText, widget.labelText,
style: const TextStyle( style: const TextStyle(
fontSize: 11, fontSize: 11,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -66,14 +89,14 @@ class InputWidget extends StatelessWidget {
), ),
), ),
TextField( TextField(
enabled: isEnable, enabled: widget.isEnable,
scrollPadding: EdgeInsets.zero, scrollPadding: EdgeInsets.zero,
keyboardType: isInputTypeNum ? TextInputType.number : TextInputType.text, keyboardType: widget.isInputTypeNum ? TextInputType.number : TextInputType.text,
controller: controller, controller: widget.controller,
maxLines: lines, maxLines: widget.lines,
obscuringCharacter: "*", obscuringCharacter: "*",
obscureText: isObscureText, obscureText: isObscureText,
onChanged: onChange, onChanged: widget.onChange,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
height: 21 / 14, height: 21 / 14,
@ -83,7 +106,7 @@ class InputWidget extends StatelessWidget {
), ),
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
hintText: hintText, hintText: widget.hintText,
hintStyle: const TextStyle( hintStyle: const TextStyle(
fontSize: 14, fontSize: 14,
height: 21 / 14, height: 21 / 14,
@ -92,7 +115,7 @@ class InputWidget extends StatelessWidget {
letterSpacing: -0.56, letterSpacing: -0.56,
), ),
suffixIconConstraints: const BoxConstraints(minWidth: 50), suffixIconConstraints: const BoxConstraints(minWidth: 50),
suffixIcon: suffixTap == null ? null : IconButton(icon: const Icon(Icons.mic, color: MyColors.darkTextColor), onPressed: suffixTap), suffixIcon: widget.suffixTap == null ? null : IconButton(icon: const Icon(Icons.mic, color: MyColors.darkTextColor), onPressed: widget.suffixTap),
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
border: InputBorder.none, border: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
@ -102,7 +125,15 @@ class InputWidget extends StatelessWidget {
], ],
), ),
), ),
if (hasSelection) Icon(Icons.keyboard_arrow_down_outlined), if (widget.isTextIsPassword) ...[
16.width,
Icon(isObscureText ? Icons.visibility_rounded : Icons.visibility_off_rounded).onPress(() {
setState(() {
isObscureText = !isObscureText;
});
})
],
if (widget.hasSelection) Icon(Icons.keyboard_arrow_down_outlined),
], ],
), ),
), ),

@ -73,6 +73,7 @@ dependencies:
qr_flutter: ^4.0.0 qr_flutter: ^4.0.0
url_launcher: ^6.0.15 url_launcher: ^6.0.15
share: 2.0.4 share: 2.0.4
flutter_rating_bar: ^4.0.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

Loading…
Cancel
Save