Haroon6138
/
RSGDoctorApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'done_button_keyboard' into 'development'

Browse Source 
add done button in all pages user keyboard and hide the keyboard when the user click on background

See merge request Cloud_Solution/doctor_app_flutter!306
ipd-changes-for-vida-plus
Mohammad Aljammal 6 years ago
parent ad1178c1b8 60e416e632
commit fb721d534f
10 changed files with 2359 additions and 2307 deletions
Show Stats Download Patch File Download Diff File

2
ios/Podfile.lock
Unescape Escape View File

@ -292,4 +292,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.0.rc.1
COCOAPODS: 1.10.1

17
lib/screens/patients/patient_search_screen.dart
Unescape Escape View File

@ -46,6 +46,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
bool isFormSubmitted = false;
FocusNode _nodeText1 = FocusNode();
FocusNode _nodeText2 = FocusNode();
FocusNode _nodeText3 = FocusNode();
var _patientSearchFormValues = PatientModel(
FirstName: "0",
MiddleName: "0",
@ -110,7 +114,11 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
@override
Widget build(BuildContext context) {
projectsProvider = Provider.of(context);
return AppScaffold(
return GestureDetector(
onTap: (){
FocusScope.of(context).requestFocus(new FocusNode());
},
child: AppScaffold(
appBarTitle: TranslationBase.of(context).searchPatient,
body: ListView(
children: <Widget>[
@ -344,7 +352,9 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
TranslationBase.of(context).phoneNumber,
borderColor: Colors.white,
textInputType: TextInputType.number,
textInputAction: TextInputAction.done,
inputFormatter: ONLY_NUMBERS,
focusNode: _nodeText1,
onSaved: (value) {
value == null || value == ''
? _patientSearchFormValues
@ -378,6 +388,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
borderColor: Colors.white,
textInputType: TextInputType.number,
inputFormatter: ONLY_NUMBERS,
focusNode: _nodeText2,
onSaved: (value) {
value == null || value==''
? _patientSearchFormValues.setPatientID =
@ -407,6 +418,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
TranslationBase.of(context).patientFile,
borderColor: Colors.white,
textInputType: TextInputType.number,
focusNode: _nodeText3,
inputFormatter: ONLY_NUMBERS,
onSaved: (value) {},
),
@ -478,6 +490,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
),
),
],
));
)),
);
}
}

13
lib/screens/prescription/add_prescription_form.dart
Unescape Escape View File

@ -209,6 +209,10 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
) =>
NetworkBaseView(
baseViewModel: model,
child: GestureDetector(
onTap: (){
FocusScope.of(context).requestFocus(new FocusNode());
},
child: DraggableScrollableSheet(
initialChildSize: 0.90,
maxChildSize: 0.90,
@ -243,6 +247,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: model.allMedicationList != null
? () {
Helpers.hideKeyboard(context);
setState(() {
_selectedMedication = null;
});
@ -377,6 +382,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
onTap: model.medicationStrengthList !=
null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: model
@ -424,6 +430,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: model.medicationRouteList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: model.medicationRouteList,
@ -468,6 +475,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: model.medicationFrequencyList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -509,6 +517,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: model.medicationDoseTimeList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -552,6 +561,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: indicationList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: indicationList,
@ -669,6 +679,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: InkWell(
onTap: model.medicationDurationList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -830,10 +841,12 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
);
}),
),
),
);
}
selectDate(BuildContext context, PrescriptionViewModel model) async {
Helpers.hideKeyboard(context);
DateTime selectedDate;
selectedDate = DateTime.now();
final DateTime picked = await showDatePicker(

11
lib/screens/prescription/update_prescription_form.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
@ -103,6 +104,10 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
(BuildContext context, MedicineViewModel model, Widget child) =>
NetworkBaseView(
baseViewModel: model,
child: GestureDetector(
onTap: (){
FocusScope.of(context).requestFocus(new FocusNode());
},
child: DraggableScrollableSheet(
initialChildSize: 0.95,
maxChildSize: 0.99,
@ -253,6 +258,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
onTap: model.medicationStrengthList !=
null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: model
@ -303,6 +309,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
child: InkWell(
onTap: model.medicationRouteList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list: model.medicationRouteList,
@ -349,6 +356,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
child: InkWell(
onTap: model.medicationDoseTimeList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -393,6 +401,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
child: InkWell(
onTap: model.medicationFrequencyList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -438,6 +447,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
child: InkWell(
onTap: model.medicationDurationList != null
? () {
Helpers.hideKeyboard(context);
ListSelectDialog dialog =
ListSelectDialog(
list:
@ -567,6 +577,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
));
}),
),
),
);
});
}

7
lib/screens/reschedule-leaves/reschedule_leave.dart
Unescape Escape View File

@ -113,7 +113,11 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
model2.getReasons(18),
model2.getCoveringDoctors()
},
builder: (_, model2, w) => AppScaffold(
builder: (_, model2, w) => GestureDetector(
onTap: (){
FocusScope.of(context).requestFocus(new FocusNode());
},
child: AppScaffold(
baseViewModel: model2,
isShowAppBar: false,
body: Center(
@ -832,6 +836,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
),
),
),
),
)));
}

