From 3771a44e0e146a52b52917e32c1d72ab4c248045 Mon Sep 17 00:00:00 2001 From: poojakhatawate Date: Fri, 26 Jul 2024 14:28:22 +0530 Subject: [PATCH] bottom bar1 --- lib/ui_screen/new_profile.dart | 537 +++++++++++++++++++++++++++------ 1 file changed, 446 insertions(+), 91 deletions(-) diff --git a/lib/ui_screen/new_profile.dart b/lib/ui_screen/new_profile.dart index 606205f..efd3210 100644 --- a/lib/ui_screen/new_profile.dart +++ b/lib/ui_screen/new_profile.dart @@ -333,7 +333,7 @@ class _NewProfileState extends State { ]), ), const SizedBox( - height: 8.0, + height: 15.0, ), Align( alignment: Alignment.centerLeft, @@ -465,7 +465,7 @@ class _NewProfileState extends State { style: TextStyle( fontWeight: FontWeight - .w500), + .w600), ), )), // DataColumn( @@ -479,7 +479,10 @@ class _NewProfileState extends State { DataColumn( label: Expanded( child: Text( - 'Time Frame'))), + 'Time Frame', + style: TextStyle( + fontWeight: + FontWeight.w600)))), // DataColumn( // label: Expanded( // child: Text( @@ -682,7 +685,7 @@ class _NewProfileState extends State { width: 8.0, ), Text1( - title: "3", + title: "(3)", txtcolor: Colors.white, fontweight: FontWeight.normal, @@ -728,31 +731,44 @@ class _NewProfileState extends State { // label: Expanded( // child: Text( // 'sl no'))), - DataColumn( - label: Expanded( - child: Text( - ''))), + // DataColumn( + // label: Expanded( + // child: Text( + // ''))), DataColumn( label: Expanded( child: Text( 'Artical Title', + style: TextStyle( + fontWeight: + FontWeight + .w600), softWrap: true), )), DataColumn( label: Expanded( child: Text( - 'Journal Name', - softWrap: true, - ))), + 'Journal Name', + softWrap: + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( - 'Date'))), + 'Date', + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( - 'Authors'))), + 'Authors', + style: TextStyle( + fontWeight: + FontWeight.w600)))), // Add more columns as needed ], @@ -761,13 +777,13 @@ class _NewProfileState extends State { .length, (index) => DataRow( cells: [ - DataCell(Text( - publication_data[index] - [ - 'id'] - .toString(), - softWrap: - true)), + // DataCell(Text( + // publication_data[index] + // [ + // 'id'] + // .toString(), + // softWrap: + // true)), DataCell(Text( publication_data[index] [ @@ -901,7 +917,7 @@ class _NewProfileState extends State { width: 8.0, ), Text1( - title: "4", + title: "(4)", txtcolor: Colors.white, fontweight: FontWeight.normal, @@ -928,36 +944,49 @@ class _NewProfileState extends State { color: Colors.white, child: DataTable( columns: const [ - DataColumn( - label: Expanded( - child: Text( - '', - softWrap: - true))), + // DataColumn( + // label: Expanded( + // child: Text( + // '', + // softWrap: + // true))), DataColumn( label: Expanded( child: Text( 'Event Name', - softWrap: true), + softWrap: true, + style: TextStyle( + fontWeight: + FontWeight + .w600)), )), DataColumn( label: Expanded( child: Text( 'Session Type', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Topic', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Role', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), // Add more columns as needed ], @@ -965,12 +994,12 @@ class _NewProfileState extends State { event_data.length, (index) => DataRow( cells: [ - DataCell(Text( - event_data[index] - ['id'] - .toString(), - softWrap: - true)), + // DataCell(Text( + // event_data[index] + // ['id'] + // .toString(), + // softWrap: + // true)), DataCell(Text( event_data[index] [ @@ -1104,7 +1133,7 @@ class _NewProfileState extends State { width: 8.0, ), Text1( - title: "4", + title: "(4)", txtcolor: Colors.white, fontweight: FontWeight.normal, @@ -1130,17 +1159,21 @@ class _NewProfileState extends State { color: Colors.white, child: DataTable( columns: const [ - DataColumn( - label: Expanded( - child: Text( - '', - softWrap: - true))), + // DataColumn( + // label: Expanded( + // child: Text( + // '', + // softWrap: + // true))), DataColumn( label: Expanded( child: Text( 'Trial Name', - softWrap: true), + softWrap: true, + style: TextStyle( + fontWeight: + FontWeight + .w600)), )), DataColumn( @@ -1148,31 +1181,46 @@ class _NewProfileState extends State { child: Text( 'Status', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Sponsers', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Condition', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Intervention', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), DataColumn( label: Expanded( child: Text( 'Phase', softWrap: - true))), + true, + style: TextStyle( + fontWeight: + FontWeight.w600)))), // Add more columns as needed ], @@ -1180,12 +1228,12 @@ class _NewProfileState extends State { trial_data.length, (index) => DataRow( cells: [ - DataCell(Text( - trial_data[index] - ['id'] - .toString(), - softWrap: - true)), + // DataCell(Text( + // trial_data[index] + // ['id'] + // .toString(), + // softWrap: + // true)), DataCell(Text( trial_data[index] [ @@ -1330,7 +1378,7 @@ class _NewProfileState extends State { width: 8.0, ), Text1( - title: "3", + title: "(3)", txtcolor: Colors.white, fontweight: FontWeight.normal, @@ -1932,6 +1980,7 @@ class _NewProfileState extends State { showModalBottomSheet( // isScrollControlled: // true, + context: context, useRootNavigator: true, @@ -1964,7 +2013,9 @@ class _NewProfileState extends State { builder: (BuildContext context, ScrollController scrollController) { return Container( width: MediaQuery.of(context).size.width, - color: Colors.white, + //color: Colors.white, + color: Color.fromARGB(255, 246, 248, 252), + // decoration: // BoxDecoration(borderRadius: BorderRadius.circular(10)), // child: ListView( @@ -1980,7 +2031,162 @@ class _NewProfileState extends State { controller: scrollController, itemCount: 1, itemBuilder: (BuildContext context, int index) { - return Column( + return + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisSize: MainAxisSize.min, + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // // Row( + // // children: [ + // // Text( + // // "Affiliation", + // // style: TextStyle(fontSize: 20.0), + // // ) + // // ], + // // ), + // Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // // Padding( + // // padding: const EdgeInsets.only( + // // left: 8.0, top: 28.0), + // // child: Text( + // // "Organization Name", + // // style: TextStyle(fontSize: 14.0), + // // ), + // // ), + // Padding( + // padding: const EdgeInsets.all(28.0), + // child: Text( + // affiliation_data['org_name'], + // style: TextStyle(fontSize: 18.0), + // ), + // ) + // ], + // ), + // Container( + // color: Colors.grey.withOpacity(0.1), + // child: Row( + // // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: + // MainAxisAlignment.spaceBetween, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 28.0, top: 18.0), + // child: Text( + // "Department", + // style: TextStyle(fontSize: 14.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(right: 8.0), + // child: Text( + // affiliation_data['dept'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // ), + // Row( + // // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Role", + // style: TextStyle(fontSize: 14.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(right: 8.0), + // child: Text( + // affiliation_data['role'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Container( + // color: Colors.grey.withOpacity(0.1), + // child: Row( + // // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: + // MainAxisAlignment.spaceBetween, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Time Frame", + // style: TextStyle(fontSize: 14.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(right: 8.0), + // child: Text( + // affiliation_data['time_frame'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // ), + // Row( + // // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0, bottom: 18.0), + // child: Text( + // "Oraganization Type", + // style: TextStyle(fontSize: 14.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(right: 8.0), + // child: Text( + // affiliation_data['org_type'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Container( + // color: Colors.grey.withOpacity(0.1), + // child: Row( + // // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: + // MainAxisAlignment.spaceBetween, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0, bottom: 18.0), + // child: Text( + // "Eng Type", + // style: TextStyle(fontSize: 14.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(right: 8.0), + // child: Text( + // affiliation_data['emg_type'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // ), + // ], + // ); + + Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, @@ -1993,42 +2199,48 @@ class _NewProfileState extends State { // ) // ], // ), - Column( + SizedBox( + height: 18.0, + ), + Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: const EdgeInsets.only( - left: 8.0, top: 28.0), - child: Text( - "Organization Name", - style: TextStyle(fontSize: 12.0), - ), - ), - Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['org_name'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 18.0, + color: Colors.grey[700]), ), ) ], ), + SizedBox( + height: 18.0, + ), + Divider(), + SizedBox( + height: 8.0, + ), + Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: const EdgeInsets.only( - left: 8.0, top: 18.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( "Department", - style: TextStyle(fontSize: 12.0), + style: TextStyle(fontSize: 13.0), ), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['dept'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 15.0, + color: Colors.grey[700]), ), ) ], @@ -2038,17 +2250,19 @@ class _NewProfileState extends State { children: [ Padding( padding: const EdgeInsets.only( - left: 8.0, top: 18.0), + left: 18.0, top: 18.0), child: Text( "Role", - style: TextStyle(fontSize: 12.0), + style: TextStyle(fontSize: 13.0), ), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['role'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 15.0, + color: Colors.grey[700]), ), ) ], @@ -2058,17 +2272,19 @@ class _NewProfileState extends State { children: [ Padding( padding: const EdgeInsets.only( - left: 8.0, top: 18.0), + left: 18.0, top: 18.0), child: Text( "Time Frame", - style: TextStyle(fontSize: 12.0), + style: TextStyle(fontSize: 13.0), ), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['time_frame'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 15.0, + color: Colors.grey[700]), ), ) ], @@ -2078,17 +2294,19 @@ class _NewProfileState extends State { children: [ Padding( padding: const EdgeInsets.only( - left: 8.0, top: 18.0), + left: 18.0, top: 18.0), child: Text( "Oraganization Type", - style: TextStyle(fontSize: 12.0), + style: TextStyle(fontSize: 13.0), ), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['org_type'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 15.0, + color: Colors.grey[700]), ), ) ], @@ -2098,23 +2316,160 @@ class _NewProfileState extends State { children: [ Padding( padding: const EdgeInsets.only( - left: 8.0, top: 18.0), + left: 18.0, top: 18.0), child: Text( "Eng Type", - style: TextStyle(fontSize: 12.0), + style: TextStyle(fontSize: 13.0), ), ), Padding( - padding: const EdgeInsets.only(left: 8.0), + padding: const EdgeInsets.only(left: 18.0), child: Text( affiliation_data['emg_type'], - style: TextStyle(fontSize: 14.0), + style: TextStyle( + fontSize: 15.0, + color: Colors.grey[700]), ), ) ], ), ], ); + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisSize: MainAxisSize.min, + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // // Row( + // // children: [ + // // Text( + // // "Affiliation", + // // style: TextStyle(fontSize: 20.0), + // // ) + // // ], + // // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 28.0), + // child: Text( + // "Organization Name", + // style: TextStyle(fontSize: 13.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['org_name'], + // style: TextStyle(fontSize: 16.0), + // ), + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Department", + // style: TextStyle(fontSize: 12.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['dept'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Role", + // style: TextStyle(fontSize: 12.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['role'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Time Frame", + // style: TextStyle(fontSize: 12.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['time_frame'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Oraganization Type", + // style: TextStyle(fontSize: 12.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['org_type'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: const EdgeInsets.only( + // left: 8.0, top: 18.0), + // child: Text( + // "Eng Type", + // style: TextStyle(fontSize: 12.0), + // ), + // ), + // Padding( + // padding: const EdgeInsets.only(left: 8.0), + // child: Text( + // affiliation_data['emg_type'], + // style: TextStyle(fontSize: 14.0), + // ), + // ) + // ], + // ), + // ], + // ); }, ), ),