my family

merge-update-with-lab-changes
Sultan Khan 5 years ago
parent 30a8e24521
commit 00b0154987

@ -20,6 +20,8 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
class MyFamily extends StatefulWidget { class MyFamily extends StatefulWidget {
final bool isAppbarVisible;
MyFamily({this.isAppbarVisible =true});
@override @override
_MyFamily createState() => _MyFamily(); _MyFamily createState() => _MyFamily();
} }
@ -39,65 +41,66 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
bool expandFlag = false; bool expandFlag = false;
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( // return Scaffold(
appBar: AppBar( // appBar: AppBar(
bottom: TabBar( // bottom: TabBar(
indicatorColor: Colors.red,
tabs: [
Padding(
padding: EdgeInsets.all(6),
child: AppText(
TranslationBase.of(context).family,
color: Colors.white,
)),
Padding(
padding: EdgeInsets.all(6),
child: AppText(
TranslationBase.of(context).request,
color: Colors.white,
)),
],
controller: _tabController,
),
title: AppText(TranslationBase.of(context).myFamilyFiles,
color: Colors.white)),
body: TabBarView(
// physics: NeverScrollableScrollPhysics(),
children: [myFamilyDetails(context), myFamilyRequest(context)],
controller: _tabController),
bottomNavigationBar: BottomBarSearch());
// AppScaffold(
// appBarTitle: TranslationBase.of(context).myFamilyFiles,
// isShowAppBar: true,
// body: SingleChildScrollView(
// child: Container(
// height: SizeConfig.screenHeight,
// width: SizeConfig.realScreenWidth,
// padding: EdgeInsets.all(20),
// child: Stack(
// children: <Widget>[
// TabBar(
// controller: _tabController,
// indicatorColor: Colors.red, // indicatorColor: Colors.red,
// tabs: [ // tabs: [
// Padding( // Padding(
// padding: EdgeInsets.all(6), // padding: EdgeInsets.all(6),
// child: Text(TranslationBase.of(context).family)), // child: AppText(
// TranslationBase.of(context).family,
// color: Colors.white,
// )),
// Padding( // Padding(
// padding: EdgeInsets.all(6), // padding: EdgeInsets.all(6),
// child: Text(TranslationBase.of(context).request)), // child: AppText(
// TranslationBase.of(context).request,
// color: Colors.white,
// )),
// ], // ],
// ),
// TabBarView(
// controller: _tabController, // controller: _tabController,
// children: [ // ),
// myFamilyDetails(context), //
// myFamilyRequest(context) // ),
// ], // body: TabBarView(
// ) // // physics: NeverScrollableScrollPhysics(),
// ], // children: [myFamilyDetails(context), myFamilyRequest(context)],
// )))); // controller: _tabController),
// );
// //bottomNavigationBar: BottomBarSearch());
return AppScaffold(
appBarTitle: TranslationBase.of(context).myFamilyFiles,
isShowAppBar: widget.isAppbarVisible,
body: SingleChildScrollView(
child: Container(
height: SizeConfig.screenHeight,
width: SizeConfig.realScreenWidth,
padding: EdgeInsets.all(20),
child: Stack(
children: <Widget>[
TabBar(
controller: _tabController,
indicatorColor: Colors.red,
tabs: [
Padding(
padding: EdgeInsets.all(6),
child: Text(TranslationBase.of(context).family)),
Padding(
padding: EdgeInsets.all(6),
child: Text(TranslationBase.of(context).request)),
],
),
TabBarView(
controller: _tabController,
children: [
myFamilyDetails(context),
myFamilyRequest(context)
],
)
],
))));
} }
Widget myFamilyDetails(context) { Widget myFamilyDetails(context) {
@ -219,12 +222,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
} }
Widget myFamilyRequest(context) { Widget myFamilyRequest(context) {
return Padding( return //Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0), // padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: SingleChildScrollView( // child:
SingleChildScrollView(
child: Container(
height: MediaQuery.of(context).size.height,
margin: EdgeInsets.only(top:50),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
// SizedBox(height: 20.0),
RoundedContainer( RoundedContainer(
child: ExpansionTile( child: ExpansionTile(
title: Text( title: Text(

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da
import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
import 'package:diplomaticquarterapp/models/LiveCare/IncomingCallData.dart'; import 'package:diplomaticquarterapp/models/LiveCare/IncomingCallData.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart';
import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
import 'package:diplomaticquarterapp/pages/livecare/incoming_call.dart'; import 'package:diplomaticquarterapp/pages/livecare/incoming_call.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
@ -387,7 +388,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
), ),
MedicalProfilePage(), MedicalProfilePage(),
BookingOptions(), BookingOptions(),
Container(), MyFamily(isAppbarVisible:false),
ToDo(), ToDo(),
], // Please do not remove the BookingOptions from this array ], // Please do not remove the BookingOptions from this array
), ),

Loading…
Cancel
Save