7
lib/screens/sick-leave/sick_leave.dart
Unescape Escape View File

@ -83,7 +83,11 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
builder: (_, model, w) => BaseView<SickLeaveViewModel>(
onModelReady: (model2) => model2.preSickLeaveStatistics(
widget.appointmentNo, widget.patientMRN),
builder: (_, model2, w) => AppScaffold(
builder: (_, model2, w) => GestureDetector(
onTap: (){
FocusScope.of(context).requestFocus(new FocusNode());
},
child: AppScaffold(
baseViewModel: model2,
isShowAppBar: false,
body: Center(
@ -391,6 +395,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
),
),
),
),
)));
}

5
lib/util/helpers.dart
Unescape Escape View File

@ -408,4 +408,9 @@ class Helpers {
)),
);
}
/// hides the keyboard if its already open
static hideKeyboard(BuildContext context) {
FocusScope.of(context).unfocus();
}
}

2
lib/widgets/shared/TextFields.dart
Unescape Escape View File

@ -54,7 +54,7 @@ class TextFields extends StatefulWidget {
this.focus = false,
this.maxLengthEnforced = true,
this.suffixIconColor,
this.inputAction,
this.inputAction = TextInputAction.done,
this.onSubmit,
this.keepPadding = true,
this.textCapitalization = TextCapitalization.none,

10
lib/widgets/shared/app_text_form_field.dart
Unescape Escape View File

@ -17,7 +17,7 @@ class AppTextFormField extends FormField<String> {
TextInputType textInputType,
String hintText,
FocusNode focusNode,
TextInputAction textInputAction,
TextInputAction textInputAction=TextInputAction.done,
ValueChanged<String> onFieldSubmitted,
IconButton prefix,
String labelText,
@ -38,10 +38,10 @@ class AppTextFormField extends FormField<String> {
focusNode: focusNode,
keyboardType: textInputType,
readOnly: readOnly,
inputFormatters: [
FilteringTextInputFormatter.allow(
RegExp(inputFormatter)),
],
// inputFormatters: [
// FilteringTextInputFormatter.allow(
// RegExp(inputFormatter)),
// ],
onChanged: onChanged ??
(value) {
state.didChange(value);

6
pubspec.lock
Unescape Escape View File

@ -559,7 +559,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.4"
version: "1.3.0-nullsafety.3"
mime:
dependency: transitive
description:
@ -830,7 +830,7 @@ packages:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.2"
version: "1.10.0-nullsafety.1"
stream_channel:
dependency: transitive
description:
@ -965,5 +965,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.10.0 <=2.11.0-213.1.beta"
dart: ">=2.10.0 <2.11.0"
flutter: ">=1.22.0 <2.0.0"

Write Preview
Loading…
Cancel
Save