fix flutter 2

merge-requests/910/head
Elham Rababh 4 years ago
parent 8df3cf8a33
commit 7af43f5f1d

@ -309,7 +309,7 @@
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
@ -350,7 +350,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",

@ -10,7 +10,7 @@ class HomePatientCard extends StatelessWidget {
final Color backgroundIconColor;
final String text;
final Color textColor;
final GestureTapCallback onTap;
final VoidCallback onTap;
final double iconSize;
HomePatientCard({

@ -74,7 +74,7 @@ class _HomeScreenState extends State<HomeScreen> {
},
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: true,
isShowAppBar: false,
appBar: HomeScreenHeader(
model: model,
onOpenDrawer: () {
@ -393,7 +393,7 @@ class _HomeScreenState extends State<HomeScreen> {
context,
FadePage(
page: InPatientScreen(
specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider!.doctorClinicsList[0]!.clinicID!)!,
specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider!.doctorClinicsList[0]!.clinicID!),
),
),
);

@ -11,15 +11,15 @@ import 'package:provider/provider.dart';
class InPatientHeader extends StatelessWidget with PreferredSizeWidget {
InPatientHeader(
{required this.model,
required this.specialClinic,
this.specialClinic,
this.activeTab,
this.selectedMapId,
this.onChangeFunc})
: super();
final PatientSearchViewModel model;
final GetSpecialClinicalCareListResponseModel specialClinic;
final GetSpecialClinicalCareListResponseModel? specialClinic;
final activeTab;
final selectedMapId;
final selectedMapId;
final onChangeFunc;
@override

@ -20,12 +20,12 @@ import '../DischargedPatientPage.dart';
import 'in_patient_list_page.dart';
class InPatientScreen extends StatefulWidget {
GetSpecialClinicalCareListResponseModel specialClinic;
GetSpecialClinicalCareListResponseModel? specialClinic;
bool isAllClinic = true;
bool showBottomSheet = false;
late String selectedClinicName;
InPatientScreen({Key? key, required this.specialClinic});
String ?selectedClinicName;
InPatientScreen({Key? key, this.specialClinic});
@override
_InPatientScreenState createState() => _InPatientScreenState();
@ -35,7 +35,7 @@ class _InPatientScreenState extends State<InPatientScreen>
with SingleTickerProviderStateMixin {
late TabController _tabController;
int _activeTab = 0;
late int selectedMapId;
int ? selectedMapId;
@override
void initState() {
@ -69,7 +69,7 @@ class _InPatientScreenState extends State<InPatientScreen>
model.clearPatientList();
if (widget.specialClinic != null) {
await model
.getSpecialClinicalCareMappingList(widget.specialClinic.clinicID);
.getSpecialClinicalCareMappingList(widget.specialClinic!.clinicID);
// requestModel.nursingStationID =
// model.specialClinicalCareMappingList[0].nursingStationID;
}
@ -160,14 +160,14 @@ class _InPatientScreenState extends State<InPatientScreen>
patientSearchViewModel: model,
isAllClinic: widget.isAllClinic,
showBottomSheet: widget.showBottomSheet,
selectedClinicName: widget.selectedClinicName,
selectedClinicName: widget.selectedClinicName??'',
onChangeValue: onChangeState),
InPatientListPage(
isMyInPatient: true,
patientSearchViewModel: model,
isAllClinic: widget.isAllClinic,
showBottomSheet: widget.showBottomSheet,
selectedClinicName: widget.selectedClinicName,
selectedClinicName: widget.selectedClinicName??"",
onChangeValue: onChangeState),
DischargedPatient(),
],

@ -21,8 +21,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
});
final TextEditingController? searchController;
final Function? onChangeFun;
final Function(String)? onChangeFun;
final Function(String)? onFieldSubmitted;
final Widget ?positionedChild;
@ -54,7 +53,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
onPressed: () {},
),
controller: searchController,
onChanged: onChangeFun!(),
onChanged: (value)=>onChangeFun,
onFieldSubmitted: ()=>onFieldSubmitted,
validationError: validationError),
if (positionedChild != null)

Loading…
Cancel
Save