fix header

dev_v2.8_reverting
Elham Rababh 4 years ago
parent 6628b6d67c
commit 6ca54f885c

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart';
import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart';
@ -53,10 +54,8 @@ class _LabsHomePageState extends State<LabsHomePage> {
baseViewModel: model, baseViewModel: model,
backgroundColor: Colors.grey[100], backgroundColor: Colors.grey[100],
isShowAppBar: true, isShowAppBar: true,
appBar: PatientProfileAppBar( patientProfileAppBarModel: PatientProfileAppBarModel(
patient, patient: patient, isInpatient:isInpatient,),
isInpatient: isInpatient,
),
body: SingleChildScrollView( body: SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: FractionallySizedBox( child: FractionallySizedBox(

@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart'; import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -36,7 +37,6 @@ class AppScaffold extends StatelessWidget {
this.bottomSheet, this.bottomSheet,
this.backgroundColor, this.backgroundColor,
this.isHomeIcon = true, this.isHomeIcon = true,
this.subtitle, this.subtitle,
this.patientProfileAppBarModel, this.patientProfileAppBarModel,
this.drawer, this.extendBody = false, this.bottomNavigationBar, this.appBar}); this.drawer, this.extendBody = false, this.bottomNavigationBar, this.appBar});
@ -55,18 +55,20 @@ class AppScaffold extends StatelessWidget {
extendBody: extendBody, extendBody: extendBody,
bottomNavigationBar: bottomNavigationBar, bottomNavigationBar: bottomNavigationBar,
appBar: isShowAppBar appBar: isShowAppBar
? appBar ?? ? patientProfileAppBarModel != null ? PatientProfileAppBar(patientProfileAppBarModel!.patient!,
AppBar( patientProfileAppBarModel: patientProfileAppBarModel!,) : appBar ??
elevation: 0, AppBar(
backgroundColor: Colors.white, //HexColor('#515B5D'), elevation: 0,
textTheme: TextTheme( backgroundColor: Colors.white,
headline6: TextStyle( //HexColor('#515B5D'),
color: Colors.black87, textTheme: TextTheme(
fontSize: 16.8, headline6: TextStyle(
)), color: Colors.black87,
title: Column( fontSize: 16.8,
crossAxisAlignment: CrossAxisAlignment.center, )),
children: [ title: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(appBarTitle.toUpperCase()), Text(appBarTitle.toUpperCase()),
if (subtitle != null) if (subtitle != null)
Text( Text(

Loading…
Cancel
Save