merge-requests/1/merge
haroon amjad 3 years ago
commit 2b2b696a08

@ -416,6 +416,9 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
} else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") { } else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
percentage = 0; percentage = 0;
} }
if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
int val = details.date!.day;
getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
@ -443,7 +446,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
child: ListView.builder( child: ListView.builder(
controller: controller, controller: controller,
itemCount: 1, itemCount: 1,
itemBuilder: (_, i) => Container( itemBuilder: (_, i) =>
Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(25.0), top: Radius.circular(25.0),
@ -618,7 +622,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
}, },
); );
}, },
); ):null;
}
} }
List<Meeting> _getDataSource() { List<Meeting> _getDataSource() {

@ -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(() {});
}, },

@ -424,6 +424,9 @@ class _ViewAttendanceState extends State<ViewAttendance> {
} else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") { } else if (value!.indexOf('%') == 0 || value!.indexOf('%') == "") {
percentage = 0; percentage = 0;
} }
if (details.date!.month == formattedDate.month && details.date!.year == formattedDate.year) {
int val = details.date!.day;
getDayHoursTypeDetailsList?[val - 1].aTTENDEDFLAG == 'Y' ?
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
@ -451,7 +454,8 @@ class _ViewAttendanceState extends State<ViewAttendance> {
child: ListView.builder( child: ListView.builder(
controller: controller, controller: controller,
itemCount: 1, itemCount: 1,
itemBuilder: (_, i) => Container( itemBuilder: (_, i) =>
Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(25.0), top: Radius.circular(25.0),
@ -626,7 +630,8 @@ class _ViewAttendanceState extends State<ViewAttendance> {
}, },
); );
}, },
); ):null;
}
} }
List<Meeting> _getDataSource() { List<Meeting> _getDataSource() {
List<Meeting> meetings = <Meeting>[]; List<Meeting> meetings = <Meeting>[];

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

Loading…
Cancel
Save