diff --git a/fonts/SourceSerif4-ExtraLight.ttf b/fonts/SourceSerif4-ExtraLight.ttf
new file mode 100644
index 0000000..6ff0eb7
Binary files /dev/null and b/fonts/SourceSerif4-ExtraLight.ttf differ
diff --git a/fonts/SourceSerif4-Italic.ttf b/fonts/SourceSerif4-Italic.ttf
new file mode 100644
index 0000000..6fc0375
Binary files /dev/null and b/fonts/SourceSerif4-Italic.ttf differ
diff --git a/fonts/SourceSerif4-Light.ttf b/fonts/SourceSerif4-Light.ttf
new file mode 100644
index 0000000..acf7063
Binary files /dev/null and b/fonts/SourceSerif4-Light.ttf differ
diff --git a/fonts/SourceSerif4-Regular.ttf b/fonts/SourceSerif4-Regular.ttf
new file mode 100644
index 0000000..bd14f6c
Binary files /dev/null and b/fonts/SourceSerif4-Regular.ttf differ
diff --git a/fonts/SourceSerif4-SemiBold.ttf b/fonts/SourceSerif4-SemiBold.ttf
new file mode 100644
index 0000000..b22bc9f
Binary files /dev/null and b/fonts/SourceSerif4-SemiBold.ttf differ
diff --git a/lib/constants.dart b/lib/constants.dart
index 739bfde..c528845 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -7,3 +7,240 @@ class Constants {
static const url = 'http://192.168.2.143:8085/api';
//static const url = 'http://192.168.153.50:8082/api';
}
+
+
+ // adds spacing between the text and image
+ // Flexible(
+ // flex: 1,
+ // child: Padding(
+ // padding: const EdgeInsets.only(
+ // left: 1.0, right: 1.0),
+ // child: Card(
+ // elevation: 5,
+ // shape: RoundedRectangleBorder(
+ // borderRadius:
+ // BorderRadius.circular(0.0),
+ // ),
+ // color: const Color.fromARGB(
+ // 255, 0, 71, 137),
+ // child: ExpansionTile(
+ // maintainState: true,
+ // onExpansionChanged:
+ // (bool expanded) {
+ // setState(() {
+ // _isExpanded = expanded;
+ // });
+ // },
+ // backgroundColor:
+ // const Color.fromARGB(
+ // 255, 0, 71, 137),
+ // trailing: Icon(
+ // _isExpanded
+ // ? Icons.keyboard_arrow_up
+ // : Icons
+ // .keyboard_arrow_down,
+ // color: Colors.white),
+ // // collapsedBackgroundColor: Color(0xFF2b9af3),
+ // initiallyExpanded: true,
+ // title: Row(
+ // //mainAxisSize: MainAxisSize.min,
+ // children: [
+ // // GestureDetector(
+
+ // Text1(
+ // title:
+ // "Medical Insight",
+ // txtcolor: Colors.white,
+ // fontweight:
+ // FontWeight.normal,
+ // txtfont: 17.0),
+ // // ),
+ // const SizedBox(
+ // width: 8.0,
+ // ),
+ // Text1(
+ // title: "4",
+ // txtfont: 18.0,
+ // txtcolor:
+ // const Color.fromARGB(
+ // 255, 60, 82, 102),
+ // )
+ // ],
+ // ),
+ // children: [
+ // Container(
+ // height: MediaQuery.of(context)
+ // .size
+ // .height /
+ // 5,
+ // color: Colors.white,
+ // child: Consumer<
+ // MediacalInsightProvider>(
+ // builder: (context, value,
+ // child) {
+ // return Column(
+ // children: [
+
+ // Expanded(
+ // child:
+ // ListView.builder(
+ // physics:
+ // const ScrollPhysics(),
+ // // scrollDirection: Axis.vertical,
+ // shrinkWrap:
+ // true,
+ // itemCount: value
+ // .med
+ // .length,
+ // itemBuilder:
+ // (context,
+ // index) {
+ // item = value
+ // .med[
+ // index];
+
+ // print(
+ // "Item_Medical_insight ${item['Therapeutic Area']}");
+ // return Padding(
+ // padding: const EdgeInsets
+ // .all(
+ // 8.0),
+ // child:
+ // Card(
+ // margin:
+ // EdgeInsets.zero,
+
+ // elevation:
+ // 4,
+ // surfaceTintColor:
+ // Colors.white,
+ // shape:
+ // RoundedRectangleBorder(
+ // borderRadius:
+ // BorderRadius.zero,
+ // ),
+
+ // // shape: RoundedRectangleBorder(
+ // // side: BorderSide(color: Colors.black, width: 1),
+ // // borderRadius: BorderRadius.only(
+ // // bottomRight: Radius.circular(30)),
+ // // ),
+ // child:
+ // SizedBox(
+ // width:
+ // MediaQuery.sizeOf(context).width,
+ // child:
+ // ListTile(
+ // dense:
+ // true,
+ // title:
+ // Column(
+ // // crossAxisAlignment: CrossAxisAlignment.center,
+ // children: [
+ // // Text(
+ // // "Acute neurology is the therapeutic area of the medical insight for Product A. The age of treatment is the topic of interest for this source type publication."),
+
+ // RichText(
+ // text: TextSpan(
+ // text: '',
+ // style: DefaultTextStyle.of(context).style,
+ // children: const [
+ // TextSpan(text: 'Acute neurology ', style: TextStyle(fontWeight: FontWeight.bold)),
+ // // TextSpan(
+ // // text: ' therapeutic area ',
+ // // style: TextStyle(
+ // // fontWeight:
+ // // FontWeight.bold)),
+ // TextSpan(text: 'is the therapeutic area of the medical insight for '),
+ // TextSpan(text: 'Product A. The age of treatment', style: TextStyle(fontWeight: FontWeight.bold)),
+ // TextSpan(text: ' is the topic of interest for this source type'),
+ // TextSpan(text: ' publication.', style: TextStyle(fontWeight: FontWeight.bold)),
+ // ],
+ // ),
+ // ),
+
+ // const Padding(
+ // padding: EdgeInsets.all(8.0),
+ // child: Row(
+ // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ // children: [
+ // Row(
+ // children: [
+ // Icon(
+ // Icons.person,
+ // size: 20,
+ // ),
+ // Text(
+ // "pooja",
+ // style: TextStyle(fontSize: 14.0),
+ // )
+ // ],
+ // ),
+ // Row(
+ // children: [
+ // Icon(
+ // Icons.calendar_today,
+ // size: 20,
+ // ),
+ // Text(
+ // "11/11/2022 ",
+ // style: TextStyle(fontSize: 14.0),
+ // )
+ // ],
+ // )
+ // ],
+ // ),
+ // ),
+ // ],
+ // ),
+ // ),
+ // ),
+ // // shape: BorderRadius.only(bottomRight: Radius.circular(50)),
+ // ),
+ // );
+ // }),
+ // )
+ // ],
+ // );
+ // }),
+ // ),
+ // Container(
+ // color: Colors.white,
+ // child: Align(
+ // alignment: Alignment.center,
+ // child: Padding(
+ // padding:
+ // const EdgeInsets.all(
+ // 8.0),
+ // child: OutlinedButton(
+ // onPressed: () {
+
+ // },
+ // child: Text(
+ // 'Show More',
+ // style: TextStyle(
+ // color: Constants
+ // .k2color),
+ // ),
+ // style: OutlinedButton
+ // .styleFrom(
+ // shape:
+ // RoundedRectangleBorder(
+ // borderRadius:
+ // BorderRadius
+ // .circular(
+ // 12),
+ // ),
+ // ),
+ // ),
+ // ),
+ // ),
+ // )
+ // ]),
+ // ),
+ // ),
+ // ),
+
+ // SizedBox(
+ // height: 10.0,
+ // ),
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index f07cb85..6da1a80 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -99,11 +99,13 @@ class _MyAppState extends State {
debugShowCheckedModeBanner: false,
title: 'Flutter Demo',
theme: ThemeData(
+ fontFamily: 'SourceSerif',
appBarTheme: const AppBarTheme(
backgroundColor: Color.fromARGB(255, 0, 71, 132),
foregroundColor: Colors.white //here you can give the text color
)),
- home: const MyHomePage(title: 'Discover Module'),
+ home: Contacts1(),
+ // home: const MyHomePage(title: 'Discover Module'),
// home: const MedicalInsight(),
);
}
diff --git a/lib/ui_screen/interactionform/edit_interaction_screen.dart b/lib/ui_screen/interactionform/edit_interaction_screen.dart
index aeaf60b..7016997 100644
--- a/lib/ui_screen/interactionform/edit_interaction_screen.dart
+++ b/lib/ui_screen/interactionform/edit_interaction_screen.dart
@@ -107,6 +107,7 @@ class _EditInteractionScreenState extends State {
child: OrientationBuilder(builder: (context, orientation) {
return SafeArea(
child: Scaffold(
+ backgroundColor: Colors.white,
appBar: AppBar(
title: Text(
widget.saveInteraction.id,
diff --git a/lib/ui_screen/interactionform/view_forms_list.dart b/lib/ui_screen/interactionform/view_forms_list.dart
index fcfc416..ddb2643 100644
--- a/lib/ui_screen/interactionform/view_forms_list.dart
+++ b/lib/ui_screen/interactionform/view_forms_list.dart
@@ -4,6 +4,7 @@ import 'package:discover_module/ui_screen/interactionform/util.dart';
import 'package:discover_module/ui_screen/interactionform/view_interaction_screen.dart';
import 'package:discover_module/ui_screen/interactionform/viewinteractionprovider.dart';
import 'package:discover_module/ui_screen/new_editinteraction.dart';
+import 'package:discover_module/ui_screen/new_viewinteraction.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -86,7 +87,7 @@ class _SavedFormListScreenState extends State {
context,
MaterialPageRoute(
builder: (BuildContext context) =>
- ViewInteractionScreen(
+ ViewInteractionScreen1(
saveInteraction:
provider.savedList[index],
)));
@@ -144,7 +145,7 @@ class _SavedFormListScreenState extends State {
context,
MaterialPageRoute(
builder: (BuildContext context) =>
- ViewInteractionScreen(
+ ViewInteractionScreen1(
saveInteraction:
provider.savedList[index],
)));
diff --git a/lib/ui_screen/medical_insight.dart b/lib/ui_screen/medical_insight.dart
index d7e7f45..594f93e 100644
--- a/lib/ui_screen/medical_insight.dart
+++ b/lib/ui_screen/medical_insight.dart
@@ -433,14 +433,14 @@ import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
import 'package:adoptive_calendar/adoptive_calendar.dart';
-class MedicalInsight extends StatefulWidget {
- const MedicalInsight({super.key});
+class MedicalInsight1 extends StatefulWidget {
+ const MedicalInsight1({super.key});
@override
- State createState() => _MedicalInsightState();
+ State createState() => _MedicalInsightState();
}
-class _MedicalInsightState extends State {
+class _MedicalInsightState extends State {
final List